aboutsummaryrefslogtreecommitdiffstats
path: root/admin/batch_manager_global.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-03-20 04:13:35 +0000
committerrvelices <rv-github@modusoptimus.com>2012-03-20 04:13:35 +0000
commitb95925dcaa7e9fb17c0bdc938be1b43f0e2c5111 (patch)
tree59a070ae4bd819746cfe709ff67279fb275510fc /admin/batch_manager_global.php
parentbd0cf9cab448d1c3084e1a0d8d370ed9adb8145e (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/batch_manager_global.php')
-rw-r--r--admin/batch_manager_global.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index 95cddf520..ed27c4817 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -677,10 +677,12 @@ foreach(ImageStdParams::get_defined_type_map() as $params)
{
$del_deriv_map[$params->type] = l10n($params->type);
}
+$gen_deriv_map = $del_deriv_map;
+$del_deriv_map[IMG_CUSTOM] = l10n(IMG_CUSTOM);
$template->assign(
array(
'del_derivatives_types' => $del_deriv_map,
- 'generate_derivatives_types' => $del_deriv_map,
+ 'generate_derivatives_types' => $gen_deriv_map,
)
);