Changeset 12643 for branches/2.3/admin/include/functions.php

Timestamp:

Nov 17, 2011, 7:10:51 PM (12 years ago)

Author:

patdenice

Message:

merge r12642 from trunk to branch 2.3
bug:2513
Warning messages during synchronisation on some servers

File:

• branches/2.3/admin/include/functions.php (modified) (1 diff)

branches/2.3/admin/include/functions.php

@@ -534 +534 @@
       while (($node = readdir($contents)) !== false)
       {
-        if (is_dir($path.'/'.$node)
-            and $node != '.'
+        if ($node != '.'
             and $node != '..'
             and $node != '.svn'
             and $node != 'thumbnail'
             and $node != 'pwg_high'
-            and $node != 'pwg_representative')
+            and $node != 'pwg_representative'
+            and is_dir($path.'/'.$node))
         {
           array_push($dirs, $path.'/'.$node);