diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-06-01 19:56:07 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-06-01 19:56:07 +0000 |
| commit | 663c13f39af9e50f59ee907ade4aaf4add0d8d01 (patch) | |
| tree | a860fcdbeadefcaec8d3dc2c59215d1751455784 /themes/default | |
| parent | cf32601902f8034e111196b4462ec30fb2d41577 (diff) | |
merge r6437 from trunk to branch 2.1
- do not remove slashes before calling insert_user_comment (homogeneity with update_user_comment and general use of slashes in piwigo)
- when using a modifier on a non array variable use @| instead of | (generated code is simpler and faster)
git-svn-id: http://piwigo.org/svn/branches/2.1@6438 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes/default')
| -rw-r--r-- | themes/default/template/identification.tpl | 2 | ||||
| -rw-r--r-- | themes/default/template/menubar_identification.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl index 1d7e6d873..ca9bd04f7 100644 --- a/themes/default/template/identification.tpl +++ b/themes/default/template/identification.tpl @@ -48,7 +48,7 @@ </fieldset> <p> - <input type="hidden" name="redirect" value="{$U_REDIRECT|urlencode}"> + <input type="hidden" name="redirect" value="{$U_REDIRECT|@urlencode}"> <input class="submit" tabindex="4" type="submit" name="login" value="{'Submit'|@translate}"> </p> diff --git a/themes/default/template/menubar_identification.tpl b/themes/default/template/menubar_identification.tpl index b686b9601..bf932141e 100644 --- a/themes/default/template/menubar_identification.tpl +++ b/themes/default/template/menubar_identification.tpl @@ -28,7 +28,7 @@ {if isset($U_LOGIN)} <form method="post" action="{$U_LOGIN}" id="quickconnect"> - <input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|urlencode}"> + <input type="hidden" name="redirect" value="{$smarty.server.REQUEST_URI|@urlencode}"> <fieldset> <legend>{'Quick connect'|@translate}</legend> <div> |