diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-06-29 04:25:02 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-06-29 04:25:02 +0000 |
| commit | a05c8c538a6a1a907dade83fc6c8e3b66bf6253f (patch) | |
| tree | 76a476cc79daa337baf8cf90a67d52d47d8dfbab | |
| parent | e39685df6f7a8d3d27cddd97211c4ccac5998a94 (diff) | |
bug 2668 - fix php warnings on glob function
git-svn-id: http://piwigo.org/svn/trunk@16167 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/configuration.php | 7 | ||||
| -rw-r--r-- | admin/include/functions.php | 7 |
2 files changed, 10 insertions, 4 deletions
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 |