diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-03-20 04:13:35 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-03-20 04:13:35 +0000 |
| commit | b95925dcaa7e9fb17c0bdc938be1b43f0e2c5111 (patch) | |
| tree | 59a070ae4bd819746cfe709ff67279fb275510fc /admin/include | |
| parent | bd0cf9cab448d1c3084e1a0d8d370ed9adb8145e (diff) | |
multisize: remove 2 php warnings, delete custom derivatives (batch man + maintenance), watermark applied to custom derivatives
git-svn-id: http://piwigo.org/svn/trunk@13651 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
| -rw-r--r-- | admin/include/functions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php index 3afb705d0..9218ce3e3 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -170,6 +170,7 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.' // @return image ids where files are deleted successfully function delete_element_files($ids) { + global $conf; if (count($ids) == 0) { return 0; @@ -2277,7 +2278,7 @@ function clear_derivative_cache($types='all') } $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#'; - if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR)) + if ($contents = @opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR)) { while (($node = readdir($contents)) !== false) { |