diff options
author | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2019-02-23 16:27:33 +0100 |
commit | 43c77f658a905e2def6aeca4c092683977cd0c55 (patch) | |
tree | cb0dc273a315a777847d251f856625b2fc779c04 /tests/ThumbnailerTest.php | |
parent | 630ebca2b6359e942e5b6c057cca2b6069c1093a (diff) | |
parent | 1826e383ecf501302974132fd443cf1ca06e10f6 (diff) | |
download | Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.gz Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.tar.zst Shaarli-43c77f658a905e2def6aeca4c092683977cd0c55.zip |
Merge commit '1826e383ecf501302974132fd443cf1ca06e10f6' into v0.10
Diffstat (limited to 'tests/ThumbnailerTest.php')
-rw-r--r-- | tests/ThumbnailerTest.php | 8 |
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 | } |