From 87bf399e38578804f83b6bab07f59958c7542cd1 Mon Sep 17 00:00:00 2001
From: Jerome Mouneyrac <jerome@moodle.com>
Date: Fri, 2 Dec 2011 11:26:48 +0800
Subject: [PATCH] MDL-29712server was translating too many HTML characters. use
 htmlspecialchars instead of htmlentities. Translated characters by
 htmlspecialchars are compatible with XML validation, and so XML parsers for
 javascript, java...

---
 webservice/rest/locallib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webservice/rest/locallib.php b/webservice/rest/locallib.php
index 8feba8f2330..fbef14c5c4e 100644
--- a/webservice/rest/locallib.php
+++ b/webservice/rest/locallib.php
@@ -95,9 +95,9 @@ class webservice_rest_server extends webservice_base_server {
         $this->send_headers();
         $xml = '<?xml version="1.0" encoding="UTF-8" ?>'."\n";
         $xml .= '<EXCEPTION class="'.get_class($ex).'">'."\n";
-        $xml .= '<MESSAGE>'.htmlentities($ex->getMessage(), ENT_COMPAT, 'UTF-8').'</MESSAGE>'."\n";
+        $xml .= '<MESSAGE>'.htmlspecialchars($ex->getMessage(), ENT_COMPAT, 'UTF-8').'</MESSAGE>'."\n";
         if (debugging() and isset($ex->debuginfo)) {
-            $xml .= '<DEBUGINFO>'.htmlentities($ex->debuginfo, ENT_COMPAT, 'UTF-8').'</DEBUGINFO>'."\n";
+            $xml .= '<DEBUGINFO>'.htmlspecialchars($ex->debuginfo, ENT_COMPAT, 'UTF-8').'</DEBUGINFO>'."\n";
         }
         $xml .= '</EXCEPTION>'."\n";
         echo $xml;
@@ -134,7 +134,7 @@ class webservice_rest_server extends webservice_base_server {
             if (is_null($returns)) {
                 return '<VALUE null="null"/>'."\n";
             } else {
-                return '<VALUE>'.htmlentities($returns, ENT_COMPAT, 'UTF-8').'</VALUE>'."\n";
+                return '<VALUE>'.htmlspecialchars($returns, ENT_COMPAT, 'UTF-8').'</VALUE>'."\n";
             }
 
         } else if ($desc instanceof external_multiple_structure) {