Fixed a wrong method name

Geeklog-Core · Jan 1, 2017 · c7cc6ee · c7cc6ee
1 parent 5445a3e
commit c7cc6ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/system/classes/XML/RPC.php b/system/classes/XML/RPC.php
@@ -312,7 +312,7 @@ public static function decode($XML_RPC_val)
         $kind = $XML_RPC_val->kindOf();
 
         if ($kind === 'scalar') {
-            return $XML_RPC_val->scalarValue();
+            return $XML_RPC_val->scalarval();
         } elseif ($kind == 'array') {
             $size = $XML_RPC_val->arraySize();
             $arr = array();
@@ -1760,8 +1760,7 @@ private function parseResponse($data = '')
             if ($XML_RPC_xh[$parser]['isf']) {
                 $f = $v->structMem('faultCode');
                 $fs = $v->structMem('faultString');
-                $r = new XML_RPC_Response($v, $f->scalarValue(),
-                    $fs->scalarValue());
+                $r = new XML_RPC_Response($v, $f->scalarval(), $fs->scalarval());
             } else {
                 $r = new XML_RPC_Response($v);
             }
@@ -2076,7 +2075,7 @@ public function getValue()
             $t = get_object_vars($b);
 
             foreach ($t as $id => $cont) {
-                $t[$id] = $cont->scalarValue();
+                $t[$id] = $cont->scalarval();
             }
 
             foreach ($t as $id => $cont) {
@@ -2092,7 +2091,7 @@ public function getValue()
      * @return mixed  the current element's scalar value.  If the value is
      *                 not scalar, FALSE is returned.
      */
-    public function scalarValue()
+    public function scalarval()
     {
         reset($this->me);
         $v = current($this->me);

diff --git a/system/classes/XML/RPC/Server.php b/system/classes/XML/RPC/Server.php
@@ -144,7 +144,7 @@ function XML_RPC_Server_methodSignature($server, $m)
     global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
 
     $method = $m->getParam(0);
-    $methodName = $method->scalarValue();
+    $methodName = $method->scalarval();
     if (strpos($methodName, 'system.') === 0) {
         $dmap = $XML_RPC_Server_dmap;
         $sysCall = 1;
@@ -189,7 +189,7 @@ function XML_RPC_Server_methodHelp($server, $m)
     global $XML_RPC_err, $XML_RPC_str, $XML_RPC_Server_dmap;
 
     $method = $m->getParam(0);
-    $methodName = $method->scalarValue();
+    $methodName = $method->scalarval();
     if (strpos($methodName, 'system.') === 0) {
         $dmap = $XML_RPC_Server_dmap;
         $sysCall = 1;