mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 19:59:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

multisize: remove 2 php warnings, delete custom derivatives (batch man + maintenance), watermark applied to custom derivatives

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@13651 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-03-20 04:13:35 +00:00
parent bd0cf9cab4
commit b95925dcaa
5 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
admin/include/functions.php
View file

@ -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)
{