From f3c84114ef7310aa7b5d3e52ed56497b3c1726da Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Fri, 29 Jun 2012 04:26:22 +0000
Subject: bug 2668 - fix php warnings on glob function (merge from trunk to
 2.4)

git-svn-id: http://piwigo.org/svn/branches/2.4@16168 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/configuration.php     | 7 +++++--
 admin/include/functions.php | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'admin')

diff --git a/admin/configuration.php b/admin/configuration.php
index 21e5c2b4d..5ea0da672 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -514,9 +514,12 @@ switch ($page['section'])
     {
       $watermark_files[] = substr($file, strlen(PHPWG_ROOT_PATH));
     }
-    foreach (glob(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'watermarks/*.png') as $file)
+    if ( ($glob=glob(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'watermarks/*.png')) !== false)
     {
-      $watermark_files[] = substr($file, strlen(PHPWG_ROOT_PATH));
+      foreach ($glob as $file)
+      {
+        $watermark_files[] = substr($file, strlen(PHPWG_ROOT_PATH));
+      }
     }
     $watermark_filemap = array( '' => '---' );
     foreach( $watermark_files as $file)
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 9218ce3e3..85295e472 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -2360,9 +2360,12 @@ function delete_element_derivatives($infos, $type='all')
     $pattern = '-'.derivative_to_url($type).'*';
   }
   $path = substr_replace($path, $pattern, $dot, 0);
-  foreach( glob(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$path) as $file)
+  if ( ($glob=glob(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$path)) !== false)
   {
-    @unlink($file);
+    foreach( $glob as $file)
+    {
+      @unlink($file);
+    }
   }
 }
 ?>
\ No newline at end of file
-- 
cgit v1.2.3