aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-04-30 00:17:20 +0000
committerplegall <plg@piwigo.org>2012-04-30 00:17:20 +0000
commit2f1ebdc9c493628bdfe130b471e81629e1cd64a9 (patch)
tree8fdca2376647fc786b947dd2308879fb15fc7345
parentc108e2b28838c716e5b8ab6cbac6a9f9183a5243 (diff)
feature 2626: explicit error message for PNG files + info message when settings saved
git-svn-id: http://piwigo.org/svn/trunk@14549 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/include/configuration_watermark_process.inc.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/admin/include/configuration_watermark_process.inc.php b/admin/include/configuration_watermark_process.inc.php
index 676056300..a253e9980 100644
--- a/admin/include/configuration_watermark_process.inc.php
+++ b/admin/include/configuration_watermark_process.inc.php
@@ -35,7 +35,10 @@ if (isset($_FILES['watermarkImage']) and !empty($_FILES['watermarkImage']['tmp_n
list($width, $height, $type) = getimagesize($_FILES['watermarkImage']['tmp_name']);
if (IMAGETYPE_PNG != $type)
{
- $errors['watermarkImage'] = 'PNG';
+ $errors['watermarkImage'] = sprintf(
+ l10n('Allowed file types: %s.'),
+ 'PNG'
+ );
}
else
{
@@ -187,6 +190,11 @@ if (count($errors) == 0)
{
clear_derivative_cache($changed_types);
}
+
+ array_push(
+ $page['infos'],
+ l10n('Your configuration settings are saved')
+ );
}
else
{