Changeset 16167 for trunk/admin

Timestamp:

Jun 29, 2012, 6:25:02 AM (12 years ago)

Author:

rvelices

Message:

bug 2668 - fix php warnings on glob function

Location:

trunk/admin

Files:

• configuration.php (modified) (1 diff)
• include/functions.php (modified) (1 diff)

trunk/admin/configuration.php

@@ -515 +515 @@
       $watermark_files[] = substr($file, strlen(PHPWG_ROOT_PATH));
     }
-    foreach (glob(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'watermarks/*.png') as $file)
-    {
-      $watermark_files[] = substr($file, strlen(PHPWG_ROOT_PATH));
+    if ( ($glob=glob(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'watermarks/*.png')) !== false)
+    {
+      foreach ($glob as $file)
+      {
+        $watermark_files[] = substr($file, strlen(PHPWG_ROOT_PATH));
+      }
     }
     $watermark_filemap = array( '' => '---' );

trunk/admin/include/functions.php

@@ -2361 +2361 @@
   }
   $path = substr_replace($path, $pattern, $dot, 0);
-  foreach( glob(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$path) as $file)
-  {
-    @unlink($file);
+  if ( ($glob=glob(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$path)) !== false)
+  {
+    foreach( $glob as $file)
+    {
+      @unlink($file);
+    }
   }
 }