ntwb / wordpress

src/wp-includes/atomlib.php

Braces +6 added lines, -3 removed lines

@@ -137,7 +137,9 @@ 
 
         $fp = fopen($this->FILE, "r");
         while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+            if($this->debug) {
+            	$this->content .= $data;
+            }
 
             if(!xml_parse($parser, $data, feof($fp))) {
                 /* translators: 1: error message, 2: line number */
@@ -182,8 +184,9 @@ 
 
             $this->content_ns_decls = array();
 
-            if($this->is_html || $this->is_text)
-                trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+            if($this->is_html || $this->is_text) {
+                            trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+            }
 
             $attrs_prefix = array();
 

Indentation +289 added lines, -289 removed lines

@@ -21,20 +21,20 @@ 
 	 * @var array
 	 * @access public
 	 */
-    var $links = array();
-    /**
-     * Stores Categories
-     * @var array
-     * @access public
-     */
-    var $categories = array();
+	var $links = array();
+	/**
+	 * Stores Categories
+	 * @var array
+	 * @access public
+	 */
+	var $categories = array();
 	/**
 	 * Stores Entries
 	 *
 	 * @var array
 	 * @access public
 	 */
-    var $entries = array();
+	var $entries = array();
 }
 
 /**
@@ -48,13 +48,13 @@ 
 	 * @var array
 	 * @access public
 	 */
-    var $links = array();
-    /**
-     * Stores Categories
-     * @var array
+	var $links = array();
+	/**
+	 * Stores Categories
+	 * @var array
 	 * @access public
-     */
-    var $categories = array();
+	 */
+	var $categories = array();
 }
 
 /**
@@ -64,39 +64,39 @@ 
  */
 class AtomParser {
 
-    var $NS = 'http://www.w3.org/2005/Atom';
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
+	var $NS = 'http://www.w3.org/2005/Atom';
+	var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
+	var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
 
-    var $debug = false;
+	var $debug = false;
 
-    var $depth = 0;
-    var $indent = 2;
-    var $in_content;
-    var $ns_contexts = array();
-    var $ns_decls = array();
-    var $content_ns_decls = array();
-    var $content_ns_contexts = array();
-    var $is_xhtml = false;
-    var $is_html = false;
-    var $is_text = true;
-    var $skipped_div = false;
+	var $depth = 0;
+	var $indent = 2;
+	var $in_content;
+	var $ns_contexts = array();
+	var $ns_decls = array();
+	var $content_ns_decls = array();
+	var $content_ns_contexts = array();
+	var $is_xhtml = false;
+	var $is_html = false;
+	var $is_text = true;
+	var $skipped_div = false;
 
-    var $FILE = "php://input";
+	var $FILE = "php://input";
 
-    var $feed;
-    var $current;
+	var $feed;
+	var $current;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct() {
+	function __construct() {
 
-        $this->feed = new AtomFeed();
-        $this->current = null;
-        $this->map_attrs_func = array( __CLASS__, 'map_attrs' );
-        $this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
-    }
+		$this->feed = new AtomFeed();
+		$this->current = null;
+		$this->map_attrs_func = array( __CLASS__, 'map_attrs' );
+		$this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -131,264 +131,264 @@ 
 		return "{$xd}=\"{$n[1]}\"";
 	}
 
-    function _p($msg) {
-        if($this->debug) {
-            print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
-        }
-    }
+	function _p($msg) {
+		if($this->debug) {
+			print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
+		}
+	}
+
+	function error_handler($log_level, $log_text, $error_file, $error_line) {
+		$this->error = $log_text;
+	}
+
+	function parse() {
 
-    function error_handler($log_level, $log_text, $error_file, $error_line) {
-        $this->error = $log_text;
-    }
+		set_error_handler(array(&$this, 'error_handler'));
 
-    function parse() {
+		array_unshift($this->ns_contexts, array());
 
-        set_error_handler(array(&$this, 'error_handler'));
+		if ( ! function_exists( 'xml_parser_create_ns' ) ) {
+			trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
+			return false;
+		}
+
+		$parser = xml_parser_create_ns();
+		xml_set_object($parser, $this);
+		xml_set_element_handler($parser, "start_element", "end_element");
+		xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
+		xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+		xml_set_character_data_handler($parser, "cdata");
+		xml_set_default_handler($parser, "_default");
+		xml_set_start_namespace_decl_handler($parser, "start_ns");
+		xml_set_end_namespace_decl_handler($parser, "end_ns");
+
+		$this->content = '';
+
+		$ret = true;
+
+		$fp = fopen($this->FILE, "r");
+		while ($data = fread($fp, 4096)) {
+			if($this->debug) $this->content .= $data;
+
+			if(!xml_parse($parser, $data, feof($fp))) {
+				/* translators: 1: error message, 2: line number */
+				trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
+					xml_error_string(xml_get_error_code($parser)),
+					xml_get_current_line_number($parser)));
+				$ret = false;
+				break;
+			}
+		}
+		fclose($fp);
 
-        array_unshift($this->ns_contexts, array());
+		xml_parser_free($parser);
 
-        if ( ! function_exists( 'xml_parser_create_ns' ) ) {
-        	trigger_error( __( "PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension." ) );
-        	return false;
-        }
+		restore_error_handler();
 
-        $parser = xml_parser_create_ns();
-        xml_set_object($parser, $this);
-        xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
-        xml_set_character_data_handler($parser, "cdata");
-        xml_set_default_handler($parser, "_default");
-        xml_set_start_namespace_decl_handler($parser, "start_ns");
-        xml_set_end_namespace_decl_handler($parser, "end_ns");
-
-        $this->content = '';
+		return $ret;
+	}
 
-        $ret = true;
-
-        $fp = fopen($this->FILE, "r");
-        while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+	function start_element($parser, $name, $attrs) {
 
-            if(!xml_parse($parser, $data, feof($fp))) {
-                /* translators: 1: error message, 2: line number */
-                trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
-                    xml_error_string(xml_get_error_code($parser)),
-                    xml_get_current_line_number($parser)));
-                $ret = false;
-                break;
-            }
-        }
-        fclose($fp);
+		$tag = array_pop(explode(":", $name));
 
-        xml_parser_free($parser);
-
-        restore_error_handler();
-
-        return $ret;
-    }
-
-    function start_element($parser, $name, $attrs) {
-
-        $tag = array_pop(explode(":", $name));
-
-        switch($name) {
-            case $this->NS . ':feed':
-                $this->current = $this->feed;
-                break;
-            case $this->NS . ':entry':
-                $this->current = new AtomEntry();
-                break;
-        };
-
-        $this->_p("start_element('$name')");
-        #$this->_p(print_r($this->ns_contexts,true));
-        #$this->_p('current(' . $this->current . ')');
-
-        array_unshift($this->ns_contexts, $this->ns_decls);
-
-        $this->depth++;
-
-        if(!empty($this->in_content)) {
-
-            $this->content_ns_decls = array();
-
-            if($this->is_html || $this->is_text)
-                trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
-
-            $attrs_prefix = array();
-
-            // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
-                $with_prefix = $this->ns_to_prefix($key, true);
-                $attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
-            }
-
-            $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
-            }
-
-            $with_prefix = $this->ns_to_prefix($name);
-
-            if(!$this->is_declared_content_ns($with_prefix[0])) {
-                array_push($this->content_ns_decls, $with_prefix[0]);
-            }
-
-            $xmlns_str = '';
-            if(count($this->content_ns_decls) > 0) {
-                array_unshift($this->content_ns_contexts, $this->content_ns_decls);
-                $xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
-                if(strlen($xmlns_str) > 0) {
-                    $xmlns_str = " " . $xmlns_str;
-                }
-            }
-
-            array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
-
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
-            $this->in_content = array();
-            $this->is_xhtml = $attrs['type'] == 'xhtml';
-            $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
-            $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
-            $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
-
-            if(in_array('src',array_keys($attrs))) {
-                $this->current->$tag = $attrs;
-            } else {
-                array_push($this->in_content, array($tag,$this->depth, $type));
-            }
-        } else if($tag == 'link') {
-            array_push($this->current->links, $attrs);
-        } else if($tag == 'category') {
-            array_push($this->current->categories, $attrs);
-        }
-
-        $this->ns_decls = array();
-    }
-
-    function end_element($parser, $name) {
-
-        $tag = array_pop(explode(":", $name));
-
-        $ccount = count($this->in_content);
-
-        # if we are *in* content, then let's proceed to serialize it
-        if(!empty($this->in_content)) {
-            # if we are ending the original content element
-            # then let's finalize the content
-            if($this->in_content[0][0] == $tag &&
-                $this->in_content[0][1] == $this->depth) {
-                $origtype = $this->in_content[0][2];
-                array_shift($this->in_content);
-                $newcontent = array();
-                foreach($this->in_content as $c) {
-                    if(count($c) == 3) {
-                        array_push($newcontent, $c[2]);
-                    } else {
-                        if($this->is_xhtml || $this->is_text) {
-                            array_push($newcontent, $this->xml_escape($c));
-                        } else {
-                            array_push($newcontent, $c);
-                        }
-                    }
-                }
-                if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
-                    $this->current->$tag = array($origtype, join('',$newcontent));
-                } else {
-                    $this->current->$tag = join('',$newcontent);
-                }
-                $this->in_content = array();
-            } else if($this->in_content[$ccount-1][0] == $tag &&
-                $this->in_content[$ccount-1][1] == $this->depth) {
-                $this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
-            } else {
-                # else, just finalize the current element's content
-                $endtag = $this->ns_to_prefix($name);
-                array_push($this->in_content, array($tag, $this->depth, "</$endtag[1]>"));
-            }
-        }
-
-        array_shift($this->ns_contexts);
-
-        $this->depth--;
-
-        if($name == ($this->NS . ':entry')) {
-            array_push($this->feed->entries, $this->current);
-            $this->current = null;
-        }
-
-        $this->_p("end_element('$name')");
-    }
-
-    function start_ns($parser, $prefix, $uri) {
-        $this->_p("starting: " . $prefix . ":" . $uri);
-        array_push($this->ns_decls, array($prefix,$uri));
-    }
-
-    function end_ns($parser, $prefix) {
-        $this->_p("ending: #" . $prefix . "#");
-    }
-
-    function cdata($parser, $data) {
-        $this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
-        if(!empty($this->in_content)) {
-            array_push($this->in_content, $data);
-        }
-    }
-
-    function _default($parser, $data) {
-        # when does this gets called?
-    }
-
-
-    function ns_to_prefix($qname, $attr=false) {
-        # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
-        $components = explode(":", $qname);
-
-        # grab the last one (e.g 'div')
-        $name = array_pop($components);
-
-        if(!empty($components)) {
-            # re-join back the namespace component
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
-                        return array($mapping, "$mapping[0]:$name");
-                    }
-                }
-            }
-        }
-
-        if($attr) {
-            return array(null, $name);
-        } else {
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if(strlen($mapping[0]) == 0) {
-                        return array($mapping, $name);
-                    }
-                }
-            }
-        }
-    }
-
-    function is_declared_content_ns($new_mapping) {
-        foreach($this->content_ns_contexts as $context) {
-            foreach($context as $mapping) {
-                if($new_mapping == $mapping) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    function xml_escape($string)
-    {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
-    }
+		switch($name) {
+			case $this->NS . ':feed':
+				$this->current = $this->feed;
+				break;
+			case $this->NS . ':entry':
+				$this->current = new AtomEntry();
+				break;
+		};
+
+		$this->_p("start_element('$name')");
+		#$this->_p(print_r($this->ns_contexts,true));
+		#$this->_p('current(' . $this->current . ')');
+
+		array_unshift($this->ns_contexts, $this->ns_decls);
+
+		$this->depth++;
+
+		if(!empty($this->in_content)) {
+
+			$this->content_ns_decls = array();
+
+			if($this->is_html || $this->is_text)
+				trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
+
+			$attrs_prefix = array();
+
+			// resolve prefixes for attributes
+			foreach($attrs as $key => $value) {
+				$with_prefix = $this->ns_to_prefix($key, true);
+				$attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
+			}
+
+			$attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
+			if(strlen($attrs_str) > 0) {
+				$attrs_str = " " . $attrs_str;
+			}
+
+			$with_prefix = $this->ns_to_prefix($name);
+
+			if(!$this->is_declared_content_ns($with_prefix[0])) {
+				array_push($this->content_ns_decls, $with_prefix[0]);
+			}
+
+			$xmlns_str = '';
+			if(count($this->content_ns_decls) > 0) {
+				array_unshift($this->content_ns_contexts, $this->content_ns_decls);
+				$xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
+				if(strlen($xmlns_str) > 0) {
+					$xmlns_str = " " . $xmlns_str;
+				}
+			}
+
+			array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
+
+		} else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+			$this->in_content = array();
+			$this->is_xhtml = $attrs['type'] == 'xhtml';
+			$this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
+			$this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
+			$type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
+
+			if(in_array('src',array_keys($attrs))) {
+				$this->current->$tag = $attrs;
+			} else {
+				array_push($this->in_content, array($tag,$this->depth, $type));
+			}
+		} else if($tag == 'link') {
+			array_push($this->current->links, $attrs);
+		} else if($tag == 'category') {
+			array_push($this->current->categories, $attrs);
+		}
+
+		$this->ns_decls = array();
+	}
+
+	function end_element($parser, $name) {
+
+		$tag = array_pop(explode(":", $name));
+
+		$ccount = count($this->in_content);
+
+		# if we are *in* content, then let's proceed to serialize it
+		if(!empty($this->in_content)) {
+			# if we are ending the original content element
+			# then let's finalize the content
+			if($this->in_content[0][0] == $tag &&
+				$this->in_content[0][1] == $this->depth) {
+				$origtype = $this->in_content[0][2];
+				array_shift($this->in_content);
+				$newcontent = array();
+				foreach($this->in_content as $c) {
+					if(count($c) == 3) {
+						array_push($newcontent, $c[2]);
+					} else {
+						if($this->is_xhtml || $this->is_text) {
+							array_push($newcontent, $this->xml_escape($c));
+						} else {
+							array_push($newcontent, $c);
+						}
+					}
+				}
+				if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
+					$this->current->$tag = array($origtype, join('',$newcontent));
+				} else {
+					$this->current->$tag = join('',$newcontent);
+				}
+				$this->in_content = array();
+			} else if($this->in_content[$ccount-1][0] == $tag &&
+				$this->in_content[$ccount-1][1] == $this->depth) {
+				$this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
+			} else {
+				# else, just finalize the current element's content
+				$endtag = $this->ns_to_prefix($name);
+				array_push($this->in_content, array($tag, $this->depth, "</$endtag[1]>"));
+			}
+		}
+
+		array_shift($this->ns_contexts);
+
+		$this->depth--;
+
+		if($name == ($this->NS . ':entry')) {
+			array_push($this->feed->entries, $this->current);
+			$this->current = null;
+		}
+
+		$this->_p("end_element('$name')");
+	}
+
+	function start_ns($parser, $prefix, $uri) {
+		$this->_p("starting: " . $prefix . ":" . $uri);
+		array_push($this->ns_decls, array($prefix,$uri));
+	}
+
+	function end_ns($parser, $prefix) {
+		$this->_p("ending: #" . $prefix . "#");
+	}
+
+	function cdata($parser, $data) {
+		$this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
+		if(!empty($this->in_content)) {
+			array_push($this->in_content, $data);
+		}
+	}
+
+	function _default($parser, $data) {
+		# when does this gets called?
+	}
+
+
+	function ns_to_prefix($qname, $attr=false) {
+		# split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
+		$components = explode(":", $qname);
+
+		# grab the last one (e.g 'div')
+		$name = array_pop($components);
+
+		if(!empty($components)) {
+			# re-join back the namespace component
+			$ns = join(":",$components);
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+						return array($mapping, "$mapping[0]:$name");
+					}
+				}
+			}
+		}
+
+		if($attr) {
+			return array(null, $name);
+		} else {
+			foreach($this->ns_contexts as $context) {
+				foreach($context as $mapping) {
+					if(strlen($mapping[0]) == 0) {
+						return array($mapping, $name);
+					}
+				}
+			}
+		}
+	}
+
+	function is_declared_content_ns($new_mapping) {
+		foreach($this->content_ns_contexts as $context) {
+			foreach($context as $mapping) {
+				if($new_mapping == $mapping) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	function xml_escape($string)
+	{
+			 return str_replace(array('&','"',"'",'<','>'),
+				array('&amp;','&quot;','&apos;','&lt;','&gt;'),
+				$string );
+	}
 }

Spacing +65 added lines, -65 removed lines

@@ -65,8 +65,8 @@ 
 class AtomParser {
 
     var $NS = 'http://www.w3.org/2005/Atom';
-    var $ATOM_CONTENT_ELEMENTS = array('content','summary','title','subtitle','rights');
-    var $ATOM_SIMPLE_ELEMENTS = array('id','updated','published','draft');
+    var $ATOM_CONTENT_ELEMENTS = array('content', 'summary', 'title', 'subtitle', 'rights');
+    var $ATOM_SIMPLE_ELEMENTS = array('id', 'updated', 'published', 'draft');
 
     var $debug = false;
 
@@ -94,8 +94,8 @@ 
 
         $this->feed = new AtomFeed();
         $this->current = null;
-        $this->map_attrs_func = array( __CLASS__, 'map_attrs' );
-        $this->map_xmlns_func = array( __CLASS__, 'map_xmlns' );
+        $this->map_attrs_func = array(__CLASS__, 'map_attrs');
+        $this->map_xmlns_func = array(__CLASS__, 'map_xmlns');
     }
 
 	/**
@@ -125,15 +125,15 @@ 
 	 */
 	public static function map_xmlns($p, $n) {
 		$xd = "xmlns";
-		if( 0 < strlen($n[0]) ) {
+		if (0 < strlen($n[0])) {
 			$xd .= ":{$n[0]}";
 		}
 		return "{$xd}=\"{$n[1]}\"";
 	}
 
     function _p($msg) {
-        if($this->debug) {
-            print str_repeat(" ", $this->depth * $this->indent) . $msg ."\n";
+        if ($this->debug) {
+            print str_repeat(" ", $this->depth * $this->indent).$msg."\n";
         }
     }
 
@@ -147,16 +147,16 @@ 
 
         array_unshift($this->ns_contexts, array());
 
-        if ( ! function_exists( 'xml_parser_create_ns' ) ) {
-        	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_ns')) {
+        	trigger_error(__("PHP's XML extension is not available. Please contact your hosting provider to enable PHP's XML extension."));
         	return false;
         }
 
         $parser = xml_parser_create_ns();
         xml_set_object($parser, $this);
         xml_set_element_handler($parser, "start_element", "end_element");
-        xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0);
-        xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0);
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 0);
         xml_set_character_data_handler($parser, "cdata");
         xml_set_default_handler($parser, "_default");
         xml_set_start_namespace_decl_handler($parser, "start_ns");
@@ -168,9 +168,9 @@ 
 
         $fp = fopen($this->FILE, "r");
         while ($data = fread($fp, 4096)) {
-            if($this->debug) $this->content .= $data;
+            if ($this->debug) $this->content .= $data;
 
-            if(!xml_parse($parser, $data, feof($fp))) {
+            if ( ! xml_parse($parser, $data, feof($fp))) {
                 /* translators: 1: error message, 2: line number */
                 trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
                     xml_error_string(xml_get_error_code($parser)),
@@ -192,11 +192,11 @@ 
 
         $tag = array_pop(explode(":", $name));
 
-        switch($name) {
-            case $this->NS . ':feed':
+        switch ($name) {
+            case $this->NS.':feed':
                 $this->current = $this->feed;
                 break;
-            case $this->NS . ':entry':
+            case $this->NS.':entry':
                 $this->current = new AtomEntry();
                 break;
         };
@@ -209,58 +209,58 @@ 
 
         $this->depth++;
 
-        if(!empty($this->in_content)) {
+        if ( ! empty($this->in_content)) {
 
             $this->content_ns_decls = array();
 
-            if($this->is_html || $this->is_text)
+            if ($this->is_html || $this->is_text)
                 trigger_error("Invalid content in element found. Content must not be of type text or html if it contains markup.");
 
             $attrs_prefix = array();
 
             // resolve prefixes for attributes
-            foreach($attrs as $key => $value) {
+            foreach ($attrs as $key => $value) {
                 $with_prefix = $this->ns_to_prefix($key, true);
                 $attrs_prefix[$with_prefix[1]] = $this->xml_escape($value);
             }
 
             $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix)));
-            if(strlen($attrs_str) > 0) {
-                $attrs_str = " " . $attrs_str;
+            if (strlen($attrs_str) > 0) {
+                $attrs_str = " ".$attrs_str;
             }
 
             $with_prefix = $this->ns_to_prefix($name);
 
-            if(!$this->is_declared_content_ns($with_prefix[0])) {
+            if ( ! $this->is_declared_content_ns($with_prefix[0])) {
                 array_push($this->content_ns_decls, $with_prefix[0]);
             }
 
             $xmlns_str = '';
-            if(count($this->content_ns_decls) > 0) {
+            if (count($this->content_ns_decls) > 0) {
                 array_unshift($this->content_ns_contexts, $this->content_ns_decls);
                 $xmlns_str .= join(' ', array_map($this->map_xmlns_func, array_keys($this->content_ns_contexts[0]), array_values($this->content_ns_contexts[0])));
-                if(strlen($xmlns_str) > 0) {
-                    $xmlns_str = " " . $xmlns_str;
+                if (strlen($xmlns_str) > 0) {
+                    $xmlns_str = " ".$xmlns_str;
                 }
             }
 
-            array_push($this->in_content, array($tag, $this->depth, "<". $with_prefix[1] ."{$xmlns_str}{$attrs_str}" . ">"));
+            array_push($this->in_content, array($tag, $this->depth, "<".$with_prefix[1]."{$xmlns_str}{$attrs_str}".">"));
 
-        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
+        } else if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) {
             $this->in_content = array();
             $this->is_xhtml = $attrs['type'] == 'xhtml';
             $this->is_html = $attrs['type'] == 'html' || $attrs['type'] == 'text/html';
-            $this->is_text = !in_array('type',array_keys($attrs)) || $attrs['type'] == 'text';
+            $this->is_text = ! in_array('type', array_keys($attrs)) || $attrs['type'] == 'text';
             $type = $this->is_xhtml ? 'XHTML' : ($this->is_html ? 'HTML' : ($this->is_text ? 'TEXT' : $attrs['type']));
 
-            if(in_array('src',array_keys($attrs))) {
+            if (in_array('src', array_keys($attrs))) {
                 $this->current->$tag = $attrs;
             } else {
-                array_push($this->in_content, array($tag,$this->depth, $type));
+                array_push($this->in_content, array($tag, $this->depth, $type));
             }
-        } else if($tag == 'link') {
+        } else if ($tag == 'link') {
             array_push($this->current->links, $attrs);
-        } else if($tag == 'category') {
+        } else if ($tag == 'category') {
             array_push($this->current->categories, $attrs);
         }
 
@@ -274,34 +274,34 @@ 
         $ccount = count($this->in_content);
 
         # if we are *in* content, then let's proceed to serialize it
-        if(!empty($this->in_content)) {
+        if ( ! empty($this->in_content)) {
             # if we are ending the original content element
             # then let's finalize the content
-            if($this->in_content[0][0] == $tag &&
+            if ($this->in_content[0][0] == $tag &&
                 $this->in_content[0][1] == $this->depth) {
                 $origtype = $this->in_content[0][2];
                 array_shift($this->in_content);
                 $newcontent = array();
-                foreach($this->in_content as $c) {
-                    if(count($c) == 3) {
+                foreach ($this->in_content as $c) {
+                    if (count($c) == 3) {
                         array_push($newcontent, $c[2]);
                     } else {
-                        if($this->is_xhtml || $this->is_text) {
+                        if ($this->is_xhtml || $this->is_text) {
                             array_push($newcontent, $this->xml_escape($c));
                         } else {
                             array_push($newcontent, $c);
                         }
                     }
                 }
-                if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
-                    $this->current->$tag = array($origtype, join('',$newcontent));
+                if (in_array($tag, $this->ATOM_CONTENT_ELEMENTS)) {
+                    $this->current->$tag = array($origtype, join('', $newcontent));
                 } else {
-                    $this->current->$tag = join('',$newcontent);
+                    $this->current->$tag = join('', $newcontent);
                 }
                 $this->in_content = array();
-            } else if($this->in_content[$ccount-1][0] == $tag &&
-                $this->in_content[$ccount-1][1] == $this->depth) {
-                $this->in_content[$ccount-1][2] = substr($this->in_content[$ccount-1][2],0,-1) . "/>";
+            } else if ($this->in_content[$ccount - 1][0] == $tag &&
+                $this->in_content[$ccount - 1][1] == $this->depth) {
+                $this->in_content[$ccount - 1][2] = substr($this->in_content[$ccount - 1][2], 0, -1)."/>";
             } else {
                 # else, just finalize the current element's content
                 $endtag = $this->ns_to_prefix($name);
@@ -313,7 +313,7 @@ 
 
         $this->depth--;
 
-        if($name == ($this->NS . ':entry')) {
+        if ($name == ($this->NS.':entry')) {
             array_push($this->feed->entries, $this->current);
             $this->current = null;
         }
@@ -322,17 +322,17 @@ 
     }
 
     function start_ns($parser, $prefix, $uri) {
-        $this->_p("starting: " . $prefix . ":" . $uri);
-        array_push($this->ns_decls, array($prefix,$uri));
+        $this->_p("starting: ".$prefix.":".$uri);
+        array_push($this->ns_decls, array($prefix, $uri));
     }
 
     function end_ns($parser, $prefix) {
-        $this->_p("ending: #" . $prefix . "#");
+        $this->_p("ending: #".$prefix."#");
     }
 
     function cdata($parser, $data) {
-        $this->_p("data: #" . str_replace(array("\n"), array("\\n"), trim($data)) . "#");
-        if(!empty($this->in_content)) {
+        $this->_p("data: #".str_replace(array("\n"), array("\\n"), trim($data))."#");
+        if ( ! empty($this->in_content)) {
             array_push($this->in_content, $data);
         }
     }
@@ -342,31 +342,31 @@ 
     }
 
 
-    function ns_to_prefix($qname, $attr=false) {
+    function ns_to_prefix($qname, $attr = false) {
         # split 'http://www.w3.org/1999/xhtml:div' into ('http','//www.w3.org/1999/xhtml','div')
         $components = explode(":", $qname);
 
         # grab the last one (e.g 'div')
         $name = array_pop($components);
 
-        if(!empty($components)) {
+        if ( ! empty($components)) {
             # re-join back the namespace component
-            $ns = join(":",$components);
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if($mapping[1] == $ns && strlen($mapping[0]) > 0) {
+            $ns = join(":", $components);
+            foreach ($this->ns_contexts as $context) {
+                foreach ($context as $mapping) {
+                    if ($mapping[1] == $ns && strlen($mapping[0]) > 0) {
                         return array($mapping, "$mapping[0]:$name");
                     }
                 }
             }
         }
 
-        if($attr) {
+        if ($attr) {
             return array(null, $name);
         } else {
-            foreach($this->ns_contexts as $context) {
-                foreach($context as $mapping) {
-                    if(strlen($mapping[0]) == 0) {
+            foreach ($this->ns_contexts as $context) {
+                foreach ($context as $mapping) {
+                    if (strlen($mapping[0]) == 0) {
                         return array($mapping, $name);
                     }
                 }
@@ -375,9 +375,9 @@ 
     }
 
     function is_declared_content_ns($new_mapping) {
-        foreach($this->content_ns_contexts as $context) {
-            foreach($context as $mapping) {
-                if($new_mapping == $mapping) {
+        foreach ($this->content_ns_contexts as $context) {
+            foreach ($context as $mapping) {
+                if ($new_mapping == $mapping) {
                     return true;
                 }
             }
@@ -387,8 +387,8 @@ 
 
     function xml_escape($string)
     {
-             return str_replace(array('&','"',"'",'<','>'),
-                array('&amp;','&quot;','&apos;','&lt;','&gt;'),
-                $string );
+             return str_replace(array('&', '"', "'", '<', '>'),
+                array('&amp;', '&quot;', '&apos;', '&lt;', '&gt;'),
+                $string);
     }
 }

src/wp-includes/feed-rdf.php

Braces +5 added lines, -2 removed lines

@@ -68,10 +68,13 @@
 	<?php the_category_rss('rdf') ?>
 <?php if (get_option('rss_use_excerpt')) : ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php else : ?>
+<?php else {
+	: ?>
 	<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 	<content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 	/**
 	 * Fires at the end of each RDF feed item.

Spacing +10 added lines, -10 removed lines

@@ -5,13 +5,13 @@ 
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rdf') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: '.feed_content_type('rdf').'; charset='.get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
 /** This action is documented in wp-includes/feed-rss2.php */
-do_action( 'rss_tag_pre', 'rdf' );
+do_action('rss_tag_pre', 'rdf');
 ?>
 <rdf:RDF
 	xmlns="http://purl.org/rss/1.0/"
@@ -26,7 +26,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_ns' );
+	do_action('rdf_ns');
 	?>
 >
 <channel rdf:about="<?php bloginfo_rss("url") ?>">
@@ -34,16 +34,16 @@ 
 	<link><?php bloginfo_rss('url') ?></link>
 	<description><?php bloginfo_rss('description') ?></description>
 	<dc:date><?php
-		$date = get_lastpostmodified( 'GMT' );
-		echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date ) : date( 'Y-m-d\TH:i:s\Z' );
+		$date = get_lastpostmodified('GMT');
+		echo $date ? mysql2date('Y-m-d\TH:i:s\Z', $date) : date('Y-m-d\TH:i:s\Z');
 	?></dc:date>
 	<sy:updatePeriod><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_period', 'hourly' );
+		echo apply_filters('rss_update_period', 'hourly');
 	?></sy:updatePeriod>
 	<sy:updateFrequency><?php
 		/** This filter is documented in wp-includes/feed-rss2.php */
-		echo apply_filters( 'rss_update_frequency', '1' );
+		echo apply_filters('rss_update_frequency', '1');
 	?></sy:updateFrequency>
 	<sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
 	<?php
@@ -52,7 +52,7 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_header' );
+	do_action('rdf_header');
 	?>
 	<items>
 		<rdf:Seq>
@@ -81,8 +81,8 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'rdf_item' );
+	do_action('rdf_item');
 	?>
 </item>
-<?php endwhile;  ?>
+<?php endwhile; ?>
 </rdf:RDF>

wp-config-sample.php

Spacing +11 added lines, -11 removed lines

@@ -46,14 +46,14 @@ 
  *

  * @since 2.6.0

  */

-define('AUTH_KEY',         'put your unique phrase here');

-define('SECURE_AUTH_KEY',  'put your unique phrase here');

-define('LOGGED_IN_KEY',    'put your unique phrase here');

-define('NONCE_KEY',        'put your unique phrase here');

-define('AUTH_SALT',        'put your unique phrase here');

+define('AUTH_KEY', 'put your unique phrase here');

+define('SECURE_AUTH_KEY', 'put your unique phrase here');

+define('LOGGED_IN_KEY', 'put your unique phrase here');

+define('NONCE_KEY', 'put your unique phrase here');

+define('AUTH_SALT', 'put your unique phrase here');

 define('SECURE_AUTH_SALT', 'put your unique phrase here');

-define('LOGGED_IN_SALT',   'put your unique phrase here');

-define('NONCE_SALT',       'put your unique phrase here');

+define('LOGGED_IN_SALT', 'put your unique phrase here');

+define('NONCE_SALT', 'put your unique phrase here');

 

 /**#@-*/

 

@@ -63,7 +63,7 @@ 
  * You can have multiple installations in one database if you give each

  * a unique prefix. Only numbers, letters, and underscores please!

  */

-$table_prefix  = 'wp_';

+$table_prefix = 'wp_';

 

 /**

  * For developers: WordPress debugging mode.

@@ -82,8 +82,8 @@ 
 /* That's all, stop editing! Happy blogging. */

 

 /** Absolute path to the WordPress directory. */

-if ( !defined('ABSPATH') )

-	define('ABSPATH', dirname(__FILE__) . '/');

+if ( ! defined('ABSPATH'))

+	define('ABSPATH', dirname(__FILE__).'/');

 

 /** Sets up WordPress vars and included files. */

-require_once(ABSPATH . 'wp-settings.php');

+require_once(ABSPATH.'wp-settings.php');

Braces +3 added lines, -2 removed lines

@@ -82,8 +82,9 @@
 /* That's all, stop editing! Happy blogging. */

 

 /** Absolute path to the WordPress directory. */

-if ( !defined('ABSPATH') )

-	define('ABSPATH', dirname(__FILE__) . '/');

+if ( !defined('ABSPATH') ) {
+	define('ABSPATH', dirname(__FILE__) . '/');
+}
 

 /** Sets up WordPress vars and included files. */

 require_once(ABSPATH . 'wp-settings.php');

src/wp-admin/includes/bookmark.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $link_id ID of the link to delete
- * @return true Always true.
+ * @return boolean Always true.
  */
 function wp_delete_link( $link_id ) {
 	global $wpdb;

Braces +24 added lines, -18 removed lines

@@ -39,8 +39,9 @@ 
 	$_POST['link_name'] = esc_html( $_POST['link_name'] );
 	$_POST['link_image'] = esc_html( $_POST['link_image'] );
 	$_POST['link_rss'] = esc_url($_POST['link_rss']);
-	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
-		$_POST['link_visible'] = 'Y';
+	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] ) {
+			$_POST['link_visible'] = 'Y';
+	}
 
 	if ( !empty( $link_id ) ) {
 		$_POST['link_id'] = $link_id;
@@ -59,15 +60,17 @@ 
  */
 function get_default_link_to_edit() {
 	$link = new stdClass;
-	if ( isset( $_GET['linkurl'] ) )
-		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
-	else
-		$link->link_url = '';
+	if ( isset( $_GET['linkurl'] ) ) {
+			$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
+	} else {
+			$link->link_url = '';
+	}
 
-	if ( isset( $_GET['name'] ) )
-		$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
-	else
-		$link->link_name = '';
+	if ( isset( $_GET['name'] ) ) {
+			$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
+	} else {
+			$link->link_name = '';
+	}
 
 	$link->link_visible = 'Y';
 
@@ -249,8 +252,9 @@ 
  */
 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
 	// If $link_categories isn't already an array, make it one:
-	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
-		$link_categories = array( get_option( 'default_link_category' ) );
+	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) ) {
+			$link_categories = array( get_option( 'default_link_category' ) );
+	}
 
 	$link_categories = array_map( 'intval', $link_categories );
 	$link_categories = array_unique( $link_categories );
@@ -278,10 +282,11 @@ 
 
 	// Passed link category list overwrites existing category list if not empty.
 	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
-			 && 0 != count( $linkdata['link_category'] ) )
-		$link_cats = $linkdata['link_category'];
-	else
-		$link_cats = $link['link_category'];
+			 && 0 != count( $linkdata['link_category'] ) ) {
+			$link_cats = $linkdata['link_category'];
+	} else {
+			$link_cats = $link['link_category'];
+	}
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$linkdata = array_merge( $link, $linkdata );
@@ -300,8 +305,9 @@ 
  */
 function wp_link_manager_disabled_message() {
 	global $pagenow;
-	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
-		return;
+	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow ) {
+			return;
+	}
 
 	add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
 	$really_can_manage_links = current_user_can( 'manage_links' );

Spacing +80 added lines, -80 removed lines

@@ -25,28 +25,28 @@ 
  * @param int $link_id Optional. ID of the link to edit. Default 0.
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
-function edit_link( $link_id = 0 ) {
-	if ( ! current_user_can( 'manage_links' ) ) {
+function edit_link($link_id = 0) {
+	if ( ! current_user_can('manage_links')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to edit the links for this site.').'</p>',
 			403
 		);
 	}
 
-	$_POST['link_url'] = esc_html( $_POST['link_url'] );
+	$_POST['link_url'] = esc_html($_POST['link_url']);
 	$_POST['link_url'] = esc_url($_POST['link_url']);
-	$_POST['link_name'] = esc_html( $_POST['link_name'] );
-	$_POST['link_image'] = esc_html( $_POST['link_image'] );
+	$_POST['link_name'] = esc_html($_POST['link_name']);
+	$_POST['link_image'] = esc_html($_POST['link_image']);
 	$_POST['link_rss'] = esc_url($_POST['link_rss']);
-	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
+	if ( ! isset($_POST['link_visible']) || 'N' != $_POST['link_visible'])
 		$_POST['link_visible'] = 'Y';
 
-	if ( !empty( $link_id ) ) {
+	if ( ! empty($link_id)) {
 		$_POST['link_id'] = $link_id;
-		return wp_update_link( $_POST );
+		return wp_update_link($_POST);
 	} else {
-		return wp_insert_link( $_POST );
+		return wp_insert_link($_POST);
 	}
 }
 
@@ -59,13 +59,13 @@ 
  */
 function get_default_link_to_edit() {
 	$link = new stdClass;
-	if ( isset( $_GET['linkurl'] ) )
-		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
+	if (isset($_GET['linkurl']))
+		$link->link_url = esc_url(wp_unslash($_GET['linkurl']));
 	else
 		$link->link_url = '';
 
-	if ( isset( $_GET['name'] ) )
-		$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
+	if (isset($_GET['name']))
+		$link->link_name = esc_attr(wp_unslash($_GET['name']));
 	else
 		$link->link_name = '';
 
@@ -84,7 +84,7 @@ 
  * @param int $link_id ID of the link to delete
  * @return true Always true.
  */
-function wp_delete_link( $link_id ) {
+function wp_delete_link($link_id) {
 	global $wpdb;
 	/**
 	 * Fires before a link is deleted.
@@ -93,11 +93,11 @@ 
 	 *
 	 * @param int $link_id ID of the link to delete.
 	 */
-	do_action( 'delete_link', $link_id );
+	do_action('delete_link', $link_id);
 
-	wp_delete_object_term_relationships( $link_id, 'link_category' );
+	wp_delete_object_term_relationships($link_id, 'link_category');
 
-	$wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) );
+	$wpdb->delete($wpdb->links, array('link_id' => $link_id));
 
 	/**
 	 * Fires after a link has been deleted.
@@ -106,9 +106,9 @@ 
 	 *
 	 * @param int $link_id ID of the deleted link.
 	 */
-	do_action( 'deleted_link', $link_id );
+	do_action('deleted_link', $link_id);
 
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 
 	return true;
 }
@@ -121,9 +121,9 @@ 
  * @param int $link_id Link ID to look up
  * @return array The requested link's categories
  */
-function wp_get_link_cats( $link_id = 0 ) {
-	$cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );
-	return array_unique( $cats );
+function wp_get_link_cats($link_id = 0) {
+	$cats = wp_get_object_terms($link_id, 'link_category', array('fields' => 'ids'));
+	return array_unique($cats);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  * @param int|stdClass $link Link ID or object to retrieve.
  * @return object Link object for editing.
  */
-function get_link_to_edit( $link ) {
-	return get_bookmark( $link, OBJECT, 'edit' );
+function get_link_to_edit($link) {
+	return get_bookmark($link, OBJECT, 'edit');
 }
 
 /**
@@ -149,63 +149,63 @@ 
  * @param bool  $wp_error Optional. Whether to return a WP_Error object on failure. Default false.
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
-function wp_insert_link( $linkdata, $wp_error = false ) {
+function wp_insert_link($linkdata, $wp_error = false) {
 	global $wpdb;
 
-	$defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+	$defaults = array('link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0);
 
-	$args = wp_parse_args( $linkdata, $defaults );
-	$r = wp_unslash( sanitize_bookmark( $args, 'db' ) );
+	$args = wp_parse_args($linkdata, $defaults);
+	$r = wp_unslash(sanitize_bookmark($args, 'db'));
 
 	$link_id   = $r['link_id'];
 	$link_name = $r['link_name'];
 	$link_url  = $r['link_url'];
 
 	$update = false;
-	if ( ! empty( $link_id ) ) {
+	if ( ! empty($link_id)) {
 		$update = true;
 	}
 
-	if ( trim( $link_name ) == '' ) {
-		if ( trim( $link_url ) != '' ) {
+	if (trim($link_name) == '') {
+		if (trim($link_url) != '') {
 			$link_name = $link_url;
 		} else {
 			return 0;
 		}
 	}
 
-	if ( trim( $link_url ) == '' ) {
+	if (trim($link_url) == '') {
 		return 0;
 	}
 
-	$link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
-	$link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
-	$link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
-	$link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
-	$link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
-	$link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
-	$link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
-	$link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
-	$link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
-	$link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
+	$link_rating      = ( ! empty($r['link_rating'])) ? $r['link_rating'] : 0;
+	$link_image       = ( ! empty($r['link_image'])) ? $r['link_image'] : '';
+	$link_target      = ( ! empty($r['link_target'])) ? $r['link_target'] : '';
+	$link_visible     = ( ! empty($r['link_visible'])) ? $r['link_visible'] : 'Y';
+	$link_owner       = ( ! empty($r['link_owner'])) ? $r['link_owner'] : get_current_user_id();
+	$link_notes       = ( ! empty($r['link_notes'])) ? $r['link_notes'] : '';
+	$link_description = ( ! empty($r['link_description'])) ? $r['link_description'] : '';
+	$link_rss         = ( ! empty($r['link_rss'])) ? $r['link_rss'] : '';
+	$link_rel         = ( ! empty($r['link_rel'])) ? $r['link_rel'] : '';
+	$link_category    = ( ! empty($r['link_category'])) ? $r['link_category'] : array();
 
 	// Make sure we set a valid category.
-	if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) {
-		$link_category = array( get_option( 'default_link_category' ) );
+	if ( ! is_array($link_category) || 0 == count($link_category)) {
+		$link_category = array(get_option('default_link_category'));
 	}
 
-	if ( $update ) {
-		if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+	if ($update) {
+		if (false === $wpdb->update($wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss'), compact('link_id'))) {
+			if ($wp_error) {
+				return new WP_Error('db_update_error', __('Could not update link in the database'), $wpdb->last_error);
 			} else {
 				return 0;
 			}
 		}
 	} else {
-		if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+		if (false === $wpdb->insert($wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss'))) {
+			if ($wp_error) {
+				return new WP_Error('db_insert_error', __('Could not insert link into the database'), $wpdb->last_error);
 			} else {
 				return 0;
 			}
@@ -213,9 +213,9 @@ 
 		$link_id = (int) $wpdb->insert_id;
 	}
 
-	wp_set_link_cats( $link_id, $link_category );
+	wp_set_link_cats($link_id, $link_category);
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires after a link was updated in the database.
 		 *
@@ -223,7 +223,7 @@ 
 		 *
 		 * @param int $link_id ID of the link that was updated.
 		 */
-		do_action( 'edit_link', $link_id );
+		do_action('edit_link', $link_id);
 	} else {
 		/**
 		 * Fires after a link was added to the database.
@@ -232,9 +232,9 @@ 
 		 *
 		 * @param int $link_id ID of the link that was added.
 		 */
-		do_action( 'add_link', $link_id );
+		do_action('add_link', $link_id);
 	}
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 
 	return $link_id;
 }
@@ -247,17 +247,17 @@ 
  * @param int   $link_id         ID of the link to update.
  * @param array $link_categories Array of link categories to add the link to.
  */
-function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
+function wp_set_link_cats($link_id = 0, $link_categories = array()) {
 	// If $link_categories isn't already an array, make it one:
-	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
-		$link_categories = array( get_option( 'default_link_category' ) );
+	if ( ! is_array($link_categories) || 0 == count($link_categories))
+		$link_categories = array(get_option('default_link_category'));
 
-	$link_categories = array_map( 'intval', $link_categories );
-	$link_categories = array_unique( $link_categories );
+	$link_categories = array_map('intval', $link_categories);
+	$link_categories = array_unique($link_categories);
 
-	wp_set_object_terms( $link_id, $link_categories, 'link_category' );
+	wp_set_object_terms($link_id, $link_categories, 'link_category');
 
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 }
 
 /**
@@ -268,26 +268,26 @@ 
  * @param array $linkdata Link data to update.
  * @return int|WP_Error Value 0 or WP_Error on failure. The updated link ID on success.
  */
-function wp_update_link( $linkdata ) {
+function wp_update_link($linkdata) {
 	$link_id = (int) $linkdata['link_id'];
 
-	$link = get_bookmark( $link_id, ARRAY_A );
+	$link = get_bookmark($link_id, ARRAY_A);
 
 	// Escape data pulled from DB.
-	$link = wp_slash( $link );
+	$link = wp_slash($link);
 
 	// Passed link category list overwrites existing category list if not empty.
-	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
-			 && 0 != count( $linkdata['link_category'] ) )
+	if (isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+			 && 0 != count($linkdata['link_category']))
 		$link_cats = $linkdata['link_category'];
 	else
 		$link_cats = $link['link_category'];
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$linkdata = array_merge( $link, $linkdata );
+	$linkdata = array_merge($link, $linkdata);
 	$linkdata['link_category'] = $link_cats;
 
-	return wp_insert_link( $linkdata );
+	return wp_insert_link($linkdata);
 }
 
 /**
@@ -300,17 +300,17 @@ 
  */
 function wp_link_manager_disabled_message() {
 	global $pagenow;
-	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
+	if ('link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow)
 		return;
 
-	add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
-	$really_can_manage_links = current_user_can( 'manage_links' );
-	remove_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
+	add_filter('pre_option_link_manager_enabled', '__return_true', 100);
+	$really_can_manage_links = current_user_can('manage_links');
+	remove_filter('pre_option_link_manager_enabled', '__return_true', 100);
 
-	if ( $really_can_manage_links && current_user_can( 'install_plugins' ) ) {
-		$link = network_admin_url( 'plugin-install.php?tab=search&amp;s=Link+Manager' );
-		wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
+	if ($really_can_manage_links && current_user_can('install_plugins')) {
+		$link = network_admin_url('plugin-install.php?tab=search&amp;s=Link+Manager');
+		wp_die(sprintf(__('If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.'), $link));
 	}
 
-	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
 }

src/wp-admin/includes/class-wp-posts-list-table.php

Doc Comments +2 added lines, -2 removed lines

@@ -484,7 +484,7 @@ 
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
@@ -1162,7 +1162,7 @@ 
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $post        Post being acted upon.
+	 * @param WP_Post $post        Post being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.

Indentation +4 added lines, -4 removed lines

@@ -1175,10 +1175,10 @@ 
 		}
 
 		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+			$count = count( get_post_ancestors( $post->ID ) );
+			$classes .= ' level-'. $count;
 		} else {
-		    $classes .= ' level-0';
+			$classes .= ' level-0';
 		}
 	?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
@@ -1553,7 +1553,7 @@ 
                 <?php
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
 				$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
-                ?>
+				?>
 				<option value="default"><?php echo esc_html( $default_title ); ?></option>
 				<?php page_template_dropdown( '', $screen->post_type ) ?>
 			</select>

Spacing +429 added lines, -429 removed lines

@@ -77,35 +77,35 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type_object, $wpdb;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'posts',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$post_type        = $this->screen->post_type;
-		$post_type_object = get_post_type_object( $post_type );
+		$post_type_object = get_post_type_object($post_type);
 
-		$exclude_states   = get_post_stati( array(
+		$exclude_states   = get_post_stati(array(
 			'show_in_admin_all_list' => false,
-		) );
-		$this->user_posts_count = intval( $wpdb->get_var( $wpdb->prepare( "
+		));
+		$this->user_posts_count = intval($wpdb->get_var($wpdb->prepare("
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
 			WHERE post_type = %s
-			AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
+			AND post_status NOT IN ( '".implode("','", $exclude_states)."' )
 			AND post_author = %d
-		", $post_type, get_current_user_id() ) ) );
+		", $post_type, get_current_user_id())));
 
-		if ( $this->user_posts_count && ! current_user_can( $post_type_object->cap->edit_others_posts ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
+		if ($this->user_posts_count && ! current_user_can($post_type_object->cap->edit_others_posts) && empty($_REQUEST['post_status']) && empty($_REQUEST['all_posts']) && empty($_REQUEST['author']) && empty($_REQUEST['show_sticky'])) {
 			$_GET['author'] = get_current_user_id();
 		}
 
-		if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
-			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
-			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
+		if ('post' === $post_type && $sticky_posts = get_option('sticky_posts')) {
+			$sticky_posts = implode(', ', array_map('absint', (array) $sticky_posts));
+			$this->sticky_posts_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type));
 		}
 	}
 
@@ -116,7 +116,7 @@ 
 	 *
 	 * @param bool $display Whether the table layout should be hierarchical.
 	 */
-	public function set_hierarchical_display( $display ) {
+	public function set_hierarchical_display($display) {
 		$this->hierarchical_display = $display;
 	}
 
@@ -125,7 +125,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
+		return current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_posts);
 	}
 
 	/**
@@ -141,50 +141,50 @@ 
 		// is going to call wp()
 		$avail_post_stati = wp_edit_posts_query();
 
-		$this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
+		$this->set_hierarchical_display(is_post_type_hierarchical($this->screen->post_type) && 'menu_order title' === $wp_query->query['orderby']);
 
 		$post_type = $this->screen->post_type;
-		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
+		$per_page = $this->get_items_per_page('edit_'.$post_type.'_per_page');
 
 		/** This filter is documented in wp-admin/includes/post.php */
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+ 		$per_page = apply_filters('edit_posts_per_page', $per_page, $post_type);
 
-		if ( $this->hierarchical_display ) {
+		if ($this->hierarchical_display) {
 			$total_items = $wp_query->post_count;
-		} elseif ( $wp_query->found_posts || $this->get_pagenum() === 1 ) {
+		} elseif ($wp_query->found_posts || $this->get_pagenum() === 1) {
 			$total_items = $wp_query->found_posts;
 		} else {
-			$post_counts = (array) wp_count_posts( $post_type, 'readable' );
+			$post_counts = (array) wp_count_posts($post_type, 'readable');
 
-			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
-				$total_items = $post_counts[ $_REQUEST['post_status'] ];
-			} elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
+			if (isset($_REQUEST['post_status']) && in_array($_REQUEST['post_status'], $avail_post_stati)) {
+				$total_items = $post_counts[$_REQUEST['post_status']];
+			} elseif (isset($_REQUEST['show_sticky']) && $_REQUEST['show_sticky']) {
 				$total_items = $this->sticky_posts_count;
-			} elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
+			} elseif (isset($_GET['author']) && $_GET['author'] == get_current_user_id()) {
 				$total_items = $this->user_posts_count;
 			} else {
-				$total_items = array_sum( $post_counts );
+				$total_items = array_sum($post_counts);
 
 				// Subtract post types that are not included in the admin all list.
-				foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
-					$total_items -= $post_counts[ $state ];
+				foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
+					$total_items -= $post_counts[$state];
 				}
 			}
 		}
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if ( ! empty($_REQUEST['mode'])) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-			set_user_setting( 'posts_list_mode', $mode );
+			set_user_setting('posts_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'posts_list_mode', 'list' );
+			$mode = get_user_setting('posts_list_mode', 'list');
 		}
 
-		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
+		$this->is_trash = isset($_REQUEST['post_status']) && $_REQUEST['post_status'] === 'trash';
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		if (isset($_REQUEST['post_status']) && 'trash' === $_REQUEST['post_status'])
+			echo get_post_type_object($this->screen->post_type)->labels->not_found_in_trash;
 		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+			echo get_post_type_object($this->screen->post_type)->labels->not_found;
 	}
 
 	/**
@@ -214,15 +214,15 @@ 
 	 */
 	protected function is_base_request() {
 		$vars = $_GET;
-		unset( $vars['paged'] );
+		unset($vars['paged']);
 
-		if ( empty( $vars ) ) {
+		if (empty($vars)) {
 			return true;
-		} elseif ( 1 === count( $vars ) && ! empty( $vars['post_type'] ) ) {
+		} elseif (1 === count($vars) && ! empty($vars['post_type'])) {
 			return $this->screen->post_type === $vars['post_type'];
 		}
 
-		return 1 === count( $vars ) && ! empty( $vars['mode'] );
+		return 1 === count($vars) && ! empty($vars['mode']);
 	}
 
 	/**
@@ -236,20 +236,20 @@ 
 	 * @param string $class Optional. Class attribute. Default empty string.
 	 * @return string The formatted link string.
 	 */
-	protected function get_edit_link( $args, $label, $class = '' ) {
-		$url = add_query_arg( $args, 'edit.php' );
+	protected function get_edit_link($args, $label, $class = '') {
+		$url = add_query_arg($args, 'edit.php');
 
 		$class_html = '';
-		if ( ! empty( $class ) ) {
+		if ( ! empty($class)) {
 			 $class_html = sprintf(
 				' class="%s"',
-				esc_attr( $class )
+				esc_attr($class)
 			);
 		}
 
 		return sprintf(
 			'<a href="%s"%s>%s</a>',
-			esc_url( $url ),
+			esc_url($url),
 			$class_html,
 			$label
 		);
@@ -266,25 +266,25 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
+		if ( ! empty($locked_post_status))
 			return array();
 
 		$status_links = array();
-		$num_posts = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array) $num_posts );
+		$num_posts = wp_count_posts($post_type, 'readable');
+		$total_posts = array_sum((array) $num_posts);
 		$class = '';
 
 		$current_user_id = get_current_user_id();
-		$all_args = array( 'post_type' => $post_type );
+		$all_args = array('post_type' => $post_type);
 		$mine = '';
 
 		// Subtract post types that are not included in the admin all list.
-		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+		foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
 			$total_posts -= $num_posts->$state;
 		}
 
-		if ( $this->user_posts_count && $this->user_posts_count !== $total_posts ) {
-			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+		if ($this->user_posts_count && $this->user_posts_count !== $total_posts) {
+			if (isset($_GET['author']) && ($_GET['author'] == $current_user_id)) {
 				$class = 'current';
 			}
 
@@ -300,16 +300,16 @@ 
 					$this->user_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->user_posts_count )
+				number_format_i18n($this->user_posts_count)
 			);
 
-			$mine = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
+			$mine = $this->get_edit_link($mine_args, $mine_inner_html, $class);
 
 			$all_args['all_posts'] = 1;
 			$class = '';
 		}
 
-		if ( empty( $class ) && ( $this->is_base_request() || isset( $_REQUEST['all_posts'] ) ) ) {
+		if (empty($class) && ($this->is_base_request() || isset($_REQUEST['all_posts']))) {
 			$class = 'current';
 		}
 
@@ -320,24 +320,24 @@ 
 				$total_posts,
 				'posts'
 			),
-			number_format_i18n( $total_posts )
+			number_format_i18n($total_posts)
 		);
 
-		$status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
-		if ( $mine ) {
+		$status_links['all'] = $this->get_edit_link($all_args, $all_inner_html, $class);
+		if ($mine) {
 			$status_links['mine'] = $mine;
 		}
 
-		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
+		foreach (get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status) {
 			$class = '';
 
 			$status_name = $status->name;
 
-			if ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
+			if ( ! in_array($status_name, $avail_post_stati) || empty($num_posts->$status_name)) {
 				continue;
 			}
 
-			if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+			if (isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status']) {
 				$class = 'current';
 			}
 
@@ -347,15 +347,15 @@ 
 			);
 
 			$status_label = sprintf(
-				translate_nooped_plural( $status->label_count, $num_posts->$status_name ),
-				number_format_i18n( $num_posts->$status_name )
+				translate_nooped_plural($status->label_count, $num_posts->$status_name),
+				number_format_i18n($num_posts->$status_name)
 			);
 
-			$status_links[ $status_name ] = $this->get_edit_link( $status_args, $status_label, $class );
+			$status_links[$status_name] = $this->get_edit_link($status_args, $status_label, $class);
 		}
 
-		if ( ! empty( $this->sticky_posts_count ) ) {
-			$class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
+		if ( ! empty($this->sticky_posts_count)) {
+			$class = ! empty($_REQUEST['show_sticky']) ? 'current' : '';
 
 			$sticky_args = array(
 				'post_type'	=> $post_type,
@@ -369,16 +369,16 @@ 
 					$this->sticky_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->sticky_posts_count )
+				number_format_i18n($this->sticky_posts_count)
 			);
 
 			$sticky_link = array(
-				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+				'sticky' => $this->get_edit_link($sticky_args, $sticky_inner_html, $class)
 			);
 
 			// Sticky comes after Publish, or if not listed, after All.
-			$split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
-			$status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
+			$split = 1 + array_search((isset($status_links['publish']) ? 'publish' : 'all'), array_keys($status_links));
+			$status_links = array_merge(array_slice($status_links, 0, $split), $sticky_link, array_slice($status_links, $split));
 		}
 
 		return $status_links;
@@ -390,21 +390,21 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$post_type_obj = get_post_type_object( $this->screen->post_type );
+		$post_type_obj = get_post_type_object($this->screen->post_type);
 
-		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
+		if (current_user_can($post_type_obj->cap->edit_posts)) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
 			} else {
-				$actions['edit'] = __( 'Edit' );
+				$actions['edit'] = __('Edit');
 			}
 		}
 
-		if ( current_user_can( $post_type_obj->cap->delete_posts ) ) {
-			if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (current_user_can($post_type_obj->cap->delete_posts)) {
+			if ($this->is_trash || ! EMPTY_TRASH_DAYS) {
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = __( 'Move to Trash' );
+				$actions['trash'] = __('Move to Trash');
 			}
 		}
 
@@ -421,7 +421,7 @@ 
 	 *
 	 * @param string $post_type Post type slug.
 	 */
-	protected function categories_dropdown( $post_type ) {
+	protected function categories_dropdown($post_type) {
 		global $cat;
 
 		/**
@@ -432,13 +432,13 @@ 
 		 * @param bool   $disable   Whether to disable the categories drop-down. Default false.
 		 * @param string $post_type Post type slug.
 		 */
-		if ( false !== apply_filters( 'disable_categories_dropdown', false, $post_type ) ) {
+		if (false !== apply_filters('disable_categories_dropdown', false, $post_type)) {
 			return;
 		}
 
-		if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
+		if (is_object_in_taxonomy($post_type, 'category')) {
 			$dropdown_options = array(
-				'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
+				'show_option_all' => get_taxonomy('category')->labels->all_items,
 				'hide_empty' => 0,
 				'hierarchical' => 1,
 				'show_count' => 0,
@@ -446,23 +446,23 @@ 
 				'selected' => $cat
 			);
 
-			echo '<label class="screen-reader-text" for="cat">' . __( 'Filter by category' ) . '</label>';
-			wp_dropdown_categories( $dropdown_options );
+			echo '<label class="screen-reader-text" for="cat">'.__('Filter by category').'</label>';
+			wp_dropdown_categories($dropdown_options);
 		}
 	}
 
 	/**
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which && !is_singular() ) {
+		if ('top' === $which && ! is_singular()) {
 			ob_start();
 
-			$this->months_dropdown( $this->screen->post_type );
-			$this->categories_dropdown( $this->screen->post_type );
+			$this->months_dropdown($this->screen->post_type);
+			$this->categories_dropdown($this->screen->post_type);
 
 			/**
 			 * Fires before the Filter button on the Posts and Pages list tables.
@@ -479,18 +479,18 @@ 
 			 *                          'top' or 'bottom' for WP_Posts_List_Table,
 			 *                          'bar' for WP_Media_List_Table.
 			 */
-			do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+			do_action('restrict_manage_posts', $this->screen->post_type, $which);
 
 			$output = ob_get_clean();
 
-			if ( ! empty( $output ) ) {
+			if ( ! empty($output)) {
 				echo $output;
-				submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+				submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'post-query-submit'));
 			}
 		}
 
-		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) && $this->has_items() ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_others_posts) && $this->has_items()) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		}
 ?>
 		</div>
@@ -503,7 +503,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'manage_posts_extra_tablenav', $which );
+		do_action('manage_posts_extra_tablenav', $which);
 	}
 
 	/**
@@ -511,7 +511,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']))
 			return 'delete_all';
 
 		return parent::current_action();
@@ -522,7 +522,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
+		return array('widefat', 'fixed', 'striped', is_post_type_hierarchical($this->screen->post_type) ? 'pages' : 'posts');
 	}
 
 	/**
@@ -537,14 +537,14 @@ 
 		$posts_columns['cb'] = '<input type="checkbox" />';
 
 		/* translators: manage posts column name */
-		$posts_columns['title'] = _x( 'Title', 'column name' );
+		$posts_columns['title'] = _x('Title', 'column name');
 
-		if ( post_type_supports( $post_type, 'author' ) ) {
-			$posts_columns['author'] = __( 'Author' );
+		if (post_type_supports($post_type, 'author')) {
+			$posts_columns['author'] = __('Author');
 		}
 
-		$taxonomies = get_object_taxonomies( $post_type, 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_object_taxonomies($post_type, 'objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filters the taxonomy columns in the Posts list table.
@@ -557,27 +557,27 @@ 
 		 * @param array  $taxonomies Array of taxonomies to show columns for.
 		 * @param string $post_type  The post type.
 		 */
-		$taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters("manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type);
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' === $taxonomy)
 				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
+			elseif ('post_tag' === $taxonomy)
 				$column_key = 'tags';
 			else
-				$column_key = 'taxonomy-' . $taxonomy;
+				$column_key = 'taxonomy-'.$taxonomy;
 
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
-		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		$post_status = ! empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
+		if (post_type_supports($post_type, 'comments') && ! in_array($post_status, array('pending', 'draft', 'future')))
+			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 
-		$posts_columns['date'] = __( 'Date' );
+		$posts_columns['date'] = __('Date');
 
-		if ( 'page' === $post_type ) {
+		if ('page' === $post_type) {
 
 			/**
 			 * Filters the columns displayed in the Pages list table.
@@ -586,7 +586,7 @@ 
 			 *
 			 * @param array $post_columns An array of column names.
 			 */
-			$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+			$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
 		} else {
 
 			/**
@@ -597,7 +597,7 @@ 
 			 * @param array  $posts_columns An array of column names.
 			 * @param string $post_type     The post type slug.
 			 */
-			$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+			$posts_columns = apply_filters('manage_posts_columns', $posts_columns, $post_type);
 		}
 
 		/**
@@ -609,7 +609,7 @@ 
 		 *
 		 * @param array $post_columns An array of column names.
 		 */
-		return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
+		return apply_filters("manage_{$post_type}_posts_columns", $posts_columns);
 	}
 
 	/**
@@ -621,7 +621,7 @@ 
 			'title'    => 'title',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true )
+			'date'     => array('date', true)
 		);
 	}
 
@@ -631,18 +631,18 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	public function display_rows( $posts = array(), $level = 0 ) {
+	public function display_rows($posts = array(), $level = 0) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
+		if (empty($posts))
 			$posts = $wp_query->posts;
 
-		add_filter( 'the_title', 'esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		if ( $this->hierarchical_display ) {
-			$this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
+		if ($this->hierarchical_display) {
+			$this->_display_rows_hierarchical($posts, $this->get_pagenum(), $per_page);
 		} else {
-			$this->_display_rows( $posts, $level );
+			$this->_display_rows($posts, $level);
 		}
 	}
 
@@ -650,17 +650,17 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	private function _display_rows( $posts, $level = 0 ) {
+	private function _display_rows($posts, $level = 0) {
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
+		foreach ($posts as $a_post)
 			$post_ids[] = $a_post->ID;
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ($posts as $post)
+			$this->single_row($post, $level);
 	}
 
 	/**
@@ -670,15 +670,15 @@ 
 	 * @param int $pagenum
 	 * @param int $per_page
 	 */
-	private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+	private function _display_rows_hierarchical($pages, $pagenum = 1, $per_page = 20) {
 		global $wpdb;
 
 		$level = 0;
 
-		if ( ! $pages ) {
-			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
+		if ( ! $pages) {
+			$pages = get_pages(array('sort_column' => 'menu_order'));
 
-			if ( ! $pages )
+			if ( ! $pages)
 				return;
 		}
 
@@ -689,56 +689,56 @@ 
 		 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
 		 * If searching, ignore hierarchy and treat everything as top level
 		 */
-		if ( empty( $_REQUEST['s'] ) ) {
+		if (empty($_REQUEST['s'])) {
 
 			$top_level_pages = array();
 			$children_pages = array();
 
-			foreach ( $pages as $page ) {
+			foreach ($pages as $page) {
 
 				// Catch and repair bad pages.
-				if ( $page->post_parent == $page->ID ) {
+				if ($page->post_parent == $page->ID) {
 					$page->post_parent = 0;
-					$wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
-					clean_post_cache( $page );
+					$wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
+					clean_post_cache($page);
 				}
 
-				if ( 0 == $page->post_parent )
+				if (0 == $page->post_parent)
 					$top_level_pages[] = $page;
 				else
-					$children_pages[ $page->post_parent ][] = $page;
+					$children_pages[$page->post_parent][] = $page;
 			}
 
 			$pages = &$top_level_pages;
 		}
 
 		$count = 0;
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 		$to_display = array();
 
-		foreach ( $pages as $page ) {
-			if ( $count >= $end )
+		foreach ($pages as $page) {
+			if ($count >= $end)
 				break;
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if (isset($children_pages))
+				$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
-		if ( isset( $children_pages ) && $count < $end ){
-			foreach ( $children_pages as $orphans ){
-				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
+		if (isset($children_pages) && $count < $end) {
+			foreach ($children_pages as $orphans) {
+				foreach ($orphans as $op) {
+					if ($count >= $end)
 						break;
 
-					if ( $count >= $start ) {
+					if ($count >= $start) {
 						$to_display[$op->ID] = 0;
 					}
 
@@ -747,16 +747,16 @@ 
 			}
 		}
 
-		$ids = array_keys( $to_display );
-		_prime_post_caches( $ids );
+		$ids = array_keys($to_display);
+		_prime_post_caches($ids);
 
-		if ( ! isset( $GLOBALS['post'] ) ) {
-			$GLOBALS['post'] = reset( $ids );
+		if ( ! isset($GLOBALS['post'])) {
+			$GLOBALS['post'] = reset($ids);
 		}
 
-		foreach ( $to_display as $page_id => $level ) {
+		foreach ($to_display as $page_id => $level) {
 			echo "\t";
-			$this->single_row( $page_id, $level );
+			$this->single_row($page_id, $level);
 		}
 	}
 
@@ -775,51 +775,51 @@ 
 	 * @param int $per_page
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
-	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
+	private function _page_rows(&$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display) {
+		if ( ! isset($children_pages[$parent]))
 			return;
 
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 
-		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
+		foreach ($children_pages[$parent] as $page) {
+			if ($count >= $end)
 				break;
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count == $start && $page->post_parent > 0 ) {
+			if ($count == $start && $page->post_parent > 0) {
 				$my_parents = array();
 				$my_parent = $page->post_parent;
-				while ( $my_parent ) {
+				while ($my_parent) {
 					// Get the ID from the list or the attribute if my_parent is an object
 					$parent_id = $my_parent;
-					if ( is_object( $my_parent ) ) {
+					if (is_object($my_parent)) {
 						$parent_id = $my_parent->ID;
 					}
 
-					$my_parent = get_post( $parent_id );
+					$my_parent = get_post($parent_id);
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
+					if ( ! $my_parent->post_parent)
 						break;
 					$my_parent = $my_parent->post_parent;
 				}
-				$num_parents = count( $my_parents );
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				$num_parents = count($my_parents);
+				while ($my_parent = array_pop($my_parents)) {
 					$to_display[$my_parent->ID] = $level - $num_parents;
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
-		unset( $children_pages[$parent] ); //required in order to keep track of orphans
+		unset($children_pages[$parent]); //required in order to keep track of orphans
 	}
 
 	/**
@@ -830,10 +830,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
-		if ( current_user_can( 'edit_post', $post->ID ) ): ?>
+	public function column_cb($post) {
+		if (current_user_can('edit_post', $post->ID)): ?>
 			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php
-				printf( __( 'Select %s' ), _draft_or_post_title() );
+				printf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
 			<div class="locked-indicator">
@@ -841,7 +841,7 @@ 
 				<span class="screen-reader-text"><?php
 				printf(
 					/* translators: %s: post title */
-					__( '&#8220;%s&#8221; is locked' ),
+					__('&#8220;%s&#8221; is locked'),
 					_draft_or_post_title()
 				);
 				?></span>
@@ -858,10 +858,10 @@ 
 	 * @param string  $data
 	 * @param string  $primary
 	 */
-	protected function _column_title( $post, $classes, $data, $primary ) {
-		echo '<td class="' . $classes . ' page-title" ', $data, '>';
-		echo $this->column_title( $post );
-		echo $this->handle_row_actions( $post, 'title', $primary );
+	protected function _column_title($post, $classes, $data, $primary) {
+		echo '<td class="'.$classes.' page-title" ', $data, '>';
+		echo $this->column_title($post);
+		echo $this->handle_row_actions($post, 'title', $primary);
 		echo '</td>';
 	}
 
@@ -875,91 +875,91 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
+	public function column_title($post) {
 		global $mode;
 
-		if ( $this->hierarchical_display ) {
-			if ( 0 === $this->current_level && (int) $post->post_parent > 0 ) {
+		if ($this->hierarchical_display) {
+			if (0 === $this->current_level && (int) $post->post_parent > 0) {
 				// Sent level 0 by accident, by default, or because we don't know the actual level.
 				$find_main_page = (int) $post->post_parent;
-				while ( $find_main_page > 0 ) {
-					$parent = get_post( $find_main_page );
+				while ($find_main_page > 0) {
+					$parent = get_post($find_main_page);
 
-					if ( is_null( $parent ) ) {
+					if (is_null($parent)) {
 						break;
 					}
 
 					$this->current_level++;
 					$find_main_page = (int) $parent->post_parent;
 
-					if ( ! isset( $parent_name ) ) {
+					if ( ! isset($parent_name)) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$parent_name = apply_filters( 'the_title', $parent->post_title, $parent->ID );
+						$parent_name = apply_filters('the_title', $parent->post_title, $parent->ID);
 					}
 				}
 			}
 		}
 
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
-			$lock_holder = wp_check_post_lock( $post->ID );
+		if ($can_edit_post && $post->post_status != 'trash') {
+			$lock_holder = wp_check_post_lock($post->ID);
 
-			if ( $lock_holder ) {
-				$lock_holder = get_userdata( $lock_holder );
-				$locked_avatar = get_avatar( $lock_holder->ID, 18 );
-				$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+			if ($lock_holder) {
+				$lock_holder = get_userdata($lock_holder);
+				$locked_avatar = get_avatar($lock_holder->ID, 18);
+				$locked_text = esc_html(sprintf(__('%s is currently editing'), $lock_holder->display_name));
 			} else {
 				$locked_avatar = $locked_text = '';
 			}
 
-			echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
+			echo '<div class="locked-info"><span class="locked-avatar">'.$locked_avatar.'</span> <span class="locked-text">'.$locked_text."</span></div>\n";
 		}
 
-		$pad = str_repeat( '&#8212; ', $this->current_level );
+		$pad = str_repeat('&#8212; ', $this->current_level);
 		echo "<strong>";
 
-		$format = get_post_format( $post->ID );
-		if ( $format ) {
-			$label = get_post_format_string( $format );
+		$format = get_post_format($post->ID);
+		if ($format) {
+			$label = get_post_format_string($format);
 
-			$format_class = 'post-state-format post-format-icon post-format-' . $format;
+			$format_class = 'post-state-format post-format-icon post-format-'.$format;
 
 			$format_args = array(
 				'post_format' => $format,
 				'post_type' => $post->post_type
 			);
 
-			echo $this->get_edit_link( $format_args, $label . ':', $format_class );
+			echo $this->get_edit_link($format_args, $label.':', $format_class);
 		}
 
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
+		if ($can_edit_post && $post->post_status != 'trash') {
 			printf(
 				'<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) ),
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title)),
 				$pad,
 				$title
 			);
 		} else {
-			echo $pad . $title;
+			echo $pad.$title;
 		}
-		_post_states( $post );
+		_post_states($post);
 
-		if ( isset( $parent_name ) ) {
-			$post_type_object = get_post_type_object( $post->post_type );
-			echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+		if (isset($parent_name)) {
+			$post_type_object = get_post_type_object($post->post_type);
+			echo ' | '.$post_type_object->labels->parent_item_colon.' '.esc_html($parent_name);
 		}
 		echo "</strong>\n";
 
-		if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
-			echo esc_html( get_the_excerpt() );
+		if ( ! is_post_type_hierarchical($this->screen->post_type) && 'excerpt' === $mode && current_user_can('read_post', $post->ID)) {
+			echo esc_html(get_the_excerpt());
 		}
 
-		get_inline_data( $post );
+		get_inline_data($post);
 	}
 
 	/**
@@ -972,36 +972,36 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
+	public function column_date($post) {
 		global $mode;
 
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time = $h_time = __( 'Unpublished' );
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$t_time = $h_time = __('Unpublished');
 			$time_diff = 0;
 		} else {
-			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
+			$t_time = get_the_time(__('Y/m/d g:i:s a'));
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post );
+			$time = get_post_time('G', true, $post);
 
 			$time_diff = time() - $time;
 
-			if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+			if ($time_diff > 0 && $time_diff < DAY_IN_SECONDS) {
+				$h_time = sprintf(__('%s ago'), human_time_diff($time));
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
-		if ( 'publish' === $post->post_status ) {
-			$status = __( 'Published' );
-		} elseif ( 'future' === $post->post_status ) {
-			if ( $time_diff > 0 ) {
-				$status = '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
+		if ('publish' === $post->post_status) {
+			$status = __('Published');
+		} elseif ('future' === $post->post_status) {
+			if ($time_diff > 0) {
+				$status = '<strong class="error-message">'.__('Missed schedule').'</strong>';
 			} else {
-				$status = __( 'Scheduled' );
+				$status = __('Scheduled');
 			}
 		} else {
-			$status = __( 'Last Modified' );
+			$status = __('Last Modified');
 		}
 
 		/**
@@ -1014,13 +1014,13 @@ 
 		 * @param string  $column_name The column name.
 		 * @param string  $mode        The list display mode ('excerpt' or 'list').
 		 */
-		$status = apply_filters( 'post_date_column_status', $status, $post, 'date', $mode );
+		$status = apply_filters('post_date_column_status', $status, $post, 'date', $mode);
 
-		if ( $status ) {
-			echo $status . '<br />';
+		if ($status) {
+			echo $status.'<br />';
 		}
 
-		if ( 'excerpt' === $mode ) {
+		if ('excerpt' === $mode) {
 			/**
 			 * Filters the published time of the post.
 			 *
@@ -1035,11 +1035,11 @@ 
 			 * @param string  $column_name The column name.
 			 * @param string  $mode        The list display mode ('excerpt' or 'list').
 			 */
-			echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
+			echo apply_filters('post_date_column_time', $t_time, $post, 'date', $mode);
 		} else {
 
 			/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, 'date', $mode ) . '</abbr>';
+			echo '<abbr title="'.$t_time.'">'.apply_filters('post_date_column_time', $h_time, $post, 'date', $mode).'</abbr>';
 		}
 	}
 
@@ -1051,13 +1051,13 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		?>
 		<div class="post-com-count-wrapper">
 		<?php
-			$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+			$pending_comments = isset($this->comment_pending_count[$post->ID]) ? $this->comment_pending_count[$post->ID] : 0;
 
-			$this->comments_bubble( $post->ID, $pending_comments );
+			$this->comments_bubble($post->ID, $pending_comments);
 		?>
 		</div>
 		<?php
@@ -1071,12 +1071,12 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
+	public function column_author($post) {
 		$args = array(
 			'post_type' => $post->post_type,
-			'author' => get_the_author_meta( 'ID' )
+			'author' => get_the_author_meta('ID')
 		);
-		echo $this->get_edit_link( $args, get_the_author() );
+		echo $this->get_edit_link($args, get_the_author());
 	}
 
 	/**
@@ -1088,45 +1088,45 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $post, $column_name ) {
-		if ( 'categories' === $column_name ) {
+	public function column_default($post, $column_name) {
+		if ('categories' === $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' === $column_name ) {
+		} elseif ('tags' === $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
-		if ( $taxonomy ) {
-			$taxonomy_object = get_taxonomy( $taxonomy );
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($taxonomy) {
+			$taxonomy_object = get_taxonomy($taxonomy);
+			$terms = get_the_terms($post->ID, $taxonomy);
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv = array();
-					if ( 'post' != $post->post_type ) {
+					if ('post' != $post->post_type) {
 						$posts_in_term_qv['post_type'] = $post->post_type;
 					}
-					if ( $taxonomy_object->query_var ) {
-						$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
+					if ($taxonomy_object->query_var) {
+						$posts_in_term_qv[$taxonomy_object->query_var] = $t->slug;
 					} else {
 						$posts_in_term_qv['taxonomy'] = $taxonomy;
 						$posts_in_term_qv['term'] = $t->slug;
 					}
 
-					$label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
-					$out[] = $this->get_edit_link( $posts_in_term_qv, $label );
+					$label = esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'));
+					$out[] = $this->get_edit_link($posts_in_term_qv, $label);
 				}
 				/* translators: used between list items, there is a space after the comma */
-				echo join( __( ', ' ), $out );
+				echo join(__(', '), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.$taxonomy_object->labels->no_terms.'</span>';
 			}
 			return;
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Fires in each custom column on the Posts list table.
@@ -1139,7 +1139,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_pages_custom_column', $column_name, $post->ID );
+			do_action('manage_pages_custom_column', $column_name, $post->ID);
 		} else {
 
 			/**
@@ -1153,7 +1153,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_posts_custom_column', $column_name, $post->ID );
+			do_action('manage_posts_custom_column', $column_name, $post->ID);
 		}
 
 		/**
@@ -1166,7 +1166,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $post_id     The current post ID.
 		 */
-		do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID );
+		do_action("manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID);
 	}
 
 	/**
@@ -1175,31 +1175,31 @@ 
 	 * @param int|WP_Post $post
 	 * @param int         $level
 	 */
-	public function single_row( $post, $level = 0 ) {
+	public function single_row($post, $level = 0) {
 		$global_post = get_post();
 
-		$post = get_post( $post );
+		$post = get_post($post);
 		$this->current_level = $level;
 
 		$GLOBALS['post'] = $post;
-		setup_postdata( $post );
+		setup_postdata($post);
 
-		$classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+		$classes = 'iedit author-'.(get_current_user_id() == $post->post_author ? 'self' : 'other');
 
-		$lock_holder = wp_check_post_lock( $post->ID );
-		if ( $lock_holder ) {
+		$lock_holder = wp_check_post_lock($post->ID);
+		if ($lock_holder) {
 			$classes .= ' wp-locked';
 		}
 
-		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+		if ($post->post_parent) {
+		    $count = count(get_post_ancestors($post->ID));
+		    $classes .= ' level-'.$count;
 		} else {
 		    $classes .= ' level-0';
 		}
 	?>
-		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
-			<?php $this->single_row_columns( $post ); ?>
+		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode(' ', get_post_class($classes, $post->ID)); ?>">
+			<?php $this->single_row_columns($post); ?>
 		</tr>
 	<?php
 		$GLOBALS['post'] = $global_post;
@@ -1228,85 +1228,85 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($post, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$post_type_object = get_post_type_object($post->post_type);
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 		$actions = array();
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && 'trash' != $post->post_status ) {
+		if ($can_edit_post && 'trash' != $post->post_status) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<a href="#" class="editinline" aria-label="%s">%s</a>',
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $title ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $title)),
+				__('Quick&nbsp;Edit')
 			);
 		}
 
-		if ( current_user_can( 'delete_post', $post->ID ) ) {
-			if ( 'trash' === $post->post_status ) {
+		if (current_user_can('delete_post', $post->ID)) {
+			if ('trash' === $post->post_status) {
 				$actions['untrash'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ),
+					wp_nonce_url(admin_url(sprintf($post_type_object->_edit_link.'&amp;action=untrash', $post->ID)), 'untrash-post_'.$post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $title ) ),
-					__( 'Restore' )
+					esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $title)),
+					__('Restore')
 				);
-			} elseif ( EMPTY_TRASH_DAYS ) {
+			} elseif (EMPTY_TRASH_DAYS) {
 				$actions['trash'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID ),
+					get_delete_post_link($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $title ) ),
-					_x( 'Trash', 'verb' )
+					esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $title)),
+					_x('Trash', 'verb')
 				);
 			}
-			if ( 'trash' === $post->post_status || ! EMPTY_TRASH_DAYS ) {
+			if ('trash' === $post->post_status || ! EMPTY_TRASH_DAYS) {
 				$actions['delete'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID, '', true ),
+					get_delete_post_link($post->ID, '', true),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $title ) ),
-					__( 'Delete Permanently' )
+					esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $title)),
+					__('Delete Permanently')
 				);
 			}
 		}
 
-		if ( is_post_type_viewable( $post_type_object ) ) {
-			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
-				if ( $can_edit_post ) {
-					$preview_link = get_preview_post_link( $post );
+		if (is_post_type_viewable($post_type_object)) {
+			if (in_array($post->post_status, array('pending', 'draft', 'future'))) {
+				if ($can_edit_post) {
+					$preview_link = get_preview_post_link($post);
 					$actions['view'] = sprintf(
 						'<a href="%s" rel="bookmark" aria-label="%s">%s</a>',
-						esc_url( $preview_link ),
+						esc_url($preview_link),
 						/* translators: %s: post title */
-						esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ),
-						__( 'Preview' )
+						esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)),
+						__('Preview')
 					);
 				}
-			} elseif ( 'trash' != $post->post_status ) {
+			} elseif ('trash' != $post->post_status) {
 				$actions['view'] = sprintf(
 					'<a href="%s" rel="bookmark" aria-label="%s">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)),
+					__('View')
 				);
 			}
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Filters the array of row action links on the Pages list table.
@@ -1320,7 +1320,7 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'page_row_actions', $actions, $post );
+			$actions = apply_filters('page_row_actions', $actions, $post);
 		} else {
 
 			/**
@@ -1335,10 +1335,10 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'post_row_actions', $actions, $post );
+			$actions = apply_filters('post_row_actions', $actions, $post);
 		}
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
@@ -1353,15 +1353,15 @@ 
 
 		$screen = $this->screen;
 
-		$post = get_default_post_to_edit( $screen->post_type );
-		$post_type_object = get_post_type_object( $screen->post_type );
+		$post = get_default_post_to_edit($screen->post_type);
+		$post_type_object = get_post_type_object($screen->post_type);
 
-		$taxonomy_names = get_object_taxonomies( $screen->post_type );
+		$taxonomy_names = get_object_taxonomies($screen->post_type);
 		$hierarchical_taxonomies = array();
 		$flat_taxonomies = array();
-		foreach ( $taxonomy_names as $taxonomy_name ) {
+		foreach ($taxonomy_names as $taxonomy_name) {
 
-			$taxonomy = get_taxonomy( $taxonomy_name );
+			$taxonomy = get_taxonomy($taxonomy_name);
 
 			$show_in_quick_edit = $taxonomy->show_in_quick_edit;
 
@@ -1374,39 +1374,39 @@ 
 			 * @param string $taxonomy_name      Taxonomy name.
 			 * @param string $post_type          Post type of current Quick Edit post.
 			 */
-			if ( ! apply_filters( 'quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type ) ) {
+			if ( ! apply_filters('quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type)) {
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
+			if ($taxonomy->hierarchical)
 				$hierarchical_taxonomies[] = $taxonomy;
 			else
 				$flat_taxonomies[] = $taxonomy;
 		}
 
-		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
-		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
-		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+		$m = (isset($mode) && 'excerpt' === $mode) ? 'excerpt' : 'list';
+		$can_publish = current_user_can($post_type_object->cap->publish_posts);
+		$core_columns = array('cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true);
 
 	?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
-		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
+		$hclass = count($hierarchical_taxonomies) ? 'post' : 'page';
 		$bulk = 0;
-		while ( $bulk < 2 ) { ?>
+		while ($bulk < 2) { ?>
 
-		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-" . $screen->post_type;
+		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-".$screen->post_type;
 			echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
 		?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 		<fieldset class="inline-edit-col-left">
-			<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
+			<legend class="inline-edit-legend"><?php echo $bulk ? __('Bulk Edit') : __('Quick Edit'); ?></legend>
 			<div class="inline-edit-col">
 	<?php
 
-	if ( post_type_supports( $screen->post_type, 'title' ) ) :
-		if ( $bulk ) : ?>
+	if (post_type_supports($screen->post_type, 'title')) :
+		if ($bulk) : ?>
 			<div id="bulk-title-div">
 				<div id="bulk-titles"></div>
 			</div>
@@ -1414,30 +1414,30 @@ 
 	<?php else : // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e('Title'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
 			<label>
-				<span class="title"><?php _e( 'Slug' ); ?></span>
+				<span class="title"><?php _e('Slug'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 			</label>
 
 	<?php endif; // $bulk
 	endif; // post_type_supports title ?>
 
-	<?php if ( !$bulk ) : ?>
+	<?php if ( ! $bulk) : ?>
 			<fieldset class="inline-edit-date">
-			<legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
-				<?php touch_time( 1, 1, 0, 1 ); ?>
+			<legend><span class="title"><?php _e('Date'); ?></span></legend>
+				<?php touch_time(1, 1, 0, 1); ?>
 			</fieldset>
 			<br class="clear" />
 	<?php endif; // $bulk
 
-		if ( post_type_supports( $screen->post_type, 'author' ) ) :
+		if (post_type_supports($screen->post_type, 'author')) :
 			$authors_dropdown = '';
 
-			if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+			if (current_user_can($post_type_object->cap->edit_others_posts)) :
 				$users_opt = array(
 					'hide_if_only_one_author' => false,
 					'who' => 'authors',
@@ -1447,39 +1447,39 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ($bulk)
+					$users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
 
-				if ( $authors = wp_dropdown_users( $users_opt ) ) :
+				if ($authors = wp_dropdown_users($users_opt)) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
-					$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+					$authors_dropdown .= '<span class="title">'.__('Author').'</span>';
 					$authors_dropdown .= $authors;
 					$authors_dropdown .= '</label>';
 				endif;
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( ! $bulk) echo $authors_dropdown;
 	endif; // post_type_supports author
 
-	if ( !$bulk && $can_publish ) :
+	if ( ! $bulk && $can_publish) :
 	?>
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="alignleft">
-					<span class="title"><?php _e( 'Password' ); ?></span>
+					<span class="title"><?php _e('Password'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
 				</label>
 
 				<em class="alignleft inline-edit-or">
 					<?php
 					/* translators: Between password field and private checkbox on post quick edit interface */
-					_e( '&ndash;OR&ndash;' );
+					_e('&ndash;OR&ndash;');
 					?>
 				</em>
 				<label class="alignleft inline-edit-private">
 					<input type="checkbox" name="keep_private" value="private" />
-					<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
+					<span class="checkbox-title"><?php _e('Private'); ?></span>
 				</label>
 			</div>
 
@@ -1487,16 +1487,16 @@ 
 
 		</div></fieldset>
 
-	<?php if ( count( $hierarchical_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($hierarchical_taxonomies) && ! $bulk) : ?>
 
 		<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
 
-	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+	<?php foreach ($hierarchical_taxonomies as $taxonomy) : ?>
 
-			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-			<input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
-			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
-				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
+			<span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->labels->name) ?></span>
+			<input type="hidden" name="<?php echo ($taxonomy->name === 'category') ? 'post_category[]' : 'tax_input['.esc_attr($taxonomy->name).'][]'; ?>" value="0" />
+			<ul class="cat-checklist <?php echo esc_attr($taxonomy->name)?>-checklist">
+				<?php wp_terms_checklist(null, array('taxonomy' => $taxonomy->name)) ?>
 			</ul>
 
 	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
@@ -1508,27 +1508,27 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
+		if (post_type_supports($screen->post_type, 'author') && $bulk)
 			echo $authors_dropdown;
 
-		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+		if (post_type_supports($screen->post_type, 'page-attributes')) :
 
-			if ( $post_type_object->hierarchical ) :
+			if ($post_type_object->hierarchical) :
 		?>
 			<label>
-				<span class="title"><?php _e( 'Parent' ); ?></span>
+				<span class="title"><?php _e('Parent'); ?></span>
 	<?php
 		$dropdown_args = array(
 			'post_type'         => $post_type_object->name,
 			'selected'          => $post->post_parent,
 			'name'              => 'post_parent',
-			'show_option_none'  => __( 'Main Page (no parent)' ),
+			'show_option_none'  => __('Main Page (no parent)'),
 			'option_none_value' => 0,
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ($bulk)
+			$dropdown_args['show_option_no_change'] = __('&mdash; No Change &mdash;');
 
 		/**
 		 * Filters the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1539,19 +1539,19 @@ 
 		 *
 		 * @param array $dropdown_args An array of arguments.
 		 */
-		$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
+		$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
 
-		wp_dropdown_pages( $dropdown_args );
+		wp_dropdown_pages($dropdown_args);
 	?>
 			</label>
 
 	<?php
 			endif; // hierarchical
 
-			if ( !$bulk ) : ?>
+			if ( ! $bulk) : ?>
 
 			<label>
-				<span class="title"><?php _e( 'Order' ); ?></span>
+				<span class="title"><?php _e('Order'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
 			</label>
 
@@ -1560,32 +1560,32 @@ 
 		endif; // page-attributes
 	?>
 
-	<?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>
+	<?php if (0 < count(get_page_templates(null, $screen->post_type))) : ?>
 		<label>
-			<span class="title"><?php _e( 'Template' ); ?></span>
+			<span class="title"><?php _e('Template'); ?></span>
 			<select name="page_template">
-<?php	if ( $bulk ) : ?>
-				<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+<?php	if ($bulk) : ?>
+				<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 <?php	endif; // $bulk ?>
                 <?php
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
-				$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
+				$default_title = apply_filters('default_page_template_title', __('Default Template'), 'quick-edit');
                 ?>
-				<option value="default"><?php echo esc_html( $default_title ); ?></option>
-				<?php page_template_dropdown( '', $screen->post_type ) ?>
+				<option value="default"><?php echo esc_html($default_title); ?></option>
+				<?php page_template_dropdown('', $screen->post_type) ?>
 			</select>
 		</label>
 	<?php endif; ?>
 
-	<?php if ( count( $flat_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($flat_taxonomies) && ! $bulk) : ?>
 
-	<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
-		<?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
-			$taxonomy_name = esc_attr( $taxonomy->name );
+	<?php foreach ($flat_taxonomies as $taxonomy) : ?>
+		<?php if (current_user_can($taxonomy->cap->assign_terms)) :
+			$taxonomy_name = esc_attr($taxonomy->name);
 
 			?>
 			<label class="inline-edit-tags">
-				<span class="title"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
+				<span class="title"><?php echo esc_html($taxonomy->labels->name) ?></span>
 				<textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>
 			</label>
 		<?php endif; ?>
@@ -1594,26 +1594,26 @@ 
 
 	<?php endif; // count( $flat_taxonomies ) && !$bulk  ?>
 
-	<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
-		if ( $bulk ) : ?>
+	<?php if (post_type_supports($screen->post_type, 'comments') || post_type_supports($screen->post_type, 'trackbacks')) :
+		if ($bulk) : ?>
 
 			<div class="inline-edit-group wp-clearfix">
-		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+		<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 			<label class="alignleft">
-				<span class="title"><?php _e( 'Comments' ); ?></span>
+				<span class="title"><?php _e('Comments'); ?></span>
 				<select name="comment_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
-		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+		<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 			<label class="alignright">
-				<span class="title"><?php _e( 'Pings' ); ?></span>
+				<span class="title"><?php _e('Pings'); ?></span>
 				<select name="ping_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
 		<?php endif; ?>
@@ -1622,15 +1622,15 @@ 
 	<?php else : // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
-			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+			<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Comments'); ?></span>
 				</label>
-			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+			<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="ping_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Pings'); ?></span>
 				</label>
 			<?php endif; ?>
 			</div>
@@ -1640,33 +1640,33 @@ 
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
-					<span class="title"><?php _e( 'Status' ); ?></span>
+					<span class="title"><?php _e('Status'); ?></span>
 					<select name="_status">
-	<?php if ( $bulk ) : ?>
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 	<?php endif; // $bulk ?>
-					<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
-						<option value="publish"><?php _e( 'Published' ); ?></option>
-						<option value="future"><?php _e( 'Scheduled' ); ?></option>
-	<?php if ( $bulk ) : ?>
-						<option value="private"><?php _e( 'Private' ) ?></option>
+					<?php if ($can_publish) : // Contributors only get "Unpublished" and "Pending Review" ?>
+						<option value="publish"><?php _e('Published'); ?></option>
+						<option value="future"><?php _e('Scheduled'); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="private"><?php _e('Private') ?></option>
 	<?php endif; // $bulk ?>
 					<?php endif; ?>
-						<option value="pending"><?php _e( 'Pending Review' ); ?></option>
-						<option value="draft"><?php _e( 'Draft' ); ?></option>
+						<option value="pending"><?php _e('Pending Review'); ?></option>
+						<option value="draft"><?php _e('Draft'); ?></option>
 					</select>
 				</label>
 
-	<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+	<?php if ('post' === $screen->post_type && $can_publish && current_user_can($post_type_object->cap->edit_others_posts)) : ?>
 
-	<?php	if ( $bulk ) : ?>
+	<?php	if ($bulk) : ?>
 
 				<label class="alignright">
-					<span class="title"><?php _e( 'Sticky' ); ?></span>
+					<span class="title"><?php _e('Sticky'); ?></span>
 					<select name="sticky">
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-						<option value="sticky"><?php _e( 'Sticky' ); ?></option>
-						<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+						<option value="sticky"><?php _e('Sticky'); ?></option>
+						<option value="unsticky"><?php _e('Not Sticky'); ?></option>
 					</select>
 				</label>
 
@@ -1674,7 +1674,7 @@ 
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e('Make this post sticky'); ?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1685,20 +1685,20 @@ 
 
 	<?php
 
-	if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
-		$post_formats = get_theme_support( 'post-formats' );
+	if ($bulk && current_theme_supports('post-formats') && post_type_supports($screen->post_type, 'post-formats')) {
+		$post_formats = get_theme_support('post-formats');
 
 		?>
 		<label class="alignleft">
-		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
+		<span class="title"><?php _ex('Format', 'post format'); ?></span>
 		<select name="post_format">
-			<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
+			<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+			<option value="0"><?php echo get_post_format_string('standard'); ?></option>
 			<?php
-			if ( is_array( $post_formats[0] ) ) {
-				foreach ( $post_formats[0] as $format ) {
+			if (is_array($post_formats[0])) {
+				foreach ($post_formats[0] as $format) {
 					?>
-					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+					<option value="<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></option>
 					<?php
 				}
 			}
@@ -1713,13 +1713,13 @@ 
 		</div></fieldset>
 
 	<?php
-		list( $columns ) = $this->get_column_info();
+		list($columns) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
+		foreach ($columns as $column_name => $column_display_name) {
+			if (isset($core_columns[$column_name]))
 				continue;
 
-			if ( $bulk ) {
+			if ($bulk) {
 
 				/**
 				 * Fires once for each column in Bulk Edit mode.
@@ -1729,7 +1729,7 @@ 
 				 * @param string  $column_name Name of the column to edit.
 				 * @param WP_Post $post_type   The post type slug.
 				 */
-				do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
+				do_action('bulk_edit_custom_box', $column_name, $screen->post_type);
 			} else {
 
 				/**
@@ -1740,25 +1740,25 @@ 
 				 * @param string $column_name Name of the column to edit.
 				 * @param string $post_type   The post type slug.
 				 */
-				do_action( 'quick_edit_custom_box', $column_name, $screen->post_type );
+				do_action('quick_edit_custom_box', $column_name, $screen->post_type);
 			}
 
 		}
 	?>
 		<p class="submit inline-edit-save">
-			<button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
-			<?php if ( ! $bulk ) {
-				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
+			<button type="button" class="button cancel alignleft"><?php _e('Cancel'); ?></button>
+			<?php if ( ! $bulk) {
+				wp_nonce_field('inlineeditnonce', '_inline_edit', false);
 				?>
-				<button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
+				<button type="button" class="button button-primary save alignright"><?php _e('Update'); ?></button>
 				<span class="spinner"></span>
 			<?php } else {
-				submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );
+				submit_button(__('Update'), 'primary alignright', 'bulk_edit', false);
 			} ?>
-			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
-			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
-			<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
-				<input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
+			<input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+			<input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
+			<?php if ( ! $bulk && ! post_type_supports($screen->post_type, 'author')) { ?>
+				<input type="hidden" name="post_author" value="<?php echo esc_attr($post->post_author); ?>" />
 			<?php } ?>
 			<span class="error" style="display:none"></span>
 			<br class="clear" />

Braces +91 added lines, -59 removed lines

@@ -199,10 +199,11 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		} else {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -266,8 +267,9 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
-			return array();
+		if ( !empty($locked_post_status) ) {
+					return array();
+		}
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -511,8 +513,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -561,19 +564,21 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' === $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' === $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
+					$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -634,8 +639,9 @@ 
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
-			$posts = $wp_query->posts;
+		if ( empty( $posts ) ) {
+					$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -654,13 +660,15 @@ 
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
-			$post_ids[] = $a_post->ID;
+		foreach ( $posts as $a_post ) {
+					$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ( $posts as $post ) {
+					$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -678,8 +686,9 @@ 
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
-				return;
+			if ( ! $pages ) {
+							return;
+			}
 		}
 
 		/*
@@ -703,10 +712,11 @@ 
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
-					$top_level_pages[] = $page;
-				else
-					$children_pages[ $page->post_parent ][] = $page;
+				if ( 0 == $page->post_parent ) {
+									$top_level_pages[] = $page;
+				} else {
+									$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
@@ -718,8 +728,9 @@ 
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			if ( $count >= $start ) {
 				$to_display[$page->ID] = $level;
@@ -727,16 +738,18 @@ 
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if ( isset( $children_pages ) ) {
+							$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
-						break;
+					if ( $count >= $end ) {
+											break;
+					}
 
 					if ( $count >= $start ) {
 						$to_display[$op->ID] = 0;
@@ -776,15 +789,17 @@ 
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
-			return;
+		if ( ! isset( $children_pages[$parent] ) ) {
+					return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
@@ -799,8 +814,9 @@ 
 
 					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
-						break;
+					if ( !$my_parent->post_parent ) {
+											break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
@@ -1378,10 +1394,11 @@ 
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
-				$hierarchical_taxonomies[] = $taxonomy;
-			else
-				$flat_taxonomies[] = $taxonomy;
+			if ( $taxonomy->hierarchical ) {
+							$hierarchical_taxonomies[] = $taxonomy;
+			} else {
+							$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
 		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
@@ -1411,10 +1428,13 @@ 
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e( 'Title' );
+}
+?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
@@ -1447,8 +1467,9 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ( $bulk ) {
+									$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				}
 
 				if ( $authors = wp_dropdown_users( $users_opt ) ) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
@@ -1459,7 +1480,9 @@ 
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( !$bulk ) {
+	echo $authors_dropdown;
+}
 	endif; // post_type_supports author
 
 	if ( !$bulk && $can_publish ) :
@@ -1508,8 +1531,9 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+					echo $authors_dropdown;
+		}
 
 		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
@@ -1527,8 +1551,9 @@ 
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ( $bulk ) {
+					$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		}
 
 		/**
 		 * Filters the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1619,13 +1644,16 @@ 
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 				</label>
 			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 				<label class="alignleft">
@@ -1670,11 +1698,14 @@ 
 					</select>
 				</label>
 
-	<?php	else : // $bulk ?>
+	<?php	else {
+	: // $bulk ?>
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1716,8 +1747,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			if ( $bulk ) {
 

src/wp-includes/cache.php

Doc Comments +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
  *
  * @since 2.0.0
  *
- * @return true Always returns true.
+ * @return boolean Always returns true.
  */
 function wp_cache_close() {
 	return true;
@@ -510,7 +510,7 @@ 
 	 * @since 2.0.0
 	 * @access public
 	 *
-	 * @return true Always returns true.
+	 * @return boolean Always returns true.
 	 */
 	public function flush() {
 		$this->cache = array();
@@ -659,7 +659,7 @@ 
 	 * @param mixed      $data   The contents to store in the cache.
 	 * @param string     $group  Optional. Where to group the cache contents. Default 'default'.
 	 * @param int        $expire Not Used.
-	 * @return true Always returns true.
+	 * @return boolean Always returns true.
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
 		if ( empty( $group ) )
@@ -753,7 +753,7 @@ 
 	 *
 	 * @since 2.0.8
 	 *
-	 * @return true Always returns true.
+	 * @return boolean Always returns true.
 	 */
 	public function __destruct() {
 		return true;

Spacing +91 added lines, -91 removed lines

@@ -24,10 +24,10 @@ 
  *                           Default 0 (no expiration).
  * @return bool False if cache key and group already exist, true on success.
  */
-function wp_cache_add( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_add($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->add( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->add($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -60,10 +60,10 @@ 
  * @param string     $group  Optional. The group the key is in. Default empty.
  * @return false|int False on failure, the item's new value on success.
  */
-function wp_cache_decr( $key, $offset = 1, $group = '' ) {
+function wp_cache_decr($key, $offset = 1, $group = '') {
 	global $wp_object_cache;
 
-	return $wp_object_cache->decr( $key, $offset, $group );
+	return $wp_object_cache->decr($key, $offset, $group);
 }
 
 /**
@@ -78,7 +78,7 @@ 
  * @param string     $group Optional. Where the cache contents are grouped. Default empty.
  * @return bool True on successful removal, false on failure.
  */
-function wp_cache_delete( $key, $group = '' ) {
+function wp_cache_delete($key, $group = '') {
 	global $wp_object_cache;
 
 	return $wp_object_cache->delete($key, $group);
@@ -117,10 +117,10 @@ 
  * @return bool|mixed False on failure to retrieve contents or the cache
  *		              contents on success
  */
-function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
+function wp_cache_get($key, $group = '', $force = false, &$found = null) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->get( $key, $group, $force, $found );
+	return $wp_object_cache->get($key, $group, $force, $found);
 }
 
 /**
@@ -136,10 +136,10 @@ 
  * @param string     $group  Optional. The group the key is in. Default empty.
  * @return false|int False on failure, the item's new value on success.
  */
-function wp_cache_incr( $key, $offset = 1, $group = '' ) {
+function wp_cache_incr($key, $offset = 1, $group = '') {
 	global $wp_object_cache;
 
-	return $wp_object_cache->incr( $key, $offset, $group );
+	return $wp_object_cache->incr($key, $offset, $group);
 }
 
 /**
@@ -169,10 +169,10 @@ 
  *                           Default 0 (no expiration).
  * @return bool False if original value does not exist, true if contents were replaced
  */
-function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_replace($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->replace( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->replace($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -193,10 +193,10 @@ 
  *                           Default 0 (no expiration).
  * @return bool False on failure, true on success
  */
-function wp_cache_set( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_set($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->set( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->set($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -211,10 +211,10 @@ 
  *
  * @param int $blog_id Site ID.
  */
-function wp_cache_switch_to_blog( $blog_id ) {
+function wp_cache_switch_to_blog($blog_id) {
 	global $wp_object_cache;
 
-	$wp_object_cache->switch_to_blog( $blog_id );
+	$wp_object_cache->switch_to_blog($blog_id);
 }
 
 /**
@@ -227,10 +227,10 @@ 
  *
  * @param string|array $groups A group or an array of groups to add.
  */
-function wp_cache_add_global_groups( $groups ) {
+function wp_cache_add_global_groups($groups) {
 	global $wp_object_cache;
 
-	$wp_object_cache->add_global_groups( $groups );
+	$wp_object_cache->add_global_groups($groups);
 }
 
 /**
@@ -240,7 +240,7 @@ 
  *
  * @param string|array $groups A group or an array of groups to add.
  */
-function wp_cache_add_non_persistent_groups( $groups ) {
+function wp_cache_add_non_persistent_groups($groups) {
 	// Default cache doesn't persist so nothing to do here.
 }
 
@@ -264,7 +264,7 @@ 
  * @global WP_Object_Cache $wp_object_cache Object cache global instance.
  */
 function wp_cache_reset() {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+	_deprecated_function(__FUNCTION__, '3.5.0');
 
 	global $wp_object_cache;
 
@@ -352,7 +352,7 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->$name;
 	}
 
@@ -366,7 +366,7 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		return $this->$name = $value;
 	}
 
@@ -379,8 +379,8 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
+	public function __isset($name) {
+		return isset($this->$name);
 	}
 
 	/**
@@ -391,8 +391,8 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
+	public function __unset($name) {
+		unset($this->$name);
 	}
 
 	/**
@@ -411,21 +411,21 @@ 
 	 * @param int        $expire Optional. When to expire the cache contents. Default 0 (no expiration).
 	 * @return bool False if cache key and group already exist, true on success
 	 */
-	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
+	public function add($key, $data, $group = 'default', $expire = 0) {
+		if (wp_suspend_cache_addition())
 			return false;
 
-		if ( empty( $group ) )
+		if (empty($group))
 			$group = 'default';
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$id = $this->blog_prefix.$key;
 
-		if ( $this->_exists( $id, $group ) )
+		if ($this->_exists($id, $group))
 			return false;
 
-		return $this->set( $key, $data, $group, (int) $expire );
+		return $this->set($key, $data, $group, (int) $expire);
 	}
 
 	/**
@@ -436,11 +436,11 @@ 
 	 *
 	 * @param array $groups List of groups that are global.
 	 */
-	public function add_global_groups( $groups ) {
+	public function add_global_groups($groups) {
 		$groups = (array) $groups;
 
-		$groups = array_fill_keys( $groups, true );
-		$this->global_groups = array_merge( $this->global_groups, $groups );
+		$groups = array_fill_keys($groups, true);
+		$this->global_groups = array_merge($this->global_groups, $groups);
 	}
 
 	/**
@@ -454,27 +454,27 @@ 
 	 * @param string     $group  Optional. The group the key is in. Default 'default'.
 	 * @return false|int False on failure, the item's new value on success.
 	 */
-	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+	public function decr($key, $offset = 1, $group = 'default') {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric($this->cache[$group][$key]))
+			$this->cache[$group][$key] = 0;
 
 		$offset = (int) $offset;
 
-		$this->cache[ $group ][ $key ] -= $offset;
+		$this->cache[$group][$key] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ($this->cache[$group][$key] < 0)
+			$this->cache[$group][$key] = 0;
 
-		return $this->cache[ $group ][ $key ];
+		return $this->cache[$group][$key];
 	}
 
 	/**
@@ -490,17 +490,17 @@ 
 	 * @param bool       $deprecated Optional. Unused. Default false.
 	 * @return bool False if the contents weren't deleted and true on success.
 	 */
-	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
+	public function delete($key, $group = 'default', $deprecated = false) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		unset( $this->cache[$group][$key] );
+		unset($this->cache[$group][$key]);
 		return true;
 	}
 
@@ -538,17 +538,17 @@ 
 	 *                           false, a storable value. Passed by reference. Default null.
 	 * @return false|mixed False on failure to retrieve contents or the cache contents on success.
 	 */
-	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
+	public function get($key, $group = 'default', $force = false, &$found = null) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( $this->_exists( $key, $group ) ) {
+		if ($this->_exists($key, $group)) {
 			$found = true;
 			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
+			if (is_object($this->cache[$group][$key]))
 				return clone $this->cache[$group][$key];
 			else
 				return $this->cache[$group][$key];
@@ -570,27 +570,27 @@ 
 	 * @param string     $group  Optional. The group the key is in. Default 'default'.
 	 * @return false|int False on failure, the item's new value on success.
 	 */
-	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+	public function incr($key, $offset = 1, $group = 'default') {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric($this->cache[$group][$key]))
+			$this->cache[$group][$key] = 0;
 
 		$offset = (int) $offset;
 
-		$this->cache[ $group ][ $key ] += $offset;
+		$this->cache[$group][$key] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ($this->cache[$group][$key] < 0)
+			$this->cache[$group][$key] = 0;
 
-		return $this->cache[ $group ][ $key ];
+		return $this->cache[$group][$key];
 	}
 
 	/**
@@ -607,18 +607,18 @@ 
 	 * @param int        $expire Optional. When to expire the cache contents. Default 0 (no expiration).
 	 * @return bool False if not exists, true if contents were replaced.
 	 */
-	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+	public function replace($key, $data, $group = 'default', $expire = 0) {
+		if (empty($group))
 			$group = 'default';
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$id = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $id, $group ) )
+		if ( ! $this->_exists($id, $group))
 			return false;
 
-		return $this->set( $key, $data, $group, (int) $expire );
+		return $this->set($key, $data, $group, (int) $expire);
 	}
 
 	/**
@@ -631,12 +631,12 @@ 
 	 * @see switch_to_blog()
 	 */
 	public function reset() {
-		_deprecated_function( __FUNCTION__, '3.5.0', 'switch_to_blog()' );
+		_deprecated_function(__FUNCTION__, '3.5.0', 'switch_to_blog()');
 
 		// Clear out non-global caches since the blog ID has changed.
-		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
-				unset( $this->cache[ $group ] );
+		foreach (array_keys($this->cache) as $group) {
+			if ( ! isset($this->global_groups[$group]))
+				unset($this->cache[$group]);
 		}
 	}
 
@@ -661,14 +661,14 @@ 
 	 * @param int        $expire Not Used.
 	 * @return true Always returns true.
 	 */
-	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+	public function set($key, $data, $group = 'default', $expire = 0) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( is_object( $data ) )
+		if (is_object($data))
 			$data = clone $data;
 
 		$this->cache[$group][$key] = $data;
@@ -691,7 +691,7 @@ 
 		echo "</p>";
 		echo '<ul>';
 		foreach ($this->cache as $group => $cache) {
-			echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / KB_IN_BYTES, 2 ) . 'k )</li>';
+			echo "<li><strong>Group:</strong> $group - ( ".number_format(strlen(serialize($cache)) / KB_IN_BYTES, 2).'k )</li>';
 		}
 		echo '</ul>';
 	}
@@ -706,9 +706,9 @@ 
 	 *
 	 * @param int $blog_id Blog ID.
 	 */
-	public function switch_to_blog( $blog_id ) {
+	public function switch_to_blog($blog_id) {
 		$blog_id = (int) $blog_id;
-		$this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
+		$this->blog_prefix = $this->multisite ? $blog_id.':' : '';
 	}
 
 	/**
@@ -721,8 +721,8 @@ 
 	 * @param string     $group Cache group for the key existence check.
 	 * @return bool Whether the key exists in the cache for the given group.
 	 */
-	protected function _exists( $key, $group ) {
-		return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) );
+	protected function _exists($key, $group) {
+		return isset($this->cache[$group]) && (isset($this->cache[$group][$key]) || array_key_exists($key, $this->cache[$group]));
 	}
 
 	/**
@@ -732,14 +732,14 @@ 
 	 */
 	public function __construct() {
 		$this->multisite = is_multisite();
-		$this->blog_prefix =  $this->multisite ? get_current_blog_id() . ':' : '';
+		$this->blog_prefix = $this->multisite ? get_current_blog_id().':' : '';
 
 
 		/**
 		 * @todo This should be moved to the PHP4 style constructor, PHP5
 		 * already calls __destruct()
 		 */
-		register_shutdown_function( array( $this, '__destruct' ) );
+		register_shutdown_function(array($this, '__destruct'));
 	}
 
 	/**

Braces +83 added lines, -56 removed lines

@@ -412,18 +412,22 @@ 
 	 * @return bool False if cache key and group already exist, true on success
 	 */
 	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
-			return false;
+		if ( wp_suspend_cache_addition() ) {
+					return false;
+		}
 
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$id = $this->blog_prefix . $key;
+		}
 
-		if ( $this->_exists( $id, $group ) )
-			return false;
+		if ( $this->_exists( $id, $group ) ) {
+					return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -455,24 +459,29 @@ 
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -491,14 +500,17 @@ 
 	 * @return bool False if the contents weren't deleted and true on success.
 	 */
 	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
 		unset( $this->cache[$group][$key] );
 		return true;
@@ -539,19 +551,22 @@ 
 	 * @return false|mixed False on failure to retrieve contents or the cache contents on success.
 	 */
 	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
 		if ( $this->_exists( $key, $group ) ) {
 			$found = true;
 			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
-				return clone $this->cache[$group][$key];
-			else
-				return $this->cache[$group][$key];
+			if ( is_object($this->cache[$group][$key]) ) {
+							return clone $this->cache[$group][$key];
+			} else {
+							return $this->cache[$group][$key];
+			}
 		}
 
 		$found = false;
@@ -571,24 +586,29 @@ 
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -608,15 +628,18 @@ 
 	 * @return bool False if not exists, true if contents were replaced.
 	 */
 	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$id = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $id, $group ) )
-			return false;
+		if ( ! $this->_exists( $id, $group ) ) {
+					return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -635,8 +658,9 @@ 
 
 		// Clear out non-global caches since the blog ID has changed.
 		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
-				unset( $this->cache[ $group ] );
+			if ( ! isset( $this->global_groups[ $group ] ) ) {
+							unset( $this->cache[ $group ] );
+			}
 		}
 	}
 
@@ -662,14 +686,17 @@ 
 	 * @return true Always returns true.
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( is_object( $data ) )
-			$data = clone $data;
+		if ( is_object( $data ) ) {
+					$data = clone $data;
+		}
 
 		$this->cache[$group][$key] = $data;
 		return true;

src/wp-includes/capabilities.php

Doc Comments -9 removed lines

@@ -20,10 +20,6 @@ 
  *
  * @param string $cap       Capability name.
  * @param int    $user_id   User ID.
- * @param int    $object_id Optional. ID of the specific object to check against if `$cap` is a "meta" cap.
- *                          "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
- *                          by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
- *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
 function map_meta_cap( $cap, $user_id ) {
@@ -416,11 +412,6 @@ 
  * @see map_meta_cap()
  *
  * @param string $capability Capability name.
- * @param int    $object_id  Optional. ID of the specific object to check against if `$capability` is a "meta" cap.
- *                           "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
- *                           by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
- *                           'edit_others_posts', etc. Accessed via func_get_args() and passed to WP_User::has_cap(),
- *                           then map_meta_cap().
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */

Switch Indentation +351 added lines, -351 removed lines

@@ -31,235 +31,235 @@ 
 	$caps = array();
 
 	switch ( $cap ) {
-	case 'remove_user':
-		// In multisite the user must be a super admin to remove themselves.
-		if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'remove_users';
-		}
-		break;
-	case 'promote_user':
-	case 'add_users':
-		$caps[] = 'promote_users';
-		break;
-	case 'edit_user':
-	case 'edit_users':
-		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		case 'remove_user':
+			// In multisite the user must be a super admin to remove themselves.
+			if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'remove_users';
+			}
 			break;
-
-		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
-		}
-		break;
-	case 'delete_post':
-	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+		case 'promote_user':
+		case 'add_users':
+			$caps[] = 'promote_users';
 			break;
-		}
+		case 'edit_user':
+		case 'edit_users':
+			// Allow user to edit itself
+			if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+				break;
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
+			if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'edit_users'; // edit_user maps to edit_users.
+			}
+			break;
+		case 'delete_post':
+		case 'delete_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
-			$caps[] = 'manage_options';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
+				$caps[] = 'manage_options';
+				break;
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'delete_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->delete_published_posts;
+					} else {
+						$caps[] = $post_type->cap->delete_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->delete_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->delete_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->delete_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->delete_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_private_posts;
+				}
 			}
-		}
-		break;
-		// edit_post breaks down to edit_posts, edit_published_posts, or
-		// edit_others_posts
-	case 'edit_post':
-	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// edit_post breaks down to edit_posts, edit_published_posts, or
+			// edit_others_posts
+		case 'edit_post':
+		case 'edit_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'edit_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->edit_published_posts;
+					} else {
+						$caps[] = $post_type->cap->edit_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->edit_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->edit_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->edit_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->edit_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_private_posts;
+				}
 			}
-		}
-		break;
-	case 'read_post':
-	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		case 'read_post':
+		case 'read_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
-			$caps[] = $post_type->cap->read;
-			break;
-		}
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'read_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
-			$caps[] = $post_type->cap->read_private_posts;
-		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		}
-		break;
-	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
+			$status_obj = get_post_status_object( $post->post_status );
+			if ( $status_obj->public ) {
+				$caps[] = $post_type->cap->read;
+				break;
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				$caps[] = $post_type->cap->read;
+			} elseif ( $status_obj->private ) {
+				$caps[] = $post_type->cap->read_private_posts;
+			} else {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			}
 			break;
-		}
+		case 'publish_post':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps[] = $post_type->cap->publish_posts;
-		break;
-	case 'edit_post_meta':
-	case 'delete_post_meta':
-	case 'add_post_meta':
-	case 'edit_comment_meta':
-	case 'delete_comment_meta':
-	case 'add_comment_meta':
-	case 'edit_term_meta':
-	case 'delete_term_meta':
-	case 'add_term_meta':
-	case 'edit_user_meta':
-	case 'delete_user_meta':
-	case 'add_user_meta':
-		list( $_, $object_type, $_ ) = explode( '_', $cap );
-		$object_id = (int) $args[0];
-
-		switch ( $object_type ) {
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
+
+			$caps[] = $post_type->cap->publish_posts;
+			break;
+		case 'edit_post_meta':
+		case 'delete_post_meta':
+		case 'add_post_meta':
+		case 'edit_comment_meta':
+		case 'delete_comment_meta':
+		case 'add_comment_meta':
+		case 'edit_term_meta':
+		case 'delete_term_meta':
+		case 'add_term_meta':
+		case 'edit_user_meta':
+		case 'delete_user_meta':
+		case 'add_user_meta':
+			list( $_, $object_type, $_ ) = explode( '_', $cap );
+			$object_id = (int) $args[0];
+
+			switch ( $object_type ) {
 			case 'post':
 				$post = get_post( $object_id );
 				if ( ! $post ) {
@@ -295,7 +295,7 @@ 
 
 				$sub_type = 'user';
 				break;
-		}
+			}
 
 		if ( empty( $sub_type ) ) {
 			$caps[] = 'do_not_allow';
@@ -321,183 +321,183 @@ 
 			$caps[] = $cap;
 		}
 		break;
-	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
+		case 'edit_comment':
+			$comment = get_comment( $args[0] );
+			if ( ! $comment ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$post = get_post( $comment->comment_post_ID );
+			$post = get_post( $comment->comment_post_ID );
 
-		/*
+			/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
-		}
-		break;
-	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'edit_css' :
-	case 'unfiltered_html' :
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'unfiltered_html';
-		break;
-	case 'edit_files':
-	case 'edit_plugins':
-	case 'edit_themes':
-		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'update_plugins':
-	case 'delete_plugins':
-	case 'install_plugins':
-	case 'upload_plugins':
-	case 'update_themes':
-	case 'delete_themes':
-	case 'install_themes':
-	case 'upload_themes':
-	case 'update_core':
-		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-		// Files in uploads are excepted.
-		if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
-			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
-			$caps[] = 'install_plugins';
-		} else {
-			$caps[] = $cap;
-		}
-		break;
-	case 'activate_plugins':
-		$caps[] = $cap;
-		if ( is_multisite() ) {
-			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
-		}
-		break;
-	case 'delete_user':
-	case 'delete_users':
-		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
-		break;
-	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+			if ( $post ) {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			} else {
+				$caps = map_meta_cap( 'edit_posts', $user_id );
+			}
+			break;
+		case 'unfiltered_upload':
+			if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'edit_css' :
+		case 'unfiltered_html' :
+			// Disallow unfiltered_html for all users, even admins and super admins.
+			if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'unfiltered_html';
+			break;
+		case 'edit_files':
+		case 'edit_plugins':
+		case 'edit_themes':
+			// Disallow the file editors.
+			if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+				$caps[] = 'do_not_allow';
+			elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'update_plugins':
+		case 'delete_plugins':
+		case 'install_plugins':
+		case 'upload_plugins':
+		case 'update_themes':
+		case 'delete_themes':
+		case 'install_themes':
+		case 'upload_themes':
+		case 'update_core':
+			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			// Files in uploads are excepted.
+			if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( 'upload_themes' === $cap ) {
+				$caps[] = 'install_themes';
+			} elseif ( 'upload_plugins' === $cap ) {
+				$caps[] = 'install_plugins';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'activate_plugins':
 			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'customize' :
-		$caps[] = 'edit_theme_options';
-		break;
-	case 'delete_site':
-		if ( is_multisite() ) {
-			$caps[] = 'manage_options';
-		} else {
-			$caps[] = 'do_not_allow';
-		}
-		break;
-	case 'edit_term':
-	case 'delete_term':
-	case 'assign_term':
-		$term_id = (int) $args[0];
-		$term = get_term( $term_id );
-		if ( ! $term || is_wp_error( $term ) ) {
-			$caps[] = 'do_not_allow';
+			if ( is_multisite() ) {
+				// update_, install_, and delete_ are handled above with is_super_admin().
+				$menu_perms = get_site_option( 'menu_items', array() );
+				if ( empty( $menu_perms['plugins'] ) )
+					$caps[] = 'manage_network_plugins';
+			}
 			break;
-		}
-
-		$tax = get_taxonomy( $term->taxonomy );
-		if ( ! $tax ) {
-			$caps[] = 'do_not_allow';
+		case 'delete_user':
+		case 'delete_users':
+			// If multisite only super admins can delete users.
+			if ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'delete_users'; // delete_user maps to delete_users.
 			break;
-		}
-
-		if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
-			$caps[] = 'do_not_allow';
+		case 'create_users':
+			if ( !is_multisite() )
+				$caps[] = $cap;
+			elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
 			break;
-		}
+		case 'manage_links' :
+			if ( get_option( 'link_manager_enabled' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'customize' :
+			$caps[] = 'edit_theme_options';
+			break;
+		case 'delete_site':
+			if ( is_multisite() ) {
+				$caps[] = 'manage_options';
+			} else {
+				$caps[] = 'do_not_allow';
+			}
+			break;
+		case 'edit_term':
+		case 'delete_term':
+		case 'assign_term':
+			$term_id = (int) $args[0];
+			$term = get_term( $term_id );
+			if ( ! $term || is_wp_error( $term ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$taxo_cap = $cap . 's';
+			$tax = get_taxonomy( $term->taxonomy );
+			if ( ! $tax ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+			if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		break;
-	case 'manage_post_tags':
-	case 'edit_categories':
-	case 'edit_post_tags':
-	case 'delete_categories':
-	case 'delete_post_tags':
-		$caps[] = 'manage_categories';
-		break;
-	case 'assign_categories':
-	case 'assign_post_tags':
-		$caps[] = 'edit_posts';
-		break;
-	case 'create_sites':
-	case 'delete_sites':
-	case 'manage_network':
-	case 'manage_sites':
-	case 'manage_network_users':
-	case 'manage_network_plugins':
-	case 'manage_network_themes':
-	case 'manage_network_options':
-	case 'upgrade_network':
-		$caps[] = $cap;
-		break;
-	case 'setup_network':
-		if ( is_multisite() ) {
-			$caps[] = 'manage_network_options';
-		} else {
-			$caps[] = 'manage_options';
-		}
-		break;
-	default:
-		// Handle meta capabilities for custom post types.
-		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
-		}
+			$taxo_cap = $cap . 's';
 
-		// If no meta caps match, return the original cap.
-		$caps[] = $cap;
+			$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+
+			break;
+		case 'manage_post_tags':
+		case 'edit_categories':
+		case 'edit_post_tags':
+		case 'delete_categories':
+		case 'delete_post_tags':
+			$caps[] = 'manage_categories';
+			break;
+		case 'assign_categories':
+		case 'assign_post_tags':
+			$caps[] = 'edit_posts';
+			break;
+		case 'create_sites':
+		case 'delete_sites':
+		case 'manage_network':
+		case 'manage_sites':
+		case 'manage_network_users':
+		case 'manage_network_plugins':
+		case 'manage_network_themes':
+		case 'manage_network_options':
+		case 'upgrade_network':
+			$caps[] = $cap;
+			break;
+		case 'setup_network':
+			if ( is_multisite() ) {
+				$caps[] = 'manage_network_options';
+			} else {
+				$caps[] = 'manage_options';
+			}
+			break;
+		default:
+			// Handle meta capabilities for custom post types.
+			global $post_type_meta_caps;
+			if ( isset( $post_type_meta_caps[ $cap ] ) ) {
+				$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
+				return call_user_func_array( 'map_meta_cap', $args );
+			}
+
+			// If no meta caps match, return the original cap.
+			$caps[] = $cap;
 	}
 
 	/**

Spacing +180 added lines, -180 removed lines

@@ -26,14 +26,14 @@ 
  *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
-function map_meta_cap( $cap, $user_id ) {
-	$args = array_slice( func_get_args(), 2 );
+function map_meta_cap($cap, $user_id) {
+	$args = array_slice(func_get_args(), 2);
 	$caps = array();
 
-	switch ( $cap ) {
+	switch ($cap) {
 	case 'remove_user':
 		// In multisite the user must be a super admin to remove themselves.
-		if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
+		if (isset($args[0]) && $user_id == $args[0] && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
 		} else {
 			$caps[] = 'remove_users';
@@ -46,11 +46,11 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		if ('edit_user' == $cap && isset($args[0]) && $user_id == $args[0])
 			break;
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+		if (is_multisite() && (( ! is_super_admin($user_id) && 'edit_user' === $cap && is_super_admin($args[0])) || ! user_can($user_id, 'manage_network_users'))) {
 			$caps[] = 'do_not_allow';
 		} else {
 			$caps[] = 'edit_users'; // edit_user maps to edit_users.
@@ -58,49 +58,49 @@ 
 		break;
 	case 'delete_post':
 	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
+		if ((get_option('page_for_posts') == $post->ID) || (get_option('page_on_front') == $post->ID)) {
 			$caps[] = 'manage_options';
 			break;
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
+			if ('delete_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->delete_published_posts;
 				} else {
 					$caps[] = $post_type->cap->delete_posts;
@@ -113,9 +113,9 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->delete_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_private_posts;
 			}
 		}
@@ -124,44 +124,44 @@ 
 		// edit_others_posts
 	case 'edit_post':
 	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
+			if ('edit_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->edit_published_posts;
 				} else {
 					$caps[] = $post_type->cap->edit_posts;
@@ -174,70 +174,70 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->edit_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_private_posts;
 			}
 		}
 		break;
 	case 'read_post':
 	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
+			if ('read_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
+		$status_obj = get_post_status_object($post->post_status);
+		if ($status_obj->public) {
 			$caps[] = $post_type->cap->read;
 			break;
 		}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
+		} elseif ($status_obj->private) {
 			$caps[] = $post_type->cap->read_private_posts;
 		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		}
 		break;
 	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
@@ -256,31 +256,31 @@ 
 	case 'edit_user_meta':
 	case 'delete_user_meta':
 	case 'add_user_meta':
-		list( $_, $object_type, $_ ) = explode( '_', $cap );
+		list($_, $object_type, $_) = explode('_', $cap);
 		$object_id = (int) $args[0];
 
-		switch ( $object_type ) {
+		switch ($object_type) {
 			case 'post':
-				$post = get_post( $object_id );
-				if ( ! $post ) {
+				$post = get_post($object_id);
+				if ( ! $post) {
 					break;
 				}
 
-				$sub_type = get_post_type( $post );
+				$sub_type = get_post_type($post);
 				break;
 
 			case 'comment':
-				$comment = get_comment( $object_id );
-				if ( ! $comment ) {
+				$comment = get_comment($object_id);
+				if ( ! $comment) {
 					break;
 				}
 
-				$sub_type = empty( $comment->comment_type ) ? 'comment' : $comment->comment_type;
+				$sub_type = empty($comment->comment_type) ? 'comment' : $comment->comment_type;
 				break;
 
 			case 'term':
-				$term = get_term( $object_id );
-				if ( ! $term ) {
+				$term = get_term($object_id);
+				if ( ! $term) {
 					break;
 				}
 
@@ -288,8 +288,8 @@ 
 				break;
 
 			case 'user':
-				$user = get_user_by( 'id', $object_id );
-				if ( ! $user ) {
+				$user = get_user_by('id', $object_id);
+				if ( ! $user) {
 					break;
 				}
 
@@ -297,51 +297,51 @@ 
 				break;
 		}
 
-		if ( empty( $sub_type ) ) {
+		if (empty($sub_type)) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$caps = map_meta_cap( "edit_{$object_type}", $user_id, $object_id );
+		$caps = map_meta_cap("edit_{$object_type}", $user_id, $object_id);
 
-		$meta_key = isset( $args[1] ) ? $args[1] : false;
+		$meta_key = isset($args[1]) ? $args[1] : false;
 
-		$has_filter = has_filter( "auth_{$object_type}_meta_{$meta_key}" ) || has_filter( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}" );
-		if ( $meta_key && $has_filter ) {
+		$has_filter = has_filter("auth_{$object_type}_meta_{$meta_key}") || has_filter("auth_{$object_type}_{$sub_type}_meta_{$meta_key}");
+		if ($meta_key && $has_filter) {
 			/** This filter is documented in wp-includes/meta.php */
-			$allowed = apply_filters( "auth_{$object_type}_meta_{$meta_key}", false, $meta_key, $object_id, $user_id, $cap, $caps );
+			$allowed = apply_filters("auth_{$object_type}_meta_{$meta_key}", false, $meta_key, $object_id, $user_id, $cap, $caps);
 
 			/** This filter is documented in wp-includes/meta.php */
-			$allowed = apply_filters( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps );
+			$allowed = apply_filters("auth_{$object_type}_{$sub_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps);
 
-			if ( ! $allowed ) {
+			if ( ! $allowed) {
 				$caps[] = $cap;
 			}
-		} elseif ( $meta_key && is_protected_meta( $meta_key, $object_type ) ) {
+		} elseif ($meta_key && is_protected_meta($meta_key, $object_type)) {
 			$caps[] = $cap;
 		}
 		break;
 	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
+		$comment = get_comment($args[0]);
+		if ( ! $comment) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post = get_post( $comment->comment_post_ID );
+		$post = get_post($comment->comment_post_ID);
 
 		/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		if ($post) {
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
+			$caps = map_meta_cap('edit_posts', $user_id);
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+		if (defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin($user_id)))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -349,9 +349,9 @@ 
 	case 'edit_css' :
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+		if (defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'unfiltered_html';
@@ -360,11 +360,11 @@ 
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+		if (defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT)
 			$caps[] = 'do_not_allow';
-		elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) )
+		elseif ( ! wp_is_file_mod_allowed('capability_edit_themes'))
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -380,13 +380,13 @@ 
 	case 'update_core':
 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
 		// Files in uploads are excepted.
-		if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
+		if ( ! wp_is_file_mod_allowed('capability_update_core')) {
 			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+		} elseif (is_multisite() && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
+		} elseif ('upload_themes' === $cap) {
 			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
+		} elseif ('upload_plugins' === $cap) {
 			$caps[] = 'install_plugins';
 		} else {
 			$caps[] = $cap;
@@ -394,31 +394,31 @@ 
 		break;
 	case 'activate_plugins':
 		$caps[] = $cap;
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
+			$menu_perms = get_site_option('menu_items', array());
+			if (empty($menu_perms['plugins']))
 				$caps[] = 'manage_network_plugins';
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
+		if (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'delete_users'; // delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
+		if ( ! is_multisite())
 			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+		elseif (is_super_admin($user_id) || get_site_option('add_new_users'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+		if (get_option('link_manager_enabled'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -427,7 +427,7 @@ 
 		$caps[] = 'edit_theme_options';
 		break;
 	case 'delete_site':
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$caps[] = 'manage_options';
 		} else {
 			$caps[] = 'do_not_allow';
@@ -437,26 +437,26 @@ 
 	case 'delete_term':
 	case 'assign_term':
 		$term_id = (int) $args[0];
-		$term = get_term( $term_id );
-		if ( ! $term || is_wp_error( $term ) ) {
+		$term = get_term($term_id);
+		if ( ! $term || is_wp_error($term)) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$tax = get_taxonomy( $term->taxonomy );
-		if ( ! $tax ) {
+		$tax = get_taxonomy($term->taxonomy);
+		if ( ! $tax) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
+		if ('delete_term' === $cap && ($term->term_id == get_option('default_'.$term->taxonomy))) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$taxo_cap = $cap . 's';
+		$taxo_cap = $cap.'s';
 
-		$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+		$caps = map_meta_cap($tax->cap->$taxo_cap, $user_id, $term_id);
 
 		break;
 	case 'manage_post_tags':
@@ -482,7 +482,7 @@ 
 		$caps[] = $cap;
 		break;
 	case 'setup_network':
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$caps[] = 'manage_network_options';
 		} else {
 			$caps[] = 'manage_options';
@@ -491,9 +491,9 @@ 
 	default:
 		// Handle meta capabilities for custom post types.
 		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
+		if (isset($post_type_meta_caps[$cap])) {
+			$args = array_merge(array($post_type_meta_caps[$cap], $user_id), $args);
+			return call_user_func_array('map_meta_cap', $args);
 		}
 
 		// If no meta caps match, return the original cap.
@@ -510,7 +510,7 @@ 
 	 * @param int    $user_id The user ID.
 	 * @param array  $args    Adds the context to the cap. Typically the object ID.
 	 */
-	return apply_filters( 'map_meta_cap', $caps, $cap, $user_id, $args );
+	return apply_filters('map_meta_cap', $caps, $cap, $user_id, $args);
 }
 
 /**
@@ -535,16 +535,16 @@ 
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */
-function current_user_can( $capability ) {
+function current_user_can($capability) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
+	if (empty($current_user))
 		return false;
 
-	$args = array_slice( func_get_args(), 1 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 1);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	return call_user_func_array(array($current_user, 'has_cap'), $args);
 }
 
 /**
@@ -556,24 +556,24 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function current_user_can_for_blog( $blog_id, $capability ) {
-	$switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
+function current_user_can_for_blog($blog_id, $capability) {
+	$switched = is_multisite() ? switch_to_blog($blog_id) : false;
 
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) ) {
-		if ( $switched ) {
+	if (empty($current_user)) {
+		if ($switched) {
 			restore_current_blog();
 		}
 		return false;
 	}
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	$can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	$can = call_user_func_array(array($current_user, 'has_cap'), $args);
 
-	if ( $switched ) {
+	if ($switched) {
 		restore_current_blog();
 	}
 
@@ -589,19 +589,19 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
+function author_can($post, $capability) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( ! $author )
+	if ( ! $author)
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $author, 'has_cap' ), $args );
+	return call_user_func_array(array($author, 'has_cap'), $args);
 }
 
 /**
@@ -613,17 +613,17 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+function user_can($user, $capability) {
+	if ( ! is_object($user))
+		$user = get_userdata($user);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $user, 'has_cap' ), $args );
+	return call_user_func_array(array($user, 'has_cap'), $args);
 }
 
 /**
@@ -638,7 +638,7 @@ 
 function wp_roles() {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) ) {
+	if ( ! isset($wp_roles)) {
 		$wp_roles = new WP_Roles();
 	}
 	return $wp_roles;
@@ -652,8 +652,8 @@ 
  * @param string $role Role name.
  * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
-function get_role( $role ) {
-	return wp_roles()->get_role( $role );
+function get_role($role) {
+	return wp_roles()->get_role($role);
 }
 
 /**
@@ -666,11 +666,11 @@ 
  * @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
-function add_role( $role, $display_name, $capabilities = array() ) {
-	if ( empty( $role ) ) {
+function add_role($role, $display_name, $capabilities = array()) {
+	if (empty($role)) {
 		return;
 	}
-	return wp_roles()->add_role( $role, $display_name, $capabilities );
+	return wp_roles()->add_role($role, $display_name, $capabilities);
 }
 
 /**
@@ -680,8 +680,8 @@ 
  *
  * @param string $role Role name.
  */
-function remove_role( $role ) {
-	wp_roles()->remove_role( $role );
+function remove_role($role) {
+	wp_roles()->remove_role($role);
 }
 
 /**
@@ -696,10 +696,10 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
+	if (isset($super_admins))
 		return $super_admins;
 	else
-		return get_site_option( 'site_admins', array('admin') );
+		return get_site_option('site_admins', array('admin'));
 }
 
 /**
@@ -710,21 +710,21 @@ 
  * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
  * @return bool True if the user is a site admin.
  */
-function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
+function is_super_admin($user_id = false) {
+	if ( ! $user_id || $user_id == get_current_user_id())
 		$user = wp_get_current_user();
 	else
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
+		if (is_array($super_admins) && in_array($user->user_login, $super_admins))
 			return true;
 	} else {
-		if ( $user->has_cap('delete_users') )
+		if ($user->has_cap('delete_users'))
 			return true;
 	}
 
@@ -742,9 +742,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user is
  *              already a super admin or when the `$super_admins` global is defined.
  */
-function grant_super_admin( $user_id ) {
+function grant_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) || ! is_multisite() ) {
+	if (isset($GLOBALS['super_admins']) || ! is_multisite()) {
 		return false;
 	}
 
@@ -755,15 +755,15 @@ 
 	 *
 	 * @param int $user_id ID of the user that is about to be granted Super Admin privileges.
 	 */
-	do_action( 'grant_super_admin', $user_id );
+	do_action('grant_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
+	$user = get_userdata($user_id);
+	if ($user && ! in_array($user->user_login, $super_admins)) {
 		$super_admins[] = $user->user_login;
-		update_site_option( 'site_admins' , $super_admins );
+		update_site_option('site_admins', $super_admins);
 
 		/**
 		 * Fires after the user is granted Super Admin privileges.
@@ -772,7 +772,7 @@ 
 		 *
 		 * @param int $user_id ID of the user that was granted Super Admin privileges.
 		 */
-		do_action( 'granted_super_admin', $user_id );
+		do_action('granted_super_admin', $user_id);
 		return true;
 	}
 	return false;
@@ -789,9 +789,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user's email
  *              is the network admin email or when the `$super_admins` global is defined.
  */
-function revoke_super_admin( $user_id ) {
+function revoke_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) || ! is_multisite() ) {
+	if (isset($GLOBALS['super_admins']) || ! is_multisite()) {
 		return false;
 	}
 
@@ -802,16 +802,16 @@ 
 	 *
 	 * @param int $user_id ID of the user Super Admin privileges are being revoked from.
 	 */
-	do_action( 'revoke_super_admin', $user_id );
+	do_action('revoke_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
-		if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
-			unset( $super_admins[$key] );
-			update_site_option( 'site_admins', $super_admins );
+	$user = get_userdata($user_id);
+	if ($user && 0 !== strcasecmp($user->user_email, get_site_option('admin_email'))) {
+		if (false !== ($key = array_search($user->user_login, $super_admins))) {
+			unset($super_admins[$key]);
+			update_site_option('site_admins', $super_admins);
 
 			/**
 			 * Fires after the user's Super Admin privileges are revoked.
@@ -820,7 +820,7 @@ 
 			 *
 			 * @param int $user_id ID of the user Super Admin privileges were revoked from.
 			 */
-			do_action( 'revoked_super_admin', $user_id );
+			do_action('revoked_super_admin', $user_id);
 			return true;
 		}
 	}

Braces +89 added lines, -67 removed lines

@@ -46,8 +46,9 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
-			break;
+		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {
+					break;
+		}
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
 		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
@@ -88,8 +89,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'delete_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -149,8 +151,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'edit_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -208,8 +211,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'read_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -341,33 +345,36 @@ 
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'edit_css' :
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'unfiltered_html';
+		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'unfiltered_html';
+		}
 		break;
 	case 'edit_files':
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
+		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = $cap;
+		}
 		break;
 	case 'update_plugins':
 	case 'delete_plugins':
@@ -397,31 +404,36 @@ 
 		if ( is_multisite() ) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
 			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
+			if ( empty( $menu_perms['plugins'] ) ) {
+							$caps[] = 'manage_network_plugins';
+			}
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
+		if ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'delete_users';
+		}
+		// delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( !is_multisite() ) {
+					$caps[] = $cap;
+		} elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( get_option( 'link_manager_enabled' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'customize' :
 		$caps[] = 'edit_theme_options';
@@ -538,8 +550,9 @@ 
 function current_user_can( $capability ) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
-		return false;
+	if ( empty( $current_user ) ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	$args = array_merge( array( $capability ), $args );
@@ -590,13 +603,15 @@ 
  * @return bool
  */
 function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
-		return false;
+	if ( !$post = get_post($post) ) {
+			return false;
+	}
 
 	$author = get_userdata( $post->post_author );
 
-	if ( ! $author )
-		return false;
+	if ( ! $author ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -614,11 +629,13 @@ 
  * @return bool
  */
 function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+	if ( ! is_object( $user ) ) {
+			$user = get_userdata( $user );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -696,11 +713,12 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
-		return $super_admins;
-	else
-		return get_site_option( 'site_admins', array('admin') );
-}
+	if ( isset($super_admins) ) {
+			return $super_admins;
+	} else {
+			return get_site_option( 'site_admins', array('admin') );
+	}
+	}
 
 /**
  * Determine if user is a site admin.
@@ -711,21 +729,25 @@ 
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
-		$user = wp_get_current_user();
-	else
-		$user = get_userdata( $user_id );
+	if ( ! $user_id || $user_id == get_current_user_id() ) {
+			$user = wp_get_current_user();
+	} else {
+			$user = get_userdata( $user_id );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	if ( is_multisite() ) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
-			return true;
+		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) ) {
+					return true;
+		}
 	} else {
-		if ( $user->has_cap('delete_users') )
-			return true;
+		if ( $user->has_cap('delete_users') ) {
+					return true;
+		}
 	}
 
 	return false;

src/wp-includes/class-http.php

Doc Comments +2 added lines, -2 removed lines

@@ -522,7 +522,7 @@ 
 	 * @since 2.7.0
 	 *
 	 * @param string $strResponse The full response string
-	 * @return array Array with 'headers' and 'body' keys.
+	 * @return string Array with 'headers' and 'body' keys.
 	 */
 	public static function processResponse($strResponse) {
 		$res = explode("\r\n\r\n", $strResponse, 2);
@@ -542,7 +542,7 @@ 
 	 *
 	 * @param string|array $headers
 	 * @param string $url The URL that was requested
-	 * @return array Processed string headers. If duplicate headers are encountered,
+	 * @return string Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
 	public static function processHeaders( $headers, $url = '' ) {

Braces +97 added lines, -66 removed lines

@@ -212,8 +212,9 @@ 
 		$args = wp_parse_args( $args );
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
-			$defaults['redirection'] = 0;
+		if ( isset($args['method']) && 'HEAD' == $args['method'] ) {
+					$defaults['redirection'] = 0;
+		}
 
 		$r = wp_parse_args( $args, $defaults );
 		/**
@@ -227,8 +228,9 @@ 
 		$r = apply_filters( 'http_request_args', $r, $url );
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
-			$r['_redirection'] = $r['redirection'];
+		if ( ! isset( $r['_redirection'] ) ) {
+					$r['_redirection'] = $r['redirection'];
+		}
 
 		/**
 		 * Filters whether to preempt an HTTP request's return value.
@@ -250,8 +252,9 @@ 
 		 */
 		$pre = apply_filters( 'pre_http_request', false, $r, $url );
 
-		if ( false !== $pre )
-			return $pre;
+		if ( false !== $pre ) {
+					return $pre;
+		}
 
 		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
 			if ( $r['reject_unsafe_urls'] ) {
@@ -371,8 +374,7 @@ 
 
 			// Add the original object to the array.
 			$response['http_response'] = $http_response;
-		}
-		catch ( Requests_Exception $e ) {
+		} catch ( Requests_Exception $e ) {
 			$response = new WP_Error( 'http_request_failed', $e->getMessage() );
 		}
 
@@ -498,8 +500,9 @@ 
 			$class = 'WP_Http_' . $transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
-				continue;
+			if ( !call_user_func( array( $class, 'test' ), $args, $url ) ) {
+							continue;
+			}
 
 			return $class;
 		}
@@ -528,20 +531,23 @@ 
 		static $transports = array();
 
 		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		if ( !$class ) {
+					return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		}
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
-			$transports[$class] = new $class;
+		if ( empty( $transports[$class] ) ) {
+					$transports[$class] = new $class;
+		}
 
 		$response = $transports[$class]->request( $url, $args );
 
 		/** This action is documented in wp-includes/class-http.php */
 		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
 
-		if ( is_wp_error( $response ) )
-			return $response;
+		if ( is_wp_error( $response ) ) {
+					return $response;
+		}
 
 		/**
 		 * Filters the HTTP API response immediately before the response is returned.
@@ -670,8 +676,9 @@ 
 		$cookies = array();
 		$newheaders = array();
 		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
-				continue;
+			if ( empty($tempheader) ) {
+							continue;
+			}
 
 			if ( false === strpos($tempheader, ':') ) {
 				$stack = explode(' ', $tempheader, 3);
@@ -686,14 +693,16 @@ 
 			$value = trim( $value );
 
 			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
+				if ( ! is_array( $newheaders[ $key ] ) ) {
+									$newheaders[$key] = array( $newheaders[ $key ] );
+				}
 				$newheaders[ $key ][] = $value;
 			} else {
 				$newheaders[ $key ] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ( 'set-cookie' == $key ) {
+							$cookies[] = new WP_Http_Cookie( $value, $url );
+			}
 		}
 
 		// Cast the Response Code to an int
@@ -719,8 +728,9 @@ 
 		if ( ! empty($r['cookies']) ) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
 			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				if ( ! is_object( $value ) ) {
+									$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				}
 			}
 
 			$cookies_header = '';
@@ -749,8 +759,9 @@ 
 	 */
 	public static function chunkTransferDecode( $body ) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
-			return $body;
+		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) ) {
+					return $body;
+		}
 
 		$parsed_body = '';
 
@@ -759,8 +770,9 @@ 
 
 		while ( true ) {
 			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
-				return $body_original;
+			if ( ! $has_chunk || empty( $match[1] ) ) {
+							return $body_original;
+			}
 
 			$length = hexdec( $match[1] );
 			$chunk_length = strlen( $match[0] );
@@ -772,8 +784,9 @@ 
 			$body = substr( $body, $length + $chunk_length );
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
-				return $parsed_body;
+			if ( '0' === trim( $body ) ) {
+							return $parsed_body;
+			}
 		}
 	}
 
@@ -801,12 +814,14 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
-			return false;
+		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) {
+					return false;
+		}
 
 		$check = parse_url($uri);
-		if ( ! $check )
-			return true;
+		if ( ! $check ) {
+					return true;
+		}
 
 		$home = parse_url( get_option('siteurl') );
 
@@ -823,8 +838,9 @@ 
 			return apply_filters( 'block_local_requests', false );
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
-			return true;
+		if ( !defined('WP_ACCESSIBLE_HOSTS') ) {
+					return true;
+		}
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
@@ -833,16 +849,19 @@ 
 
 			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				foreach ( $accessible_hosts as $host ) {
+									$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				}
 				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+		if ( !empty($wildcard_regex) ) {
+					return !preg_match($wildcard_regex, $check['host']);
+		} else {
+					return !in_array( $check['host'], $accessible_hosts );
+		}
+		//Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -877,8 +896,9 @@ 
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
 	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
-			return $maybe_relative_path;
+		if ( empty( $url ) ) {
+					return $maybe_relative_path;
+		}
 
 		if ( ! $url_parts = wp_parse_url( $url ) ) {
 			return $maybe_relative_path;
@@ -898,12 +918,14 @@ 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
 		if ( isset( $relative_url_parts['host'] ) ) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if ( isset( $relative_url_parts['port'] ) ) {
+							$absolute_path .= ':' . $relative_url_parts['port'];
+			}
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if ( isset( $url_parts['port'] ) ) {
+							$absolute_path .= ':' . $url_parts['port'];
+			}
 		}
 
 		// Start off with the Absolute URL path.
@@ -931,8 +953,9 @@ 
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty( $relative_url_parts['query'] ) ) {
+					$path .= '?' . $relative_url_parts['query'];
+		}
 
 		return $absolute_path . '/' . ltrim( $path, '/' );
 	}
@@ -951,36 +974,42 @@ 
 	 */
 	public static function handle_redirects( $url, $args, $response ) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
-			return false;
+		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) {
+					return false;
+		}
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
-			return false;
+		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 ) {
+					return false;
+		}
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ( $args['redirection']-- <= 0 ) {
+					return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		}
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if ( is_array( $redirect_location ) ) {
+					$redirect_location = array_pop( $redirect_location );
+		}
 
 		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
 
 		// POST requests should not POST to a redirected location.
 		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
-				$args['method'] = 'GET';
+			if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) {
+							$args['method'] = 'GET';
+			}
 		}
 
 		// Include valid cookies in the redirect process.
 		if ( ! empty( $response['cookies'] ) ) {
 			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
-					$args['cookies'][] = $cookie;
+				if ( $cookie->test( $redirect_location ) ) {
+									$args['cookies'][] = $cookie;
+				}
 			}
 		}
 
@@ -1004,11 +1033,13 @@ 
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
 	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
-			return 4;
+		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) {
+					return 4;
+		}
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
-			return 6;
+		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
+					return 6;
+		}
 
 		return false;
 	}

Spacing +179 added lines, -179 removed lines

@@ -7,11 +7,11 @@ 
  * @since 2.7.0
  */
 
-if ( ! class_exists( 'Requests' ) ) {
-	require( ABSPATH . WPINC . '/class-requests.php' );
+if ( ! class_exists('Requests')) {
+	require(ABSPATH.WPINC.'/class-requests.php');
 
 	Requests::register_autoloader();
-	Requests::set_certificate_path( ABSPATH . WPINC . '/certificates/ca-bundle.crt' );
+	Requests::set_certificate_path(ABSPATH.WPINC.'/certificates/ca-bundle.crt');
 }
 
 /**
@@ -145,7 +145,7 @@ 
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'.
 	 *                        A WP_Error instance upon error.
 	 */
-	public function request( $url, $args = array() ) {
+	public function request($url, $args = array()) {
 		$defaults = array(
 			'method' => 'GET',
 			/**
@@ -156,7 +156,7 @@ 
 			 * @param int $timeout_value Time in seconds until a request times out.
 			 *                           Default 5.
 			 */
-			'timeout' => apply_filters( 'http_request_timeout', 5 ),
+			'timeout' => apply_filters('http_request_timeout', 5),
 			/**
 			 * Filters the number of redirects allowed during an HTTP request.
 			 *
@@ -164,7 +164,7 @@ 
 			 *
 			 * @param int $redirect_count Number of redirects allowed. Default 5.
 			 */
-			'redirection' => apply_filters( 'http_request_redirection_count', 5 ),
+			'redirection' => apply_filters('http_request_redirection_count', 5),
 			/**
 			 * Filters the version of the HTTP protocol used in a request.
 			 *
@@ -173,7 +173,7 @@ 
 			 * @param string $version Version of HTTP used. Accepts '1.0' and '1.1'.
 			 *                        Default '1.0'.
 			 */
-			'httpversion' => apply_filters( 'http_request_version', '1.0' ),
+			'httpversion' => apply_filters('http_request_version', '1.0'),
 			/**
 			 * Filters the user agent value sent with an HTTP request.
 			 *
@@ -181,7 +181,7 @@ 
 			 *
 			 * @param string $user_agent WordPress user agent string.
 			 */
-			'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) ),
+			'user-agent' => apply_filters('http_headers_useragent', 'WordPress/'.get_bloginfo('version').'; '.get_bloginfo('url')),
 			/**
 			 * Filters whether to pass URLs through wp_http_validate_url() in an HTTP request.
 			 *
@@ -190,7 +190,7 @@ 
 			 * @param bool $pass_url Whether to pass URLs through wp_http_validate_url().
 			 *                       Default false.
 			 */
-			'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ),
+			'reject_unsafe_urls' => apply_filters('http_request_reject_unsafe_urls', false),
 			'blocking' => true,
 			'headers' => array(),
 			'cookies' => array(),
@@ -198,20 +198,20 @@ 
 			'compress' => false,
 			'decompress' => true,
 			'sslverify' => true,
-			'sslcertificates' => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
+			'sslcertificates' => ABSPATH.WPINC.'/certificates/ca-bundle.crt',
 			'stream' => false,
 			'filename' => null,
 			'limit_response_size' => null,
 		);
 
 		// Pre-parse for the HEAD checks.
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
+		if (isset($args['method']) && 'HEAD' == $args['method'])
 			$defaults['redirection'] = 0;
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		/**
 		 * Filters the arguments used in an HTTP request.
 		 *
@@ -220,10 +220,10 @@ 
 		 * @param array  $r   An array of HTTP request arguments.
 		 * @param string $url The request URL.
 		 */
-		$r = apply_filters( 'http_request_args', $r, $url );
+		$r = apply_filters('http_request_args', $r, $url);
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
+		if ( ! isset($r['_redirection']))
 			$r['_redirection'] = $r['redirection'];
 
 		/**
@@ -244,51 +244,51 @@ 
 		 * @param array               $r        HTTP request arguments.
 		 * @param string              $url      The request URL.
 		 */
-		$pre = apply_filters( 'pre_http_request', false, $r, $url );
+		$pre = apply_filters('pre_http_request', false, $r, $url);
 
-		if ( false !== $pre )
+		if (false !== $pre)
 			return $pre;
 
-		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-			if ( $r['reject_unsafe_urls'] ) {
-				$url = wp_http_validate_url( $url );
+		if (function_exists('wp_kses_bad_protocol')) {
+			if ($r['reject_unsafe_urls']) {
+				$url = wp_http_validate_url($url);
 			}
-			if ( $url ) {
-				$url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+			if ($url) {
+				$url = wp_kses_bad_protocol($url, array('http', 'https', 'ssl'));
 			}
 		}
 
-		$arrURL = @parse_url( $url );
+		$arrURL = @parse_url($url);
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
+		if (empty($url) || empty($arrURL['scheme'])) {
 			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
 		}
 
-		if ( $this->block_request( $url ) ) {
-			return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		if ($this->block_request($url)) {
+			return new WP_Error('http_request_failed', __('User has blocked requests through HTTP.'));
 		}
 
 		// If we are streaming to a file but no filename was given drop it in the WP temp dir
 		// and pick its name using the basename of the $url
-		if ( $r['stream'] ) {
-			if ( empty( $r['filename'] ) ) {
-				$r['filename'] = get_temp_dir() . basename( $url );
+		if ($r['stream']) {
+			if (empty($r['filename'])) {
+				$r['filename'] = get_temp_dir().basename($url);
 			}
 
 			// Force some settings if we are streaming to a file and check for existence and perms of destination directory
 			$r['blocking'] = true;
-			if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
-				return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			if ( ! wp_is_writable(dirname($r['filename']))) {
+				return new WP_Error('http_request_failed', __('Destination directory for file streaming does not exist or is not writable.'));
 			}
 		}
 
-		if ( is_null( $r['headers'] ) ) {
+		if (is_null($r['headers'])) {
 			$r['headers'] = array();
 		}
 
 		// WP allows passing in headers as a string, weirdly.
-		if ( ! is_array( $r['headers'] ) ) {
-			$processedHeaders = WP_Http::processHeaders( $r['headers'] );
+		if ( ! is_array($r['headers'])) {
+			$processedHeaders = WP_Http::processHeaders($r['headers']);
 			$r['headers'] = $processedHeaders['headers'];
 		}
 
@@ -300,38 +300,38 @@ 
 			'timeout' => $r['timeout'],
 			'useragent' => $r['user-agent'],
 			'blocking' => $r['blocking'],
-			'hooks' => new WP_HTTP_Requests_Hooks( $url, $r ),
+			'hooks' => new WP_HTTP_Requests_Hooks($url, $r),
 		);
 
 		// Ensure redirects follow browser behaviour.
-		$options['hooks']->register( 'requests.before_redirect', array( get_class(), 'browser_redirect_compatibility' ) );
+		$options['hooks']->register('requests.before_redirect', array(get_class(), 'browser_redirect_compatibility'));
 
 		// Validate redirected URLs.
-		if ( function_exists( 'wp_kses_bad_protocol' ) && $r['reject_unsafe_urls'] ) {
-			$options['hooks']->register( 'requests.before_redirect', array( get_class(), 'validate_redirects' ) );
+		if (function_exists('wp_kses_bad_protocol') && $r['reject_unsafe_urls']) {
+			$options['hooks']->register('requests.before_redirect', array(get_class(), 'validate_redirects'));
 		}
 
-		if ( $r['stream'] ) {
+		if ($r['stream']) {
 			$options['filename'] = $r['filename'];
 		}
-		if ( empty( $r['redirection'] ) ) {
+		if (empty($r['redirection'])) {
 			$options['follow_redirects'] = false;
 		} else {
 			$options['redirects'] = $r['redirection'];
 		}
 
 		// Use byte limit, if we can
-		if ( isset( $r['limit_response_size'] ) ) {
+		if (isset($r['limit_response_size'])) {
 			$options['max_bytes'] = $r['limit_response_size'];
 		}
 
 		// If we've got cookies, use and convert them to Requests_Cookie.
-		if ( ! empty( $r['cookies'] ) ) {
-			$options['cookies'] = WP_Http::normalize_cookies( $r['cookies'] );
+		if ( ! empty($r['cookies'])) {
+			$options['cookies'] = WP_Http::normalize_cookies($r['cookies']);
 		}
 
 		// SSL certificate handling
-		if ( ! $r['sslverify'] ) {
+		if ( ! $r['sslverify']) {
 			$options['verify'] = false;
 			$options['verifyname'] = false;
 		} else {
@@ -339,7 +339,7 @@ 
 		}
 
 		// All non-GET/HEAD requests should put the arguments in the form body.
-		if ( 'HEAD' !== $type && 'GET' !== $type ) {
+		if ('HEAD' !== $type && 'GET' !== $type) {
 			$options['data_format'] = 'body';
 		}
 
@@ -350,14 +350,14 @@ 
 		 *
 		 * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
 		 */
-		$options['verify'] = apply_filters( 'https_ssl_verify', $options['verify'] );
+		$options['verify'] = apply_filters('https_ssl_verify', $options['verify']);
 
 		// Check for proxies.
 		$proxy = new WP_HTTP_Proxy();
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
-			$options['proxy'] = new Requests_Proxy_HTTP( $proxy->host() . ':' . $proxy->port() );
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) {
+			$options['proxy'] = new Requests_Proxy_HTTP($proxy->host().':'.$proxy->port());
 
-			if ( $proxy->use_authentication() ) {
+			if ($proxy->use_authentication()) {
 				$options['proxy']->use_authentication = true;
 				$options['proxy']->user = $proxy->username();
 				$options['proxy']->pass = $proxy->password();
@@ -368,17 +368,17 @@ 
 		mbstring_binary_safe_encoding();
 
 		try {
-			$requests_response = Requests::request( $url, $headers, $data, $type, $options );
+			$requests_response = Requests::request($url, $headers, $data, $type, $options);
 
 			// Convert the response into an array
-			$http_response = new WP_HTTP_Requests_Response( $requests_response, $r['filename'] );
+			$http_response = new WP_HTTP_Requests_Response($requests_response, $r['filename']);
 			$response = $http_response->to_array();
 
 			// Add the original object to the array.
 			$response['http_response'] = $http_response;
 		}
-		catch ( Requests_Exception $e ) {
-			$response = new WP_Error( 'http_request_failed', $e->getMessage() );
+		catch (Requests_Exception $e) {
+			$response = new WP_Error('http_request_failed', $e->getMessage());
 		}
 
 		reset_mbstring_encoding();
@@ -394,12 +394,12 @@ 
 		 * @param array          $args     HTTP request arguments.
 		 * @param string         $url      The request URL.
 		 */
-		do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
-		if ( is_wp_error( $response ) ) {
+		do_action('http_api_debug', $response, 'response', 'Requests', $r, $url);
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
-		if ( ! $r['blocking'] ) {
+		if ( ! $r['blocking']) {
 			return array(
 				'headers' => array(),
 				'body' => '',
@@ -421,7 +421,7 @@ 
 		 * @param array  $r        HTTP request arguments.
 		 * @param string $url      The request URL.
 		 */
-		return apply_filters( 'http_response', $response, $r, $url );
+		return apply_filters('http_response', $response, $r, $url);
 	}
 
 	/**
@@ -434,14 +434,14 @@ 
 	 * @param array $cookies List of cookies to send with the request.
 	 * @return Requests_Cookie_Jar Cookie holder object.
 	 */
-	public static function normalize_cookies( $cookies ) {
+	public static function normalize_cookies($cookies) {
 		$cookie_jar = new Requests_Cookie_Jar();
 
-		foreach ( $cookies as $name => $value ) {
-			if ( $value instanceof WP_Http_Cookie ) {
-				$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes() );
-			} elseif ( is_scalar( $value ) ) {
-				$cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
+		foreach ($cookies as $name => $value) {
+			if ($value instanceof WP_Http_Cookie) {
+				$cookie_jar[$value->name] = new Requests_Cookie($value->name, $value->value, $value->get_attributes());
+			} elseif (is_scalar($value)) {
+				$cookie_jar[$name] = new Requests_Cookie($name, $value);
 			}
 		}
 
@@ -464,9 +464,9 @@ 
 	 * @param array             $options  Redirect request options.
 	 * @param Requests_Response $original Response object.
 	 */
-	public static function browser_redirect_compatibility( $location, $headers, $data, &$options, $original ) {
+	public static function browser_redirect_compatibility($location, $headers, $data, &$options, $original) {
 		// Browser compat
-		if ( $original->status_code === 302 ) {
+		if ($original->status_code === 302) {
 			$options['type'] = Requests::GET;
 		}
 	}
@@ -479,9 +479,9 @@ 
 	 * @throws Requests_Exception On unsuccessful URL validation
 	 * @param string $location URL to redirect to.
 	 */
-	public static function validate_redirects( $location ) {
-		if ( ! wp_http_validate_url( $location ) ) {
-			throw new Requests_Exception( __('A valid URL was not provided.'), 'wp_http.redirect_failed_validation' );
+	public static function validate_redirects($location) {
+		if ( ! wp_http_validate_url($location)) {
+			throw new Requests_Exception(__('A valid URL was not provided.'), 'wp_http.redirect_failed_validation');
 		}
 	}
 
@@ -496,8 +496,8 @@ 
 	 *
 	 * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
 	 */
-	public function _get_first_available_transport( $args, $url = null ) {
-		$transports = array( 'curl', 'streams' );
+	public function _get_first_available_transport($args, $url = null) {
+		$transports = array('curl', 'streams');
 
 		/**
 		 * Filters which HTTP transports are available and in what order.
@@ -509,17 +509,17 @@ 
 		 * @param array  $args       HTTP request arguments.
 		 * @param string $url        The URL to request.
 		 */
-		$request_order = apply_filters( 'http_api_transports', $transports, $args, $url );
+		$request_order = apply_filters('http_api_transports', $transports, $args, $url);
 
 		// Loop over each transport on each HTTP request looking for one which will serve this request's needs.
-		foreach ( $request_order as $transport ) {
-			if ( in_array( $transport, $transports ) ) {
-				$transport = ucfirst( $transport );
+		foreach ($request_order as $transport) {
+			if (in_array($transport, $transports)) {
+				$transport = ucfirst($transport);
 			}
-			$class = 'WP_Http_' . $transport;
+			$class = 'WP_Http_'.$transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
+			if ( ! call_user_func(array($class, 'test'), $args, $url))
 				continue;
 
 			return $class;
@@ -545,23 +545,23 @@ 
 	 * @param array $args Request arguments
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	private function _dispatch_request( $url, $args ) {
+	private function _dispatch_request($url, $args) {
 		static $transports = array();
 
-		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		$class = $this->_get_first_available_transport($args, $url);
+		if ( ! $class)
+			return new WP_Error('http_failure', __('There are no HTTP transports available which can complete the requested request.'));
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
+		if (empty($transports[$class]))
 			$transports[$class] = new $class;
 
-		$response = $transports[$class]->request( $url, $args );
+		$response = $transports[$class]->request($url, $args);
 
 		/** This action is documented in wp-includes/class-http.php */
-		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
+		do_action('http_api_debug', $response, 'response', $class, $args, $url);
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return $response;
 
 		/**
@@ -573,7 +573,7 @@ 
 		 * @param array  $args     HTTP request arguments.
 		 * @param string $url      The request URL.
 		 */
-		return apply_filters( 'http_response', $response, $args, $url );
+		return apply_filters('http_response', $response, $args, $url);
 	}
 
 	/**
@@ -590,7 +590,7 @@ 
 	 */
 	public function post($url, $args = array()) {
 		$defaults = array('method' => 'POST');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -608,7 +608,7 @@ 
 	 */
 	public function get($url, $args = array()) {
 		$defaults = array('method' => 'GET');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -626,7 +626,7 @@ 
 	 */
 	public function head($url, $args = array()) {
 		$defaults = array('method' => 'HEAD');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -661,9 +661,9 @@ 
 	 * @return array Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
-	public static function processHeaders( $headers, $url = '' ) {
+	public static function processHeaders($headers, $url = '') {
 		// Split headers, one per array element.
-		if ( is_string($headers) ) {
+		if (is_string($headers)) {
 			// Tolerate line terminator: CRLF = LF (RFC 2616 19.3).
 			$headers = str_replace("\r\n", "\n", $headers);
 			/*
@@ -681,8 +681,8 @@ 
 		 * If a redirection has taken place, The headers for each page request may have been passed.
 		 * In this case, determine the final HTTP header and parse from there.
 		 */
-		for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-			if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
+		for ($i = count($headers) - 1; $i >= 0; $i--) {
+			if ( ! empty($headers[$i]) && false === strpos($headers[$i], ':')) {
 				$headers = array_splice($headers, $i);
 				break;
 			}
@@ -690,35 +690,35 @@ 
 
 		$cookies = array();
 		$newheaders = array();
-		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
+		foreach ((array) $headers as $tempheader) {
+			if (empty($tempheader))
 				continue;
 
-			if ( false === strpos($tempheader, ':') ) {
+			if (false === strpos($tempheader, ':')) {
 				$stack = explode(' ', $tempheader, 3);
 				$stack[] = '';
-				list( , $response['code'], $response['message']) = $stack;
+				list(, $response['code'], $response['message']) = $stack;
 				continue;
 			}
 
 			list($key, $value) = explode(':', $tempheader, 2);
 
-			$key = strtolower( $key );
-			$value = trim( $value );
+			$key = strtolower($key);
+			$value = trim($value);
 
-			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
-				$newheaders[ $key ][] = $value;
+			if (isset($newheaders[$key])) {
+				if ( ! is_array($newheaders[$key]))
+					$newheaders[$key] = array($newheaders[$key]);
+				$newheaders[$key][] = $value;
 			} else {
-				$newheaders[ $key ] = $value;
+				$newheaders[$key] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ('set-cookie' == $key)
+				$cookies[] = new WP_Http_Cookie($value, $url);
 		}
 
 		// Cast the Response Code to an int
-		$response['code'] = intval( $response['code'] );
+		$response['code'] = intval($response['code']);
 
 		return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
 	}
@@ -736,20 +736,20 @@ 
 	 *
 	 * @param array $r Full array of args passed into ::request()
 	 */
-	public static function buildCookieHeader( &$r ) {
-		if ( ! empty($r['cookies']) ) {
+	public static function buildCookieHeader(&$r) {
+		if ( ! empty($r['cookies'])) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
-			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+			foreach ($r['cookies'] as $name => $value) {
+				if ( ! is_object($value))
+					$r['cookies'][$name] = new WP_Http_Cookie(array('name' => $name, 'value' => $value));
 			}
 
 			$cookies_header = '';
-			foreach ( (array) $r['cookies'] as $cookie ) {
-				$cookies_header .= $cookie->getHeaderValue() . '; ';
+			foreach ((array) $r['cookies'] as $cookie) {
+				$cookies_header .= $cookie->getHeaderValue().'; ';
 			}
 
-			$cookies_header = substr( $cookies_header, 0, -2 );
+			$cookies_header = substr($cookies_header, 0, -2);
 			$r['headers']['cookie'] = $cookies_header;
 		}
 	}
@@ -768,9 +768,9 @@ 
 	 * @param string $body Body content
 	 * @return string Chunked decoded body on success or raw body on failure.
 	 */
-	public static function chunkTransferDecode( $body ) {
+	public static function chunkTransferDecode($body) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
+		if ( ! preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($body)))
 			return $body;
 
 		$parsed_body = '';
@@ -778,22 +778,22 @@ 
 		// We'll be altering $body, so need a backup in case of error.
 		$body_original = $body;
 
-		while ( true ) {
-			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
+		while (true) {
+			$has_chunk = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match);
+			if ( ! $has_chunk || empty($match[1]))
 				return $body_original;
 
-			$length = hexdec( $match[1] );
-			$chunk_length = strlen( $match[0] );
+			$length = hexdec($match[1]);
+			$chunk_length = strlen($match[0]);
 
 			// Parse out the chunk of data.
-			$parsed_body .= substr( $body, $chunk_length, $length );
+			$parsed_body .= substr($body, $chunk_length, $length);
 
 			// Remove the chunk from the raw data.
-			$body = substr( $body, $length + $chunk_length );
+			$body = substr($body, $length + $chunk_length);
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
+			if ('0' === trim($body))
 				return $parsed_body;
 		}
 	}
@@ -822,17 +822,17 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
+		if ( ! defined('WP_HTTP_BLOCK_EXTERNAL') || ! WP_HTTP_BLOCK_EXTERNAL)
 			return false;
 
 		$check = parse_url($uri);
-		if ( ! $check )
+		if ( ! $check)
 			return true;
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url(get_option('siteurl'));
 
 		// Don't block requests back to ourselves by default.
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
+		if ('localhost' == $check['host'] || (isset($home['host']) && $home['host'] == $check['host'])) {
 			/**
 			 * Filters whether to block local requests through the proxy.
 			 *
@@ -841,29 +841,29 @@ 
 			 * @param bool $block Whether to block local requests through proxy.
 			 *                    Default false.
 			 */
-			return apply_filters( 'block_local_requests', false );
+			return apply_filters('block_local_requests', false);
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
+		if ( ! defined('WP_ACCESSIBLE_HOSTS'))
 			return true;
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
-		if ( null === $accessible_hosts ) {
+		if (null === $accessible_hosts) {
 			$accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS);
 
-			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
+			if (false !== strpos(WP_ACCESSIBLE_HOSTS, '*')) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				foreach ($accessible_hosts as $host)
+					$wildcard_regex[] = str_replace('\*', '.+', preg_quote($host, '/'));
+				$wildcard_regex = '/^('.implode('|', $wildcard_regex).')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
+		if ( ! empty($wildcard_regex))
+			return ! preg_match($wildcard_regex, $check['host']);
 		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+			return ! in_array($check['host'], $accessible_hosts); //Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -878,9 +878,9 @@ 
 	 * @return bool|array False on failure; Array of URL components on success;
 	 *                    See parse_url()'s return values.
 	 */
-	protected static function parse_url( $url ) {
-		_deprecated_function( __METHOD__, '4.4.0', 'wp_parse_url()' );
-		return wp_parse_url( $url );
+	protected static function parse_url($url) {
+		_deprecated_function(__METHOD__, '4.4.0', 'wp_parse_url()');
+		return wp_parse_url($url);
 	}
 
 	/**
@@ -897,65 +897,65 @@ 
 	 * @param string $url                 The URL which $maybe_relative_path is relative to
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
-	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
+	public static function make_absolute_url($maybe_relative_path, $url) {
+		if (empty($url))
 			return $maybe_relative_path;
 
-		if ( ! $url_parts = wp_parse_url( $url ) ) {
+		if ( ! $url_parts = wp_parse_url($url)) {
 			return $maybe_relative_path;
 		}
 
-		if ( ! $relative_url_parts = wp_parse_url( $maybe_relative_path ) ) {
+		if ( ! $relative_url_parts = wp_parse_url($maybe_relative_path)) {
 			return $maybe_relative_path;
 		}
 
 		// Check for a scheme on the 'relative' url
-		if ( ! empty( $relative_url_parts['scheme'] ) ) {
+		if ( ! empty($relative_url_parts['scheme'])) {
 			return $maybe_relative_path;
 		}
 
-		$absolute_path = $url_parts['scheme'] . '://';
+		$absolute_path = $url_parts['scheme'].'://';
 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
-		if ( isset( $relative_url_parts['host'] ) ) {
+		if (isset($relative_url_parts['host'])) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if (isset($relative_url_parts['port']))
+				$absolute_path .= ':'.$relative_url_parts['port'];
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if (isset($url_parts['port']))
+				$absolute_path .= ':'.$url_parts['port'];
 		}
 
 		// Start off with the Absolute URL path.
-		$path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
+		$path = ! empty($url_parts['path']) ? $url_parts['path'] : '/';
 
 		// If it's a root-relative path, then great.
-		if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
+		if ( ! empty($relative_url_parts['path']) && '/' == $relative_url_parts['path'][0]) {
 			$path = $relative_url_parts['path'];
 
 		// Else it's a relative path.
-		} elseif ( ! empty( $relative_url_parts['path'] ) ) {
+		} elseif ( ! empty($relative_url_parts['path'])) {
 			// Strip off any file components from the absolute path.
-			$path = substr( $path, 0, strrpos( $path, '/' ) + 1 );
+			$path = substr($path, 0, strrpos($path, '/') + 1);
 
 			// Build the new path.
 			$path .= $relative_url_parts['path'];
 
 			// Strip all /path/../ out of the path.
-			while ( strpos( $path, '../' ) > 1 ) {
-				$path = preg_replace( '![^/]+/\.\./!', '', $path );
+			while (strpos($path, '../') > 1) {
+				$path = preg_replace('![^/]+/\.\./!', '', $path);
 			}
 
 			// Strip any final leading ../ from the path.
-			$path = preg_replace( '!^/(\.\./)+!', '', $path );
+			$path = preg_replace('!^/(\.\./)+!', '', $path);
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty($relative_url_parts['query']))
+			$path .= '?'.$relative_url_parts['query'];
 
-		return $absolute_path . '/' . ltrim( $path, '/' );
+		return $absolute_path.'/'.ltrim($path, '/');
 	}
 
 	/**
@@ -970,42 +970,42 @@ 
 	 * @param array $response The Response of the HTTP request.
 	 * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise.
 	 */
-	public static function handle_redirects( $url, $args, $response ) {
+	public static function handle_redirects($url, $args, $response) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+		if ( ! isset($response['headers']['location']) || 0 === $args['_redirection'])
 			return false;
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+		if ($response['response']['code'] > 399 || $response['response']['code'] < 300)
 			return false;
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ($args['redirection']-- <= 0)
+			return new WP_Error('http_request_failed', __('Too many redirects.'));
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if (is_array($redirect_location))
+			$redirect_location = array_pop($redirect_location);
 
-		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
+		$redirect_location = WP_Http::make_absolute_url($redirect_location, $url);
 
 		// POST requests should not POST to a redirected location.
-		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+		if ('POST' == $args['method']) {
+			if (in_array($response['response']['code'], array(302, 303)))
 				$args['method'] = 'GET';
 		}
 
 		// Include valid cookies in the redirect process.
-		if ( ! empty( $response['cookies'] ) ) {
-			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
+		if ( ! empty($response['cookies'])) {
+			foreach ($response['cookies'] as $cookie) {
+				if ($cookie->test($redirect_location))
 					$args['cookies'][] = $cookie;
 			}
 		}
 
-		return wp_remote_request( $redirect_location, $args );
+		return wp_remote_request($redirect_location, $args);
 	}
 
 	/**
@@ -1024,11 +1024,11 @@ 
 	 * @param string $maybe_ip A suspected IP address
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
-	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
+	public static function is_ip_address($maybe_ip) {
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip))
 			return 4;
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
+		if (false !== strpos($maybe_ip, ':') && preg_match('/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim($maybe_ip, ' []')))
 			return 6;
 
 		return false;

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

Doc Comments +1 added lines, -1 removed lines

@@ -1004,7 +1004,7 @@
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param string $string
-	 * @param array $cols
+	 * @param string[] $cols
 	 * @return string
 	 */
 	protected function get_search_sql( $string, $cols ) {

Indentation +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 	 *                                                   The parameter is ignored (forced to `false`) when
 	 *                                                   `$fields` is 'ids' or 'counts'. Accepts 'threaded',
 	 *                                                   'flat', or false. Default: false.
- 	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
+	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
 	 *                                                   an object cache. Default is 'core'.
 	 *     @type bool         $update_comment_meta_cache Whether to prime the metadata cache for found comments.
 	 *                                                   Default true.

Spacing +236 added lines, -237 removed lines

@@ -134,9 +134,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -259,7 +259,7 @@ 
 	 *                                                   Default false.
 	 * }
 	 */
-	public function __construct( $query = '' ) {
+	public function __construct($query = '') {
 		$this->query_var_defaults = array(
 			'author_email' => '',
 			'author_url' => '',
@@ -307,8 +307,8 @@ 
 			'update_comment_post_cache' => false,
 		);
 
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -321,12 +321,12 @@ 
 	 *
 	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
 	 */
-	public function parse_query( $query = '' ) {
-		if ( empty( $query ) ) {
+	public function parse_query($query = '') {
+		if (empty($query)) {
 			$query = $this->query_vars;
 		}
 
-		$this->query_vars = wp_parse_args( $query, $this->query_var_defaults );
+		$this->query_vars = wp_parse_args($query, $this->query_var_defaults);
 
 		/**
 		 * Fires after the comment query vars have been parsed.
@@ -335,7 +335,7 @@ 
 		 *
 		 * @param WP_Comment_Query &$this The WP_Comment_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_comment_query', array( &$this ) );
+		do_action_ref_array('parse_comment_query', array(&$this));
 	}
 
 	/**
@@ -352,8 +352,8 @@ 
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of comments, or number of comments 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_comments();
 	}
 
@@ -374,7 +374,7 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $this->query_vars );
+		$this->meta_query->parse_query_vars($this->query_vars);
 
 		/**
 		 * Fires before comments are retrieved.
@@ -383,24 +383,24 @@ 
 		 *
 		 * @param WP_Comment_Query &$this Current instance of WP_Comment_Query, passed by reference.
 		 */
-		do_action_ref_array( 'pre_get_comments', array( &$this ) );
+		do_action_ref_array('pre_get_comments', array(&$this));
 
 		// Reparse query vars, in case they were modified in a 'pre_get_comments' callback.
-		$this->meta_query->parse_query_vars( $this->query_vars );
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+		$this->meta_query->parse_query_vars($this->query_vars);
+		if ( ! empty($this->meta_query->queries)) {
+			$this->meta_query_clauses = $this->meta_query->get_sql('comment', $wpdb->comments, 'comment_ID', $this);
 		}
 
 		// $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get_last_changed( 'comment' );
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get_last_changed('comment');
 
 
 		$cache_key   = "get_comments:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'comment' );
-		if ( false === $cache_value ) {
+		$cache_value = wp_cache_get($cache_key, 'comment');
+		if (false === $cache_value) {
 			$comment_ids = $this->get_comment_ids();
-			if ( $comment_ids ) {
+			if ($comment_ids) {
 				$this->set_found_comments();
 			}
 
@@ -408,47 +408,47 @@ 
 				'comment_ids'    => $comment_ids,
 				'found_comments' => $this->found_comments,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'comment' );
+			wp_cache_add($cache_key, $cache_value, 'comment');
 		} else {
 			$comment_ids          = $cache_value['comment_ids'];
 			$this->found_comments = $cache_value['found_comments'];
 		}
 
-		if ( $this->found_comments && $this->query_vars['number'] ) {
-			$this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
+		if ($this->found_comments && $this->query_vars['number']) {
+			$this->max_num_pages = ceil($this->found_comments / $this->query_vars['number']);
 		}
 
 		// If querying for a count only, there's nothing more to do.
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			// $comment_ids is actually a count in this case.
-			return intval( $comment_ids );
+			return intval($comment_ids);
 		}
 
-		$comment_ids = array_map( 'intval', $comment_ids );
+		$comment_ids = array_map('intval', $comment_ids);
 
-		if ( 'ids' == $this->query_vars['fields'] ) {
+		if ('ids' == $this->query_vars['fields']) {
 			$this->comments = $comment_ids;
 			return $this->comments;
 		}
 
-		_prime_comment_caches( $comment_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches($comment_ids, $this->query_vars['update_comment_meta_cache']);
 
 		// Fetch full comment objects from the primed cache.
 		$_comments = array();
-		foreach ( $comment_ids as $comment_id ) {
-			if ( $_comment = get_comment( $comment_id ) ) {
+		foreach ($comment_ids as $comment_id) {
+			if ($_comment = get_comment($comment_id)) {
 				$_comments[] = $_comment;
 			}
 		}
 
 		// Prime comment post caches.
-		if ( $this->query_vars['update_comment_post_cache'] ) {
+		if ($this->query_vars['update_comment_post_cache']) {
 			$comment_post_ids = array();
-			foreach ( $_comments as $_comment ) {
+			foreach ($_comments as $_comment) {
 				$comment_post_ids[] = $_comment->comment_post_ID;
 			}
 
-			_prime_post_caches( $comment_post_ids, false, false );
+			_prime_post_caches($comment_post_ids, false, false);
 		}
 
 		/**
@@ -459,13 +459,13 @@ 
 		 * @param array            $results  An array of comments.
 		 * @param WP_Comment_Query &$this    Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$_comments = apply_filters_ref_array( 'the_comments', array( $_comments, &$this ) );
+		$_comments = apply_filters_ref_array('the_comments', array($_comments, &$this));
 
 		// Convert to WP_Comment instances
-		$comments = array_map( 'get_comment', $_comments );
+		$comments = array_map('get_comment', $_comments);
 
-		if ( $this->query_vars['hierarchical'] ) {
-			$comments = $this->fill_descendants( $comments );
+		if ($this->query_vars['hierarchical']) {
+			$comments = $this->fill_descendants($comments);
 		}
 
 		$this->comments = $comments;
@@ -489,14 +489,14 @@ 
 		// 'status' accepts an array or a comma-separated string.
 		$status_clauses = array();
 		$statuses = $this->query_vars['status'];
-		if ( ! is_array( $statuses ) ) {
-			$statuses = preg_split( '/[\s,]+/', $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = preg_split('/[\s,]+/', $statuses);
 		}
 
 		// 'any' overrides other statuses.
-		if ( ! in_array( 'any', $statuses ) ) {
-			foreach ( $statuses as $status ) {
-				switch ( $status ) {
+		if ( ! in_array('any', $statuses)) {
+			foreach ($statuses as $status) {
+				switch ($status) {
 					case 'hold' :
 						$status_clauses[] = "comment_approved = '0'";
 						break;
@@ -511,65 +511,64 @@ 
 						break;
 
 					default :
-						$status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+						$status_clauses[] = $wpdb->prepare("comment_approved = %s", $status);
 						break;
 				}
 			}
 
-			if ( ! empty( $status_clauses ) ) {
-				$approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
+			if ( ! empty($status_clauses)) {
+				$approved_clauses[] = '( '.implode(' OR ', $status_clauses).' )';
 			}
 		}
 
 		// User IDs or emails whose unapproved comments are included, regardless of $status.
-		if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
+		if ( ! empty($this->query_vars['include_unapproved'])) {
 			$include_unapproved = $this->query_vars['include_unapproved'];
 
 			// Accepts arrays or comma-separated strings.
-			if ( ! is_array( $include_unapproved ) ) {
-				$include_unapproved = preg_split( '/[\s,]+/', $include_unapproved );
+			if ( ! is_array($include_unapproved)) {
+				$include_unapproved = preg_split('/[\s,]+/', $include_unapproved);
 			}
 
 			$unapproved_ids = $unapproved_emails = array();
-			foreach ( $include_unapproved as $unapproved_identifier ) {
+			foreach ($include_unapproved as $unapproved_identifier) {
 				// Numeric values are assumed to be user ids.
-				if ( is_numeric( $unapproved_identifier ) ) {
-					$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
+				if (is_numeric($unapproved_identifier)) {
+					$approved_clauses[] = $wpdb->prepare("( user_id = %d AND comment_approved = '0' )", $unapproved_identifier);
 
 				// Otherwise we match against email addresses.
 				} else {
-					$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+					$approved_clauses[] = $wpdb->prepare("( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier);
 				}
 			}
 		}
 
 		// Collapse comment_approved clauses into a single OR-separated clause.
-		if ( ! empty( $approved_clauses ) ) {
-			if ( 1 === count( $approved_clauses ) ) {
+		if ( ! empty($approved_clauses)) {
+			if (1 === count($approved_clauses)) {
 				$this->sql_clauses['where']['approved'] = $approved_clauses[0];
 			} else {
-				$this->sql_clauses['where']['approved'] = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+				$this->sql_clauses['where']['approved'] = '( '.implode(' OR ', $approved_clauses).' )';
 			}
 		}
 
-		$order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
+		$order = ('ASC' == strtoupper($this->query_vars['order'])) ? 'ASC' : 'DESC';
 
 		// Disable ORDER BY with 'none', an empty array, or boolean false.
-		if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
+		if (in_array($this->query_vars['orderby'], array('none', array(), false), true)) {
 			$orderby = '';
-		} elseif ( ! empty( $this->query_vars['orderby'] ) ) {
-			$ordersby = is_array( $this->query_vars['orderby'] ) ?
-				$this->query_vars['orderby'] :
-				preg_split( '/[,\s]/', $this->query_vars['orderby'] );
+		} elseif ( ! empty($this->query_vars['orderby'])) {
+			$ordersby = is_array($this->query_vars['orderby']) ?
+				$this->query_vars['orderby'] : preg_split('/[,\s]/', $this->query_vars['orderby']);
 
 			$orderby_array = array();
 			$found_orderby_comment_ID = false;
-			foreach ( $ordersby as $_key => $_value ) {
-				if ( ! $_value ) {
+			foreach ($ordersby as $_key => $_value) {
+				if ( ! $_value) {
 					continue;
 				}
 
-				if ( is_int( $_key ) ) {
+				if (is_int($_key)) {
 					$_orderby = $_value;
 					$_order = $order;
 				} else {
@@ -577,45 +576,45 @@ 
 					$_order = $_value;
 				}
 
-				if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
+				if ( ! $found_orderby_comment_ID && in_array($_orderby, array('comment_ID', 'comment__in'))) {
 					$found_orderby_comment_ID = true;
 				}
 
-				$parsed = $this->parse_orderby( $_orderby );
+				$parsed = $this->parse_orderby($_orderby);
 
-				if ( ! $parsed ) {
+				if ( ! $parsed) {
 					continue;
 				}
 
-				if ( 'comment__in' === $_orderby ) {
+				if ('comment__in' === $_orderby) {
 					$orderby_array[] = $parsed;
 					continue;
 				}
 
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+				$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 			}
 
 			// If no valid clauses were found, order by comment_date_gmt.
-			if ( empty( $orderby_array ) ) {
+			if (empty($orderby_array)) {
 				$orderby_array[] = "$wpdb->comments.comment_date_gmt $order";
 			}
 
 			// To ensure determinate sorting, always include a comment_ID clause.
-			if ( ! $found_orderby_comment_ID ) {
+			if ( ! $found_orderby_comment_ID) {
 				$comment_ID_order = '';
 
 				// Inherit order from comment_date or comment_date_gmt, if available.
-				foreach ( $orderby_array as $orderby_clause ) {
-					if ( preg_match( '/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match ) ) {
+				foreach ($orderby_array as $orderby_clause) {
+					if (preg_match('/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match)) {
 						$comment_ID_order = $match[1];
 						break;
 					}
 				}
 
 				// If no date-related order is available, use the date from the first available clause.
-				if ( ! $comment_ID_order ) {
-					foreach ( $orderby_array as $orderby_clause ) {
-						if ( false !== strpos( 'ASC', $orderby_clause ) ) {
+				if ( ! $comment_ID_order) {
+					foreach ($orderby_array as $orderby_clause) {
+						if (false !== strpos('ASC', $orderby_clause)) {
 							$comment_ID_order = 'ASC';
 						} else {
 							$comment_ID_order = 'DESC';
@@ -626,94 +625,94 @@ 
 				}
 
 				// Default to DESC.
-				if ( ! $comment_ID_order ) {
+				if ( ! $comment_ID_order) {
 					$comment_ID_order = 'DESC';
 				}
 
 				$orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
 			}
 
-			$orderby = implode( ', ', $orderby_array );
+			$orderby = implode(', ', $orderby_array);
 		} else {
 			$orderby = "$wpdb->comments.comment_date_gmt $order";
 		}
 
-		$number = absint( $this->query_vars['number'] );
-		$offset = absint( $this->query_vars['offset'] );
+		$number = absint($this->query_vars['number']);
+		$offset = absint($this->query_vars['offset']);
 
-		if ( ! empty( $number ) ) {
-			if ( $offset ) {
-				$limits = 'LIMIT ' . $offset . ',' . $number;
+		if ( ! empty($number)) {
+			if ($offset) {
+				$limits = 'LIMIT '.$offset.','.$number;
 			} else {
-				$limits = 'LIMIT ' . $number;
+				$limits = 'LIMIT '.$number;
 			}
 		}
 
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			$fields = 'COUNT(*)';
 		} else {
 			$fields = "$wpdb->comments.comment_ID";
 		}
 
-		$post_id = absint( $this->query_vars['post_id'] );
-		if ( ! empty( $post_id ) ) {
-			$this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
+		$post_id = absint($this->query_vars['post_id']);
+		if ( ! empty($post_id)) {
+			$this->sql_clauses['where']['post_id'] = $wpdb->prepare('comment_post_ID = %d', $post_id);
 		}
 
 		// Parse comment IDs for an IN clause.
-		if ( ! empty( $this->query_vars['comment__in'] ) ) {
-			$this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__in'])) {
+			$this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__in'])).' )';
 		}
 
 		// Parse comment IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-			$this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__not_in'])) {
+			$this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__not_in'])).' )';
 		}
 
 		// Parse comment parent IDs for an IN clause.
-		if ( ! empty( $this->query_vars['parent__in'] ) ) {
-			$this->sql_clauses['where']['parent__in'] = 'comment_parent IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['parent__in'])) {
+			$this->sql_clauses['where']['parent__in'] = 'comment_parent IN ( '.implode(',', wp_parse_id_list($this->query_vars['parent__in'])).' )';
 		}
 
 		// Parse comment parent IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['parent__not_in'] ) ) {
-			$this->sql_clauses['where']['parent__not_in'] = 'comment_parent NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['parent__not_in'])) {
+			$this->sql_clauses['where']['parent__not_in'] = 'comment_parent NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['parent__not_in'])).' )';
 		}
 
 		// Parse comment post IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post__in'] ) ) {
-			$this->sql_clauses['where']['post__in'] = 'comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__in'])) {
+			$this->sql_clauses['where']['post__in'] = 'comment_post_ID IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__in'])).' )';
 		}
 
 		// Parse comment post IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post__not_in'] ) ) {
-			$this->sql_clauses['where']['post__not_in'] = 'comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__not_in'])) {
+			$this->sql_clauses['where']['post__not_in'] = 'comment_post_ID NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__not_in'])).' )';
 		}
 
-		if ( '' !== $this->query_vars['author_email'] ) {
-			$this->sql_clauses['where']['author_email'] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
+		if ('' !== $this->query_vars['author_email']) {
+			$this->sql_clauses['where']['author_email'] = $wpdb->prepare('comment_author_email = %s', $this->query_vars['author_email']);
 		}
 
-		if ( '' !== $this->query_vars['author_url'] ) {
-			$this->sql_clauses['where']['author_url'] = $wpdb->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
+		if ('' !== $this->query_vars['author_url']) {
+			$this->sql_clauses['where']['author_url'] = $wpdb->prepare('comment_author_url = %s', $this->query_vars['author_url']);
 		}
 
-		if ( '' !== $this->query_vars['karma'] ) {
-			$this->sql_clauses['where']['karma'] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
+		if ('' !== $this->query_vars['karma']) {
+			$this->sql_clauses['where']['karma'] = $wpdb->prepare('comment_karma = %d', $this->query_vars['karma']);
 		}
 
 		// Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
 		$raw_types = array(
-			'IN' => array_merge( (array) $this->query_vars['type'], (array) $this->query_vars['type__in'] ),
+			'IN' => array_merge((array) $this->query_vars['type'], (array) $this->query_vars['type__in']),
 			'NOT IN' => (array) $this->query_vars['type__not_in'],
 		);
 
 		$comment_types = array();
-		foreach ( $raw_types as $operator => $_raw_types ) {
-			$_raw_types = array_unique( $_raw_types );
+		foreach ($raw_types as $operator => $_raw_types) {
+			$_raw_types = array_unique($_raw_types);
 
-			foreach ( $_raw_types as $type ) {
-				switch ( $type ) {
+			foreach ($_raw_types as $type) {
+				switch ($type) {
 					// An empty translates to 'all', for backward compatibility
 					case '':
 					case 'all' :
@@ -721,134 +720,134 @@ 
 
 					case 'comment':
 					case 'comments':
-						$comment_types[ $operator ][] = "''";
+						$comment_types[$operator][] = "''";
 						break;
 
 					case 'pings':
-						$comment_types[ $operator ][] = "'pingback'";
-						$comment_types[ $operator ][] = "'trackback'";
+						$comment_types[$operator][] = "'pingback'";
+						$comment_types[$operator][] = "'trackback'";
 						break;
 
 					default:
-						$comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
+						$comment_types[$operator][] = $wpdb->prepare('%s', $type);
 						break;
 				}
 			}
 
-			if ( ! empty( $comment_types[ $operator ] ) ) {
-				$types_sql = implode( ', ', $comment_types[ $operator ] );
-				$this->sql_clauses['where']['comment_type__' . strtolower( str_replace( ' ', '_', $operator ) ) ] = "comment_type $operator ($types_sql)";
+			if ( ! empty($comment_types[$operator])) {
+				$types_sql = implode(', ', $comment_types[$operator]);
+				$this->sql_clauses['where']['comment_type__'.strtolower(str_replace(' ', '_', $operator))] = "comment_type $operator ($types_sql)";
 			}
 		}
 
 		$parent = $this->query_vars['parent'];
-		if ( $this->query_vars['hierarchical'] && ! $parent ) {
+		if ($this->query_vars['hierarchical'] && ! $parent) {
 			$parent = 0;
 		}
 
-		if ( '' !== $parent ) {
-			$this->sql_clauses['where']['parent'] = $wpdb->prepare( 'comment_parent = %d', $parent );
+		if ('' !== $parent) {
+			$this->sql_clauses['where']['parent'] = $wpdb->prepare('comment_parent = %d', $parent);
 		}
 
-		if ( is_array( $this->query_vars['user_id'] ) ) {
-			$this->sql_clauses['where']['user_id'] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
-		} elseif ( '' !== $this->query_vars['user_id'] ) {
-			$this->sql_clauses['where']['user_id'] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
+		if (is_array($this->query_vars['user_id'])) {
+			$this->sql_clauses['where']['user_id'] = 'user_id IN ('.implode(',', array_map('absint', $this->query_vars['user_id'])).')';
+		} elseif ('' !== $this->query_vars['user_id']) {
+			$this->sql_clauses['where']['user_id'] = $wpdb->prepare('user_id = %d', $this->query_vars['user_id']);
 		}
 
 		// Falsy search strings are ignored.
-		if ( strlen( $this->query_vars['search'] ) ) {
+		if (strlen($this->query_vars['search'])) {
 			$search_sql = $this->get_search_sql(
 				$this->query_vars['search'],
-				array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )
+				array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content')
 			);
 
 			// Strip leading 'AND'.
-			$this->sql_clauses['where']['search'] = preg_replace( '/^\s*AND\s*/', '', $search_sql );
+			$this->sql_clauses['where']['search'] = preg_replace('/^\s*AND\s*/', '', $search_sql);
 		}
 
 		// If any post-related query vars are passed, join the posts table.
 		$join_posts_table = false;
-		$plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent' ) );
-		$post_fields = array_filter( $plucked );
+		$plucked = wp_array_slice_assoc($this->query_vars, array('post_author', 'post_name', 'post_parent'));
+		$post_fields = array_filter($plucked);
 
-		if ( ! empty( $post_fields ) ) {
+		if ( ! empty($post_fields)) {
 			$join_posts_table = true;
-			foreach ( $post_fields as $field_name => $field_value ) {
+			foreach ($post_fields as $field_name => $field_value) {
 				// $field_value may be an array.
-				$esses = array_fill( 0, count( (array) $field_value ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+				$esses = array_fill(0, count((array) $field_value), '%s');
+				$this->sql_clauses['where'][$field_name] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).')', $field_value);
 			}
 		}
 
 		// 'post_status' and 'post_type' are handled separately, due to the specialized behavior of 'any'.
-		foreach ( array( 'post_status', 'post_type' ) as $field_name ) {
+		foreach (array('post_status', 'post_type') as $field_name) {
 			$q_values = array();
-			if ( ! empty( $this->query_vars[ $field_name ] ) ) {
-				$q_values = $this->query_vars[ $field_name ];
-				if ( ! is_array( $q_values ) ) {
-					$q_values = explode( ',', $q_values );
+			if ( ! empty($this->query_vars[$field_name])) {
+				$q_values = $this->query_vars[$field_name];
+				if ( ! is_array($q_values)) {
+					$q_values = explode(',', $q_values);
 				}
 
 				// 'any' will cause the query var to be ignored.
-				if ( in_array( 'any', $q_values, true ) || empty( $q_values ) ) {
+				if (in_array('any', $q_values, true) || empty($q_values)) {
 					continue;
 				}
 
 				$join_posts_table = true;
 
-				$esses = array_fill( 0, count( $q_values ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
+				$esses = array_fill(0, count($q_values), '%s');
+				$this->sql_clauses['where'][$field_name] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).")", $q_values);
 			}
 		}
 
 		// Comment author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['author__in'] ) ) {
-			$this->sql_clauses['where']['author__in'] = 'user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__in'])) {
+			$this->sql_clauses['where']['author__in'] = 'user_id IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__in'])).' )';
 		}
 
 		// Comment author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['author__not_in'] ) ) {
-			$this->sql_clauses['where']['author__not_in'] = 'user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__not_in'])) {
+			$this->sql_clauses['where']['author__not_in'] = 'user_id NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__not_in'])).' )';
 		}
 
 		// Post author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post_author__in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__in'])) {
 			$join_posts_table = true;
-			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
+			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__in'])).' )';
 		}
 
 		// Post author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__not_in'])) {
 			$join_posts_table = true;
-			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
+			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__not_in'])).' )';
 		}
 
 		$join = '';
 
-		if ( $join_posts_table ) {
+		if ($join_posts_table) {
 			$join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
 		}
 
-		if ( ! empty( $this->meta_query_clauses ) ) {
+		if ( ! empty($this->meta_query_clauses)) {
 			$join .= $this->meta_query_clauses['join'];
 
 			// Strip leading 'AND'.
-			$this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $this->meta_query_clauses['where'] );
+			$this->sql_clauses['where']['meta_query'] = preg_replace('/^\s*AND\s*/', '', $this->meta_query_clauses['where']);
 
-			if ( ! $this->query_vars['count'] ) {
+			if ( ! $this->query_vars['count']) {
 				$groupby = "{$wpdb->comments}.comment_ID";
 			}
 		}
 
-		if ( ! empty( $this->query_vars['date_query'] ) && is_array( $this->query_vars['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $this->query_vars['date_query'], 'comment_date' );
-			$this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() );
+		if ( ! empty($this->query_vars['date_query']) && is_array($this->query_vars['date_query'])) {
+			$this->date_query = new WP_Date_Query($this->query_vars['date_query'], 'comment_date');
+			$this->sql_clauses['where']['date_query'] = preg_replace('/^\s*AND\s*/', '', $this->date_query->get_sql());
 		}
 
-		$where = implode( ' AND ', $this->sql_clauses['where'] );
+		$where = implode(' AND ', $this->sql_clauses['where']);
 
-		$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+		$pieces = array('fields', 'join', 'where', 'orderby', 'limits', 'groupby');
 		/**
 		 * Filters the comment query clauses.
 		 *
@@ -857,31 +856,31 @@ 
 		 * @param array            $pieces A compacted array of comment query clauses.
 		 * @param WP_Comment_Query &$this  Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
+		$clauses = apply_filters_ref_array('comments_clauses', array(compact($pieces), &$this));
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
-		$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
+		$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+		$join = isset($clauses['join']) ? $clauses['join'] : '';
+		$where = isset($clauses['where']) ? $clauses['where'] : '';
+		$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+		$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
+		$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
 
 		$this->filtered_where_clause = $where;
 
-		if ( $where ) {
-			$where = 'WHERE ' . $where;
+		if ($where) {
+			$where = 'WHERE '.$where;
 		}
 
-		if ( $groupby ) {
-			$groupby = 'GROUP BY ' . $groupby;
+		if ($groupby) {
+			$groupby = 'GROUP BY '.$groupby;
 		}
 
-		if ( $orderby ) {
+		if ($orderby) {
 			$orderby = "ORDER BY $orderby";
 		}
 
 		$found_rows = '';
-		if ( ! $this->query_vars['no_found_rows'] ) {
+		if ( ! $this->query_vars['no_found_rows']) {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
 
@@ -893,11 +892,11 @@ 
 
 		$this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
-		if ( $this->query_vars['count'] ) {
-			return intval( $wpdb->get_var( $this->request ) );
+		if ($this->query_vars['count']) {
+			return intval($wpdb->get_var($this->request));
 		} else {
-			$comment_ids = $wpdb->get_col( $this->request );
-			return array_map( 'intval', $comment_ids );
+			$comment_ids = $wpdb->get_col($this->request);
+			return array_map('intval', $comment_ids);
 		}
 	}
 
@@ -913,7 +912,7 @@ 
 	private function set_found_comments() {
 		global $wpdb;
 
-		if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
+		if ($this->query_vars['number'] && ! $this->query_vars['no_found_rows']) {
 			/**
 			 * Filters the query used to retrieve found comment count.
 			 *
@@ -922,9 +921,9 @@ 
 			 * @param string           $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
 			 * @param WP_Comment_Query $comment_query        The `WP_Comment_Query` instance.
 			 */
-			$found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
+			$found_comments_query = apply_filters('found_comments_query', 'SELECT FOUND_ROWS()', $this);
 
-			$this->found_comments = (int) $wpdb->get_var( $found_comments_query );
+			$this->found_comments = (int) $wpdb->get_var($found_comments_query);
 		}
 	}
 
@@ -939,38 +938,38 @@ 
 	 * @param array $comments Array of top-level comments whose descendants should be filled in.
 	 * @return array
 	 */
-	protected function fill_descendants( $comments ) {
+	protected function fill_descendants($comments) {
 		global $wpdb;
 
 		$levels = array(
-			0 => wp_list_pluck( $comments, 'comment_ID' ),
+			0 => wp_list_pluck($comments, 'comment_ID'),
 		);
 
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get_last_changed( 'comment' );
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get_last_changed('comment');
 
 		// Fetch an entire level of the descendant tree at a time.
 		$level = 0;
-		$exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
+		$exclude_keys = array('parent', 'parent__in', 'parent__not_in');
 		do {
 			// Parent-child relationships may be cached. Only query for those that are not.
 			$child_ids = $uncached_parent_ids = array();
-			$_parent_ids = $levels[ $level ];
-			foreach ( $_parent_ids as $parent_id ) {
+			$_parent_ids = $levels[$level];
+			foreach ($_parent_ids as $parent_id) {
 				$cache_key = "get_comment_child_ids:$parent_id:$key:$last_changed";
-				$parent_child_ids = wp_cache_get( $cache_key, 'comment' );
-				if ( false !== $parent_child_ids ) {
-					$child_ids = array_merge( $child_ids, $parent_child_ids );
+				$parent_child_ids = wp_cache_get($cache_key, 'comment');
+				if (false !== $parent_child_ids) {
+					$child_ids = array_merge($child_ids, $parent_child_ids);
 				} else {
 					$uncached_parent_ids[] = $parent_id;
 				}
 			}
 
-			if ( $uncached_parent_ids ) {
+			if ($uncached_parent_ids) {
 				// Fetch this level of comments.
 				$parent_query_args = $this->query_vars;
-				foreach ( $exclude_keys as $exclude_key ) {
-					$parent_query_args[ $exclude_key ] = '';
+				foreach ($exclude_keys as $exclude_key) {
+					$parent_query_args[$exclude_key] = '';
 				}
 				$parent_query_args['parent__in']    = $uncached_parent_ids;
 				$parent_query_args['no_found_rows'] = true;
@@ -978,61 +977,61 @@ 
 				$parent_query_args['offset']        = 0;
 				$parent_query_args['number']        = 0;
 
-				$level_comments = get_comments( $parent_query_args );
+				$level_comments = get_comments($parent_query_args);
 
 				// Cache parent-child relationships.
-				$parent_map = array_fill_keys( $uncached_parent_ids, array() );
-				foreach ( $level_comments as $level_comment ) {
-					$parent_map[ $level_comment->comment_parent ][] = $level_comment->comment_ID;
+				$parent_map = array_fill_keys($uncached_parent_ids, array());
+				foreach ($level_comments as $level_comment) {
+					$parent_map[$level_comment->comment_parent][] = $level_comment->comment_ID;
 					$child_ids[] = $level_comment->comment_ID;
 				}
 
-				foreach ( $parent_map as $parent_id => $children ) {
+				foreach ($parent_map as $parent_id => $children) {
 					$cache_key = "get_comment_child_ids:$parent_id:$key:$last_changed";
-					wp_cache_set( $cache_key, $children, 'comment' );
+					wp_cache_set($cache_key, $children, 'comment');
 				}
 			}
 
 			$level++;
-			$levels[ $level ] = $child_ids;
-		} while ( $child_ids );
+			$levels[$level] = $child_ids;
+		} while ($child_ids);
 
 		// Prime comment caches for non-top-level comments.
 		$descendant_ids = array();
-		for ( $i = 1, $c = count( $levels ); $i < $c; $i++ ) {
-			$descendant_ids = array_merge( $descendant_ids, $levels[ $i ] );
+		for ($i = 1, $c = count($levels); $i < $c; $i++) {
+			$descendant_ids = array_merge($descendant_ids, $levels[$i]);
 		}
 
-		_prime_comment_caches( $descendant_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches($descendant_ids, $this->query_vars['update_comment_meta_cache']);
 
 		// Assemble a flat array of all comments + descendants.
 		$all_comments = $comments;
-		foreach ( $descendant_ids as $descendant_id ) {
-			$all_comments[] = get_comment( $descendant_id );
+		foreach ($descendant_ids as $descendant_id) {
+			$all_comments[] = get_comment($descendant_id);
 		}
 
 		// If a threaded representation was requested, build the tree.
-		if ( 'threaded' === $this->query_vars['hierarchical'] ) {
+		if ('threaded' === $this->query_vars['hierarchical']) {
 			$threaded_comments = $ref = array();
-			foreach ( $all_comments as $k => $c ) {
-				$_c = get_comment( $c->comment_ID );
+			foreach ($all_comments as $k => $c) {
+				$_c = get_comment($c->comment_ID);
 
 				// If the comment isn't in the reference array, it goes in the top level of the thread.
-				if ( ! isset( $ref[ $c->comment_parent ] ) ) {
-					$threaded_comments[ $_c->comment_ID ] = $_c;
-					$ref[ $_c->comment_ID ] = $threaded_comments[ $_c->comment_ID ];
+				if ( ! isset($ref[$c->comment_parent])) {
+					$threaded_comments[$_c->comment_ID] = $_c;
+					$ref[$_c->comment_ID] = $threaded_comments[$_c->comment_ID];
 
 				// Otherwise, set it as a child of its parent.
 				} else {
 
-					$ref[ $_c->comment_parent ]->add_child( $_c );
-					$ref[ $_c->comment_ID ] = $ref[ $_c->comment_parent ]->get_child( $_c->comment_ID );
+					$ref[$_c->comment_parent]->add_child($_c);
+					$ref[$_c->comment_ID] = $ref[$_c->comment_parent]->get_child($_c->comment_ID);
 				}
 			}
 
 			// Set the 'populated_children' flag, to ensure additional database queries aren't run.
-			foreach ( $ref as $_ref ) {
-				$_ref->populated_children( true );
+			foreach ($ref as $_ref) {
+				$_ref->populated_children(true);
 			}
 
 			$comments = $threaded_comments;
@@ -1055,17 +1054,17 @@ 
 	 * @param array $cols
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols ) {
+	protected function get_search_sql($string, $cols) {
 		global $wpdb;
 
-		$like = '%' . $wpdb->esc_like( $string ) . '%';
+		$like = '%'.$wpdb->esc_like($string).'%';
 
 		$searches = array();
-		foreach ( $cols as $col ) {
-			$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+		foreach ($cols as $col) {
+			$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -1079,7 +1078,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$allowed_keys = array(
@@ -1100,30 +1099,30 @@ 
 			'user_id',
 		);
 
-		if ( ! empty( $this->query_vars['meta_key'] ) ) {
+		if ( ! empty($this->query_vars['meta_key'])) {
 			$allowed_keys[] = $this->query_vars['meta_key'];
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
 		}
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
-		if ( $meta_query_clauses ) {
-			$allowed_keys = array_merge( $allowed_keys, array_keys( $meta_query_clauses ) );
+		if ($meta_query_clauses) {
+			$allowed_keys = array_merge($allowed_keys, array_keys($meta_query_clauses));
 		}
 
 		$parsed = false;
-		if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
+		if ($orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value') {
 			$parsed = "$wpdb->commentmeta.meta_value";
-		} elseif ( $orderby == 'meta_value_num' ) {
+		} elseif ($orderby == 'meta_value_num') {
 			$parsed = "$wpdb->commentmeta.meta_value+0";
-		} elseif ( $orderby == 'comment__in' ) {
-			$comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
+		} elseif ($orderby == 'comment__in') {
+			$comment__in = implode(',', array_map('absint', $this->query_vars['comment__in']));
 			$parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
-		} elseif ( in_array( $orderby, $allowed_keys ) ) {
+		} elseif (in_array($orderby, $allowed_keys)) {
 
-			if ( isset( $meta_query_clauses[ $orderby ] ) ) {
-				$meta_clause = $meta_query_clauses[ $orderby ];
-				$parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+			if (isset($meta_query_clauses[$orderby])) {
+				$meta_clause = $meta_query_clauses[$orderby];
+				$parsed = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 			} else {
 				$parsed = "$wpdb->comments.$orderby";
 			}
@@ -1141,12 +1140,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';