[vlc-devel] commit: Really XML encode the playlist and status contents ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 31 20:25:58 2009 +0300| [50bbf4564c39c3c79f83071fd52204346018a173] | committer: Rémi Denis-Courmont 

Really XML encode the playlist and status contents

(cherry picked from commit 959e1e31a64ff8fac1ee4b1bbcbc87a76cb53505§)

Conflicts:

    share/http/requests/playlist.xml

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=50bbf4564c39c3c79f83071fd52204346018a173
---

 share/http/requests/playlist.xml |    4 ++--
 share/http/requests/status.xml   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/share/http/requests/playlist.xml b/share/http/requests/playlist.xml
index 5a3fb5c..cfeb4a8 100644
--- a/share/http/requests/playlist.xml
+++ b/share/http/requests/playlist.xml
@@ -35,9 +35,9 @@
   <vlc id="end" />
   <vlc id="if" param1="pl.type value 'Node' strcmp" />
     <vlc id="rpn" param1="1 +" />
-    <leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri xml_encode" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />" />
+    <leaf id="<vlc id="value" param1="pl.index" />" <vlc id="if" param1="pl.current" /> current="current" <vlc id="end" /> uri="<vlc id="value" param1="pl.uri value xml_encode" />" name="<vlc id="value" param1="pl.name value xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" duration="<vlc id="value" param1="pl.duration" />" />
   <vlc id="else" />
-    <node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
+    <node id="<vlc id="value" param1="pl.index" />" name="<vlc id="value" param1="pl.name value xml_encode" />" ro="<vlc id="value" param1="pl.ro" />" >
     <vlc id="if" param1="first_item value 0 ="/>
       <vlc id="rpn" param1="first_item 1 store" />
     <vlc id="end"/>
diff --git a/share/http/requests/status.xml b/share/http/requests/status.xml
index c180fa2..a5eeb43 100644
--- a/share/http/requests/status.xml
+++ b/share/http/requests/status.xml
@@ -117,9 +117,9 @@
   <repeat><vlc id="value" param1="'repeat' 'VLC_OBJECT_PLAYLIST' vlc_var_get" /></repeat>
   <information>
     <vlc id="foreach" param1="inf" param2="information" />
-      <category name="<vlc id="value" param1="inf.name xml_encode" />">
+      <category name="<vlc id="value" param1="inf.name value xml_encode" />">
         <vlc id="foreach" param1="subinf" param2="inf.info" />
-          <info name="<vlc id="value" param1="subinf.name xml_encode" />"><vlc id="value" param1="subinf.value xml_encode" /></info>
+          <info name="<vlc id="value" param1="subinf.name value xml_encode" />"><vlc id="value" param1="subinf.value value xml_encode" /></info>
         <vlc id="end" />
       </category>
     <vlc id="end" />