diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-06-29 04:26:22 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-06-29 04:26:22 +0000 |
| commit | f3c84114ef7310aa7b5d3e52ed56497b3c1726da (patch) | |
| tree | 7a018b4fd4d255b3f18a3027d098ab597bcedd19 /admin/configuration.php | |
| parent | de1166c7f22104d8e22294f44060484e688632bf (diff) | |
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
Diffstat (limited to 'admin/configuration.php')
| -rw-r--r-- | admin/configuration.php | 7 |
1 files changed, 5 insertions, 2 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) |