ntwb / wordpress

src/wp-includes/IXR/class-IXR-server.php

Indentation +191 added lines, -191 removed lines

@@ -8,25 +8,25 @@ 
  */
 class IXR_Server
 {
-    var $data;
-    var $callbacks = array();
-    var $message;
-    var $capabilities;
+	var $data;
+	var $callbacks = array();
+	var $message;
+	var $capabilities;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $callbacks = false, $data = false, $wait = false )
-    {
-        $this->setCapabilities();
-        if ($callbacks) {
-            $this->callbacks = $callbacks;
-        }
-        $this->setCallbacks();
-        if (!$wait) {
-            $this->serve($data);
-        }
-    }
+	function __construct( $callbacks = false, $data = false, $wait = false )
+	{
+		$this->setCapabilities();
+		if ($callbacks) {
+			$this->callbacks = $callbacks;
+		}
+		$this->setCallbacks();
+		if (!$wait) {
+			$this->serve($data);
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -35,46 +35,46 @@ 
 		self::__construct( $callbacks, $data, $wait );
 	}
 
-    function serve($data = false)
-    {
-        if (!$data) {
-            if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
-                if ( function_exists( 'status_header' ) ) {
-                    status_header( 405 ); // WP #20986
-                    header( 'Allow: POST' );
-                }
-                header('Content-Type: text/plain'); // merged from WP #9093
-                die('XML-RPC server accepts POST requests only.');
-            }
-
-            global $HTTP_RAW_POST_DATA;
-            if (empty($HTTP_RAW_POST_DATA)) {
-                // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
-                $data = file_get_contents('php://input');
-            } else {
-                $data =& $HTTP_RAW_POST_DATA;
-            }
-        }
-        $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
-            $this->error(-32700, 'parse error. not well formed');
-        }
-        if ($this->message->messageType != 'methodCall') {
-            $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
-        }
-        $result = $this->call($this->message->methodName, $this->message->params);
-
-        // Is the result an error?
-        if (is_a($result, 'IXR_Error')) {
-            $this->error($result);
-        }
-
-        // Encode the result
-        $r = new IXR_Value($result);
-        $resultxml = $r->getXml();
-
-        // Create the XML
-        $xml = <<<EOD
+	function serve($data = false)
+	{
+		if (!$data) {
+			if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
+				if ( function_exists( 'status_header' ) ) {
+					status_header( 405 ); // WP #20986
+					header( 'Allow: POST' );
+				}
+				header('Content-Type: text/plain'); // merged from WP #9093
+				die('XML-RPC server accepts POST requests only.');
+			}
+
+			global $HTTP_RAW_POST_DATA;
+			if (empty($HTTP_RAW_POST_DATA)) {
+				// workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
+				$data = file_get_contents('php://input');
+			} else {
+				$data =& $HTTP_RAW_POST_DATA;
+			}
+		}
+		$this->message = new IXR_Message($data);
+		if (!$this->message->parse()) {
+			$this->error(-32700, 'parse error. not well formed');
+		}
+		if ($this->message->messageType != 'methodCall') {
+			$this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
+		}
+		$result = $this->call($this->message->methodName, $this->message->params);
+
+		// Is the result an error?
+		if (is_a($result, 'IXR_Error')) {
+			$this->error($result);
+		}
+
+		// Encode the result
+		$r = new IXR_Value($result);
+		$resultxml = $r->getXml();
+
+		// Create the XML
+		$xml = <<<EOD
 <methodResponse>
   <params>
     <param>
@@ -86,140 +86,140 @@ 
 </methodResponse>
 
 EOD;
-      // Send it
-      $this->output($xml);
-    }
-
-    function call($methodname, $args)
-    {
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
-        }
-        $method = $this->callbacks[$methodname];
-
-        // Perform the callback and send the response
-        if (count($args) == 1) {
-            // If only one parameter just send that instead of the whole array
-            $args = $args[0];
-        }
-
-        // Are we dealing with a function or a method?
-        if (is_string($method) && substr($method, 0, 5) == 'this:') {
-            // It's a class method - check it exists
-            $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
-            }
-
-            //Call the method
-            $result = $this->$method($args);
-        } else {
-            // It's a function - does it exist?
-            if (is_array($method)) {
-                if (!is_callable(array($method[0], $method[1]))) {
-                    return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
-                }
-            } else if (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
-            }
-
-            // Call the function
-            $result = call_user_func($method, $args);
-        }
-        return $result;
-    }
-
-    function error($error, $message = false)
-    {
-        // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
-            $error = new IXR_Error($error, $message);
-        }
-        $this->output($error->getXml());
-    }
-
-    function output($xml)
-    {
-        $charset = function_exists('get_option') ? get_option('blog_charset') : '';
-        if ($charset)
-            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
-        else
-            $xml = '<?xml version="1.0"?>'."\n".$xml;
-        $length = strlen($xml);
-        header('Connection: close');
-        if ($charset)
-            header('Content-Type: text/xml; charset='.$charset);
-        else
-            header('Content-Type: text/xml');
-        header('Date: '.date('r'));
-        echo $xml;
-        exit;
-    }
-
-    function hasMethod($method)
-    {
-        return in_array($method, array_keys($this->callbacks));
-    }
-
-    function setCapabilities()
-    {
-        // Initialises capabilities array
-        $this->capabilities = array(
-            'xmlrpc' => array(
-                'specUrl' => 'http://www.xmlrpc.com/spec',
-                'specVersion' => 1
-        ),
-            'faults_interop' => array(
-                'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
-                'specVersion' => 20010516
-        ),
-            'system.multicall' => array(
-                'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
-                'specVersion' => 1
-        ),
-        );
-    }
-
-    function getCapabilities($args)
-    {
-        return $this->capabilities;
-    }
-
-    function setCallbacks()
-    {
-        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
-        $this->callbacks['system.listMethods'] = 'this:listMethods';
-        $this->callbacks['system.multicall'] = 'this:multiCall';
-    }
-
-    function listMethods($args)
-    {
-        // Returns a list of methods - uses array_reverse to ensure user defined
-        // methods are listed before server defined methods
-        return array_reverse(array_keys($this->callbacks));
-    }
-
-    function multiCall($methodcalls)
-    {
-        // See http://www.xmlrpc.com/discuss/msgReader$1208
-        $return = array();
-        foreach ($methodcalls as $call) {
-            $method = $call['methodName'];
-            $params = $call['params'];
-            if ($method == 'system.multicall') {
-                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
-                $result = $this->call($method, $params);
-            }
-            if (is_a($result, 'IXR_Error')) {
-                $return[] = array(
-                    'faultCode' => $result->code,
-                    'faultString' => $result->message
-                );
-            } else {
-                $return[] = array($result);
-            }
-        }
-        return $return;
-    }
+	  // Send it
+	  $this->output($xml);
+	}
+
+	function call($methodname, $args)
+	{
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
+		}
+		$method = $this->callbacks[$methodname];
+
+		// Perform the callback and send the response
+		if (count($args) == 1) {
+			// If only one parameter just send that instead of the whole array
+			$args = $args[0];
+		}
+
+		// Are we dealing with a function or a method?
+		if (is_string($method) && substr($method, 0, 5) == 'this:') {
+			// It's a class method - check it exists
+			$method = substr($method, 5);
+			if (!method_exists($this, $method)) {
+				return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
+			}
+
+			//Call the method
+			$result = $this->$method($args);
+		} else {
+			// It's a function - does it exist?
+			if (is_array($method)) {
+				if (!is_callable(array($method[0], $method[1]))) {
+					return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
+				}
+			} else if (!function_exists($method)) {
+				return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
+			}
+
+			// Call the function
+			$result = call_user_func($method, $args);
+		}
+		return $result;
+	}
+
+	function error($error, $message = false)
+	{
+		// Accepts either an error object or an error code and message
+		if ($message && !is_object($error)) {
+			$error = new IXR_Error($error, $message);
+		}
+		$this->output($error->getXml());
+	}
+
+	function output($xml)
+	{
+		$charset = function_exists('get_option') ? get_option('blog_charset') : '';
+		if ($charset)
+			$xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
+		else
+			$xml = '<?xml version="1.0"?>'."\n".$xml;
+		$length = strlen($xml);
+		header('Connection: close');
+		if ($charset)
+			header('Content-Type: text/xml; charset='.$charset);
+		else
+			header('Content-Type: text/xml');
+		header('Date: '.date('r'));
+		echo $xml;
+		exit;
+	}
+
+	function hasMethod($method)
+	{
+		return in_array($method, array_keys($this->callbacks));
+	}
+
+	function setCapabilities()
+	{
+		// Initialises capabilities array
+		$this->capabilities = array(
+			'xmlrpc' => array(
+				'specUrl' => 'http://www.xmlrpc.com/spec',
+				'specVersion' => 1
+		),
+			'faults_interop' => array(
+				'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
+				'specVersion' => 20010516
+		),
+			'system.multicall' => array(
+				'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
+				'specVersion' => 1
+		),
+		);
+	}
+
+	function getCapabilities($args)
+	{
+		return $this->capabilities;
+	}
+
+	function setCallbacks()
+	{
+		$this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
+		$this->callbacks['system.listMethods'] = 'this:listMethods';
+		$this->callbacks['system.multicall'] = 'this:multiCall';
+	}
+
+	function listMethods($args)
+	{
+		// Returns a list of methods - uses array_reverse to ensure user defined
+		// methods are listed before server defined methods
+		return array_reverse(array_keys($this->callbacks));
+	}
+
+	function multiCall($methodcalls)
+	{
+		// See http://www.xmlrpc.com/discuss/msgReader$1208
+		$return = array();
+		foreach ($methodcalls as $call) {
+			$method = $call['methodName'];
+			$params = $call['params'];
+			if ($method == 'system.multicall') {
+				$result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
+			} else {
+				$result = $this->call($method, $params);
+			}
+			if (is_a($result, 'IXR_Error')) {
+				$return[] = array(
+					'faultCode' => $result->code,
+					'faultString' => $result->message
+				);
+			} else {
+				$return[] = array($result);
+			}
+		}
+		return $return;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -16,14 +16,14 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $callbacks = false, $data = false, $wait = false )
+    function __construct($callbacks = false, $data = false, $wait = false)
     {
         $this->setCapabilities();
         if ($callbacks) {
             $this->callbacks = $callbacks;
         }
         $this->setCallbacks();
-        if (!$wait) {
+        if ( ! $wait) {
             $this->serve($data);
         }
     }
@@ -31,17 +31,17 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Server( $callbacks = false, $data = false, $wait = false ) {
-		self::__construct( $callbacks, $data, $wait );
+	public function IXR_Server($callbacks = false, $data = false, $wait = false) {
+		self::__construct($callbacks, $data, $wait);
 	}
 
     function serve($data = false)
     {
-        if (!$data) {
+        if ( ! $data) {
             if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') {
-                if ( function_exists( 'status_header' ) ) {
-                    status_header( 405 ); // WP #20986
-                    header( 'Allow: POST' );
+                if (function_exists('status_header')) {
+                    status_header(405); // WP #20986
+                    header('Allow: POST');
                 }
                 header('Content-Type: text/plain'); // merged from WP #9093
                 die('XML-RPC server accepts POST requests only.');
@@ -52,11 +52,11 @@ 
                 // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293
                 $data = file_get_contents('php://input');
             } else {
-                $data =& $HTTP_RAW_POST_DATA;
+                $data = & $HTTP_RAW_POST_DATA;
             }
         }
         $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
+        if ( ! $this->message->parse()) {
             $this->error(-32700, 'parse error. not well formed');
         }
         if ($this->message->messageType != 'methodCall') {
@@ -92,7 +92,7 @@ 
 
     function call($methodname, $args)
     {
-        if (!$this->hasMethod($methodname)) {
+        if ( ! $this->hasMethod($methodname)) {
             return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
         }
         $method = $this->callbacks[$methodname];
@@ -107,7 +107,7 @@ 
         if (is_string($method) && substr($method, 0, 5) == 'this:') {
             // It's a class method - check it exists
             $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
+            if ( ! method_exists($this, $method)) {
                 return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
             }
 
@@ -116,10 +116,10 @@ 
         } else {
             // It's a function - does it exist?
             if (is_array($method)) {
-                if (!is_callable(array($method[0], $method[1]))) {
+                if ( ! is_callable(array($method[0], $method[1]))) {
                     return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.');
                 }
-            } else if (!function_exists($method)) {
+            } else if ( ! function_exists($method)) {
                 return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
             }
 
@@ -132,7 +132,7 @@ 
     function error($error, $message = false)
     {
         // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
+        if ($message && ! is_object($error)) {
             $error = new IXR_Error($error, $message);
         }
         $this->output($error->getXml());

Braces +10 added lines, -8 removed lines

@@ -534,17 +534,19 @@
     function output($xml)
     {
         $charset = function_exists('get_option') ? get_option('blog_charset') : '';
-        if ($charset)
-            $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
-        else
-            $xml = '<?xml version="1.0"?>'."\n".$xml;
+        if ($charset) {
+                    $xml = '<?xml version="1.0" encoding="'.$charset.'"?>'."\n".$xml;
+        } else {
+                    $xml = '<?xml version="1.0"?>'."\n".$xml;
+        }
         $length = strlen($xml);
         header('Connection: close');
         header('Content-Length: '.$length);
-        if ($charset)
-            header('Content-Type: text/xml; charset='.$charset);
-        else
-            header('Content-Type: text/xml');
+        if ($charset) {
+                    header('Content-Type: text/xml; charset='.$charset);
+        } else {
+                    header('Content-Type: text/xml');
+        }
         header('Date: '.date('r'));
         echo $xml;
         exit;

src/wp-includes/IXR/class-IXR-error.php

Indentation +12 added lines, -12 removed lines

@@ -8,17 +8,17 @@ 
  */
 class IXR_Error
 {
-    var $code;
-    var $message;
+	var $code;
+	var $message;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $code, $message )
-    {
-        $this->code = $code;
-        $this->message = htmlspecialchars($message);
-    }
+	function __construct( $code, $message )
+	{
+		$this->code = $code;
+		$this->message = htmlspecialchars($message);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -27,9 +27,9 @@ 
 		self::__construct( $code, $message );
 	}
 
-    function getXml()
-    {
-        $xml = <<<EOD
+	function getXml()
+	{
+		$xml = <<<EOD
 <methodResponse>
   <fault>
     <value>
@@ -48,6 +48,6 @@ 
 </methodResponse>
 
 EOD;
-        return $xml;
-    }
+		return $xml;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $code, $message )
+    function __construct($code, $message)
     {
         $this->code = $code;
         $this->message = htmlspecialchars($message);
@@ -23,8 +23,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Error( $code, $message ) {
-		self::__construct( $code, $message );
+	public function IXR_Error($code, $message) {
+		self::__construct($code, $message);
 	}
 
     function getXml()

src/wp-includes/IXR/class-IXR-request.php

Indentation +24 added lines, -24 removed lines

@@ -8,32 +8,32 @@ 
  */
 class IXR_Request
 {
-    var $method;
-    var $args;
-    var $xml;
+	var $method;
+	var $args;
+	var $xml;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct($method, $args)
-    {
-        $this->method = $method;
-        $this->args = $args;
-        $this->xml = <<<EOD
+	function __construct($method, $args)
+	{
+		$this->method = $method;
+		$this->args = $args;
+		$this->xml = <<<EOD
 <?xml version="1.0"?>
 <methodCall>
 <methodName>{$this->method}</methodName>
 <params>
 
 EOD;
-        foreach ($this->args as $arg) {
-            $this->xml .= '<param><value>';
-            $v = new IXR_Value($arg);
-            $this->xml .= $v->getXml();
-            $this->xml .= "</value></param>\n";
-        }
-        $this->xml .= '</params></methodCall>';
-    }
+		foreach ($this->args as $arg) {
+			$this->xml .= '<param><value>';
+			$v = new IXR_Value($arg);
+			$this->xml .= $v->getXml();
+			$this->xml .= "</value></param>\n";
+		}
+		$this->xml .= '</params></methodCall>';
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -42,13 +42,13 @@ 
 		self::__construct( $method, $args );
 	}
 
-    function getLength()
-    {
-        return strlen($this->xml);
-    }
+	function getLength()
+	{
+		return strlen($this->xml);
+	}
 
-    function getXml()
-    {
-        return $this->xml;
-    }
+	function getXml()
+	{
+		return $this->xml;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Request( $method, $args ) {
-		self::__construct( $method, $args );
+	public function IXR_Request($method, $args) {
+		self::__construct($method, $args);
 	}
 
     function getLength()

src/wp-includes/IXR/class-IXR-client.php

Indentation +142 added lines, -142 removed lines

@@ -9,47 +9,47 @@ 
  */
 class IXR_Client
 {
-    var $server;
-    var $port;
-    var $path;
-    var $useragent;
-    var $response;
-    var $message = false;
-    var $debug = false;
-    var $timeout;
-    var $headers = array();
-
-    // Storage place for an error message
-    var $error = false;
+	var $server;
+	var $port;
+	var $path;
+	var $useragent;
+	var $response;
+	var $message = false;
+	var $debug = false;
+	var $timeout;
+	var $headers = array();
+
+	// Storage place for an error message
+	var $error = false;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80, $timeout = 15 )
-    {
-        if (!$path) {
-            // Assume we have been given a URL instead
-            $bits = parse_url($server);
-            $this->server = $bits['host'];
-            $this->port = isset($bits['port']) ? $bits['port'] : 80;
-            $this->path = isset($bits['path']) ? $bits['path'] : '/';
-
-            // Make absolutely sure we have a path
-            if (!$this->path) {
-                $this->path = '/';
-            }
-
-            if ( ! empty( $bits['query'] ) ) {
-                $this->path .= '?' . $bits['query'];
-            }
-        } else {
-            $this->server = $server;
-            $this->path = $path;
-            $this->port = $port;
-        }
-        $this->useragent = 'The Incutio XML-RPC PHP Library';
-        $this->timeout = $timeout;
-    }
+	function __construct( $server, $path = false, $port = 80, $timeout = 15 )
+	{
+		if (!$path) {
+			// Assume we have been given a URL instead
+			$bits = parse_url($server);
+			$this->server = $bits['host'];
+			$this->port = isset($bits['port']) ? $bits['port'] : 80;
+			$this->path = isset($bits['path']) ? $bits['path'] : '/';
+
+			// Make absolutely sure we have a path
+			if (!$this->path) {
+				$this->path = '/';
+			}
+
+			if ( ! empty( $bits['query'] ) ) {
+				$this->path .= '?' . $bits['query'];
+			}
+		} else {
+			$this->server = $server;
+			$this->path = $path;
+			$this->port = $port;
+		}
+		$this->useragent = 'The Incutio XML-RPC PHP Library';
+		$this->timeout = $timeout;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -58,109 +58,109 @@ 
 		self::__construct( $server, $path, $port, $timeout );
 	}
 
-    function query()
-    {
-        $args = func_get_args();
-        $method = array_shift($args);
-        $request = new IXR_Request($method, $args);
-        $length = $request->getLength();
-        $xml = $request->getXml();
-        $r = "\r\n";
-        $request  = "POST {$this->path} HTTP/1.0$r";
-
-        // Merged from WP #8145 - allow custom headers
-        $this->headers['Host']          = $this->server;
-        $this->headers['Content-Type']  = 'text/xml';
-        $this->headers['User-Agent']    = $this->useragent;
-        $this->headers['Content-Length']= $length;
-
-        foreach( $this->headers as $header => $value ) {
-            $request .= "{$header}: {$value}{$r}";
-        }
-        $request .= $r;
-
-        $request .= $xml;
-
-        // Now send the request
-        if ($this->debug) {
-            echo '<pre class="ixr_request">'.htmlspecialchars($request)."\n</pre>\n\n";
-        }
-
-        if ($this->timeout) {
-            $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
-        } else {
-            $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
-        }
-        if (!$fp) {
-            $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
-            return false;
-        }
-        fputs($fp, $request);
-        $contents = '';
-        $debugContents = '';
-        $gotFirstLine = false;
-        $gettingHeaders = true;
-        while (!feof($fp)) {
-            $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
-                // Check line for '200'
-                if (strstr($line, '200') === false) {
-                    $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
-                    return false;
-                }
-                $gotFirstLine = true;
-            }
-            if (trim($line) == '') {
-                $gettingHeaders = false;
-            }
-            if (!$gettingHeaders) {
-            	// merged from WP #12559 - remove trim
-                $contents .= $line;
-            }
-            if ($this->debug) {
-            	$debugContents .= $line;
-            }
-        }
-        if ($this->debug) {
-            echo '<pre class="ixr_response">'.htmlspecialchars($debugContents)."\n</pre>\n\n";
-        }
-
-        // Now parse what we've got back
-        $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
-            // XML error
-            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
-            return false;
-        }
-
-        // Is the message a fault?
-        if ($this->message->messageType == 'fault') {
-            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
-            return false;
-        }
-
-        // Message must be OK
-        return true;
-    }
-
-    function getResponse()
-    {
-        // methodResponses can only have one param - return that
-        return $this->message->params[0];
-    }
-
-    function isError()
-    {
-        return (is_object($this->error));
-    }
-
-    function getErrorCode()
-    {
-        return $this->error->code;
-    }
-
-    function getErrorMessage()
-    {
-        return $this->error->message;
-    }
+	function query()
+	{
+		$args = func_get_args();
+		$method = array_shift($args);
+		$request = new IXR_Request($method, $args);
+		$length = $request->getLength();
+		$xml = $request->getXml();
+		$r = "\r\n";
+		$request  = "POST {$this->path} HTTP/1.0$r";
+
+		// Merged from WP #8145 - allow custom headers
+		$this->headers['Host']          = $this->server;
+		$this->headers['Content-Type']  = 'text/xml';
+		$this->headers['User-Agent']    = $this->useragent;
+		$this->headers['Content-Length']= $length;
+
+		foreach( $this->headers as $header => $value ) {
+			$request .= "{$header}: {$value}{$r}";
+		}
+		$request .= $r;
+
+		$request .= $xml;
+
+		// Now send the request
+		if ($this->debug) {
+			echo '<pre class="ixr_request">'.htmlspecialchars($request)."\n</pre>\n\n";
+		}
+
+		if ($this->timeout) {
+			$fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+		} else {
+			$fp = @fsockopen($this->server, $this->port, $errno, $errstr);
+		}
+		if (!$fp) {
+			$this->error = new IXR_Error(-32300, 'transport error - could not open socket');
+			return false;
+		}
+		fputs($fp, $request);
+		$contents = '';
+		$debugContents = '';
+		$gotFirstLine = false;
+		$gettingHeaders = true;
+		while (!feof($fp)) {
+			$line = fgets($fp, 4096);
+			if (!$gotFirstLine) {
+				// Check line for '200'
+				if (strstr($line, '200') === false) {
+					$this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
+					return false;
+				}
+				$gotFirstLine = true;
+			}
+			if (trim($line) == '') {
+				$gettingHeaders = false;
+			}
+			if (!$gettingHeaders) {
+				// merged from WP #12559 - remove trim
+				$contents .= $line;
+			}
+			if ($this->debug) {
+				$debugContents .= $line;
+			}
+		}
+		if ($this->debug) {
+			echo '<pre class="ixr_response">'.htmlspecialchars($debugContents)."\n</pre>\n\n";
+		}
+
+		// Now parse what we've got back
+		$this->message = new IXR_Message($contents);
+		if (!$this->message->parse()) {
+			// XML error
+			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
+			return false;
+		}
+
+		// Is the message a fault?
+		if ($this->message->messageType == 'fault') {
+			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+			return false;
+		}
+
+		// Message must be OK
+		return true;
+	}
+
+	function getResponse()
+	{
+		// methodResponses can only have one param - return that
+		return $this->message->params[0];
+	}
+
+	function isError()
+	{
+		return (is_object($this->error));
+	}
+
+	function getErrorCode()
+	{
+		return $this->error->code;
+	}
+
+	function getErrorMessage()
+	{
+		return $this->error->message;
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -25,9 +25,9 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80, $timeout = 15 )
+    function __construct($server, $path = false, $port = 80, $timeout = 15)
     {
-        if (!$path) {
+        if ( ! $path) {
             // Assume we have been given a URL instead
             $bits = parse_url($server);
             $this->server = $bits['host'];
@@ -35,12 +35,12 @@ 
             $this->path = isset($bits['path']) ? $bits['path'] : '/';
 
             // Make absolutely sure we have a path
-            if (!$this->path) {
+            if ( ! $this->path) {
                 $this->path = '/';
             }
 
-            if ( ! empty( $bits['query'] ) ) {
-                $this->path .= '?' . $bits['query'];
+            if ( ! empty($bits['query'])) {
+                $this->path .= '?'.$bits['query'];
             }
         } else {
             $this->server = $server;
@@ -54,8 +54,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Client( $server, $path = false, $port = 80, $timeout = 15 ) {
-		self::__construct( $server, $path, $port, $timeout );
+	public function IXR_Client($server, $path = false, $port = 80, $timeout = 15) {
+		self::__construct($server, $path, $port, $timeout);
 	}
 
     function query()
@@ -66,15 +66,15 @@ 
         $length = $request->getLength();
         $xml = $request->getXml();
         $r = "\r\n";
-        $request  = "POST {$this->path} HTTP/1.0$r";
+        $request = "POST {$this->path} HTTP/1.0$r";
 
         // Merged from WP #8145 - allow custom headers
         $this->headers['Host']          = $this->server;
         $this->headers['Content-Type']  = 'text/xml';
         $this->headers['User-Agent']    = $this->useragent;
-        $this->headers['Content-Length']= $length;
+        $this->headers['Content-Length'] = $length;
 
-        foreach( $this->headers as $header => $value ) {
+        foreach ($this->headers as $header => $value) {
             $request .= "{$header}: {$value}{$r}";
         }
         $request .= $r;
@@ -91,7 +91,7 @@ 
         } else {
             $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
         }
-        if (!$fp) {
+        if ( ! $fp) {
             $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
             return false;
         }
@@ -100,9 +100,9 @@ 
         $debugContents = '';
         $gotFirstLine = false;
         $gettingHeaders = true;
-        while (!feof($fp)) {
+        while ( ! feof($fp)) {
             $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
+            if ( ! $gotFirstLine) {
                 // Check line for '200'
                 if (strstr($line, '200') === false) {
                     $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
@@ -113,7 +113,7 @@ 
             if (trim($line) == '') {
                 $gettingHeaders = false;
             }
-            if (!$gettingHeaders) {
+            if ( ! $gettingHeaders) {
             	// merged from WP #12559 - remove trim
                 $contents .= $line;
             }
@@ -127,7 +127,7 @@ 
 
         // Now parse what we've got back
         $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
+        if ( ! $this->message->parse()) {
             // XML error
             $this->error = new IXR_Error(-32700, 'parse error. not well formed');
             return false;

src/wp-includes/IXR/class-IXR-date.php

Indentation +48 added lines, -48 removed lines

@@ -7,26 +7,26 @@ 
  * @since 1.5.0
  */
 class IXR_Date {
-    var $year;
-    var $month;
-    var $day;
-    var $hour;
-    var $minute;
-    var $second;
-    var $timezone;
+	var $year;
+	var $month;
+	var $day;
+	var $hour;
+	var $minute;
+	var $second;
+	var $timezone;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $time )
-    {
-        // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
-            $this->parseTimestamp($time);
-        } else {
-            $this->parseIso($time);
-        }
-    }
+	function __construct( $time )
+	{
+		// $time can be a PHP timestamp or an ISO one
+		if (is_numeric($time)) {
+			$this->parseTimestamp($time);
+		} else {
+			$this->parseIso($time);
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -35,40 +35,40 @@ 
 		self::__construct( $time );
 	}
 
-    function parseTimestamp($timestamp)
-    {
-        $this->year = date('Y', $timestamp);
-        $this->month = date('m', $timestamp);
-        $this->day = date('d', $timestamp);
-        $this->hour = date('H', $timestamp);
-        $this->minute = date('i', $timestamp);
-        $this->second = date('s', $timestamp);
-        $this->timezone = '';
-    }
+	function parseTimestamp($timestamp)
+	{
+		$this->year = date('Y', $timestamp);
+		$this->month = date('m', $timestamp);
+		$this->day = date('d', $timestamp);
+		$this->hour = date('H', $timestamp);
+		$this->minute = date('i', $timestamp);
+		$this->second = date('s', $timestamp);
+		$this->timezone = '';
+	}
 
-    function parseIso($iso)
-    {
-        $this->year = substr($iso, 0, 4);
-        $this->month = substr($iso, 4, 2);
-        $this->day = substr($iso, 6, 2);
-        $this->hour = substr($iso, 9, 2);
-        $this->minute = substr($iso, 12, 2);
-        $this->second = substr($iso, 15, 2);
-        $this->timezone = substr($iso, 17);
-    }
+	function parseIso($iso)
+	{
+		$this->year = substr($iso, 0, 4);
+		$this->month = substr($iso, 4, 2);
+		$this->day = substr($iso, 6, 2);
+		$this->hour = substr($iso, 9, 2);
+		$this->minute = substr($iso, 12, 2);
+		$this->second = substr($iso, 15, 2);
+		$this->timezone = substr($iso, 17);
+	}
 
-    function getIso()
-    {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
-    }
+	function getIso()
+	{
+		return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
+	}
 
-    function getXml()
-    {
-        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
-    }
+	function getXml()
+	{
+		return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
+	}
 
-    function getTimestamp()
-    {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-    }
+	function getTimestamp()
+	{
+		return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $time )
+    function __construct($time)
     {
         // $time can be a PHP timestamp or an ISO one
         if (is_numeric($time)) {
@@ -31,8 +31,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Date( $time ) {
-		self::__construct( $time );
+	public function IXR_Date($time) {
+		self::__construct($time);
 	}
 
     function parseTimestamp($timestamp)

src/wp-includes/IXR/class-IXR-value.php

Indentation +110 added lines, -110 removed lines

@@ -6,31 +6,31 @@ 
  * @since 1.5.0
  */
 class IXR_Value {
-    var $data;
-    var $type;
+	var $data;
+	var $type;
 
 	/**
 	 * PHP5 constructor.
 	 */
 	function __construct( $data, $type = false )
-    {
-        $this->data = $data;
-        if (!$type) {
-            $type = $this->calculateType();
-        }
-        $this->type = $type;
-        if ($type == 'struct') {
-            // Turn all the values in the array in to new IXR_Value objects
-            foreach ($this->data as $key => $value) {
-                $this->data[$key] = new IXR_Value($value);
-            }
-        }
-        if ($type == 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; $i++) {
-                $this->data[$i] = new IXR_Value($this->data[$i]);
-            }
-        }
-    }
+	{
+		$this->data = $data;
+		if (!$type) {
+			$type = $this->calculateType();
+		}
+		$this->type = $type;
+		if ($type == 'struct') {
+			// Turn all the values in the array in to new IXR_Value objects
+			foreach ($this->data as $key => $value) {
+				$this->data[$key] = new IXR_Value($value);
+			}
+		}
+		if ($type == 'array') {
+			for ($i = 0, $j = count($this->data); $i < $j; $i++) {
+				$this->data[$i] = new IXR_Value($this->data[$i]);
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -39,100 +39,100 @@ 
 		self::__construct( $data, $type );
 	}
 
-    function calculateType()
-    {
-        if ($this->data === true || $this->data === false) {
-            return 'boolean';
-        }
-        if (is_integer($this->data)) {
-            return 'int';
-        }
-        if (is_double($this->data)) {
-            return 'double';
-        }
+	function calculateType()
+	{
+		if ($this->data === true || $this->data === false) {
+			return 'boolean';
+		}
+		if (is_integer($this->data)) {
+			return 'int';
+		}
+		if (is_double($this->data)) {
+			return 'double';
+		}
 
-        // Deal with IXR object types base64 and date
-        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
-            return 'date';
-        }
-        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
-            return 'base64';
-        }
+		// Deal with IXR object types base64 and date
+		if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
+			return 'date';
+		}
+		if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
+			return 'base64';
+		}
 
-        // If it is a normal PHP object convert it in to a struct
-        if (is_object($this->data)) {
-            $this->data = get_object_vars($this->data);
-            return 'struct';
-        }
-        if (!is_array($this->data)) {
-            return 'string';
-        }
+		// If it is a normal PHP object convert it in to a struct
+		if (is_object($this->data)) {
+			$this->data = get_object_vars($this->data);
+			return 'struct';
+		}
+		if (!is_array($this->data)) {
+			return 'string';
+		}
 
-        // We have an array - is it an array or a struct?
-        if ($this->isStruct($this->data)) {
-            return 'struct';
-        } else {
-            return 'array';
-        }
-    }
+		// We have an array - is it an array or a struct?
+		if ($this->isStruct($this->data)) {
+			return 'struct';
+		} else {
+			return 'array';
+		}
+	}
 
-    function getXml()
-    {
-        // Return XML for this value
-        switch ($this->type) {
-            case 'boolean':
-                return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
-                break;
-            case 'int':
-                return '<int>'.$this->data.'</int>';
-                break;
-            case 'double':
-                return '<double>'.$this->data.'</double>';
-                break;
-            case 'string':
-                return '<string>'.htmlspecialchars($this->data).'</string>';
-                break;
-            case 'array':
-                $return = '<array><data>'."\n";
-                foreach ($this->data as $item) {
-                    $return .= '  <value>'.$item->getXml()."</value>\n";
-                }
-                $return .= '</data></array>';
-                return $return;
-                break;
-            case 'struct':
-                $return = '<struct>'."\n";
-                foreach ($this->data as $name => $value) {
+	function getXml()
+	{
+		// Return XML for this value
+		switch ($this->type) {
+			case 'boolean':
+				return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
+				break;
+			case 'int':
+				return '<int>'.$this->data.'</int>';
+				break;
+			case 'double':
+				return '<double>'.$this->data.'</double>';
+				break;
+			case 'string':
+				return '<string>'.htmlspecialchars($this->data).'</string>';
+				break;
+			case 'array':
+				$return = '<array><data>'."\n";
+				foreach ($this->data as $item) {
+					$return .= '  <value>'.$item->getXml()."</value>\n";
+				}
+				$return .= '</data></array>';
+				return $return;
+				break;
+			case 'struct':
+				$return = '<struct>'."\n";
+				foreach ($this->data as $name => $value) {
 					$name = htmlspecialchars($name);
-                    $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml()."</value></member>\n";
-                }
-                $return .= '</struct>';
-                return $return;
-                break;
-            case 'date':
-            case 'base64':
-                return $this->data->getXml();
-                break;
-        }
-        return false;
-    }
+					$return .= "  <member><name>$name</name><value>";
+					$return .= $value->getXml()."</value></member>\n";
+				}
+				$return .= '</struct>';
+				return $return;
+				break;
+			case 'date':
+			case 'base64':
+				return $this->data->getXml();
+				break;
+		}
+		return false;
+	}
 
-    /**
-     * Checks whether or not the supplied array is a struct or not
-     *
-     * @param array $array
-     * @return bool
-     */
-    function isStruct($array)
-    {
-        $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key !== (string)$expected) {
-                return true;
-            }
-            $expected++;
-        }
-        return false;
-    }
+	/**
+	 * Checks whether or not the supplied array is a struct or not
+	 *
+	 * @param array $array
+	 * @return bool
+	 */
+	function isStruct($array)
+	{
+		$expected = 0;
+		foreach ($array as $key => $value) {
+			if ((string)$key !== (string)$expected) {
+				return true;
+			}
+			$expected++;
+		}
+		return false;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -12,10 +12,10 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $data, $type = false )
+	function __construct($data, $type = false)
     {
         $this->data = $data;
-        if (!$type) {
+        if ( ! $type) {
             $type = $this->calculateType();
         }
         $this->type = $type;
@@ -35,8 +35,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Value( $data, $type = false ) {
-		self::__construct( $data, $type );
+	public function IXR_Value($data, $type = false) {
+		self::__construct($data, $type);
 	}
 
     function calculateType()
@@ -64,7 +64,7 @@ 
             $this->data = get_object_vars($this->data);
             return 'struct';
         }
-        if (!is_array($this->data)) {
+        if ( ! is_array($this->data)) {
             return 'string';
         }
 
@@ -128,7 +128,7 @@ 
     {
         $expected = 0;
         foreach ($array as $key => $value) {
-            if ((string)$key !== (string)$expected) {
+            if ((string) $key !== (string) $expected) {
                 return true;
             }
             $expected++;

src/wp-includes/IXR/class-IXR-clientmulticall.php

Indentation +21 added lines, -21 removed lines

@@ -7,16 +7,16 @@ 
  */
 class IXR_ClientMulticall extends IXR_Client
 {
-    var $calls = array();
+	var $calls = array();
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80 )
-    {
-        parent::IXR_Client($server, $path, $port);
-        $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
-    }
+	function __construct( $server, $path = false, $port = 80 )
+	{
+		parent::IXR_Client($server, $path, $port);
+		$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -25,20 +25,20 @@ 
 		self::__construct( $server, $path, $port );
 	}
 
-    function addCall()
-    {
-        $args = func_get_args();
-        $methodName = array_shift($args);
-        $struct = array(
-            'methodName' => $methodName,
-            'params' => $args
-        );
-        $this->calls[] = $struct;
-    }
+	function addCall()
+	{
+		$args = func_get_args();
+		$methodName = array_shift($args);
+		$struct = array(
+			'methodName' => $methodName,
+			'params' => $args
+		);
+		$this->calls[] = $struct;
+	}
 
-    function query()
-    {
-        // Prepare multicall, then call the parent::query() method
-        return parent::query('system.multicall', $this->calls);
-    }
+	function query()
+	{
+		// Prepare multicall, then call the parent::query() method
+		return parent::query('system.multicall', $this->calls);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $server, $path = false, $port = 80 )
+    function __construct($server, $path = false, $port = 80)
     {
         parent::IXR_Client($server, $path, $port);
         $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
@@ -21,8 +21,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_ClientMulticall( $server, $path = false, $port = 80 ) {
-		self::__construct( $server, $path, $port );
+	public function IXR_ClientMulticall($server, $path = false, $port = 80) {
+		self::__construct($server, $path, $port);
 	}
 
     function addCall()

src/wp-includes/IXR/class-IXR-message.php

Indentation +210 added lines, -210 removed lines

@@ -9,31 +9,31 @@ 
  */
 class IXR_Message
 {
-    var $message;
-    var $messageType;  // methodCall / methodResponse / fault
-    var $faultCode;
-    var $faultString;
-    var $methodName;
-    var $params;
-
-    // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
-    var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
-    var $_param;
-    var $_value;
-    var $_currentTag;
-    var $_currentTagContents;
-    // The XML parser
-    var $_parser;
+	var $message;
+	var $messageType;  // methodCall / methodResponse / fault
+	var $faultCode;
+	var $faultString;
+	var $methodName;
+	var $params;
+
+	// Current variable stacks
+	var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+	var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
+	var $_currentStructName = array();  // A stack as well
+	var $_param;
+	var $_value;
+	var $_currentTag;
+	var $_currentTagContents;
+	// The XML parser
+	var $_parser;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $message )
-    {
-        $this->message =& $message;
-    }
+	function __construct( $message )
+	{
+		$this->message =& $message;
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -42,193 +42,193 @@ 
 		self::__construct( $message );
 	}
 
-    function parse()
-    {
-        if ( ! function_exists( 'xml_parser_create' ) ) {
-            trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
-            return false;
-        }
-
-        // first remove the XML declaration
-        // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
-        $header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
-        if ( '' == $this->message ) {
-            return false;
-        }
-
-        // Then remove the DOCTYPE
-        $header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
-        if ( '' == $this->message ) {
-            return false;
-        }
-
-        // Check that the root tag is valid
-        $root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
-        if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
-            return false;
-        }
-        if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
-            return false;
-        }
-
-        // Bail if there are too many elements to parse
-        $element_limit = 30000;
-        if ( function_exists( 'apply_filters' ) ) {
-            /**
-             * Filters the number of elements to parse in an XML-RPC response.
-             *
-             * @since 4.0.0
-             *
-             * @param int $element_limit Default elements limit.
-             */
-            $element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
-        }
-        if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
-            return false;
-        }
-
-        $this->_parser = xml_parser_create();
-        // Set XML parser to take the case of tags in to account
-        xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
-        // Set XML parser callback functions
-        xml_set_object($this->_parser, $this);
-        xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
-        xml_set_character_data_handler($this->_parser, 'cdata');
-
-        // 256Kb, parse in chunks to avoid the RAM usage on very large messages
-        $chunk_size = 262144;
-
-        /**
-         * Filters the chunk size that can be used to parse an XML-RPC reponse message.
-         *
-         * @since 4.4.0
-         *
-         * @param int $chunk_size Chunk size to parse in bytes.
-         */
-        $chunk_size = apply_filters( 'xmlrpc_chunk_parsing_size', $chunk_size );
-
-        $final = false;
-        do {
-            if (strlen($this->message) <= $chunk_size) {
-                $final = true;
-            }
-            $part = substr($this->message, 0, $chunk_size);
-            $this->message = substr($this->message, $chunk_size);
-            if (!xml_parse($this->_parser, $part, $final)) {
-                return false;
-            }
-            if ($final) {
-                break;
-            }
-        } while (true);
-        xml_parser_free($this->_parser);
-
-        // Grab the error messages, if any
-        if ($this->messageType == 'fault') {
-            $this->faultCode = $this->params[0]['faultCode'];
-            $this->faultString = $this->params[0]['faultString'];
-        }
-        return true;
-    }
-
-    function tag_open($parser, $tag, $attr)
-    {
-        $this->_currentTagContents = '';
-        $this->currentTag = $tag;
-        switch($tag) {
-            case 'methodCall':
-            case 'methodResponse':
-            case 'fault':
-                $this->messageType = $tag;
-                break;
-                /* Deal with stacks of arrays and structs */
-            case 'data':    // data is to all intents and puposes more interesting than array
-                $this->_arraystructstypes[] = 'array';
-                $this->_arraystructs[] = array();
-                break;
-            case 'struct':
-                $this->_arraystructstypes[] = 'struct';
-                $this->_arraystructs[] = array();
-                break;
-        }
-    }
-
-    function cdata($parser, $cdata)
-    {
-        $this->_currentTagContents .= $cdata;
-    }
-
-    function tag_close($parser, $tag)
-    {
-        $valueFlag = false;
-        switch($tag) {
-            case 'int':
-            case 'i4':
-                $value = (int)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'double':
-                $value = (double)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'string':
-                $value = (string)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'dateTime.iso8601':
-                $value = new IXR_Date(trim($this->_currentTagContents));
-                $valueFlag = true;
-                break;
-            case 'value':
-                // "If no type is indicated, the type is string."
-                if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
-                    $valueFlag = true;
-                }
-                break;
-            case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-            case 'base64':
-                $value = base64_decode($this->_currentTagContents);
-                $valueFlag = true;
-                break;
-                /* Deal with stacks of arrays and structs */
-            case 'data':
-            case 'struct':
-                $value = array_pop($this->_arraystructs);
-                array_pop($this->_arraystructstypes);
-                $valueFlag = true;
-                break;
-            case 'member':
-                array_pop($this->_currentStructName);
-                break;
-            case 'name':
-                $this->_currentStructName[] = trim($this->_currentTagContents);
-                break;
-            case 'methodName':
-                $this->methodName = trim($this->_currentTagContents);
-                break;
-        }
-
-        if ($valueFlag) {
-            if (count($this->_arraystructs) > 0) {
-                // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
-                    // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
-                } else {
-                    // Add to array
-                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
-                }
-            } else {
-                // Just add as a parameter
-                $this->params[] = $value;
-            }
-        }
-        $this->_currentTagContents = '';
-    }
+	function parse()
+	{
+		if ( ! function_exists( 'xml_parser_create' ) ) {
+			trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+			return false;
+		}
+
+		// first remove the XML declaration
+		// merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
+		$header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
+		$this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
+		if ( '' == $this->message ) {
+			return false;
+		}
+
+		// Then remove the DOCTYPE
+		$header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
+		$this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
+		if ( '' == $this->message ) {
+			return false;
+		}
+
+		// Check that the root tag is valid
+		$root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
+		if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
+			return false;
+		}
+		if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
+			return false;
+		}
+
+		// Bail if there are too many elements to parse
+		$element_limit = 30000;
+		if ( function_exists( 'apply_filters' ) ) {
+			/**
+			 * Filters the number of elements to parse in an XML-RPC response.
+			 *
+			 * @since 4.0.0
+			 *
+			 * @param int $element_limit Default elements limit.
+			 */
+			$element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
+		}
+		if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
+			return false;
+		}
+
+		$this->_parser = xml_parser_create();
+		// Set XML parser to take the case of tags in to account
+		xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
+		// Set XML parser callback functions
+		xml_set_object($this->_parser, $this);
+		xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
+		xml_set_character_data_handler($this->_parser, 'cdata');
+
+		// 256Kb, parse in chunks to avoid the RAM usage on very large messages
+		$chunk_size = 262144;
+
+		/**
+		 * Filters the chunk size that can be used to parse an XML-RPC reponse message.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param int $chunk_size Chunk size to parse in bytes.
+		 */
+		$chunk_size = apply_filters( 'xmlrpc_chunk_parsing_size', $chunk_size );
+
+		$final = false;
+		do {
+			if (strlen($this->message) <= $chunk_size) {
+				$final = true;
+			}
+			$part = substr($this->message, 0, $chunk_size);
+			$this->message = substr($this->message, $chunk_size);
+			if (!xml_parse($this->_parser, $part, $final)) {
+				return false;
+			}
+			if ($final) {
+				break;
+			}
+		} while (true);
+		xml_parser_free($this->_parser);
+
+		// Grab the error messages, if any
+		if ($this->messageType == 'fault') {
+			$this->faultCode = $this->params[0]['faultCode'];
+			$this->faultString = $this->params[0]['faultString'];
+		}
+		return true;
+	}
+
+	function tag_open($parser, $tag, $attr)
+	{
+		$this->_currentTagContents = '';
+		$this->currentTag = $tag;
+		switch($tag) {
+			case 'methodCall':
+			case 'methodResponse':
+			case 'fault':
+				$this->messageType = $tag;
+				break;
+				/* Deal with stacks of arrays and structs */
+			case 'data':    // data is to all intents and puposes more interesting than array
+				$this->_arraystructstypes[] = 'array';
+				$this->_arraystructs[] = array();
+				break;
+			case 'struct':
+				$this->_arraystructstypes[] = 'struct';
+				$this->_arraystructs[] = array();
+				break;
+		}
+	}
+
+	function cdata($parser, $cdata)
+	{
+		$this->_currentTagContents .= $cdata;
+	}
+
+	function tag_close($parser, $tag)
+	{
+		$valueFlag = false;
+		switch($tag) {
+			case 'int':
+			case 'i4':
+				$value = (int)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'double':
+				$value = (double)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'string':
+				$value = (string)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'dateTime.iso8601':
+				$value = new IXR_Date(trim($this->_currentTagContents));
+				$valueFlag = true;
+				break;
+			case 'value':
+				// "If no type is indicated, the type is string."
+				if (trim($this->_currentTagContents) != '') {
+					$value = (string)$this->_currentTagContents;
+					$valueFlag = true;
+				}
+				break;
+			case 'boolean':
+				$value = (boolean)trim($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+			case 'base64':
+				$value = base64_decode($this->_currentTagContents);
+				$valueFlag = true;
+				break;
+				/* Deal with stacks of arrays and structs */
+			case 'data':
+			case 'struct':
+				$value = array_pop($this->_arraystructs);
+				array_pop($this->_arraystructstypes);
+				$valueFlag = true;
+				break;
+			case 'member':
+				array_pop($this->_currentStructName);
+				break;
+			case 'name':
+				$this->_currentStructName[] = trim($this->_currentTagContents);
+				break;
+			case 'methodName':
+				$this->methodName = trim($this->_currentTagContents);
+				break;
+		}
+
+		if ($valueFlag) {
+			if (count($this->_arraystructs) > 0) {
+				// Add value to struct or array
+				if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
+					// Add to struct
+					$this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+				} else {
+					// Add to array
+					$this->_arraystructs[count($this->_arraystructs)-1][] = $value;
+				}
+			} else {
+				// Just add as a parameter
+				$this->params[] = $value;
+			}
+		}
+		$this->_currentTagContents = '';
+	}
 }

Spacing +33 added lines, -33 removed lines

@@ -10,16 +10,16 @@ 
 class IXR_Message
 {
     var $message;
-    var $messageType;  // methodCall / methodResponse / fault
+    var $messageType; // methodCall / methodResponse / fault
     var $faultCode;
     var $faultString;
     var $methodName;
     var $params;
 
     // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+    var $_arraystructs = array(); // The stack used to keep track of the current array/struct
     var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
+    var $_currentStructName = array(); // A stack as well
     var $_param;
     var $_value;
     var $_currentTag;
@@ -30,52 +30,52 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct( $message )
+    function __construct($message)
     {
-        $this->message =& $message;
+        $this->message = & $message;
     }
 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function IXR_Message( $message ) {
-		self::__construct( $message );
+	public function IXR_Message($message) {
+		self::__construct($message);
 	}
 
     function parse()
     {
-        if ( ! function_exists( 'xml_parser_create' ) ) {
-            trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+        if ( ! function_exists('xml_parser_create')) {
+            trigger_error(__("PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension."));
             return false;
         }
 
         // first remove the XML declaration
         // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages
-        $header = preg_replace( '/<\?xml.*?\?'.'>/s', '', substr( $this->message, 0, 100 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 100 ) );
-        if ( '' == $this->message ) {
+        $header = preg_replace('/<\?xml.*?\?'.'>/s', '', substr($this->message, 0, 100), 1);
+        $this->message = trim(substr_replace($this->message, $header, 0, 100));
+        if ('' == $this->message) {
             return false;
         }
 
         // Then remove the DOCTYPE
-        $header = preg_replace( '/^<!DOCTYPE[^>]*+>/i', '', substr( $this->message, 0, 200 ), 1 );
-        $this->message = trim( substr_replace( $this->message, $header, 0, 200 ) );
-        if ( '' == $this->message ) {
+        $header = preg_replace('/^<!DOCTYPE[^>]*+>/i', '', substr($this->message, 0, 200), 1);
+        $this->message = trim(substr_replace($this->message, $header, 0, 200));
+        if ('' == $this->message) {
             return false;
         }
 
         // Check that the root tag is valid
-        $root_tag = substr( $this->message, 0, strcspn( substr( $this->message, 0, 20 ), "> \t\r\n" ) );
-        if ( '<!DOCTYPE' === strtoupper( $root_tag ) ) {
+        $root_tag = substr($this->message, 0, strcspn(substr($this->message, 0, 20), "> \t\r\n"));
+        if ('<!DOCTYPE' === strtoupper($root_tag)) {
             return false;
         }
-        if ( ! in_array( $root_tag, array( '<methodCall', '<methodResponse', '<fault' ) ) ) {
+        if ( ! in_array($root_tag, array('<methodCall', '<methodResponse', '<fault'))) {
             return false;
         }
 
         // Bail if there are too many elements to parse
         $element_limit = 30000;
-        if ( function_exists( 'apply_filters' ) ) {
+        if (function_exists('apply_filters')) {
             /**
              * Filters the number of elements to parse in an XML-RPC response.
              *
@@ -83,9 +83,9 @@ 
              *
              * @param int $element_limit Default elements limit.
              */
-            $element_limit = apply_filters( 'xmlrpc_element_limit', $element_limit );
+            $element_limit = apply_filters('xmlrpc_element_limit', $element_limit);
         }
-        if ( $element_limit && 2 * $element_limit < substr_count( $this->message, '<' ) ) {
+        if ($element_limit && 2 * $element_limit < substr_count($this->message, '<')) {
             return false;
         }
 
@@ -107,7 +107,7 @@ 
          *
          * @param int $chunk_size Chunk size to parse in bytes.
          */
-        $chunk_size = apply_filters( 'xmlrpc_chunk_parsing_size', $chunk_size );
+        $chunk_size = apply_filters('xmlrpc_chunk_parsing_size', $chunk_size);
 
         $final = false;
         do {
@@ -116,7 +116,7 @@ 
             }
             $part = substr($this->message, 0, $chunk_size);
             $this->message = substr($this->message, $chunk_size);
-            if (!xml_parse($this->_parser, $part, $final)) {
+            if ( ! xml_parse($this->_parser, $part, $final)) {
                 return false;
             }
             if ($final) {
@@ -137,7 +137,7 @@ 
     {
         $this->_currentTagContents = '';
         $this->currentTag = $tag;
-        switch($tag) {
+        switch ($tag) {
             case 'methodCall':
             case 'methodResponse':
             case 'fault':
@@ -163,18 +163,18 @@ 
     function tag_close($parser, $tag)
     {
         $valueFlag = false;
-        switch($tag) {
+        switch ($tag) {
             case 'int':
             case 'i4':
-                $value = (int)trim($this->_currentTagContents);
+                $value = (int) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'double':
-                $value = (double)trim($this->_currentTagContents);
+                $value = (double) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'string':
-                $value = (string)trim($this->_currentTagContents);
+                $value = (string) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'dateTime.iso8601':
@@ -184,12 +184,12 @@ 
             case 'value':
                 // "If no type is indicated, the type is string."
                 if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
+                    $value = (string) $this->_currentTagContents;
                     $valueFlag = true;
                 }
                 break;
             case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
+                $value = (boolean) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'base64':
@@ -217,12 +217,12 @@ 
         if ($valueFlag) {
             if (count($this->_arraystructs) > 0) {
                 // Add value to struct or array
-                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
+                if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] == 'struct') {
                     // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+                    $this->_arraystructs[count($this->_arraystructs) - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
                 } else {
                     // Add to array
-                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
+                    $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
                 }
             } else {
                 // Just add as a parameter

src/wp-includes/class-wp-term-query.php

Spacing +207 added lines, -207 removed lines

@@ -178,7 +178,7 @@ 
 	 *                                                Usually used in conjunction with `$meta_key`.
 	 * }
 	 */
-	public function __construct( $query = '' ) {
+	public function __construct($query = '') {
 		$this->query_var_defaults = array(
 			'taxonomy'               => null,
 			'object_ids'             => null,
@@ -213,8 +213,8 @@ 
 			'meta_compare'           => '',
 		);
 
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -226,12 +226,12 @@ 
 	 *
 	 * @param string|array $query WP_Term_Query arguments. See WP_Term_Query::__construct()
 	 */
-	public function parse_query( $query = '' ) {
-		if ( empty( $query ) ) {
+	public function parse_query($query = '') {
+		if (empty($query)) {
 			$query = $this->query_vars;
 		}
 
-		$taxonomies = isset( $query['taxonomy'] ) ? (array) $query['taxonomy'] : null;
+		$taxonomies = isset($query['taxonomy']) ? (array) $query['taxonomy'] : null;
 
 		/**
 		 * Filters the terms query default arguments.
@@ -243,19 +243,19 @@ 
 		 * @param array $defaults   An array of default get_terms() arguments.
 		 * @param array $taxonomies An array of taxonomies.
 		 */
-		$this->query_var_defaults = apply_filters( 'get_terms_defaults', $this->query_var_defaults, $taxonomies );
+		$this->query_var_defaults = apply_filters('get_terms_defaults', $this->query_var_defaults, $taxonomies);
 
-		$query = wp_parse_args( $query, $this->query_var_defaults );
+		$query = wp_parse_args($query, $this->query_var_defaults);
 
-		$query['number'] = absint( $query['number'] );
-		$query['offset'] = absint( $query['offset'] );
+		$query['number'] = absint($query['number']);
+		$query['offset'] = absint($query['offset']);
 
 		// 'parent' overrides 'child_of'.
-		if ( 0 < intval( $query['parent'] ) ) {
+		if (0 < intval($query['parent'])) {
 			$query['child_of'] = false;
 		}
 
-		if ( 'all' == $query['get'] ) {
+		if ('all' == $query['get']) {
 			$query['childless'] = false;
 			$query['child_of'] = 0;
 			$query['hide_empty'] = 0;
@@ -274,7 +274,7 @@ 
 		 *
 		 * @param WP_Term_Query $this Current instance of WP_Term_Query.
 		 */
-		do_action( 'parse_term_query', $this );
+		do_action('parse_term_query', $this);
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of terms, or number of terms when 'count' is passed as a query var.
 	 */
-	public function query( $query ) {
-		$this->query_vars = wp_parse_args( $query );
+	public function query($query) {
+		$this->query_vars = wp_parse_args($query);
 		return $this->get_terms();
 	}
 
@@ -304,12 +304,12 @@ 
 	public function get_terms() {
 		global $wpdb;
 
-		$this->parse_query( $this->query_vars );
+		$this->parse_query($this->query_vars);
 		$args = &$this->query_vars;
 
 		// Set up meta_query so it's available to 'pre_get_terms'.
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $args );
+		$this->meta_query->parse_query_vars($args);
 
 		/**
 		 * Fires before terms are retrieved.
@@ -318,31 +318,31 @@ 
 		 *
 		 * @param WP_Term_Query $this Current instance of WP_Term_Query.
 		 */
-		do_action( 'pre_get_terms', $this );
+		do_action('pre_get_terms', $this);
 
 		$taxonomies = $args['taxonomy'];
 
 		// Save queries by not crawling the tree in the case of multiple taxes or a flat tax.
 		$has_hierarchical_tax = false;
-		if ( $taxonomies ) {
-			foreach ( $taxonomies as $_tax ) {
-				if ( is_taxonomy_hierarchical( $_tax ) ) {
+		if ($taxonomies) {
+			foreach ($taxonomies as $_tax) {
+				if (is_taxonomy_hierarchical($_tax)) {
 					$has_hierarchical_tax = true;
 				}
 			}
 		}
 
-		if ( ! $has_hierarchical_tax ) {
+		if ( ! $has_hierarchical_tax) {
 			$args['hierarchical'] = false;
 			$args['pad_counts'] = false;
 		}
 
 		// 'parent' overrides 'child_of'.
-		if ( 0 < intval( $args['parent'] ) ) {
+		if (0 < intval($args['parent'])) {
 			$args['child_of'] = false;
 		}
 
-		if ( 'all' == $args['get'] ) {
+		if ('all' == $args['get']) {
 			$args['childless'] = false;
 			$args['child_of'] = 0;
 			$args['hide_empty'] = 0;
@@ -358,50 +358,50 @@ 
 		 * @param array $args       An array of get_terms() arguments.
 		 * @param array $taxonomies An array of taxonomies.
 		 */
-		$args = apply_filters( 'get_terms_args', $args, $taxonomies );
+		$args = apply_filters('get_terms_args', $args, $taxonomies);
 
 		// Avoid the query if the queried parent/child_of term has no descendants.
 		$child_of = $args['child_of'];
 		$parent   = $args['parent'];
 
-		if ( $child_of ) {
+		if ($child_of) {
 			$_parent = $child_of;
-		} elseif ( $parent ) {
+		} elseif ($parent) {
 			$_parent = $parent;
 		} else {
 			$_parent = false;
 		}
 
-		if ( $_parent ) {
+		if ($_parent) {
 			$in_hierarchy = false;
-			foreach ( $taxonomies as $_tax ) {
-				$hierarchy = _get_term_hierarchy( $_tax );
+			foreach ($taxonomies as $_tax) {
+				$hierarchy = _get_term_hierarchy($_tax);
 
-				if ( isset( $hierarchy[ $_parent ] ) ) {
+				if (isset($hierarchy[$_parent])) {
 					$in_hierarchy = true;
 				}
 			}
 
-			if ( ! $in_hierarchy ) {
+			if ( ! $in_hierarchy) {
 				return array();
 			}
 		}
 
 		// 'term_order' is a legal sort order only when joining the relationship table.
 		$_orderby = $this->query_vars['orderby'];
-		if ( 'term_order' === $_orderby && empty( $this->query_vars['object_ids'] ) ) {
+		if ('term_order' === $_orderby && empty($this->query_vars['object_ids'])) {
 			$_orderby = 'term_id';
 		}
-		$orderby = $this->parse_orderby( $_orderby );
+		$orderby = $this->parse_orderby($_orderby);
 
-		if ( $orderby ) {
+		if ($orderby) {
 			$orderby = "ORDER BY $orderby";
 		}
 
-		$order = $this->parse_order( $this->query_vars['order'] );
+		$order = $this->parse_order($this->query_vars['order']);
 
-		if ( $taxonomies ) {
-			$this->sql_clauses['where']['taxonomy'] = "tt.taxonomy IN ('" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "')";
+		if ($taxonomies) {
+			$this->sql_clauses['where']['taxonomy'] = "tt.taxonomy IN ('".implode("', '", array_map('esc_sql', $taxonomies))."')";
 		}
 
 		$exclude      = $args['exclude'];
@@ -409,48 +409,48 @@ 
 		$include      = $args['include'];
 
 		$inclusions = '';
-		if ( ! empty( $include ) ) {
+		if ( ! empty($include)) {
 			$exclude = '';
 			$exclude_tree = '';
-			$inclusions = implode( ',', wp_parse_id_list( $include ) );
+			$inclusions = implode(',', wp_parse_id_list($include));
 		}
 
-		if ( ! empty( $inclusions ) ) {
-			$this->sql_clauses['where']['inclusions'] = 't.term_id IN ( ' . $inclusions . ' )';
+		if ( ! empty($inclusions)) {
+			$this->sql_clauses['where']['inclusions'] = 't.term_id IN ( '.$inclusions.' )';
 		}
 
 		$exclusions = array();
-		if ( ! empty( $exclude_tree ) ) {
-			$exclude_tree = wp_parse_id_list( $exclude_tree );
+		if ( ! empty($exclude_tree)) {
+			$exclude_tree = wp_parse_id_list($exclude_tree);
 			$excluded_children = $exclude_tree;
-			foreach ( $exclude_tree as $extrunk ) {
+			foreach ($exclude_tree as $extrunk) {
 				$excluded_children = array_merge(
 					$excluded_children,
-					(array) get_terms( $taxonomies[0], array(
-						'child_of' => intval( $extrunk ),
+					(array) get_terms($taxonomies[0], array(
+						'child_of' => intval($extrunk),
 						'fields' => 'ids',
 						'hide_empty' => 0
-					) )
+					))
 				);
 			}
-			$exclusions = array_merge( $excluded_children, $exclusions );
+			$exclusions = array_merge($excluded_children, $exclusions);
 		}
 
-		if ( ! empty( $exclude ) ) {
-			$exclusions = array_merge( wp_parse_id_list( $exclude ), $exclusions );
+		if ( ! empty($exclude)) {
+			$exclusions = array_merge(wp_parse_id_list($exclude), $exclusions);
 		}
 
 		// 'childless' terms are those without an entry in the flattened term hierarchy.
 		$childless = (bool) $args['childless'];
-		if ( $childless ) {
-			foreach ( $taxonomies as $_tax ) {
-				$term_hierarchy = _get_term_hierarchy( $_tax );
-				$exclusions = array_merge( array_keys( $term_hierarchy ), $exclusions );
+		if ($childless) {
+			foreach ($taxonomies as $_tax) {
+				$term_hierarchy = _get_term_hierarchy($_tax);
+				$exclusions = array_merge(array_keys($term_hierarchy), $exclusions);
 			}
 		}
 
-		if ( ! empty( $exclusions ) ) {
-			$exclusions = 't.term_id NOT IN (' . implode( ',', array_map( 'intval', $exclusions ) ) . ')';
+		if ( ! empty($exclusions)) {
+			$exclusions = 't.term_id NOT IN ('.implode(',', array_map('intval', $exclusions)).')';
 		} else {
 			$exclusions = '';
 		}
@@ -464,57 +464,57 @@ 
 		 * @param array  $args       An array of terms query arguments.
 		 * @param array  $taxonomies An array of taxonomies.
 		 */
-		$exclusions = apply_filters( 'list_terms_exclusions', $exclusions, $args, $taxonomies );
+		$exclusions = apply_filters('list_terms_exclusions', $exclusions, $args, $taxonomies);
 
-		if ( ! empty( $exclusions ) ) {
+		if ( ! empty($exclusions)) {
 			// Must do string manipulation here for backward compatibility with filter.
-			$this->sql_clauses['where']['exclusions'] = preg_replace( '/^\s*AND\s*/', '', $exclusions );
+			$this->sql_clauses['where']['exclusions'] = preg_replace('/^\s*AND\s*/', '', $exclusions);
 		}
 
-		if ( ! empty( $args['name'] ) ) {
+		if ( ! empty($args['name'])) {
 			$names = (array) $args['name'];
-			foreach ( $names as &$_name ) {
+			foreach ($names as &$_name) {
 				// `sanitize_term_field()` returns slashed data.
-				$_name = stripslashes( sanitize_term_field( 'name', $_name, 0, reset( $taxonomies ), 'db' ) );
+				$_name = stripslashes(sanitize_term_field('name', $_name, 0, reset($taxonomies), 'db'));
 			}
 
-			$this->sql_clauses['where']['name'] = "t.name IN ('" . implode( "', '", array_map( 'esc_sql', $names ) ) . "')";
+			$this->sql_clauses['where']['name'] = "t.name IN ('".implode("', '", array_map('esc_sql', $names))."')";
 		}
 
-		if ( ! empty( $args['slug'] ) ) {
-			if ( is_array( $args['slug'] ) ) {
-				$slug = array_map( 'sanitize_title', $args['slug'] );
-				$this->sql_clauses['where']['slug'] = "t.slug IN ('" . implode( "', '", $slug ) . "')";
+		if ( ! empty($args['slug'])) {
+			if (is_array($args['slug'])) {
+				$slug = array_map('sanitize_title', $args['slug']);
+				$this->sql_clauses['where']['slug'] = "t.slug IN ('".implode("', '", $slug)."')";
 			} else {
-				$slug = sanitize_title( $args['slug'] );
+				$slug = sanitize_title($args['slug']);
 				$this->sql_clauses['where']['slug'] = "t.slug = '$slug'";
 			}
 		}
 
-		if ( ! empty( $args['term_taxonomy_id'] ) ) {
-			if ( is_array( $args['term_taxonomy_id'] ) ) {
-				$tt_ids = implode( ',', array_map( 'intval', $args['term_taxonomy_id'] ) );
+		if ( ! empty($args['term_taxonomy_id'])) {
+			if (is_array($args['term_taxonomy_id'])) {
+				$tt_ids = implode(',', array_map('intval', $args['term_taxonomy_id']));
 				$this->sql_clauses['where']['term_taxonomy_id'] = "tt.term_taxonomy_id IN ({$tt_ids})";
 			} else {
-				$this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare( "tt.term_taxonomy_id = %d", $args['term_taxonomy_id'] );
+				$this->sql_clauses['where']['term_taxonomy_id'] = $wpdb->prepare("tt.term_taxonomy_id = %d", $args['term_taxonomy_id']);
 			}
 		}
 
-		if ( ! empty( $args['name__like'] ) ) {
-			$this->sql_clauses['where']['name__like'] = $wpdb->prepare( "t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
+		if ( ! empty($args['name__like'])) {
+			$this->sql_clauses['where']['name__like'] = $wpdb->prepare("t.name LIKE %s", '%'.$wpdb->esc_like($args['name__like']).'%');
 		}
 
-		if ( ! empty( $args['description__like'] ) ) {
-			$this->sql_clauses['where']['description__like'] = $wpdb->prepare( "tt.description LIKE %s", '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
+		if ( ! empty($args['description__like'])) {
+			$this->sql_clauses['where']['description__like'] = $wpdb->prepare("tt.description LIKE %s", '%'.$wpdb->esc_like($args['description__like']).'%');
 		}
 
-		if ( ! empty( $args['object_ids'] ) ) {
+		if ( ! empty($args['object_ids'])) {
 			$object_ids = $args['object_ids'];
-			if ( ! is_array( $object_ids ) ) {
-				$object_ids = array( $object_ids );
+			if ( ! is_array($object_ids)) {
+				$object_ids = array($object_ids);
 			}
 
-			$object_ids = implode( ', ', array_map( 'intval', $object_ids ) );
+			$object_ids = implode(', ', array_map('intval', $object_ids));
 			$this->sql_clauses['where']['object_ids'] = "tr.object_id IN ($object_ids)";
 		}
 
@@ -522,20 +522,20 @@ 
 		 * When querying for object relationships, the 'count > 0' check
 		 * added by 'hide_empty' is superfluous.
 		 */
-		if ( ! empty( $args['object_ids'] ) ) {
+		if ( ! empty($args['object_ids'])) {
 			$args['hide_empty'] = false;
 		}
 
-		if ( '' !== $parent ) {
+		if ('' !== $parent) {
 			$parent = (int) $parent;
 			$this->sql_clauses['where']['parent'] = "tt.parent = '$parent'";
 		}
 
 		$hierarchical = $args['hierarchical'];
-		if ( 'count' == $args['fields'] ) {
+		if ('count' == $args['fields']) {
 			$hierarchical = false;
 		}
-		if ( $args['hide_empty'] && !$hierarchical ) {
+		if ($args['hide_empty'] && ! $hierarchical) {
 			$this->sql_clauses['where']['count'] = 'tt.count > 0';
 		}
 
@@ -543,19 +543,19 @@ 
 		$offset = $args['offset'];
 
 		// Don't limit the query results when we have to descend the family tree.
-		if ( $number && ! $hierarchical && ! $child_of && '' === $parent ) {
-			if ( $offset ) {
-				$limits = 'LIMIT ' . $offset . ',' . $number;
+		if ($number && ! $hierarchical && ! $child_of && '' === $parent) {
+			if ($offset) {
+				$limits = 'LIMIT '.$offset.','.$number;
 			} else {
-				$limits = 'LIMIT ' . $number;
+				$limits = 'LIMIT '.$number;
 			}
 		} else {
 			$limits = '';
 		}
 
 
-		if ( ! empty( $args['search'] ) ) {
-			$this->sql_clauses['where']['search'] = $this->get_search_sql( $args['search'] );
+		if ( ! empty($args['search'])) {
+			$this->sql_clauses['where']['search'] = $this->get_search_sql($args['search']);
 		}
 
 		// Meta query support.
@@ -563,45 +563,45 @@ 
 		$distinct = '';
 
 		// Reparse meta_query query_vars, in case they were modified in a 'pre_get_terms' callback.
-		$this->meta_query->parse_query_vars( $this->query_vars );
-		$mq_sql = $this->meta_query->get_sql( 'term', 't', 'term_id' );
+		$this->meta_query->parse_query_vars($this->query_vars);
+		$mq_sql = $this->meta_query->get_sql('term', 't', 'term_id');
 		$meta_clauses = $this->meta_query->get_clauses();
 
-		if ( ! empty( $meta_clauses ) ) {
+		if ( ! empty($meta_clauses)) {
 			$join .= $mq_sql['join'];
-			$this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
+			$this->sql_clauses['where']['meta_query'] = preg_replace('/^\s*AND\s*/', '', $mq_sql['where']);
 			$distinct .= "DISTINCT";
 
 		}
 
 		$selects = array();
-		switch ( $args['fields'] ) {
+		switch ($args['fields']) {
 			case 'all':
 			case 'all_with_object_id' :
 			case 'tt_ids' :
 			case 'slugs' :
-				$selects = array( 't.*', 'tt.*' );
-				if ( 'all_with_object_id' === $args['fields'] && ! empty( $args['object_ids'] ) ) {
+				$selects = array('t.*', 'tt.*');
+				if ('all_with_object_id' === $args['fields'] && ! empty($args['object_ids'])) {
 					$selects[] = 'tr.object_id';
 				}
 				break;
 			case 'ids':
 			case 'id=>parent':
-				$selects = array( 't.term_id', 'tt.parent', 'tt.count', 'tt.taxonomy' );
+				$selects = array('t.term_id', 'tt.parent', 'tt.count', 'tt.taxonomy');
 				break;
 			case 'names':
-				$selects = array( 't.term_id', 'tt.parent', 'tt.count', 't.name', 'tt.taxonomy' );
+				$selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name', 'tt.taxonomy');
 				break;
 			case 'count':
 				$orderby = '';
 				$order = '';
-				$selects = array( 'COUNT(*)' );
+				$selects = array('COUNT(*)');
 				break;
 			case 'id=>name':
-				$selects = array( 't.term_id', 't.name', 'tt.count', 'tt.taxonomy' );
+				$selects = array('t.term_id', 't.name', 'tt.count', 'tt.taxonomy');
 				break;
 			case 'id=>slug':
-				$selects = array( 't.term_id', 't.slug', 'tt.count', 'tt.taxonomy' );
+				$selects = array('t.term_id', 't.slug', 'tt.count', 'tt.taxonomy');
 				break;
 		}
 
@@ -623,15 +623,15 @@ 
 		 * @param array $args       An array of term query arguments.
 		 * @param array $taxonomies An array of taxonomies.
 		 */
-		$fields = implode( ', ', apply_filters( 'get_terms_fields', $selects, $args, $taxonomies ) );
+		$fields = implode(', ', apply_filters('get_terms_fields', $selects, $args, $taxonomies));
 
 		$join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
 
-		if ( ! empty( $this->query_vars['object_ids'] ) ) {
+		if ( ! empty($this->query_vars['object_ids'])) {
 			$join .= " INNER JOIN {$wpdb->term_relationships} AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id";
 		}
 
-		$where = implode( ' AND ', $this->sql_clauses['where'] );
+		$where = implode(' AND ', $this->sql_clauses['where']);
 
 		/**
 		 * Filters the terms query SQL clauses.
@@ -642,17 +642,17 @@ 
 		 * @param array $taxonomies An array of taxonomies.
 		 * @param array $args       An array of terms query arguments.
 		 */
-		$clauses = apply_filters( 'terms_clauses', compact( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' ), $taxonomies, $args );
+		$clauses = apply_filters('terms_clauses', compact('fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits'), $taxonomies, $args);
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$order = isset( $clauses[ 'order' ] ) ? $clauses[ 'order' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+		$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+		$join = isset($clauses['join']) ? $clauses['join'] : '';
+		$where = isset($clauses['where']) ? $clauses['where'] : '';
+		$distinct = isset($clauses['distinct']) ? $clauses['distinct'] : '';
+		$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+		$order = isset($clauses['order']) ? $clauses['order'] : '';
+		$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
 
-		if ( $where ) {
+		if ($where) {
 			$where = "WHERE $where";
 		}
 
@@ -664,73 +664,73 @@ 
 		$this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
 		// $args can be anything. Only use the args defined in defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $args, array_keys( $this->query_var_defaults ) ) ) . serialize( $taxonomies ) . $this->request );
-		$last_changed = wp_cache_get_last_changed( 'terms' );
+		$key = md5(serialize(wp_array_slice_assoc($args, array_keys($this->query_var_defaults))).serialize($taxonomies).$this->request);
+		$last_changed = wp_cache_get_last_changed('terms');
 		$cache_key = "get_terms:$key:$last_changed";
-		$cache = wp_cache_get( $cache_key, 'terms' );
-		if ( false !== $cache ) {
-			if ( 'all' === $_fields ) {
-				$cache = array_map( 'get_term', $cache );
+		$cache = wp_cache_get($cache_key, 'terms');
+		if (false !== $cache) {
+			if ('all' === $_fields) {
+				$cache = array_map('get_term', $cache);
 			}
 
 			$this->terms = $cache;
 			return $this->terms;
 		}
 
-		if ( 'count' == $_fields ) {
-			$count = $wpdb->get_var( $this->request );
-			wp_cache_set( $cache_key, $count, 'terms' );
+		if ('count' == $_fields) {
+			$count = $wpdb->get_var($this->request);
+			wp_cache_set($cache_key, $count, 'terms');
 			return $count;
 		}
 
-		$terms = $wpdb->get_results( $this->request );
-		if ( 'all' == $_fields || 'all_with_object_id' === $_fields ) {
-			update_term_cache( $terms );
+		$terms = $wpdb->get_results($this->request);
+		if ('all' == $_fields || 'all_with_object_id' === $_fields) {
+			update_term_cache($terms);
 		}
 
 		// Prime termmeta cache.
-		if ( $args['update_term_meta_cache'] ) {
-			$term_ids = wp_list_pluck( $terms, 'term_id' );
-			update_termmeta_cache( $term_ids );
+		if ($args['update_term_meta_cache']) {
+			$term_ids = wp_list_pluck($terms, 'term_id');
+			update_termmeta_cache($term_ids);
 		}
 
-		if ( empty( $terms ) ) {
-			wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS );
+		if (empty($terms)) {
+			wp_cache_add($cache_key, array(), 'terms', DAY_IN_SECONDS);
 			return array();
 		}
 
-		if ( $child_of ) {
-			foreach ( $taxonomies as $_tax ) {
-				$children = _get_term_hierarchy( $_tax );
-				if ( ! empty( $children ) ) {
-					$terms = _get_term_children( $child_of, $terms, $_tax );
+		if ($child_of) {
+			foreach ($taxonomies as $_tax) {
+				$children = _get_term_hierarchy($_tax);
+				if ( ! empty($children)) {
+					$terms = _get_term_children($child_of, $terms, $_tax);
 				}
 			}
 		}
 
 		// Update term counts to include children.
-		if ( $args['pad_counts'] && 'all' == $_fields ) {
-			foreach ( $taxonomies as $_tax ) {
-				_pad_term_counts( $terms, $_tax );
+		if ($args['pad_counts'] && 'all' == $_fields) {
+			foreach ($taxonomies as $_tax) {
+				_pad_term_counts($terms, $_tax);
 			}
 		}
 
 		// Make sure we show empty categories that have children.
-		if ( $hierarchical && $args['hide_empty'] && is_array( $terms ) ) {
-			foreach ( $terms as $k => $term ) {
-				if ( ! $term->count ) {
-					$children = get_term_children( $term->term_id, $term->taxonomy );
-					if ( is_array( $children ) ) {
-						foreach ( $children as $child_id ) {
-							$child = get_term( $child_id, $term->taxonomy );
-							if ( $child->count ) {
+		if ($hierarchical && $args['hide_empty'] && is_array($terms)) {
+			foreach ($terms as $k => $term) {
+				if ( ! $term->count) {
+					$children = get_term_children($term->term_id, $term->taxonomy);
+					if (is_array($children)) {
+						foreach ($children as $child_id) {
+							$child = get_term($child_id, $term->taxonomy);
+							if ($child->count) {
 								continue 2;
 							}
 						}
 					}
 
 					// It really is empty.
-					unset( $terms[ $k ] );
+					unset($terms[$k]);
 				}
 			}
 		}
@@ -741,14 +741,14 @@ 
 		 * `$fields` is 'all_with_object_id', but should otherwise be
 		 * removed.
 		 */
-		if ( ! empty( $args['object_ids'] ) && 'all_with_object_id' != $_fields ) {
+		if ( ! empty($args['object_ids']) && 'all_with_object_id' != $_fields) {
 			$_tt_ids = $_terms = array();
-			foreach ( $terms as $term ) {
-				if ( isset( $_tt_ids[ $term->term_id ] ) ) {
+			foreach ($terms as $term) {
+				if (isset($_tt_ids[$term->term_id])) {
 					continue;
 				}
 
-				$_tt_ids[ $term->term_id ] = 1;
+				$_tt_ids[$term->term_id] = 1;
 				$_terms[] = $term;
 			}
 
@@ -756,53 +756,53 @@ 
 		}
 
 		$_terms = array();
-		if ( 'id=>parent' == $_fields ) {
-			foreach ( $terms as $term ) {
-				$_terms[ $term->term_id ] = $term->parent;
+		if ('id=>parent' == $_fields) {
+			foreach ($terms as $term) {
+				$_terms[$term->term_id] = $term->parent;
 			}
-		} elseif ( 'ids' == $_fields ) {
-			foreach ( $terms as $term ) {
+		} elseif ('ids' == $_fields) {
+			foreach ($terms as $term) {
 				$_terms[] = (int) $term->term_id;
 			}
-		} elseif ( 'tt_ids' == $_fields ) {
-			foreach ( $terms as $term ) {
+		} elseif ('tt_ids' == $_fields) {
+			foreach ($terms as $term) {
 				$_terms[] = (int) $term->term_taxonomy_id;
 			}
-		} elseif ( 'names' == $_fields ) {
-			foreach ( $terms as $term ) {
+		} elseif ('names' == $_fields) {
+			foreach ($terms as $term) {
 				$_terms[] = $term->name;
 			}
-		} elseif ( 'slugs' == $_fields ) {
-			foreach ( $terms as $term ) {
+		} elseif ('slugs' == $_fields) {
+			foreach ($terms as $term) {
 				$_terms[] = $term->slug;
 			}
-		} elseif ( 'id=>name' == $_fields ) {
-			foreach ( $terms as $term ) {
-				$_terms[ $term->term_id ] = $term->name;
+		} elseif ('id=>name' == $_fields) {
+			foreach ($terms as $term) {
+				$_terms[$term->term_id] = $term->name;
 			}
-		} elseif ( 'id=>slug' == $_fields ) {
-			foreach ( $terms as $term ) {
-				$_terms[ $term->term_id ] = $term->slug;
+		} elseif ('id=>slug' == $_fields) {
+			foreach ($terms as $term) {
+				$_terms[$term->term_id] = $term->slug;
 			}
 		}
 
-		if ( ! empty( $_terms ) ) {
+		if ( ! empty($_terms)) {
 			$terms = $_terms;
 		}
 
 		// Hierarchical queries are not limited, so 'offset' and 'number' must be handled now.
-		if ( $hierarchical && $number && is_array( $terms ) ) {
-			if ( $offset >= count( $terms ) ) {
+		if ($hierarchical && $number && is_array($terms)) {
+			if ($offset >= count($terms)) {
 				$terms = array();
 			} else {
-				$terms = array_slice( $terms, $offset, $number, true );
+				$terms = array_slice($terms, $offset, $number, true);
 			}
 		}
 
-		wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
+		wp_cache_add($cache_key, $terms, 'terms', DAY_IN_SECONDS);
 
-		if ( 'all' === $_fields || 'all_with_object_id' === $_fields ) {
-			$terms = array_map( 'get_term', $terms );
+		if ('all' === $_fields || 'all_with_object_id' === $_fields) {
+			$terms = array_map('get_term', $terms);
 		}
 
 		$this->terms = $terms;
@@ -820,22 +820,22 @@ 
 	 * @param string $orderby_raw Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby_raw ) {
-		$_orderby = strtolower( $orderby_raw );
+	protected function parse_orderby($orderby_raw) {
+		$_orderby = strtolower($orderby_raw);
 		$maybe_orderby_meta = false;
 
-		if ( in_array( $_orderby, array( 'term_id', 'name', 'slug', 'term_group' ), true ) ) {
+		if (in_array($_orderby, array('term_id', 'name', 'slug', 'term_group'), true)) {
 			$orderby = "t.$_orderby";
-		} elseif ( in_array( $_orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id', 'description' ), true ) ) {
+		} elseif (in_array($_orderby, array('count', 'parent', 'taxonomy', 'term_taxonomy_id', 'description'), true)) {
 			$orderby = "tt.$_orderby";
-		} elseif ( 'term_order' === $_orderby ) {
+		} elseif ('term_order' === $_orderby) {
 			$orderby = 'tr.term_order';
-		} elseif ( 'include' == $_orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include = implode( ',', wp_parse_id_list( $this->query_vars['include'] ) );
+		} elseif ('include' == $_orderby && ! empty($this->query_vars['include'])) {
+			$include = implode(',', wp_parse_id_list($this->query_vars['include']));
 			$orderby = "FIELD( t.term_id, $include )";
-		} elseif ( 'none' == $_orderby ) {
+		} elseif ('none' == $_orderby) {
 			$orderby = '';
-		} elseif ( empty( $_orderby ) || 'id' == $_orderby || 'term_id' === $_orderby ) {
+		} elseif (empty($_orderby) || 'id' == $_orderby || 'term_id' === $_orderby) {
 			$orderby = 't.term_id';
 		} else {
 			$orderby = 't.name';
@@ -853,12 +853,12 @@ 
 		 * @param array  $args       An array of terms query arguments.
 		 * @param array  $taxonomies An array of taxonomies.
 		 */
-		$orderby = apply_filters( 'get_terms_orderby', $orderby, $this->query_vars, $this->query_vars['taxonomy'] );
+		$orderby = apply_filters('get_terms_orderby', $orderby, $this->query_vars, $this->query_vars['taxonomy']);
 
 		// Run after the 'get_terms_orderby' filter for backward compatibility.
-		if ( $maybe_orderby_meta ) {
-			$maybe_orderby_meta = $this->parse_orderby_meta( $_orderby );
-			if ( $maybe_orderby_meta ) {
+		if ($maybe_orderby_meta) {
+			$maybe_orderby_meta = $this->parse_orderby_meta($_orderby);
+			if ($maybe_orderby_meta) {
 				$orderby = $maybe_orderby_meta;
 			}
 		}
@@ -875,35 +875,35 @@ 
 	 * @param string $orderby_raw Raw 'orderby' value passed to WP_Term_Query.
 	 * @return string ORDER BY clause.
 	 */
-	protected function parse_orderby_meta( $orderby_raw ) {
+	protected function parse_orderby_meta($orderby_raw) {
 		$orderby = '';
 
 		// Tell the meta query to generate its SQL, so we have access to table aliases.
-		$this->meta_query->get_sql( 'term', 't', 'term_id' );
+		$this->meta_query->get_sql('term', 't', 'term_id');
 		$meta_clauses = $this->meta_query->get_clauses();
-		if ( ! $meta_clauses || ! $orderby_raw ) {
+		if ( ! $meta_clauses || ! $orderby_raw) {
 			return $orderby;
 		}
 
 		$allowed_keys = array();
 		$primary_meta_key = null;
-		$primary_meta_query = reset( $meta_clauses );
-		if ( ! empty( $primary_meta_query['key'] ) ) {
+		$primary_meta_query = reset($meta_clauses);
+		if ( ! empty($primary_meta_query['key'])) {
 			$primary_meta_key = $primary_meta_query['key'];
 			$allowed_keys[] = $primary_meta_key;
 		}
 		$allowed_keys[] = 'meta_value';
 		$allowed_keys[] = 'meta_value_num';
-		$allowed_keys   = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
+		$allowed_keys   = array_merge($allowed_keys, array_keys($meta_clauses));
 
-		if ( ! in_array( $orderby_raw, $allowed_keys, true ) ) {
+		if ( ! in_array($orderby_raw, $allowed_keys, true)) {
 			return $orderby;
 		}
 
-		switch( $orderby_raw ) {
+		switch ($orderby_raw) {
 			case $primary_meta_key:
 			case 'meta_value':
-				if ( ! empty( $primary_meta_query['type'] ) ) {
+				if ( ! empty($primary_meta_query['type'])) {
 					$orderby = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
 				} else {
 					$orderby = "{$primary_meta_query['alias']}.meta_value";
@@ -915,9 +915,9 @@ 
 				break;
 
 			default:
-				if ( array_key_exists( $orderby_raw, $meta_clauses ) ) {
+				if (array_key_exists($orderby_raw, $meta_clauses)) {
 					// $orderby corresponds to a meta_query clause.
-					$meta_clause = $meta_clauses[ $orderby_raw ];
+					$meta_clause = $meta_clauses[$orderby_raw];
 					$orderby = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
 				}
 				break;
@@ -935,12 +935,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';
@@ -958,11 +958,11 @@ 
 	 * @param string $string
 	 * @return string
 	 */
-	protected function get_search_sql( $string ) {
+	protected function get_search_sql($string) {
 		global $wpdb;
 
-		$like = '%' . $wpdb->esc_like( $string ) . '%';
+		$like = '%'.$wpdb->esc_like($string).'%';
 
-		return $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
+		return $wpdb->prepare('((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like);
 	}
 }