Author: sdumitriu
Date: 2008-02-15 03:42:02 +0100 (Fri, 15 Feb 2008)
New Revision: 7745
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
Log:
XWIKI-2103: Add encodeURI and decodeURI to Util, deprecate XWiki.getURLEncoded,
Utils.encode, Utils.decode
Update templates
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
2008-02-15 02:00:45 UTC (rev 7744)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
2008-02-15 02:42:02 UTC (rev 7745)
@@ -40,10 +40,10 @@
#end
#if ($context.action != "loginerror")
#if ($isGuest)
-#set($loginurl = $xwiki.getURL("XWiki.XWikiLogin", "login",
"xredirect=$xwiki.getURLEncoded($logredir)"))
+#set($loginurl = $xwiki.getURL("XWiki.XWikiLogin", "login",
"xredirect=$util.encodeURI($logredir)"))
<a class="glink" href="$!loginurl"
id="headerlogin">$!msg.get("login")</a>#sep()
#else
-#set($logouturl = $xwiki.getURL("XWiki.XWikiLogout","logout",
"xredirect=$xwiki.getURLEncoded($logredir)"))
+#set($logouturl = $xwiki.getURL("XWiki.XWikiLogout","logout",
"xredirect=$util.encodeURI($logredir)"))
<a class="glink" href="$!logouturl"
id="headerlogout">$!msg.get("logout")</a>#sep()
#end
#end
_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications
