summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-01-03 10:01:48 +0100
committerAndrey Andreev <narf@bofh.bg>2012-01-03 10:01:48 +0100
commitb195637240bbbc7c3dc7ee0585f0e4cd39cb9d81 (patch)
tree34b9bc253bb7ef0acb5d665edd451ae2f96c8e3b
parentadc1175f7af1a5fa3a833f72b6f24a82b59e69c1 (diff)
Replace htmlentities() with htmlspecialchars() to fix issue #561
-rw-r--r--system/libraries/Xmlrpc.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index bb95ca145..a9f8d9c38 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -437,7 +437,14 @@ class XML_RPC_Response
{
// error
$this->errno = $code;
- $this->errstr = htmlentities($fstr);
+ if ( ! is_php('5.4'))
+ {
+ $this->errstr = htmlspecialchars($fstr, ENT_NOQUOTES, 'UTF-8');
+ }
+ else
+ {
+ $this->errstr = htmlspecialchars($fstr, ENT_XML1 | ENT_NOQUOTES, 'UTF-8');
+ }
}
else if ( ! is_object($val))
{