Re: [xwiki-devs] [xwiki-notifications] r30338 - platform/skins/trunk/colibri/src/main/resources/colibri
sdumitriu (SVN) wrote:
Author: sdumitriu Date: 2010-07-18 17:33:08 +0200 (Sun, 18 Jul 2010) New Revision: 30338
Modified: platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm Log: [cleanup] Updated deprecated method calls
Modified: platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm =================================================================== --- platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm 2010-07-18 15:32:58 UTC (rev 30337) +++ platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm 2010-07-18 15:33:08 UTC (rev 30338) @@ -47,10 +47,10 @@ <input type="hidden" name="template" value="$!request.template" /> <input type="hidden" name="language" value="$!doc.language" /> #if("$!request.parent" != '') - <input type="hidden" name="parent" value="$xwiki.getXMLEncoded($!request.parent)" /> + <input type="hidden" name="parent" value="$escapetool.html($!request.parent)" />
Is it supposed to be $escapetool.html( or $escapetool.xml(? I had been using html until I saw you using xml and switched to xml. Which one should we be using? Caleb
#end #if("$!request.title" != '') - <input type="hidden" name="title" value="$xwiki.getXMLEncoded($!request.title)" /> + <input type="hidden" name="title" value="$escapetool.html($!request.title)" /> #end ## ---------------------------- ## Display the rendered content
_______________________________________________ notifications mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/notifications
On 07/18/2010 05:48 PM, Caleb James DeLisle wrote:
sdumitriu (SVN) wrote:
Author: sdumitriu Date: 2010-07-18 17:33:08 +0200 (Sun, 18 Jul 2010) New Revision: 30338
Modified: platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm Log: [cleanup] Updated deprecated method calls
Modified: platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm =================================================================== --- platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm 2010-07-18 15:32:58 UTC (rev 30337) +++ platform/skins/trunk/colibri/src/main/resources/colibri/editinline.vm 2010-07-18 15:33:08 UTC (rev 30338) @@ -47,10 +47,10 @@ <input type="hidden" name="template" value="$!request.template" /> <input type="hidden" name="language" value="$!doc.language" /> #if("$!request.parent" != '') -<input type="hidden" name="parent" value="$xwiki.getXMLEncoded($!request.parent)" /> +<input type="hidden" name="parent" value="$escapetool.html($!request.parent)" />
Is it supposed to be $escapetool.html( or $escapetool.xml(? I had been using html until I saw you using xml and switched to xml. Which one should we be using?
I normally use .xml, but this time I used .html because it was already used like this, probably by you. Circular reference? So, I'd say +1 for XML, since it's more generic than HTML, and a bit safer. By the way, XWiki tries to output XHTML, which is more XML than HTML, but since IE doesn't actually understand XHTML, we're not fully there yet.
Caleb
#end #if("$!request.title" != '') -<input type="hidden" name="title" value="$xwiki.getXMLEncoded($!request.title)" /> +<input type="hidden" name="title" value="$escapetool.html($!request.title)" /> #end ## ---------------------------- ## Display the rendered content
-- Sergiu Dumitriu http://purl.org/net/sergiu/
participants (2)
-
Caleb James DeLisle -
Sergiu Dumitriu