aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ThumbnailerTest.php
diff options
context:
space:
mode:
authorVirtualTam <virtualtam@flibidi.net>2019-02-23 16:46:02 +0100
committerVirtualTam <virtualtam@flibidi.net>2019-02-23 16:46:02 +0100
commitaf22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e (patch)
treee461ef309a15e9b9da6058892350c4275558d783 /tests/ThumbnailerTest.php
parent1a3da5a5011fc79c2bf15a8d1f6c7dd9f87db715 (diff)
parent1c03b65e2ea722b39e54b22c46014f35e34b575b (diff)
downloadShaarli-af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e.tar.gz
Shaarli-af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e.tar.zst
Shaarli-af22c1ae3adb7a0705814bb7c4d75c9e2aa26a0e.zip
Merge tag 'v0.10.3' into latest
Release v0.10.3
Diffstat (limited to 'tests/ThumbnailerTest.php')
-rw-r--r--tests/ThumbnailerTest.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/ThumbnailerTest.php b/tests/ThumbnailerTest.php
index 08311545..c01849f7 100644
--- a/tests/ThumbnailerTest.php
+++ b/tests/ThumbnailerTest.php
@@ -98,15 +98,17 @@ class ThumbnailerTest extends TestCase
98 ini_set('error_log', $oldlog); 98 ini_set('error_log', $oldlog);
99 } 99 }
100 100
101 protected function rrmdirContent($dir) { 101 protected function rrmdirContent($dir)
102 {
102 if (is_dir($dir)) { 103 if (is_dir($dir)) {
103 $objects = scandir($dir); 104 $objects = scandir($dir);
104 foreach ($objects as $object) { 105 foreach ($objects as $object) {
105 if ($object != "." && $object != "..") { 106 if ($object != "." && $object != "..") {
106 if (is_dir($dir."/".$object)) 107 if (is_dir($dir."/".$object)) {
107 $this->rrmdirContent($dir."/".$object); 108 $this->rrmdirContent($dir."/".$object);
108 else 109 } else {
109 unlink($dir."/".$object); 110 unlink($dir."/".$object);
111 }
110 } 112 }
111 } 113 }
112 } 114 }