bug:2511

Warning messages during thumbnails creation (FTP method) git-svn-id: http://piwigo.org/svn/trunk@12640 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Nov 17, 2011 · 5c7f267 · 5c7f267
1 parent 24e6177
commit 5c7f267
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/admin/include/functions.php b/admin/include/functions.php
@@ -858,6 +858,8 @@ function get_fs($path, $recursive = true)
     {
       while (($node = readdir($contents)) !== false)
       {
+        if ($node == '.' or $node == '..') continue;
+
         if (is_file($path.'/'.$node))
         {
           $extension = get_extension($node);
@@ -884,11 +886,7 @@ function get_fs($path, $recursive = true)
             array_push($fs['elements'], $path.'/'.$node);
           }
         }
-        else if (is_dir($path.'/'.$node)
-                 and $node != '.'
-                 and $node != '..'
-                 and $node != 'pwg_high'
-                 and $recursive)
+        else if (is_dir($path.'/'.$node) and $node != 'pwg_high' and $recursive)
         {
           array_push($subdirs, $node);
         }