WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-includes / class-json.php

diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php
index 417592fb88ba331e11f9b259bc30d854a75b24eb..7f34d3fcab80da0ce68f83f18a99def369bed758 100644 (file)
--- a/wp-includes/class-json.php
+++ b/wp-includes/class-json.php
@@ -136,17 +136,24 @@ class Services_JSON
     *                                   from encode() should be checked with isError()
     *                           - SERVICES_JSON_USE_TO_JSON:  call toJSON when serializing objects
     *                                   It serializes the return value from the toJSON call rather 
-    *                                   than the object it'self,  toJSON can return associative arrays, 
+    *                                   than the object itself, toJSON can return associative arrays, 
     *                                   strings or numbers, if you return an object, make sure it does
     *                                   not have a toJSON method, otherwise an error will occur.
     */
-    function Services_JSON($use = 0)
+    function __construct( $use = 0 )
     {
         $this->use = $use;
         $this->_mb_strlen            = function_exists('mb_strlen');
         $this->_mb_convert_encoding  = function_exists('mb_convert_encoding');
         $this->_mb_substr            = function_exists('mb_substr');
     }
+
+       /**
+        * PHP4 constructor.
+        */
+       public function Services_JSON( $use = 0 ) {
+               self::__construct( $use );
+       }
     // private - cache the mbstring lookup results..
     var $_mb_strlen = false;
     var $_mb_substr = false;
@@ -438,7 +445,7 @@ class Services_JSON
             case 'array':
                /*
                 * As per JSON spec if any array key is not an integer
-                * we must treat the the whole array as an object. We
+                * we must treat the whole array as an object. We
                 * also try to catch a sparsely populated associative
                 * array with numeric keys here because some JS engines
                 * will create an array with empty indexes up to
@@ -910,11 +917,17 @@ if (class_exists('PEAR_Error')) {
 
     class Services_JSON_Error extends PEAR_Error
     {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
+        function __construct($message = 'unknown error', $code = null,
                                      $mode = null, $options = null, $userinfo = null)
         {
             parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
         }
+
+       public function Services_JSON_Error($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null) {
+               self::__construct($message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null);
+       }
     }
 
 } else {
@@ -924,11 +937,22 @@ if (class_exists('PEAR_Error')) {
      */
     class Services_JSON_Error
     {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
+           /**
+            * PHP5 constructor.
+            */
+        function __construct( $message = 'unknown error', $code = null,
+                                     $mode = null, $options = null, $userinfo = null )
         {
 
         }
+
+           /**
+            * PHP4 constructor.
+            */
+               public function Services_JSON_Error( $message = 'unknown error', $code = null,
+                                            $mode = null, $options = null, $userinfo = null ) {
+                       self::__construct( $message, $code, $mode, $options, $userinfo );
+               }
     }
     
 }