diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-08-30 19:20:50 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-08-30 19:20:50 +0000 |
| commit | a2f73718d9588a2b6185e73aa683cecd9f990363 (patch) | |
| tree | e73c443a871d1ddadfa767b60d3d8221e5f93fa8 /admin/themes | |
| parent | 2c24b0b38ae678a0269b308ddf03ab1bc85630d2 (diff) | |
bug 2725: Piwigo isn't compatible with suPHP + better handling of watermark upload errors merge from trunk to branch 2.4
git-svn-id: http://piwigo.org/svn/branches/2.4@17676 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/themes/default/template/configuration.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl index f612c8386..e64a19c63 100644 --- a/admin/themes/default/template/configuration.tpl +++ b/admin/themes/default/template/configuration.tpl @@ -518,7 +518,7 @@ jQuery(document).ready(function() { <span id="addWatermark"{if isset($ferrors.watermarkImage)} style="display:inline"{/if}> {'add a new watermark'|@translate} {'... or '|@translate}<a href="#" class="addWatermarkOpen">{'Select a file'|@translate}</a> <br><input type="file" size="60" id="watermarkImage" name="watermarkImage"{if isset($ferrors.watermarkImage)} class="dError"{/if}> (png) - {if isset($ferrors.watermarkImage)}<span class="dErrorDesc" title="{$ferrors.watermarkImage}">!</span>{/if} + {if isset($ferrors.watermarkImage)}<span class="dErrorDesc" title="{$ferrors.watermarkImage|@htmlspecialchars}">!</span>{/if} </span>{* #addWatermark *} </li> |