diff options
| author | Florian Pritz <bluewind@xinu.at> | 2023-01-29 13:58:21 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2023-01-29 13:58:21 +0100 |
| commit | c88be04f0ec35304be812d7f5379c4362008b730 (patch) | |
| tree | 0d161faf7b5d03396fcab28e1ecb8e8764f32cb2 /system/libraries/Xmlrpc.php | |
| parent | 457e351cbc1335de951f4ac79bb91a9f3ea9ab38 (diff) | |
| parent | a6faab2ebf082eefff9c2422fce016e49da548bf (diff) | |
Merge remote-tracking branch 'upstream/develop' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/libraries/Xmlrpc.php')
| -rw-r--r-- | system/libraries/Xmlrpc.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php index a22841cca..8587015e8 100644 --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -744,7 +744,7 @@ class XML_RPC_Client extends CI_Xmlrpc { break; } - // See https://bugs.php.net/bug.php?id=39598 and http://php.net/manual/en/function.fwrite.php#96951 + // See https://bugs.php.net/bug.php?id=39598 and https://secure.php.net/manual/en/function.fwrite.php#96951 elseif ($result === 0) { if ($timestamp === 0) @@ -837,9 +837,7 @@ class XML_RPC_Response { // error $this->errno = $code; - $this->errstr = htmlspecialchars($fstr, - (is_php('5.4') ? ENT_XML1 | ENT_NOQUOTES : ENT_NOQUOTES), - 'UTF-8'); + $this->errstr = htmlspecialchars($fstr, ENT_XML1 | ENT_NOQUOTES, 'UTF-8'); } elseif ( ! is_object($val)) { @@ -1721,7 +1719,7 @@ class XML_RPC_Values extends CI_Xmlrpc if ($typeof != 1) { - echo '<strong>XML_RPC_Values</strong>: not a scalar type (${typeof})<br />'; + echo "<strong>XML_RPC_Values</strong>: not a scalar type ($typeof)<br />"; return 0; } |