ntwb / wordpress

src/wp-includes/SimplePie/Parser.php

Doc Comments +9 added lines

@@ -265,6 +265,9 @@ 
 		return $this->data;
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function tag_open($parser, $tag, $attributes)
 	{
 		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
@@ -332,6 +335,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $cdata
+	 */
 	public function cdata($parser, $cdata)
 	{
 		if ($this->current_xhtml_construct >= 0)
@@ -344,6 +350,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	public function tag_close($parser, $tag)
 	{
 		if ($this->current_xhtml_construct >= 0)

Spacing +15 added lines, -15 removed lines

@@ -120,7 +120,7 @@ 
 			if ($declaration->parse())
 			{
 				$data = substr($data, $pos + 2);
-				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
+				$data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'.$data;
 			}
 			else
 			{
@@ -151,7 +151,7 @@ 
 			xml_set_element_handler($xml, 'tag_open', 'tag_close');
 
 			// Parse!
-			if (!xml_parse($xml, $data, true))
+			if ( ! xml_parse($xml, $data, true))
 			{
 				$this->error_code = xml_get_error_code($xml);
 				$this->error_string = xml_error_string($this->error_code);
@@ -176,7 +176,7 @@ 
 					case constant('XMLReader::END_ELEMENT'):
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -188,7 +188,7 @@ 
 						$empty = $xml->isEmptyElement;
 						if ($xml->namespaceURI !== '')
 						{
-							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+							$tagName = $xml->namespaceURI.$this->separator.$xml->localName;
 						}
 						else
 						{
@@ -199,7 +199,7 @@ 
 						{
 							if ($xml->namespaceURI !== '')
 							{
-								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+								$attrName = $xml->namespaceURI.$this->separator.$xml->localName;
 							}
 							else
 							{
@@ -305,12 +305,12 @@ 
 			$this->current_xhtml_construct++;
 			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
 			{
-				$this->data['data'] .= '<' . end($this->element);
+				$this->data['data'] .= '<'.end($this->element);
 				if (isset($attribs['']))
 				{
 					foreach ($attribs[''] as $name => $value)
 					{
-						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+						$this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
 					}
 				}
 				$this->data['data'] .= '>';
@@ -318,8 +318,8 @@ 
 		}
 		else
 		{
-			$this->datas[] =& $this->data;
-			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->datas[] = & $this->data;
+			$this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
 			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
 			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
 			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
@@ -349,14 +349,14 @@ 
 		if ($this->current_xhtml_construct >= 0)
 		{
 			$this->current_xhtml_construct--;
-			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
+			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && ! in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
 			{
-				$this->data['data'] .= '</' . end($this->element) . '>';
+				$this->data['data'] .= '</'.end($this->element).'>';
 			}
 		}
 		if ($this->current_xhtml_construct === -1)
 		{
-			$this->data =& $this->datas[count($this->datas) - 1];
+			$this->data = & $this->datas[count($this->datas) - 1];
 			array_pop($this->datas);
 		}
 
@@ -370,12 +370,12 @@ 
 	public function split_ns($string)
 	{
 		static $cache = array();
-		if (!isset($cache[$string]))
+		if ( ! isset($cache[$string]))
 		{
 			if ($pos = strpos($string, $this->separator))
 			{
 				static $separator_length;
-				if (!$separator_length)
+				if ( ! $separator_length)
 				{
 					$separator_length = strlen($this->separator);
 				}
@@ -391,7 +391,7 @@ 
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
 					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
 				{
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}

Braces +12 added lines, -24 removed lines

@@ -81,8 +81,7 @@ 
 		if (strtoupper($encoding) === 'US-ASCII')
 		{
 			$this->encoding = 'UTF-8';
-		}
-		else
+		} else
 		{
 			$this->encoding = $encoding;
 		}
@@ -121,8 +120,7 @@ 
 			{
 				$data = substr($data, $pos + 2);
 				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
-			}
-			else
+			} else
 			{
 				$this->error_string = 'SimplePie bug! Please report this!';
 				return false;
@@ -162,8 +160,7 @@ 
 			$this->current_byte = xml_get_current_byte_index($xml);
 			xml_parser_free($xml);
 			return $return;
-		}
-		else
+		} else
 		{
 			libxml_clear_errors();
 			$xml = new XMLReader();
@@ -177,8 +174,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$tagName = $xml->localName;
 						}
@@ -189,8 +185,7 @@ 
 						if ($xml->namespaceURI !== '')
 						{
 							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-						}
-						else
+						} else
 						{
 							$tagName = $xml->localName;
 						}
@@ -200,8 +195,7 @@ 
 							if ($xml->namespaceURI !== '')
 							{
 								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
-							}
-							else
+							} else
 							{
 								$attrName = $xml->localName;
 							}
@@ -227,8 +221,7 @@ 
 				$this->current_line = $error->line;
 				$this->current_column = $error->column;
 				return false;
-			}
-			else
+			} else
 			{
 				return true;
 			}
@@ -284,8 +277,7 @@ 
 				$this->xml_base[] = $base;
 				$this->xml_base_explicit[] = true;
 			}
-		}
-		else
+		} else
 		{
 			$this->xml_base[] = end($this->xml_base);
 			$this->xml_base_explicit[] = end($this->xml_base_explicit);
@@ -294,8 +286,7 @@ 
 		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
 		{
 			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
-		}
-		else
+		} else
 		{
 			$this->xml_lang[] = end($this->xml_lang);
 		}
@@ -315,8 +306,7 @@ 
 				}
 				$this->data['data'] .= '>';
 			}
-		}
-		else
+		} else
 		{
 			$this->datas[] =& $this->data;
 			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
@@ -337,8 +327,7 @@ 
 		if ($this->current_xhtml_construct >= 0)
 		{
 			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-		}
-		else
+		} else
 		{
 			$this->data['data'] .= $cdata;
 		}
@@ -396,8 +385,7 @@ 
 					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
 				}
 				$cache[$string] = array($namespace, $local_name);
-			}
-			else
+			} else
 			{
 				$cache[$string] = array('', $string);
 			}

src/wp-includes/SimplePie/Sanitize.php

Doc Comments +15 added lines

@@ -222,6 +222,9 @@ 
 		$this->replace_url_attributes = (array) $element_attribute;
 	}
 
+	/**
+	 * @param string $data
+	 */
 	public function sanitize($data, $type, $base = '')
 	{
 		$data = trim($data);
@@ -381,6 +384,9 @@ 
 		return $data;
 	}
 
+	/**
+	 * @param string $html
+	 */
 	protected function preprocess($html, $type)
 	{
 		$ret = '';
@@ -404,6 +410,9 @@ 
 		return $ret;
 	}
 
+	/**
+	 * @param DOMDocument $document
+	 */
 	public function replace_urls($document, $tag, $attributes)
 	{
 		if (!is_array($attributes))
@@ -456,6 +465,9 @@ 
 		}
 	}
 
+	/**
+	 * @param DOMDocument $document
+	 */
 	protected function strip_tag($tag, $document, $type)
 	{
 		$xpath = new DOMXPath($document);
@@ -541,6 +553,9 @@ 
 		}
 	}
 
+	/**
+	 * @param DOMDocument $document
+	 */
 	protected function strip_attr($attrib, $document)
 	{
 		$xpath = new DOMXPath($document);

Spacing +21 added lines, -21 removed lines

@@ -229,7 +229,7 @@ 
 		{
 			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
 			{
-				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
 				}
@@ -247,7 +247,7 @@ 
 			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
 			{
 
-				if (!class_exists('DOMDocument'))
+				if ( ! class_exists('DOMDocument'))
 				{
 					$this->registry->call('Misc', 'error', array('DOMDocument not found, unable to use sanitizer', E_USER_WARNING, __FILE__, __LINE__));
 					return '';
@@ -311,7 +311,7 @@ 
 
 							if ($cache->load())
 							{
-								$img->setAttribute('src', $this->image_handler . $image_url);
+								$img->setAttribute('src', $this->image_handler.$image_url);
 							}
 							else
 							{
@@ -322,7 +322,7 @@ 
 								{
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
 									{
-										$img->setAttribute('src', $this->image_handler . $image_url);
+										$img->setAttribute('src', $this->image_handler.$image_url);
 									}
 									else
 									{
@@ -350,12 +350,12 @@ 
 
 				if ($this->remove_div)
 				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data);
 					$data = preg_replace('/<\/div>$/', '', $data);
 				}
 				else
 				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+					$data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data);
 				}
 			}
 
@@ -388,7 +388,7 @@ 
 		{
 			// Atom XHTML constructs are wrapped with a div by default
 			// Note: No protection if $html contains a stray </div>!
-			$html = '<div>' . $html . '</div>';
+			$html = '<div>'.$html.'</div>';
 			$ret .= '<!DOCTYPE html>';
 			$content_type = 'text/html';
 		}
@@ -399,19 +399,19 @@ 
 		}
 
 		$ret .= '<html><head>';
-		$ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
-		$ret .= '</head><body>' . $html . '</body></html>';
+		$ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />';
+		$ret .= '</head><body>'.$html.'</body></html>';
 		return $ret;
 	}
 
 	public function replace_urls($document, $tag, $attributes)
 	{
-		if (!is_array($attributes))
+		if ( ! is_array($attributes))
 		{
 			$attributes = array($attributes);
 		}
 
-		if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags))
+		if ( ! is_array($this->strip_htmltags) || ! in_array($tag, $this->strip_htmltags))
 		{
 			$elements = $document->getElementsByTagName($tag);
 			foreach ($elements as $element)
@@ -435,7 +435,7 @@ 
 	{
 		if ($this->encode_instead_of_strip)
 		{
-			if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+			if (isset($match[4]) && ! in_array(strtolower($match[1]), array('script', 'style')))
 			{
 				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
 				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
@@ -446,7 +446,7 @@ 
 				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
 			}
 		}
-		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+		elseif (isset($match[4]) && ! in_array(strtolower($match[1]), array('script', 'style')))
 		{
 			return $match[4];
 		}
@@ -459,7 +459,7 @@ 
 	protected function strip_tag($tag, $document, $type)
 	{
 		$xpath = new DOMXPath($document);
-		$elements = $xpath->query('body//' . $tag);
+		$elements = $xpath->query('body//'.$tag);
 		if ($this->encode_instead_of_strip)
 		{
 			foreach ($elements as $element)
@@ -467,9 +467,9 @@ 
 				$fragment = $document->createDocumentFragment();
 
 				// For elements which aren't script or style, include the tag itself
-				if (!in_array($tag, array('script', 'style')))
+				if ( ! in_array($tag, array('script', 'style')))
 				{
-					$text = '<' . $tag;
+					$text = '<'.$tag;
 					if ($element->hasAttributes())
 					{
 						$attrs = array();
@@ -490,9 +490,9 @@ 
 							}
 
 							// Standard attribute text
-							$attrs[] = $name . '="' . $attr->value . '"';
+							$attrs[] = $name.'="'.$attr->value.'"';
 						}
-						$text .= ' ' . implode(' ', $attrs);
+						$text .= ' '.implode(' ', $attrs);
 					}
 					$text .= '>';
 					$fragment->appendChild(new DOMText($text));
@@ -505,9 +505,9 @@ 
 					$fragment->appendChild($child);
 				}
 
-				if (!in_array($tag, array('script', 'style')))
+				if ( ! in_array($tag, array('script', 'style')))
 				{
-					$fragment->appendChild(new DOMText('</' . $tag . '>'));
+					$fragment->appendChild(new DOMText('</'.$tag.'>'));
 				}
 
 				$element->parentNode->replaceChild($fragment, $element);
@@ -544,7 +544,7 @@ 
 	protected function strip_attr($attrib, $document)
 	{
 		$xpath = new DOMXPath($document);
-		$elements = $xpath->query('//*[@' . $attrib . ']');
+		$elements = $xpath->query('//*[@'.$attrib.']');
 
 		foreach ($elements as $element)
 		{

Braces +15 added lines, -30 removed lines

@@ -88,8 +88,7 @@ 
 		if ($page)
 		{
 			$this->image_handler = (string) $page;
-		}
-		else
+		} else
 		{
 			$this->image_handler = false;
 		}
@@ -143,13 +142,11 @@ 
 			if (is_array($tags))
 			{
 				$this->strip_htmltags = $tags;
-			}
-			else
+			} else
 			{
 				$this->strip_htmltags = explode(',', $tags);
 			}
-		}
-		else
+		} else
 		{
 			$this->strip_htmltags = false;
 		}
@@ -167,13 +164,11 @@ 
 			if (is_array($attribs))
 			{
 				$this->strip_attributes = $attribs;
-			}
-			else
+			} else
 			{
 				$this->strip_attributes = explode(',', $attribs);
 			}
-		}
-		else
+		} else
 		{
 			$this->strip_attributes = false;
 		}
@@ -232,8 +227,7 @@ 
 				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_HTML;
-				}
-				else
+				} else
 				{
 					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
 				}
@@ -312,8 +306,7 @@ 
 							if ($cache->load())
 							{
 								$img->setAttribute('src', $this->image_handler . $image_url);
-							}
-							else
+							} else
 							{
 								$file = $this->registry->create('File', array($img->getAttribute('src'), $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
 								$headers = $file->headers;
@@ -323,8 +316,7 @@ 
 									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
 									{
 										$img->setAttribute('src', $this->image_handler . $image_url);
-									}
-									else
+									} else
 									{
 										trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
 									}
@@ -352,8 +344,7 @@ 
 				{
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
 					$data = preg_replace('/<\/div>$/', '', $data);
-				}
-				else
+				} else
 				{
 					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
 				}
@@ -391,8 +382,7 @@ 
 			$html = '<div>' . $html . '</div>';
 			$ret .= '<!DOCTYPE html>';
 			$content_type = 'text/html';
-		}
-		else
+		} else
 		{
 			$ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
 			$content_type = 'application/xhtml+xml';
@@ -440,17 +430,14 @@ 
 				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
 				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
 				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
-			}
-			else
+			} else
 			{
 				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
 			}
-		}
-		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+		} elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
 		{
 			return $match[4];
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -514,8 +501,7 @@ 
 			}
 
 			return;
-		}
-		elseif (in_array($tag, array('script', 'style')))
+		} elseif (in_array($tag, array('script', 'style')))
 		{
 			foreach ($elements as $element)
 			{
@@ -523,8 +509,7 @@ 
 			}
 
 			return;
-		}
-		else
+		} else
 		{
 			foreach ($elements as $element)
 			{

src/wp-includes/taxonomy.php

Doc Comments +5 added lines, -5 removed lines

@@ -328,7 +328,7 @@ 
  * @global WP    $wp            WP instance.
  *
  * @param string       $taxonomy    Taxonomy key, must not exceed 32 characters.
- * @param array|string $object_type Name of the object type for the taxonomy object.
+ * @param string $object_type Name of the object type for the taxonomy object.
  * @param array|string $args        See optional args description above.
  * @return WP_Error|void WP_Error, if errors.
  */
@@ -598,7 +598,7 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|array    $term_ids   Term id or array of term ids of terms that will be used.
- * @param string|array $taxonomies String of taxonomy name or Array of string values of taxonomy names.
+ * @param string $taxonomies String of taxonomy name or Array of string values of taxonomy names.
  * @param array|string $args       Change the order of the object_ids, either ASC or DESC.
  * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success.
  *	the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
@@ -3730,7 +3730,7 @@ 
  *
  * @param array  $terms    The term_taxonomy_id of terms to update.
  * @param string $taxonomy The context of the term.
- * @return true Always true when complete.
+ * @return boolean Always true when complete.
  */
 function wp_update_term_count_now( $terms, $taxonomy ) {
 	$terms = array_map('intval', $terms);
@@ -4714,7 +4714,7 @@ 
  *
  * @since 2.5.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @param array $args {
  *     Optional. Arguments about how to format the list of taxonomies. Default empty array.
  *
@@ -4776,7 +4776,7 @@ 
  *
  * @since 2.5.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array
  */
 function get_post_taxonomies( $post = 0 ) {

Spacing +893 added lines, -893 removed lines

@@ -24,8 +24,8 @@ 
 function create_initial_taxonomies() {
 	global $wp_rewrite;
 
-	if ( ! did_action( 'init' ) ) {
-		$rewrite = array( 'category' => false, 'post_tag' => false, 'post_format' => false );
+	if ( ! did_action('init')) {
+		$rewrite = array('category' => false, 'post_tag' => false, 'post_format' => false);
 	} else {
 
 		/**
@@ -35,7 +35,7 @@ 
 		 *
 		 * @param string $context Context of the rewrite base. Default 'type'.
 		 */
-		$post_format_base = apply_filters( 'post_format_rewrite_base', 'type' );
+		$post_format_base = apply_filters('post_format_rewrite_base', 'type');
 		$rewrite = array(
 			'category' => array(
 				'hierarchical' => true,
@@ -49,11 +49,11 @@ 
 				'with_front' => ! get_option('tag_base') || $wp_rewrite->using_index_permalinks(),
 				'ep_mask' => EP_TAGS,
 			),
-			'post_format' => $post_format_base ? array( 'slug' => $post_format_base ) : false,
+			'post_format' => $post_format_base ? array('slug' => $post_format_base) : false,
 		);
 	}
 
-	register_taxonomy( 'category', 'post', array(
+	register_taxonomy('category', 'post', array(
 		'hierarchical' => true,
 		'query_var' => 'category_name',
 		'rewrite' => $rewrite['category'],
@@ -61,9 +61,9 @@ 
 		'show_ui' => true,
 		'show_admin_column' => true,
 		'_builtin' => true,
-	) );
+	));
 
-	register_taxonomy( 'post_tag', 'post', array(
+	register_taxonomy('post_tag', 'post', array(
 	 	'hierarchical' => false,
 		'query_var' => 'tag',
 		'rewrite' => $rewrite['post_tag'],
@@ -71,34 +71,34 @@ 
 		'show_ui' => true,
 		'show_admin_column' => true,
 		'_builtin' => true,
-	) );
+	));
 
-	register_taxonomy( 'nav_menu', 'nav_menu_item', array(
+	register_taxonomy('nav_menu', 'nav_menu_item', array(
 		'public' => false,
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => __( 'Navigation Menus' ),
-			'singular_name' => __( 'Navigation Menu' ),
+			'name' => __('Navigation Menus'),
+			'singular_name' => __('Navigation Menu'),
 		),
 		'query_var' => false,
 		'rewrite' => false,
 		'show_ui' => false,
 		'_builtin' => true,
 		'show_in_nav_menus' => false,
-	) );
+	));
 
-	register_taxonomy( 'link_category', 'link', array(
+	register_taxonomy('link_category', 'link', array(
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => __( 'Link Categories' ),
-			'singular_name' => __( 'Link Category' ),
-			'search_items' => __( 'Search Link Categories' ),
+			'name' => __('Link Categories'),
+			'singular_name' => __('Link Category'),
+			'search_items' => __('Search Link Categories'),
 			'popular_items' => null,
-			'all_items' => __( 'All Link Categories' ),
-			'edit_item' => __( 'Edit Link Category' ),
-			'update_item' => __( 'Update Link Category' ),
-			'add_new_item' => __( 'Add New Link Category' ),
-			'new_item_name' => __( 'New Link Category Name' ),
+			'all_items' => __('All Link Categories'),
+			'edit_item' => __('Edit Link Category'),
+			'update_item' => __('Update Link Category'),
+			'add_new_item' => __('Add New Link Category'),
+			'new_item_name' => __('New Link Category Name'),
 			'separate_items_with_commas' => null,
 			'add_or_remove_items' => null,
 			'choose_from_most_used' => null,
@@ -114,21 +114,21 @@ 
 		'public' => false,
 		'show_ui' => true,
 		'_builtin' => true,
-	) );
+	));
 
-	register_taxonomy( 'post_format', 'post', array(
+	register_taxonomy('post_format', 'post', array(
 		'public' => true,
 		'hierarchical' => false,
 		'labels' => array(
-			'name' => _x( 'Format', 'post format' ),
-			'singular_name' => _x( 'Format', 'post format' ),
+			'name' => _x('Format', 'post format'),
+			'singular_name' => _x('Format', 'post format'),
 		),
 		'query_var' => true,
 		'rewrite' => $rewrite['post_format'],
 		'show_ui' => false,
 		'_builtin' => true,
-		'show_in_nav_menus' => current_theme_supports( 'post-formats' ),
-	) );
+		'show_in_nav_menus' => current_theme_supports('post-formats'),
+	));
 }
 
 /**
@@ -147,7 +147,7 @@ 
  *                         Default 'and'.
  * @return array A list of taxonomy names or objects.
  */
-function get_taxonomies( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_taxonomies($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_taxonomies;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -176,11 +176,11 @@ 
  *                                     taxonomy 'names' or 'objects'. Default 'names'.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_object_taxonomies( $object, $output = 'names' ) {
+function get_object_taxonomies($object, $output = 'names') {
 	global $wp_taxonomies;
 
-	if ( is_object($object) ) {
-		if ( $object->post_type == 'attachment' )
+	if (is_object($object)) {
+		if ($object->post_type == 'attachment')
 			return get_attachment_taxonomies($object);
 		$object = $object->post_type;
 	}
@@ -188,12 +188,12 @@ 
 	$object = (array) $object;
 
 	$taxonomies = array();
-	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
-		if ( array_intersect($object, (array) $tax_obj->object_type) ) {
-			if ( 'names' == $output )
+	foreach ((array) $wp_taxonomies as $tax_name => $tax_obj) {
+		if (array_intersect($object, (array) $tax_obj->object_type)) {
+			if ('names' == $output)
 				$taxonomies[] = $tax_name;
 			else
-				$taxonomies[ $tax_name ] = $tax_obj;
+				$taxonomies[$tax_name] = $tax_obj;
 		}
 	}
 
@@ -213,10 +213,10 @@ 
  * @param string $taxonomy Name of taxonomy object to return.
  * @return object|false The Taxonomy Object or false if $taxonomy doesn't exist.
  */
-function get_taxonomy( $taxonomy ) {
+function get_taxonomy($taxonomy) {
 	global $wp_taxonomies;
 
-	if ( ! taxonomy_exists( $taxonomy ) )
+	if ( ! taxonomy_exists($taxonomy))
 		return false;
 
 	return $wp_taxonomies[$taxonomy];
@@ -234,10 +234,10 @@ 
  * @param string $taxonomy Name of taxonomy object.
  * @return bool Whether the taxonomy exists.
  */
-function taxonomy_exists( $taxonomy ) {
+function taxonomy_exists($taxonomy) {
 	global $wp_taxonomies;
 
-	return isset( $wp_taxonomies[$taxonomy] );
+	return isset($wp_taxonomies[$taxonomy]);
 }
 
 /**
@@ -254,7 +254,7 @@ 
  * @return bool Whether the taxonomy is hierarchical.
  */
 function is_taxonomy_hierarchical($taxonomy) {
-	if ( ! taxonomy_exists($taxonomy) )
+	if ( ! taxonomy_exists($taxonomy))
 		return false;
 
 	$taxonomy = get_taxonomy($taxonomy);
@@ -348,13 +348,13 @@ 
  * }
  * @return WP_Error|void WP_Error, if errors.
  */
-function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
+function register_taxonomy($taxonomy, $object_type, $args = array()) {
 	global $wp_taxonomies, $wp;
 
-	if ( ! is_array( $wp_taxonomies ) )
+	if ( ! is_array($wp_taxonomies))
 		$wp_taxonomies = array();
 
-	$args = wp_parse_args( $args );
+	$args = wp_parse_args($args);
 
 	/**
 	 * Filters the arguments for registering a taxonomy.
@@ -365,7 +365,7 @@ 
 	 * @param string $taxonomy    Taxonomy key.
 	 * @param array  $object_type Array of names of object types for the taxonomy.
 	 */
-	$args = apply_filters( 'register_taxonomy_args', $args, $taxonomy, (array) $object_type );
+	$args = apply_filters('register_taxonomy_args', $args, $taxonomy, (array) $object_type);
 
 	$defaults = array(
 		'labels'                => array(),
@@ -386,67 +386,67 @@ 
 		'update_count_callback' => '',
 		'_builtin'              => false,
 	);
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
-	if ( empty( $taxonomy ) || strlen( $taxonomy ) > 32 ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Taxonomy names must be between 1 and 32 characters in length.' ), '4.2' );
-		return new WP_Error( 'taxonomy_length_invalid', __( 'Taxonomy names must be between 1 and 32 characters in length.' ) );
+	if (empty($taxonomy) || strlen($taxonomy) > 32) {
+		_doing_it_wrong(__FUNCTION__, __('Taxonomy names must be between 1 and 32 characters in length.'), '4.2');
+		return new WP_Error('taxonomy_length_invalid', __('Taxonomy names must be between 1 and 32 characters in length.'));
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['publicly_queryable'] ) {
+	if (null === $args['publicly_queryable']) {
 		$args['publicly_queryable'] = $args['public'];
 	}
 
 	// Non-publicly queryable taxonomies should not register query vars, except in the admin.
-	if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) {
-		if ( true === $args['query_var'] )
+	if (false !== $args['query_var'] && (is_admin() || false !== $args['publicly_queryable']) && ! empty($wp)) {
+		if (true === $args['query_var'])
 			$args['query_var'] = $taxonomy;
 		else
-			$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
-		$wp->add_query_var( $args['query_var'] );
+			$args['query_var'] = sanitize_title_with_dashes($args['query_var']);
+		$wp->add_query_var($args['query_var']);
 	} else {
 		// Force query_var to false for non-public taxonomies.
 		$args['query_var'] = false;
 	}
 
-	if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-		$args['rewrite'] = wp_parse_args( $args['rewrite'], array(
+	if (false !== $args['rewrite'] && (is_admin() || '' != get_option('permalink_structure'))) {
+		$args['rewrite'] = wp_parse_args($args['rewrite'], array(
 			'with_front' => true,
 			'hierarchical' => false,
 			'ep_mask' => EP_NONE,
-		) );
+		));
 
-		if ( empty( $args['rewrite']['slug'] ) )
-			$args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
+		if (empty($args['rewrite']['slug']))
+			$args['rewrite']['slug'] = sanitize_title_with_dashes($taxonomy);
 
-		if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )
+		if ($args['hierarchical'] && $args['rewrite']['hierarchical'])
 			$tag = '(.+?)';
 		else
 			$tag = '([^/]+)';
 
-		add_rewrite_tag( "%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=" );
-		add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
+		add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+		add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']);
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_ui'] )
+	if (null === $args['show_ui'])
 		$args['show_ui'] = $args['public'];
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_in_menu' ] || ! $args['show_ui'] )
-		$args['show_in_menu' ] = $args['show_ui'];
+	if (null === $args['show_in_menu'] || ! $args['show_ui'])
+		$args['show_in_menu'] = $args['show_ui'];
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_in_nav_menus'] )
+	if (null === $args['show_in_nav_menus'])
 		$args['show_in_nav_menus'] = $args['public'];
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_tagcloud'] )
+	if (null === $args['show_tagcloud'])
 		$args['show_tagcloud'] = $args['show_ui'];
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_in_quick_edit'] ) {
+	if (null === $args['show_in_quick_edit']) {
 		$args['show_in_quick_edit'] = $args['show_ui'];
 	}
 
@@ -456,27 +456,27 @@ 
 		'delete_terms' => 'manage_categories',
 		'assign_terms' => 'edit_posts',
 	);
-	$args['cap'] = (object) array_merge( $default_caps, $args['capabilities'] );
-	unset( $args['capabilities'] );
+	$args['cap'] = (object) array_merge($default_caps, $args['capabilities']);
+	unset($args['capabilities']);
 
 	$args['name'] = $taxonomy;
-	$args['object_type'] = array_unique( (array) $object_type );
+	$args['object_type'] = array_unique((array) $object_type);
 
-	$args['labels'] = get_taxonomy_labels( (object) $args );
+	$args['labels'] = get_taxonomy_labels((object) $args);
 	$args['label'] = $args['labels']->name;
 
 	// If not set, use the default meta box
-	if ( null === $args['meta_box_cb'] ) {
-		if ( $args['hierarchical'] )
+	if (null === $args['meta_box_cb']) {
+		if ($args['hierarchical'])
 			$args['meta_box_cb'] = 'post_categories_meta_box';
 		else
 			$args['meta_box_cb'] = 'post_tags_meta_box';
 	}
 
-	$wp_taxonomies[ $taxonomy ] = (object) $args;
+	$wp_taxonomies[$taxonomy] = (object) $args;
 
 	// register callback handling for metabox
- 	add_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' );
+ 	add_filter('wp_ajax_add-'.$taxonomy, '_wp_ajax_add_hierarchical_term');
 
 	/**
 	 * Fires after a taxonomy is registered.
@@ -487,7 +487,7 @@ 
 	 * @param array|string $object_type Object type or array of object types.
 	 * @param array        $args        Array of taxonomy registration arguments.
 	 */
-	do_action( 'registered_taxonomy', $taxonomy, $object_type, $args );
+	do_action('registered_taxonomy', $taxonomy, $object_type, $args);
 }
 
 /**
@@ -503,36 +503,36 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return bool|WP_Error True on success, WP_Error on failure or if the taxonomy doesn't exist.
  */
-function unregister_taxonomy( $taxonomy ) {
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+function unregister_taxonomy($taxonomy) {
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 	}
 
-	$taxonomy_args = get_taxonomy( $taxonomy );
+	$taxonomy_args = get_taxonomy($taxonomy);
 
 	// Do not allow unregistering internal taxonomies.
-	if ( $taxonomy_args->_builtin ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed' ) );
+	if ($taxonomy_args->_builtin) {
+		return new WP_Error('invalid_taxonomy', __('Unregistering a built-in taxonomy is not allowed'));
 	}
 
 	global $wp, $wp_taxonomies;
 
 	// Remove query var.
-	if ( false !== $taxonomy_args->query_var ) {
-		$wp->remove_query_var( $taxonomy_args->query_var );
+	if (false !== $taxonomy_args->query_var) {
+		$wp->remove_query_var($taxonomy_args->query_var);
 	}
 
 	// Remove rewrite tags and permastructs.
-	if ( false !== $taxonomy_args->rewrite ) {
-		remove_rewrite_tag( "%$taxonomy%" );
-		remove_permastruct( $taxonomy );
+	if (false !== $taxonomy_args->rewrite) {
+		remove_rewrite_tag("%$taxonomy%");
+		remove_permastruct($taxonomy);
 	}
 
 	// Unregister callback handling for metabox.
-	remove_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' );
+	remove_filter('wp_ajax_add-'.$taxonomy, '_wp_ajax_add_hierarchical_term');
 
 	// Remove the taxonomy.
-	unset( $wp_taxonomies[ $taxonomy ] );
+	unset($wp_taxonomies[$taxonomy]);
 
 	/**
 	 * Fires after a taxonomy is unregistered.
@@ -541,7 +541,7 @@ 
 	 *
 	 * @param string $taxonomy Taxonomy name.
 	 */
-	do_action( 'unregistered_taxonomy', $taxonomy );
+	do_action('unregistered_taxonomy', $taxonomy);
 
 	return true;
 }
@@ -582,39 +582,39 @@ 
  * @param object $tax Taxonomy object.
  * @return object object with all the labels as member variables.
  */
-function get_taxonomy_labels( $tax ) {
+function get_taxonomy_labels($tax) {
 	$tax->labels = (array) $tax->labels;
 
-	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
+	if (isset($tax->helps) && empty($tax->labels['separate_items_with_commas']))
 		$tax->labels['separate_items_with_commas'] = $tax->helps;
 
-	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
+	if (isset($tax->no_tagcloud) && empty($tax->labels['not_found']))
 		$tax->labels['not_found'] = $tax->no_tagcloud;
 
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
-		'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
-		'search_items' => array( __( 'Search Tags' ), __( 'Search Categories' ) ),
-		'popular_items' => array( __( 'Popular Tags' ), null ),
-		'all_items' => array( __( 'All Tags' ), __( 'All Categories' ) ),
-		'parent_item' => array( null, __( 'Parent Category' ) ),
-		'parent_item_colon' => array( null, __( 'Parent Category:' ) ),
-		'edit_item' => array( __( 'Edit Tag' ), __( 'Edit Category' ) ),
-		'view_item' => array( __( 'View Tag' ), __( 'View Category' ) ),
-		'update_item' => array( __( 'Update Tag' ), __( 'Update Category' ) ),
-		'add_new_item' => array( __( 'Add New Tag' ), __( 'Add New Category' ) ),
-		'new_item_name' => array( __( 'New Tag Name' ), __( 'New Category Name' ) ),
-		'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
-		'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
-		'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
-		'not_found' => array( __( 'No tags found.' ), __( 'No categories found.' ) ),
-		'no_terms' => array( __( 'No tags' ), __( 'No categories' ) ),
-		'items_list_navigation' => array( __( 'Tags list navigation' ), __( 'Categories list navigation' ) ),
-		'items_list' => array( __( 'Tags list' ), __( 'Categories list' ) ),
+		'name' => array(_x('Tags', 'taxonomy general name'), _x('Categories', 'taxonomy general name')),
+		'singular_name' => array(_x('Tag', 'taxonomy singular name'), _x('Category', 'taxonomy singular name')),
+		'search_items' => array(__('Search Tags'), __('Search Categories')),
+		'popular_items' => array(__('Popular Tags'), null),
+		'all_items' => array(__('All Tags'), __('All Categories')),
+		'parent_item' => array(null, __('Parent Category')),
+		'parent_item_colon' => array(null, __('Parent Category:')),
+		'edit_item' => array(__('Edit Tag'), __('Edit Category')),
+		'view_item' => array(__('View Tag'), __('View Category')),
+		'update_item' => array(__('Update Tag'), __('Update Category')),
+		'add_new_item' => array(__('Add New Tag'), __('Add New Category')),
+		'new_item_name' => array(__('New Tag Name'), __('New Category Name')),
+		'separate_items_with_commas' => array(__('Separate tags with commas'), null),
+		'add_or_remove_items' => array(__('Add or remove tags'), null),
+		'choose_from_most_used' => array(__('Choose from the most used tags'), null),
+		'not_found' => array(__('No tags found.'), __('No categories found.')),
+		'no_terms' => array(__('No tags'), __('No categories')),
+		'items_list_navigation' => array(__('Tags list navigation'), __('Categories list navigation')),
+		'items_list' => array(__('Tags list'), __('Categories list')),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
-	$labels = _get_custom_object_labels( $tax, $nohier_vs_hier_defaults );
+	$labels = _get_custom_object_labels($tax, $nohier_vs_hier_defaults);
 
 	$taxonomy = $tax->name;
 
@@ -631,10 +631,10 @@ 
 	 *
 	 * @param object $labels Object with labels for the taxonomy as member variables.
 	 */
-	$labels = apply_filters( "taxonomy_labels_{$taxonomy}", $labels );
+	$labels = apply_filters("taxonomy_labels_{$taxonomy}", $labels);
 
 	// Ensure that the filtered labels contain all required default values.
-	$labels = (object) array_merge( (array) $default_labels, (array) $labels );
+	$labels = (object) array_merge((array) $default_labels, (array) $labels);
 
 	return $labels;
 }
@@ -650,20 +650,20 @@ 
  * @param string $object_type Name of the object type.
  * @return bool True if successful, false if not.
  */
-function register_taxonomy_for_object_type( $taxonomy, $object_type) {
+function register_taxonomy_for_object_type($taxonomy, $object_type) {
 	global $wp_taxonomies;
 
-	if ( !isset($wp_taxonomies[$taxonomy]) )
+	if ( ! isset($wp_taxonomies[$taxonomy]))
 		return false;
 
-	if ( ! get_post_type_object($object_type) )
+	if ( ! get_post_type_object($object_type))
 		return false;
 
-	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
+	if ( ! in_array($object_type, $wp_taxonomies[$taxonomy]->object_type))
 		$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
 
 	// Filter out empties.
-	$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
+	$wp_taxonomies[$taxonomy]->object_type = array_filter($wp_taxonomies[$taxonomy]->object_type);
 
 	return true;
 }
@@ -679,20 +679,20 @@ 
  * @param string $object_type Name of the object type.
  * @return bool True if successful, false if not.
  */
-function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
+function unregister_taxonomy_for_object_type($taxonomy, $object_type) {
 	global $wp_taxonomies;
 
-	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) )
+	if ( ! isset($wp_taxonomies[$taxonomy]))
 		return false;
 
-	if ( ! get_post_type_object( $object_type ) )
+	if ( ! get_post_type_object($object_type))
 		return false;
 
-	$key = array_search( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true );
-	if ( false === $key )
+	$key = array_search($object_type, $wp_taxonomies[$taxonomy]->object_type, true);
+	if (false === $key)
 		return false;
 
-	unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
+	unset($wp_taxonomies[$taxonomy]->object_type[$key]);
 	return true;
 }
 
@@ -725,34 +725,34 @@ 
  * @return WP_Error|array If the taxonomy does not exist, then WP_Error will be returned. On success.
  *	the array can be empty meaning that there are no $object_ids found or it will return the $object_ids found.
  */
-function get_objects_in_term( $term_ids, $taxonomies, $args = array() ) {
+function get_objects_in_term($term_ids, $taxonomies, $args = array()) {
 	global $wpdb;
 
-	if ( ! is_array( $term_ids ) ) {
-		$term_ids = array( $term_ids );
+	if ( ! is_array($term_ids)) {
+		$term_ids = array($term_ids);
 	}
-	if ( ! is_array( $taxonomies ) ) {
-		$taxonomies = array( $taxonomies );
+	if ( ! is_array($taxonomies)) {
+		$taxonomies = array($taxonomies);
 	}
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists( $taxonomy ) ) {
-			return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+	foreach ((array) $taxonomies as $taxonomy) {
+		if ( ! taxonomy_exists($taxonomy)) {
+			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 		}
 	}
 
-	$defaults = array( 'order' => 'ASC' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'ASC');
+	$args = wp_parse_args($args, $defaults);
 
-	$order = ( 'desc' == strtolower( $args['order'] ) ) ? 'DESC' : 'ASC';
+	$order = ('desc' == strtolower($args['order'])) ? 'DESC' : 'ASC';
 
-	$term_ids = array_map('intval', $term_ids );
+	$term_ids = array_map('intval', $term_ids);
 
-	$taxonomies = "'" . implode( "', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
-	$term_ids = "'" . implode( "', '", $term_ids ) . "'";
+	$taxonomies = "'".implode("', '", array_map('esc_sql', $taxonomies))."'";
+	$term_ids = "'".implode("', '", $term_ids)."'";
 
 	$object_ids = $wpdb->get_col("SELECT tr.object_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tt.term_id IN ($term_ids) ORDER BY tr.object_id $order");
 
-	if ( ! $object_ids ){
+	if ( ! $object_ids) {
 		return array();
 	}
 	return $object_ids;
@@ -770,9 +770,9 @@ 
  * @param string $primary_id_column
  * @return array
  */
-function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
-	$tax_query_obj = new WP_Tax_Query( $tax_query );
-	return $tax_query_obj->get_sql( $primary_table, $primary_id_column );
+function get_tax_sql($tax_query, $primary_table, $primary_id_column) {
+	$tax_query_obj = new WP_Tax_Query($tax_query);
+	return $tax_query_obj->get_sql($primary_table, $primary_id_column);
 }
 
 /**
@@ -820,31 +820,31 @@ 
  *                                     a WP_Term instance is returned. If taxonomy does not exist, a WP_Error is
  *                                     returned. Returns null for miscellaneous failure.
  */
-function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $term ) ) {
-		return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+function get_term($term, $taxonomy = '', $output = OBJECT, $filter = 'raw') {
+	if (empty($term)) {
+		return new WP_Error('invalid_term', __('Empty Term'));
 	}
 
-	if ( $taxonomy && ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+	if ($taxonomy && ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 	}
 
-	if ( $term instanceof WP_Term ) {
+	if ($term instanceof WP_Term) {
 		$_term = $term;
-	} elseif ( is_object( $term ) ) {
-		if ( empty( $term->filter ) || 'raw' === $term->filter ) {
-			$_term = sanitize_term( $term, $taxonomy, 'raw' );
-			$_term = new WP_Term( $_term );
+	} elseif (is_object($term)) {
+		if (empty($term->filter) || 'raw' === $term->filter) {
+			$_term = sanitize_term($term, $taxonomy, 'raw');
+			$_term = new WP_Term($_term);
 		} else {
-			$_term = WP_Term::get_instance( $term->term_id );
+			$_term = WP_Term::get_instance($term->term_id);
 		}
 	} else {
-		$_term = WP_Term::get_instance( $term, $taxonomy );
+		$_term = WP_Term::get_instance($term, $taxonomy);
 	}
 
-	if ( is_wp_error( $_term ) ) {
+	if (is_wp_error($_term)) {
 		return $_term;
-	} elseif ( ! $_term ) {
+	} elseif ( ! $_term) {
 		return null;
 	}
 
@@ -857,7 +857,7 @@ 
 	 * @param int|WP_Term $_term    Term object or ID.
 	 * @param string      $taxonomy The taxonomy slug.
 	 */
-	$_term = apply_filters( 'get_term', $_term, $taxonomy );
+	$_term = apply_filters('get_term', $_term, $taxonomy);
 
 	/**
 	 * Filters a taxonomy.
@@ -871,20 +871,20 @@ 
 	 * @param int|WP_Term $_term    Term object or ID.
 	 * @param string      $taxonomy The taxonomy slug.
 	 */
-	$_term = apply_filters( "get_$taxonomy", $_term, $taxonomy );
+	$_term = apply_filters("get_$taxonomy", $_term, $taxonomy);
 
 	// Bail if a filter callback has changed the type of the `$_term` object.
-	if ( ! ( $_term instanceof WP_Term ) ) {
+	if ( ! ($_term instanceof WP_Term)) {
 		return $_term;
 	}
 
 	// Sanitize term, according to the specified filter.
-	$_term->filter( $filter );
+	$_term->filter($filter);
 
-	if ( $output == ARRAY_A ) {
+	if ($output == ARRAY_A) {
 		return $_term->to_array();
-	} elseif ( $output == ARRAY_N ) {
-		return array_values( $_term->to_array() );
+	} elseif ($output == ARRAY_N) {
+		return array_values($_term->to_array());
 	}
 
 	return $_term;
@@ -926,51 +926,51 @@ 
  * @return WP_Term|bool WP_Term instance on success. Will return false if `$taxonomy` does not exist
  *                      or `$term` was not found.
  */
-function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
+function get_term_by($field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
 
 	// 'term_taxonomy_id' lookups don't require taxonomy checks.
-	if ( 'term_taxonomy_id' !== $field && ! taxonomy_exists( $taxonomy ) ) {
+	if ('term_taxonomy_id' !== $field && ! taxonomy_exists($taxonomy)) {
 		return false;
 	}
 
-	$tax_clause = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+	$tax_clause = $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-	if ( 'slug' == $field ) {
+	if ('slug' == $field) {
 		$_field = 't.slug';
 		$value = sanitize_title($value);
-		if ( empty($value) )
+		if (empty($value))
 			return false;
-	} elseif ( 'name' == $field ) {
+	} elseif ('name' == $field) {
 		// Assume already escaped
 		$value = wp_unslash($value);
 		$_field = 't.name';
-	} elseif ( 'term_taxonomy_id' == $field ) {
+	} elseif ('term_taxonomy_id' == $field) {
 		$value = (int) $value;
 		$_field = 'tt.term_taxonomy_id';
 
 		// No `taxonomy` clause when searching by 'term_taxonomy_id'.
 		$tax_clause = '';
 	} else {
-		$term = get_term( (int) $value, $taxonomy, $output, $filter );
-		if ( is_wp_error( $term ) || is_null( $term ) ) {
+		$term = get_term((int) $value, $taxonomy, $output, $filter);
+		if (is_wp_error($term) || is_null($term)) {
 			$term = false;
 		}
 		return $term;
 	}
 
-	$term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value ) . " $tax_clause LIMIT 1" );
-	if ( ! $term )
+	$term = $wpdb->get_row($wpdb->prepare("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value)." $tax_clause LIMIT 1");
+	if ( ! $term)
 		return false;
 
 	// In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.
-	if ( 'term_taxonomy_id' === $field ) {
+	if ('term_taxonomy_id' === $field) {
 		$taxonomy = $term->taxonomy;
 	}
 
-	wp_cache_add( $term->term_id, $term, 'terms' );
+	wp_cache_add($term->term_id, $term, 'terms');
 
-	return get_term( $term, $taxonomy, $output, $filter );
+	return get_term($term, $taxonomy, $output, $filter);
 }
 
 /**
@@ -987,25 +987,25 @@ 
  * @param string $taxonomy Taxonomy Name.
  * @return array|WP_Error List of Term IDs. WP_Error returned if `$taxonomy` does not exist.
  */
-function get_term_children( $term_id, $taxonomy ) {
-	if ( ! taxonomy_exists($taxonomy) )
+function get_term_children($term_id, $taxonomy) {
+	if ( ! taxonomy_exists($taxonomy))
 		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
-	$term_id = intval( $term_id );
+	$term_id = intval($term_id);
 
 	$terms = _get_term_hierarchy($taxonomy);
 
-	if ( ! isset($terms[$term_id]) )
+	if ( ! isset($terms[$term_id]))
 		return array();
 
 	$children = $terms[$term_id];
 
-	foreach ( (array) $terms[$term_id] as $child ) {
-		if ( $term_id == $child ) {
+	foreach ((array) $terms[$term_id] as $child) {
+		if ($term_id == $child) {
 			continue;
 		}
 
-		if ( isset($terms[$child]) )
+		if (isset($terms[$child]))
 			$children = array_merge($children, get_term_children($child, $taxonomy));
 	}
 
@@ -1028,18 +1028,18 @@ 
  * @param string      $context  Optional, default is display. Look at sanitize_term_field() for available options.
  * @return string|int|null|WP_Error Will return an empty string if $term is not an object or if $field is not set in $term.
  */
-function get_term_field( $field, $term, $taxonomy = '', $context = 'display' ) {
-	$term = get_term( $term, $taxonomy );
-	if ( is_wp_error($term) )
+function get_term_field($field, $term, $taxonomy = '', $context = 'display') {
+	$term = get_term($term, $taxonomy);
+	if (is_wp_error($term))
 		return $term;
 
-	if ( !is_object($term) )
+	if ( ! is_object($term))
 		return '';
 
-	if ( !isset($term->$field) )
+	if ( ! isset($term->$field))
 		return '';
 
-	return sanitize_term_field( $field, $term->$field, $term->term_id, $term->taxonomy, $context );
+	return sanitize_term_field($field, $term->$field, $term->term_id, $term->taxonomy, $context);
 }
 
 /**
@@ -1054,13 +1054,13 @@ 
  * @param string     $taxonomy Taxonomy name.
  * @return string|int|null|WP_Error Will return empty string if $term is not an object.
  */
-function get_term_to_edit( $id, $taxonomy ) {
-	$term = get_term( $id, $taxonomy );
+function get_term_to_edit($id, $taxonomy) {
+	$term = get_term($id, $taxonomy);
 
-	if ( is_wp_error($term) )
+	if (is_wp_error($term))
 		return $term;
 
-	if ( !is_object($term) )
+	if ( ! is_object($term))
 		return '';
 
 	return sanitize_term($term, $taxonomy, 'edit');
@@ -1178,7 +1178,7 @@ 
  * @return array|int|WP_Error List of WP_Term instances and their children. Will return WP_Error, if any of $taxonomies
  *                            do not exist.
  */
-function get_terms( $args = array(), $deprecated = '' ) {
+function get_terms($args = array(), $deprecated = '') {
 	global $wpdb;
 
 	$term_query = new WP_Term_Query();
@@ -1190,33 +1190,33 @@ 
 	 * (a) a second non-empty parameter is passed, or
 	 * (b) the first parameter shares no keys with the default array (ie, it's a list of taxonomies)
 	 */
-	$_args = wp_parse_args( $args );
-	$key_intersect  = array_intersect_key( $term_query->query_var_defaults, (array) $_args );
-	$do_legacy_args = $deprecated || empty( $key_intersect );
+	$_args = wp_parse_args($args);
+	$key_intersect  = array_intersect_key($term_query->query_var_defaults, (array) $_args);
+	$do_legacy_args = $deprecated || empty($key_intersect);
 
-	if ( $do_legacy_args ) {
+	if ($do_legacy_args) {
 		$taxonomies = (array) $args;
-		$args = wp_parse_args( $deprecated );
+		$args = wp_parse_args($deprecated);
 		$args['taxonomy'] = $taxonomies;
 	} else {
-		$args = wp_parse_args( $args );
-		if ( isset( $args['taxonomy'] ) && null !== $args['taxonomy'] ) {
+		$args = wp_parse_args($args);
+		if (isset($args['taxonomy']) && null !== $args['taxonomy']) {
 			$args['taxonomy'] = (array) $args['taxonomy'];
 		}
 	}
 
-	if ( ! empty( $args['taxonomy'] ) ) {
-		foreach ( $args['taxonomy'] as $taxonomy ) {
-			if ( ! taxonomy_exists( $taxonomy ) ) {
-				return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+	if ( ! empty($args['taxonomy'])) {
+		foreach ($args['taxonomy'] as $taxonomy) {
+			if ( ! taxonomy_exists($taxonomy)) {
+				return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 			}
 		}
 	}
 
-	$terms = $term_query->query( $args );
+	$terms = $term_query->query($args);
 
 	// Count queries are not filtered, for legacy reasons.
-	if ( ! is_array( $terms ) ) {
+	if ( ! is_array($terms)) {
 		return $terms;
 	}
 
@@ -1231,7 +1231,7 @@ 
 	 * @param array         $args       An array of get_terms() arguments.
 	 * @param WP_Term_Query $term_query The WP_Term_Query object.
 	 */
-	return apply_filters( 'get_terms', $terms, $term_query->query_vars['taxonomy'], $term_query->query_vars, $term_query );
+	return apply_filters('get_terms', $terms, $term_query->query_vars['taxonomy'], $term_query->query_vars, $term_query);
 }
 
 /**
@@ -1247,21 +1247,21 @@ 
  * @return int|WP_Error|bool Meta ID on success. WP_Error when term_id is ambiguous between taxonomies.
  *                           False on failure.
  */
-function add_term_meta( $term_id, $meta_key, $meta_value, $unique = false ) {
+function add_term_meta($term_id, $meta_key, $meta_value, $unique = false) {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	if ( wp_term_is_shared( $term_id ) ) {
-		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
+	if (wp_term_is_shared($term_id)) {
+		return new WP_Error('ambiguous_term_id', __('Term meta cannot be added to terms that are shared between taxonomies.'), $term_id);
 	}
 
-	$added = add_metadata( 'term', $term_id, $meta_key, $meta_value, $unique );
+	$added = add_metadata('term', $term_id, $meta_key, $meta_value, $unique);
 
 	// Bust term query cache.
-	if ( $added ) {
-		wp_cache_set( 'last_changed', microtime(), 'terms' );
+	if ($added) {
+		wp_cache_set('last_changed', microtime(), 'terms');
 	}
 
 	return $added;
@@ -1277,17 +1277,17 @@ 
  * @param mixed  $meta_value Optional. Metadata value. If provided, rows will only be removed that match the value.
  * @return bool True on success, false on failure.
  */
-function delete_term_meta( $term_id, $meta_key, $meta_value = '' ) {
+function delete_term_meta($term_id, $meta_key, $meta_value = '') {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	$deleted = delete_metadata( 'term', $term_id, $meta_key, $meta_value );
+	$deleted = delete_metadata('term', $term_id, $meta_key, $meta_value);
 
 	// Bust term query cache.
-	if ( $deleted ) {
-		wp_cache_set( 'last_changed', microtime(), 'terms' );
+	if ($deleted) {
+		wp_cache_set('last_changed', microtime(), 'terms');
 	}
 
 	return $deleted;
@@ -1304,13 +1304,13 @@ 
  *                        `$term_id`/`$key` pair will be returned. Default: false.
  * @return mixed If `$single` is false, an array of metadata values. If `$single` is true, a single metadata value.
  */
-function get_term_meta( $term_id, $key = '', $single = false ) {
+function get_term_meta($term_id, $key = '', $single = false) {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	return get_metadata( 'term', $term_id, $key, $single );
+	return get_metadata('term', $term_id, $key, $single);
 }
 
 /**
@@ -1329,21 +1329,21 @@ 
  * @return int|WP_Error|bool Meta ID if the key didn't previously exist. True on successful update.
  *                           WP_Error when term_id is ambiguous between taxonomies. False on failure.
  */
-function update_term_meta( $term_id, $meta_key, $meta_value, $prev_value = '' ) {
+function update_term_meta($term_id, $meta_key, $meta_value, $prev_value = '') {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return false;
 	}
 
-	if ( wp_term_is_shared( $term_id ) ) {
-		return new WP_Error( 'ambiguous_term_id', __( 'Term meta cannot be added to terms that are shared between taxonomies.'), $term_id );
+	if (wp_term_is_shared($term_id)) {
+		return new WP_Error('ambiguous_term_id', __('Term meta cannot be added to terms that are shared between taxonomies.'), $term_id);
 	}
 
-	$updated = update_metadata( 'term', $term_id, $meta_key, $meta_value, $prev_value );
+	$updated = update_metadata('term', $term_id, $meta_key, $meta_value, $prev_value);
 
 	// Bust term query cache.
-	if ( $updated ) {
-		wp_cache_set( 'last_changed', microtime(), 'terms' );
+	if ($updated) {
+		wp_cache_set('last_changed', microtime(), 'terms');
 	}
 
 	return $updated;
@@ -1360,13 +1360,13 @@ 
  * @param array $term_ids List of term IDs.
  * @return array|false Returns false if there is nothing to update. Returns an array of metadata on success.
  */
-function update_termmeta_cache( $term_ids ) {
+function update_termmeta_cache($term_ids) {
 	// Bail if term meta table is not installed.
-	if ( get_option( 'db_version' ) < 34370 ) {
+	if (get_option('db_version') < 34370) {
 		return;
 	}
 
-	return update_meta_cache( 'term', $term_ids );
+	return update_meta_cache('term', $term_ids);
 }
 
 /**
@@ -1386,24 +1386,24 @@ 
  *               an array of the term ID and the term taxonomy ID the taxonomy
  *               is specified and the pairing exists.
  */
-function term_exists( $term, $taxonomy = '', $parent = null ) {
+function term_exists($term, $taxonomy = '', $parent = null) {
 	global $wpdb;
 
 	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
 	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
 
-	if ( is_int($term) ) {
-		if ( 0 == $term )
+	if (is_int($term)) {
+		if (0 == $term)
 			return 0;
 		$where = 't.term_id = %d';
-		if ( !empty($taxonomy) )
-			return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
+		if ( ! empty($taxonomy))
+			return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
 		else
-			return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+			return $wpdb->get_var($wpdb->prepare($select.$where, $term));
 	}
 
-	$term = trim( wp_unslash( $term ) );
-	$slug = sanitize_title( $term );
+	$term = trim(wp_unslash($term));
+	$slug = sanitize_title($term);
 
 	$where = 't.slug = %s';
 	$else_where = 't.name = %s';
@@ -1411,8 +1411,8 @@ 
 	$else_where_fields = array($term);
 	$orderby = 'ORDER BY t.term_id ASC';
 	$limit = 'LIMIT 1';
-	if ( !empty($taxonomy) ) {
-		if ( is_numeric( $parent ) ) {
+	if ( ! empty($taxonomy)) {
+		if (is_numeric($parent)) {
 			$parent = (int) $parent;
 			$where_fields[] = $parent;
 			$else_where_fields[] = $parent;
@@ -1423,16 +1423,16 @@ 
 		$where_fields[] = $taxonomy;
 		$else_where_fields[] = $taxonomy;
 
-		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) )
+		if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A))
 			return $result;
 
-		return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
+		return $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
 	}
 
-	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) )
+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields)))
 		return $result;
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields) );
+	return $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields));
 }
 
 /**
@@ -1447,18 +1447,18 @@ 
  * @param string     $taxonomy Taxonomy name that $term1 and `$term2` belong to.
  * @return bool Whether `$term2` is a child of `$term1`.
  */
-function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
-	if ( ! isset( $term1->term_id ) )
-		$term1 = get_term( $term1, $taxonomy );
-	if ( ! isset( $term2->parent ) )
-		$term2 = get_term( $term2, $taxonomy );
+function term_is_ancestor_of($term1, $term2, $taxonomy) {
+	if ( ! isset($term1->term_id))
+		$term1 = get_term($term1, $taxonomy);
+	if ( ! isset($term2->parent))
+		$term2 = get_term($term2, $taxonomy);
 
-	if ( empty( $term1->term_id ) || empty( $term2->parent ) )
+	if (empty($term1->term_id) || empty($term2->parent))
 		return false;
-	if ( $term2->parent == $term1->term_id )
+	if ($term2->parent == $term1->term_id)
 		return true;
 
-	return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
+	return term_is_ancestor_of($term1, get_term($term2->parent, $taxonomy), $taxonomy);
 }
 
 /**
@@ -1479,23 +1479,23 @@ 
  * @return array|object Term with all fields sanitized.
  */
 function sanitize_term($term, $taxonomy, $context = 'display') {
-	$fields = array( 'term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id' );
+	$fields = array('term_id', 'name', 'description', 'slug', 'count', 'parent', 'term_group', 'term_taxonomy_id', 'object_id');
 
-	$do_object = is_object( $term );
+	$do_object = is_object($term);
 
 	$term_id = $do_object ? $term->term_id : (isset($term['term_id']) ? $term['term_id'] : 0);
 
-	foreach ( (array) $fields as $field ) {
-		if ( $do_object ) {
-			if ( isset($term->$field) )
+	foreach ((array) $fields as $field) {
+		if ($do_object) {
+			if (isset($term->$field))
 				$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
 		} else {
-			if ( isset($term[$field]) )
+			if (isset($term[$field]))
 				$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
 		}
 	}
 
-	if ( $do_object )
+	if ($do_object)
 		$term->filter = $context;
 	else
 		$term['filter'] = $context;
@@ -1527,17 +1527,17 @@ 
  * @return mixed Sanitized field.
  */
 function sanitize_term_field($field, $value, $term_id, $taxonomy, $context) {
-	$int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
-	if ( in_array( $field, $int_fields ) ) {
+	$int_fields = array('parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id');
+	if (in_array($field, $int_fields)) {
 		$value = (int) $value;
-		if ( $value < 0 )
+		if ($value < 0)
 			$value = 0;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 
 		/**
 		 * Filters a term field to edit before it is sanitized.
@@ -1550,7 +1550,7 @@ 
 		 * @param int   $term_id   Term ID.
 		 * @param string $taxonomy Taxonomy slug.
 		 */
-		$value = apply_filters( "edit_term_{$field}", $value, $term_id, $taxonomy );
+		$value = apply_filters("edit_term_{$field}", $value, $term_id, $taxonomy);
 
 		/**
 		 * Filters the taxonomy field to edit before it is sanitized.
@@ -1563,13 +1563,13 @@ 
 		 * @param mixed $value   Value of the taxonomy field to edit.
 		 * @param int   $term_id Term ID.
 		 */
-		$value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
+		$value = apply_filters("edit_{$taxonomy}_{$field}", $value, $term_id);
 
-		if ( 'description' == $field )
+		if ('description' == $field)
 			$value = esc_html($value); // textarea_escaped
 		else
 			$value = esc_attr($value);
-	} elseif ( 'db' == $context ) {
+	} elseif ('db' == $context) {
 
 		/**
 		 * Filters a term field value before it is sanitized.
@@ -1581,7 +1581,7 @@ 
 		 * @param mixed  $value    Value of the term field.
 		 * @param string $taxonomy Taxonomy slug.
 		 */
-		$value = apply_filters( "pre_term_{$field}", $value, $taxonomy );
+		$value = apply_filters("pre_term_{$field}", $value, $taxonomy);
 
 		/**
 		 * Filters a taxonomy field before it is sanitized.
@@ -1593,10 +1593,10 @@ 
 		 *
 		 * @param mixed $value Value of the taxonomy field.
 		 */
-		$value = apply_filters( "pre_{$taxonomy}_{$field}", $value );
+		$value = apply_filters("pre_{$taxonomy}_{$field}", $value);
 
 		// Back compat filters
-		if ( 'slug' == $field ) {
+		if ('slug' == $field) {
 			/**
 			 * Filters the category nicename before it is sanitized.
 			 *
@@ -1606,10 +1606,10 @@ 
 			 *
 			 * @param string $value The category nicename.
 			 */
-			$value = apply_filters( 'pre_category_nicename', $value );
+			$value = apply_filters('pre_category_nicename', $value);
 		}
 
-	} elseif ( 'rss' == $context ) {
+	} elseif ('rss' == $context) {
 
 		/**
 		 * Filters the term field for use in RSS.
@@ -1621,7 +1621,7 @@ 
 		 * @param mixed  $value    Value of the term field.
 		 * @param string $taxonomy Taxonomy slug.
 		 */
-		$value = apply_filters( "term_{$field}_rss", $value, $taxonomy );
+		$value = apply_filters("term_{$field}_rss", $value, $taxonomy);
 
 		/**
 		 * Filters the taxonomy field for use in RSS.
@@ -1633,7 +1633,7 @@ 
 		 *
 		 * @param mixed $value Value of the taxonomy field.
 		 */
-		$value = apply_filters( "{$taxonomy}_{$field}_rss", $value );
+		$value = apply_filters("{$taxonomy}_{$field}_rss", $value);
 	} else {
 		// Use display filters by default.
 
@@ -1649,7 +1649,7 @@ 
 		 * @param string $taxonomy Taxonomy slug.
 		 * @param string $context  Context to retrieve the term field value.
 		 */
-		$value = apply_filters( "term_{$field}", $value, $term_id, $taxonomy, $context );
+		$value = apply_filters("term_{$field}", $value, $term_id, $taxonomy, $context);
 
 		/**
 		 * Filters the taxonomy field sanitized for display.
@@ -1663,12 +1663,12 @@ 
 		 * @param int    $term_id Term ID.
 		 * @param string $context Context to retrieve the taxonomy field value.
 		 */
-		$value = apply_filters( "{$taxonomy}_{$field}", $value, $term_id, $context );
+		$value = apply_filters("{$taxonomy}_{$field}", $value, $term_id, $context);
 	}
 
-	if ( 'attribute' == $context ) {
+	if ('attribute' == $context) {
 		$value = esc_attr($value);
-	} elseif ( 'js' == $context ) {
+	} elseif ('js' == $context) {
 		$value = esc_js($value);
 	}
 	return $value;
@@ -1686,12 +1686,12 @@ 
  *                               Default empty array.
  * @return array|int|WP_Error Number of terms in that taxonomy or WP_Error if the taxonomy does not exist.
  */
-function wp_count_terms( $taxonomy, $args = array() ) {
+function wp_count_terms($taxonomy, $args = array()) {
 	$defaults = array('hide_empty' => false);
 	$args = wp_parse_args($args, $defaults);
 
 	// backward compatibility
-	if ( isset($args['ignore_empty']) ) {
+	if (isset($args['ignore_empty'])) {
 		$args['hide_empty'] = $args['ignore_empty'];
 		unset($args['ignore_empty']);
 	}
@@ -1713,16 +1713,16 @@ 
  * @param int          $object_id  The term Object Id that refers to the term.
  * @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name.
  */
-function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
+function wp_delete_object_term_relationships($object_id, $taxonomies) {
 	$object_id = (int) $object_id;
 
-	if ( !is_array($taxonomies) )
+	if ( ! is_array($taxonomies))
 		$taxonomies = array($taxonomies);
 
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		$term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
-		$term_ids = array_map( 'intval', $term_ids );
-		wp_remove_object_terms( $object_id, $term_ids, $taxonomy );
+	foreach ((array) $taxonomies as $taxonomy) {
+		$term_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'ids'));
+		$term_ids = array_map('intval', $term_ids);
+		wp_remove_object_terms($object_id, $term_ids, $taxonomy);
 	}
 }
 
@@ -1753,36 +1753,36 @@ 
  * @return bool|int|WP_Error True on success, false if term does not exist. Zero on attempted
  *                           deletion of default Category. WP_Error if the taxonomy does not exist.
  */
-function wp_delete_term( $term, $taxonomy, $args = array() ) {
+function wp_delete_term($term, $taxonomy, $args = array()) {
 	global $wpdb;
 
 	$term = (int) $term;
 
-	if ( ! $ids = term_exists($term, $taxonomy) )
+	if ( ! $ids = term_exists($term, $taxonomy))
 		return false;
-	if ( is_wp_error( $ids ) )
+	if (is_wp_error($ids))
 		return $ids;
 
 	$tt_id = $ids['term_taxonomy_id'];
 
 	$defaults = array();
 
-	if ( 'category' == $taxonomy ) {
-		$defaults['default'] = get_option( 'default_category' );
-		if ( $defaults['default'] == $term )
+	if ('category' == $taxonomy) {
+		$defaults['default'] = get_option('default_category');
+		if ($defaults['default'] == $term)
 			return 0; // Don't delete the default category
 	}
 
 	$args = wp_parse_args($args, $defaults);
 
-	if ( isset( $args['default'] ) ) {
+	if (isset($args['default'])) {
 		$default = (int) $args['default'];
-		if ( ! term_exists( $default, $taxonomy ) ) {
-			unset( $default );
+		if ( ! term_exists($default, $taxonomy)) {
+			unset($default);
 		}
 	}
 
-	if ( isset( $args['force_default'] ) ) {
+	if (isset($args['force_default'])) {
 		$force_default = $args['force_default'];
 	}
 
@@ -1794,17 +1794,17 @@ 
 	 * @param int    $term     Term ID.
 	 * @param string $taxonomy Taxonomy Name.
 	 */
-	do_action( 'pre_delete_term', $term, $taxonomy );
+	do_action('pre_delete_term', $term, $taxonomy);
 
 	// Update children to point to new parent
-	if ( is_taxonomy_hierarchical($taxonomy) ) {
+	if (is_taxonomy_hierarchical($taxonomy)) {
 		$term_obj = get_term($term, $taxonomy);
-		if ( is_wp_error( $term_obj ) )
+		if (is_wp_error($term_obj))
 			return $term_obj;
 		$parent = $term_obj->parent;
 
-		$edit_ids = $wpdb->get_results( "SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = " . (int)$term_obj->term_id );
-		$edit_tt_ids = wp_list_pluck( $edit_ids, 'term_taxonomy_id' );
+		$edit_ids = $wpdb->get_results("SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = ".(int) $term_obj->term_id);
+		$edit_tt_ids = wp_list_pluck($edit_ids, 'term_taxonomy_id');
 
 		/**
 		 * Fires immediately before a term to delete's children are reassigned a parent.
@@ -1813,13 +1813,13 @@ 
 		 *
 		 * @param array $edit_tt_ids An array of term taxonomy IDs for the given term.
 		 */
-		do_action( 'edit_term_taxonomies', $edit_tt_ids );
+		do_action('edit_term_taxonomies', $edit_tt_ids);
 
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'parent' ), array( 'parent' => $term_obj->term_id) + compact( 'taxonomy' ) );
+		$wpdb->update($wpdb->term_taxonomy, compact('parent'), array('parent' => $term_obj->term_id) + compact('taxonomy'));
 
 		// Clean the cache for all child terms.
-		$edit_term_ids = wp_list_pluck( $edit_ids, 'term_id' );
-		clean_term_cache( $edit_term_ids, $taxonomy );
+		$edit_term_ids = wp_list_pluck($edit_ids, 'term_id');
+		clean_term_cache($edit_term_ids, $taxonomy);
 
 		/**
 		 * Fires immediately after a term to delete's children are reassigned a parent.
@@ -1828,17 +1828,17 @@ 
 		 *
 		 * @param array $edit_tt_ids An array of term taxonomy IDs for the given term.
 		 */
-		do_action( 'edited_term_taxonomies', $edit_tt_ids );
+		do_action('edited_term_taxonomies', $edit_tt_ids);
 	}
 
 	// Get the term before deleting it or its term relationships so we can pass to actions below.
-	$deleted_term = get_term( $term, $taxonomy );
+	$deleted_term = get_term($term, $taxonomy);
 
-	$object_ids = (array) $wpdb->get_col( $wpdb->prepare( "SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id ) );
+	$object_ids = (array) $wpdb->get_col($wpdb->prepare("SELECT object_id FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $tt_id));
 
-	foreach ( $object_ids as $object_id ) {
-		$terms = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids', 'orderby' => 'none' ) );
-		if ( 1 == count($terms) && isset($default) ) {
+	foreach ($object_ids as $object_id) {
+		$terms = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'ids', 'orderby' => 'none'));
+		if (1 == count($terms) && isset($default)) {
 			$terms = array($default);
 		} else {
 			$terms = array_diff($terms, array($term));
@@ -1846,17 +1846,17 @@ 
 				$terms = array_merge($terms, array($default));
 		}
 		$terms = array_map('intval', $terms);
-		wp_set_object_terms( $object_id, $terms, $taxonomy );
+		wp_set_object_terms($object_id, $terms, $taxonomy);
 	}
 
 	// Clean the relationship caches for all object types using this term.
-	$tax_object = get_taxonomy( $taxonomy );
-	foreach ( $tax_object->object_type as $object_type )
-		clean_object_term_cache( $object_ids, $object_type );
+	$tax_object = get_taxonomy($taxonomy);
+	foreach ($tax_object->object_type as $object_type)
+		clean_object_term_cache($object_ids, $object_type);
 
-	$term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
-	foreach ( $term_meta_ids as $mid ) {
-		delete_metadata_by_mid( 'term', $mid );
+	$term_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term));
+	foreach ($term_meta_ids as $mid) {
+		delete_metadata_by_mid('term', $mid);
 	}
 
 	/**
@@ -1866,8 +1866,8 @@ 
 	 *
 	 * @param int $tt_id Term taxonomy ID.
 	 */
-	do_action( 'delete_term_taxonomy', $tt_id );
-	$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $tt_id ) );
+	do_action('delete_term_taxonomy', $tt_id);
+	$wpdb->delete($wpdb->term_taxonomy, array('term_taxonomy_id' => $tt_id));
 
 	/**
 	 * Fires immediately after a term taxonomy ID is deleted.
@@ -1876,11 +1876,11 @@ 
 	 *
 	 * @param int $tt_id Term taxonomy ID.
 	 */
-	do_action( 'deleted_term_taxonomy', $tt_id );
+	do_action('deleted_term_taxonomy', $tt_id);
 
 	// Delete the term if no taxonomies use it.
-	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) )
-		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	if ( ! $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term)))
+		$wpdb->delete($wpdb->terms, array('term_id' => $term));
 
 	clean_term_cache($term, $taxonomy);
 
@@ -1897,7 +1897,7 @@ 
 	 *                              by the parent function. WP_Error otherwise.
 	 * @param array   $object_ids   List of term object IDs.
 	 */
-	do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term, $object_ids );
+	do_action('delete_term', $term, $tt_id, $taxonomy, $deleted_term, $object_ids);
 
 	/**
 	 * Fires after a term in a specific taxonomy is deleted.
@@ -1914,7 +1914,7 @@ 
 	 *                              by the parent function. WP_Error otherwise.
 	 * @param array   $object_ids   List of term object IDs.
 	 */
-	do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids );
+	do_action("delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids);
 
 	return true;
 }
@@ -1928,8 +1928,8 @@ 
  * @return bool|int|WP_Error Returns true if completes delete action; false if term doesn't exist;
  * 	Zero on attempted deletion of default Category; WP_Error object is also a possibility.
  */
-function wp_delete_category( $cat_ID ) {
-	return wp_delete_term( $cat_ID, 'category' );
+function wp_delete_category($cat_ID) {
+	return wp_delete_term($cat_ID, 'category');
 }
 
 /**
@@ -1967,18 +1967,18 @@ 
 function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
 	global $wpdb;
 
-	if ( empty( $object_ids ) || empty( $taxonomies ) )
+	if (empty($object_ids) || empty($taxonomies))
 		return array();
 
-	if ( !is_array($taxonomies) )
+	if ( ! is_array($taxonomies))
 		$taxonomies = array($taxonomies);
 
-	foreach ( $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists($taxonomy) )
+	foreach ($taxonomies as $taxonomy) {
+		if ( ! taxonomy_exists($taxonomy))
 			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 	}
 
-	if ( !is_array($object_ids) )
+	if ( ! is_array($object_ids))
 		$object_ids = array($object_ids);
 	$object_ids = array_map('intval', $object_ids);
 
@@ -1990,20 +1990,20 @@ 
 		'update_term_meta_cache' => true,
 		'meta_query' => '',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$terms = array();
-	if ( count($taxonomies) > 1 ) {
-		foreach ( $taxonomies as $index => $taxonomy ) {
+	if (count($taxonomies) > 1) {
+		foreach ($taxonomies as $index => $taxonomy) {
 			$t = get_taxonomy($taxonomy);
-			if ( isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args) ) {
+			if (isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args)) {
 				unset($taxonomies[$index]);
 				$terms = array_merge($terms, wp_get_object_terms($object_ids, $taxonomy, array_merge($args, $t->args)));
 			}
 		}
 	} else {
 		$t = get_taxonomy($taxonomies[0]);
-		if ( isset($t->args) && is_array($t->args) )
+		if (isset($t->args) && is_array($t->args))
 			$args = array_merge($args, $t->args);
 	}
 
@@ -2011,13 +2011,13 @@ 
 	$order = $args['order'];
 	$fields = $args['fields'];
 
-	if ( in_array( $orderby, array( 'term_id', 'name', 'slug', 'term_group' ) ) ) {
+	if (in_array($orderby, array('term_id', 'name', 'slug', 'term_group'))) {
 		$orderby = "t.$orderby";
-	} elseif ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) {
+	} elseif (in_array($orderby, array('count', 'parent', 'taxonomy', 'term_taxonomy_id'))) {
 		$orderby = "tt.$orderby";
-	} elseif ( 'term_order' === $orderby ) {
+	} elseif ('term_order' === $orderby) {
 		$orderby = 'tr.term_order';
-	} elseif ( 'none' === $orderby ) {
+	} elseif ('none' === $orderby) {
 		$orderby = '';
 		$order = '';
 	} else {
@@ -2025,31 +2025,31 @@ 
 	}
 
 	// tt_ids queries can only be none or tr.term_taxonomy_id
-	if ( ('tt_ids' == $fields) && !empty($orderby) )
+	if (('tt_ids' == $fields) && ! empty($orderby))
 		$orderby = 'tr.term_taxonomy_id';
 
-	if ( !empty($orderby) )
+	if ( ! empty($orderby))
 		$orderby = "ORDER BY $orderby";
 
-	$order = strtoupper( $order );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) )
+	$order = strtoupper($order);
+	if ('' !== $order && ! in_array($order, array('ASC', 'DESC')))
 		$order = 'ASC';
 
 	$taxonomy_array = $taxonomies;
 	$object_id_array = $object_ids;
-	$taxonomies = "'" . implode("', '", array_map( 'esc_sql', $taxonomies ) ) . "'";
+	$taxonomies = "'".implode("', '", array_map('esc_sql', $taxonomies))."'";
 	$object_ids = implode(', ', $object_ids);
 
 	$select_this = '';
-	if ( 'all' == $fields ) {
+	if ('all' == $fields) {
 		$select_this = 't.*, tt.*';
-	} elseif ( 'ids' == $fields ) {
+	} elseif ('ids' == $fields) {
 		$select_this = 't.term_id';
-	} elseif ( 'names' == $fields ) {
+	} elseif ('names' == $fields) {
 		$select_this = 't.name';
-	} elseif ( 'slugs' == $fields ) {
+	} elseif ('slugs' == $fields) {
 		$select_this = 't.slug';
-	} elseif ( 'all_with_object_id' == $fields ) {
+	} elseif ('all_with_object_id' == $fields) {
 		$select_this = 't.*, tt.*, tr.object_id';
 	}
 
@@ -2058,86 +2058,86 @@ 
 		"tr.object_id IN ($object_ids)",
 	);
 
-	if ( '' !== $args['parent'] ) {
-		$where[] = $wpdb->prepare( 'tt.parent = %d', $args['parent'] );
+	if ('' !== $args['parent']) {
+		$where[] = $wpdb->prepare('tt.parent = %d', $args['parent']);
 	}
 
 	// Meta query support.
 	$meta_query_join = '';
-	if ( ! empty( $args['meta_query'] ) ) {
-		$mquery = new WP_Meta_Query( $args['meta_query'] );
-		$mq_sql = $mquery->get_sql( 'term', 't', 'term_id' );
+	if ( ! empty($args['meta_query'])) {
+		$mquery = new WP_Meta_Query($args['meta_query']);
+		$mq_sql = $mquery->get_sql('term', 't', 'term_id');
 
 		$meta_query_join .= $mq_sql['join'];
 
 		// Strip leading AND.
-		$where[] = preg_replace( '/^\s*AND/', '', $mq_sql['where'] );
+		$where[] = preg_replace('/^\s*AND/', '', $mq_sql['where']);
 	}
 
-	$where = implode( ' AND ', $where );
+	$where = implode(' AND ', $where);
 
 	$query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id $meta_query_join WHERE $where $orderby $order";
 
 	$objects = false;
-	if ( 'all' == $fields || 'all_with_object_id' == $fields ) {
-		$_terms = $wpdb->get_results( $query );
+	if ('all' == $fields || 'all_with_object_id' == $fields) {
+		$_terms = $wpdb->get_results($query);
 		$object_id_index = array();
-		foreach ( $_terms as $key => $term ) {
-			$term = sanitize_term( $term, $taxonomy, 'raw' );
-			$_terms[ $key ] = $term;
+		foreach ($_terms as $key => $term) {
+			$term = sanitize_term($term, $taxonomy, 'raw');
+			$_terms[$key] = $term;
 
-			if ( isset( $term->object_id ) ) {
-				$object_id_index[ $key ] = $term->object_id;
+			if (isset($term->object_id)) {
+				$object_id_index[$key] = $term->object_id;
 			}
 		}
 
-		update_term_cache( $_terms );
-		$_terms = array_map( 'get_term', $_terms );
+		update_term_cache($_terms);
+		$_terms = array_map('get_term', $_terms);
 
 		// Re-add the object_id data, which is lost when fetching terms from cache.
-		if ( 'all_with_object_id' === $fields ) {
-			foreach ( $_terms as $key => $_term ) {
-				if ( isset( $object_id_index[ $key ] ) ) {
-					$_term->object_id = $object_id_index[ $key ];
+		if ('all_with_object_id' === $fields) {
+			foreach ($_terms as $key => $_term) {
+				if (isset($object_id_index[$key])) {
+					$_term->object_id = $object_id_index[$key];
 				}
 			}
 		}
 
-		$terms = array_merge( $terms, $_terms );
+		$terms = array_merge($terms, $_terms);
 		$objects = true;
 
-	} elseif ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
-		$_terms = $wpdb->get_col( $query );
-		$_field = ( 'ids' == $fields ) ? 'term_id' : 'name';
-		foreach ( $_terms as $key => $term ) {
-			$_terms[$key] = sanitize_term_field( $_field, $term, $term, $taxonomy, 'raw' );
+	} elseif ('ids' == $fields || 'names' == $fields || 'slugs' == $fields) {
+		$_terms = $wpdb->get_col($query);
+		$_field = ('ids' == $fields) ? 'term_id' : 'name';
+		foreach ($_terms as $key => $term) {
+			$_terms[$key] = sanitize_term_field($_field, $term, $term, $taxonomy, 'raw');
 		}
-		$terms = array_merge( $terms, $_terms );
-	} elseif ( 'tt_ids' == $fields ) {
+		$terms = array_merge($terms, $_terms);
+	} elseif ('tt_ids' == $fields) {
 		$terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
-		foreach ( $terms as $key => $tt_id ) {
-			$terms[$key] = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context.
+		foreach ($terms as $key => $tt_id) {
+			$terms[$key] = sanitize_term_field('term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw'); // 0 should be the term id, however is not needed when using raw context.
 		}
 	}
 
 	// Update termmeta cache, if necessary.
-	if ( $args['update_term_meta_cache'] && ( 'all' === $fields || 'all_with_object_id' === $fields || 'ids' === $fields ) ) {
-		if ( 'ids' === $fields ) {
+	if ($args['update_term_meta_cache'] && ('all' === $fields || 'all_with_object_id' === $fields || 'ids' === $fields)) {
+		if ('ids' === $fields) {
 			$term_ids = $terms;
 		} else {
-			$term_ids = wp_list_pluck( $terms, 'term_id' );
+			$term_ids = wp_list_pluck($terms, 'term_id');
 		}
 
-		update_termmeta_cache( $term_ids );
+		update_termmeta_cache($term_ids);
 	}
 
-	if ( ! $terms ) {
+	if ( ! $terms) {
 		$terms = array();
-	} elseif ( $objects && 'all_with_object_id' !== $fields ) {
+	} elseif ($objects && 'all_with_object_id' !== $fields) {
 		$_tt_ids = array();
 		$_terms = array();
-		foreach ( $terms as $term ) {
-			if ( in_array( $term->term_taxonomy_id, $_tt_ids ) ) {
+		foreach ($terms as $term) {
+			if (in_array($term->term_taxonomy_id, $_tt_ids)) {
 				continue;
 			}
 
@@ -2145,8 +2145,8 @@ 
 			$_terms[] = $term;
 		}
 		$terms = $_terms;
-	} elseif ( ! $objects ) {
-		$terms = array_values( array_unique( $terms ) );
+	} elseif ( ! $objects) {
+		$terms = array_values(array_unique($terms));
 	}
 
 	/**
@@ -2160,7 +2160,7 @@ 
 	 * @param array $args            An array of arguments for retrieving terms for the given
 	 *                               object(s). See wp_get_object_terms() for details.
 	 */
-	$terms = apply_filters( 'get_object_terms', $terms, $object_id_array, $taxonomy_array, $args );
+	$terms = apply_filters('get_object_terms', $terms, $object_id_array, $taxonomy_array, $args);
 
 	/**
 	 * Filters the terms for a given object or objects.
@@ -2176,7 +2176,7 @@ 
 	 * @param array     $args       An array of arguments for retrieving terms for the given object(s).
 	 *                              See wp_get_object_terms() for details.
 	 */
-	return apply_filters( 'wp_get_object_terms', $terms, $object_ids, $taxonomies, $args );
+	return apply_filters('wp_get_object_terms', $terms, $object_ids, $taxonomies, $args);
 }
 
 /**
@@ -2222,10 +2222,10 @@ 
  * @return array|WP_Error An array containing the `term_id` and `term_taxonomy_id`,
  *                        WP_Error otherwise.
  */
-function wp_insert_term( $term, $taxonomy, $args = array() ) {
+function wp_insert_term($term, $taxonomy, $args = array()) {
 	global $wpdb;
 
-	if ( ! taxonomy_exists($taxonomy) ) {
+	if ( ! taxonomy_exists($taxonomy)) {
 		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 	}
 	/**
@@ -2236,21 +2236,21 @@ 
 	 * @param string $term     The term to add or update.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	$term = apply_filters( 'pre_insert_term', $term, $taxonomy );
-	if ( is_wp_error( $term ) ) {
+	$term = apply_filters('pre_insert_term', $term, $taxonomy);
+	if (is_wp_error($term)) {
 		return $term;
 	}
-	if ( is_int($term) && 0 == $term ) {
+	if (is_int($term) && 0 == $term) {
 		return new WP_Error('invalid_term_id', __('Invalid term ID'));
 	}
-	if ( '' == trim($term) ) {
+	if ('' == trim($term)) {
 		return new WP_Error('empty_term_name', __('A name is required for this term'));
 	}
-	$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
+	$args = wp_parse_args($args, $defaults);
 
-	if ( $args['parent'] > 0 && ! term_exists( (int) $args['parent'] ) ) {
-		return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
+	if ($args['parent'] > 0 && ! term_exists((int) $args['parent'])) {
+		return new WP_Error('missing_parent', __('Parent term does not exist.'));
 	}
 
 	$args['name'] = $term;
@@ -2262,33 +2262,33 @@ 
 	$args = sanitize_term($args, $taxonomy, 'db');
 
 	// expected_slashed ($name)
-	$name = wp_unslash( $args['name'] );
-	$description = wp_unslash( $args['description'] );
+	$name = wp_unslash($args['name']);
+	$description = wp_unslash($args['description']);
 	$parent = (int) $args['parent'];
 
-	$slug_provided = ! empty( $args['slug'] );
-	if ( ! $slug_provided ) {
-		$slug = sanitize_title( $name );
+	$slug_provided = ! empty($args['slug']);
+	if ( ! $slug_provided) {
+		$slug = sanitize_title($name);
 	} else {
 		$slug = $args['slug'];
 	}
 
 	$term_group = 0;
-	if ( $args['alias_of'] ) {
-		$alias = get_term_by( 'slug', $args['alias_of'], $taxonomy );
-		if ( ! empty( $alias->term_group ) ) {
+	if ($args['alias_of']) {
+		$alias = get_term_by('slug', $args['alias_of'], $taxonomy);
+		if ( ! empty($alias->term_group)) {
 			// The alias we want is already in a group, so let's use that one.
 			$term_group = $alias->term_group;
-		} elseif ( ! empty( $alias->term_id ) ) {
+		} elseif ( ! empty($alias->term_id)) {
 			/*
 			 * The alias is not in a group, so we create a new one
 			 * and add the alias to it.
 			 */
 			$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
 
-			wp_update_term( $alias->term_id, $taxonomy, array(
+			wp_update_term($alias->term_id, $taxonomy, array(
 				'term_group' => $term_group,
-			) );
+			));
 		}
 	}
 
@@ -2296,73 +2296,73 @@ 
 	 * Prevent the creation of terms with duplicate names at the same level of a taxonomy hierarchy,
 	 * unless a unique slug has been explicitly provided.
 	 */
-	$name_matches = get_terms( $taxonomy, array(
+	$name_matches = get_terms($taxonomy, array(
 		'name' => $name,
 		'hide_empty' => false,
-	) );
+	));
 
 	/*
 	 * The `name` match in `get_terms()` doesn't differentiate accented characters,
 	 * so we do a stricter comparison here.
 	 */
 	$name_match = null;
-	if ( $name_matches ) {
-		foreach ( $name_matches as $_match ) {
-			if ( strtolower( $name ) === strtolower( $_match->name ) ) {
+	if ($name_matches) {
+		foreach ($name_matches as $_match) {
+			if (strtolower($name) === strtolower($_match->name)) {
 				$name_match = $_match;
 				break;
 			}
 		}
 	}
 
-	if ( $name_match ) {
-		$slug_match = get_term_by( 'slug', $slug, $taxonomy );
-		if ( ! $slug_provided || $name_match->slug === $slug || $slug_match ) {
-			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-				$siblings = get_terms( $taxonomy, array( 'get' => 'all', 'parent' => $parent ) );
+	if ($name_match) {
+		$slug_match = get_term_by('slug', $slug, $taxonomy);
+		if ( ! $slug_provided || $name_match->slug === $slug || $slug_match) {
+			if (is_taxonomy_hierarchical($taxonomy)) {
+				$siblings = get_terms($taxonomy, array('get' => 'all', 'parent' => $parent));
 
 				$existing_term = null;
-				if ( $name_match->slug === $slug && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
+				if ($name_match->slug === $slug && in_array($name, wp_list_pluck($siblings, 'name'))) {
 					$existing_term = $name_match;
-				} elseif ( $slug_match && in_array( $slug, wp_list_pluck( $siblings, 'slug' ) ) ) {
+				} elseif ($slug_match && in_array($slug, wp_list_pluck($siblings, 'slug'))) {
 					$existing_term = $slug_match;
 				}
 
-				if ( $existing_term ) {
-					return new WP_Error( 'term_exists', __( 'A term with the name provided already exists with this parent.' ), $existing_term->term_id );
+				if ($existing_term) {
+					return new WP_Error('term_exists', __('A term with the name provided already exists with this parent.'), $existing_term->term_id);
 				}
 			} else {
-				return new WP_Error( 'term_exists', __( 'A term with the name provided already exists in this taxonomy.' ), $name_match->term_id );
+				return new WP_Error('term_exists', __('A term with the name provided already exists in this taxonomy.'), $name_match->term_id);
 			}
 		}
 	}
 
-	$slug = wp_unique_term_slug( $slug, (object) $args );
+	$slug = wp_unique_term_slug($slug, (object) $args);
 
-	if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) {
-		return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database' ), $wpdb->last_error );
+	if (false === $wpdb->insert($wpdb->terms, compact('name', 'slug', 'term_group'))) {
+		return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
 	}
 
 	$term_id = (int) $wpdb->insert_id;
 
 	// Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.
-	if ( empty($slug) ) {
+	if (empty($slug)) {
 		$slug = sanitize_title($slug, $term_id);
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edit_terms', $term_id, $taxonomy );
-		$wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
+		do_action('edit_terms', $term_id, $taxonomy);
+		$wpdb->update($wpdb->terms, compact('slug'), compact('term_id'));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edited_terms', $term_id, $taxonomy );
+		do_action('edited_terms', $term_id, $taxonomy);
 	}
 
-	$tt_id = $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id ) );
+	$tt_id = $wpdb->get_var($wpdb->prepare("SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id));
 
-	if ( !empty($tt_id) ) {
+	if ( ! empty($tt_id)) {
 		return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 	}
-	$wpdb->insert( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent') + array( 'count' => 0 ) );
+	$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent') + array('count' => 0));
 	$tt_id = (int) $wpdb->insert_id;
 
 	/*
@@ -2371,16 +2371,16 @@ 
 	 * and term_taxonomy_id of the older term instead. Then return out of the function so that the "create" hooks
 	 * are not fired.
 	 */
-	$duplicate_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.term_id, tt.term_taxonomy_id FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON ( tt.term_id = t.term_id ) WHERE t.slug = %s AND tt.parent = %d AND tt.taxonomy = %s AND t.term_id < %d AND tt.term_taxonomy_id != %d", $slug, $parent, $taxonomy, $term_id, $tt_id ) );
-	if ( $duplicate_term ) {
-		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term_id ) );
-		$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $tt_id ) );
+	$duplicate_term = $wpdb->get_row($wpdb->prepare("SELECT t.term_id, tt.term_taxonomy_id FROM $wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON ( tt.term_id = t.term_id ) WHERE t.slug = %s AND tt.parent = %d AND tt.taxonomy = %s AND t.term_id < %d AND tt.term_taxonomy_id != %d", $slug, $parent, $taxonomy, $term_id, $tt_id));
+	if ($duplicate_term) {
+		$wpdb->delete($wpdb->terms, array('term_id' => $term_id));
+		$wpdb->delete($wpdb->term_taxonomy, array('term_taxonomy_id' => $tt_id));
 
 		$term_id = (int) $duplicate_term->term_id;
 		$tt_id   = (int) $duplicate_term->term_taxonomy_id;
 
-		clean_term_cache( $term_id, $taxonomy );
-		return array( 'term_id' => $term_id, 'term_taxonomy_id' => $tt_id );
+		clean_term_cache($term_id, $taxonomy);
+		return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 	}
 
 	/**
@@ -2392,7 +2392,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "create_term", $term_id, $tt_id, $taxonomy );
+	do_action("create_term", $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a new term is created for a specific taxonomy.
@@ -2405,7 +2405,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "create_$taxonomy", $term_id, $tt_id );
+	do_action("create_$taxonomy", $term_id, $tt_id);
 
 	/**
 	 * Filters the term ID after a new term is created.
@@ -2415,7 +2415,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Taxonomy term ID.
 	 */
-	$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
+	$term_id = apply_filters('term_id_filter', $term_id, $tt_id);
 
 	clean_term_cache($term_id, $taxonomy);
 
@@ -2428,7 +2428,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'created_term', $term_id, $tt_id, $taxonomy );
+	do_action('created_term', $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a new term in a specific taxonomy is created, and after the term
@@ -2441,7 +2441,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "created_$taxonomy", $term_id, $tt_id );
+	do_action("created_$taxonomy", $term_id, $tt_id);
 
 	return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 }
@@ -2468,19 +2468,19 @@ 
  * @param bool             $append    Optional. If false will delete difference of terms. Default false.
  * @return array|WP_Error Term taxonomy IDs of the affected terms.
  */
-function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
+function wp_set_object_terms($object_id, $terms, $taxonomy, $append = false) {
 	global $wpdb;
 
 	$object_id = (int) $object_id;
 
-	if ( ! taxonomy_exists($taxonomy) )
+	if ( ! taxonomy_exists($taxonomy))
 		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 
-	if ( !is_array($terms) )
+	if ( ! is_array($terms))
 		$terms = array($terms);
 
-	if ( ! $append )
-		$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
+	if ( ! $append)
+		$old_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
 	else
 		$old_tt_ids = array();
 
@@ -2488,23 +2488,23 @@ 
 	$term_ids = array();
 	$new_tt_ids = array();
 
-	foreach ( (array) $terms as $term) {
-		if ( !strlen(trim($term)) )
+	foreach ((array) $terms as $term) {
+		if ( ! strlen(trim($term)))
 			continue;
 
-		if ( !$term_info = term_exists($term, $taxonomy) ) {
+		if ( ! $term_info = term_exists($term, $taxonomy)) {
 			// Skip if a non-existent term ID is passed.
-			if ( is_int($term) )
+			if (is_int($term))
 				continue;
 			$term_info = wp_insert_term($term, $taxonomy);
 		}
-		if ( is_wp_error($term_info) )
+		if (is_wp_error($term_info))
 			return $term_info;
 		$term_ids[] = $term_info['term_id'];
 		$tt_id = $term_info['term_taxonomy_id'];
 		$tt_ids[] = $tt_id;
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) )
+		if ($wpdb->get_var($wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id)))
 			continue;
 
 		/**
@@ -2515,8 +2515,8 @@ 
 		 * @param int $object_id Object ID.
 		 * @param int $tt_id     Term taxonomy ID.
 		 */
-		do_action( 'add_term_relationship', $object_id, $tt_id );
-		$wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) );
+		do_action('add_term_relationship', $object_id, $tt_id);
+		$wpdb->insert($wpdb->term_relationships, array('object_id' => $object_id, 'term_taxonomy_id' => $tt_id));
 
 		/**
 		 * Fires immediately after an object-term relationship is added.
@@ -2526,42 +2526,42 @@ 
 		 * @param int $object_id Object ID.
 		 * @param int $tt_id     Term taxonomy ID.
 		 */
-		do_action( 'added_term_relationship', $object_id, $tt_id );
+		do_action('added_term_relationship', $object_id, $tt_id);
 		$new_tt_ids[] = $tt_id;
 	}
 
-	if ( $new_tt_ids )
-		wp_update_term_count( $new_tt_ids, $taxonomy );
+	if ($new_tt_ids)
+		wp_update_term_count($new_tt_ids, $taxonomy);
 
-	if ( ! $append ) {
-		$delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
+	if ( ! $append) {
+		$delete_tt_ids = array_diff($old_tt_ids, $tt_ids);
 
-		if ( $delete_tt_ids ) {
-			$in_delete_tt_ids = "'" . implode( "', '", $delete_tt_ids ) . "'";
-			$delete_term_ids = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
-			$delete_term_ids = array_map( 'intval', $delete_term_ids );
+		if ($delete_tt_ids) {
+			$in_delete_tt_ids = "'".implode("', '", $delete_tt_ids)."'";
+			$delete_term_ids = $wpdb->get_col($wpdb->prepare("SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy));
+			$delete_term_ids = array_map('intval', $delete_term_ids);
 
-			$remove = wp_remove_object_terms( $object_id, $delete_term_ids, $taxonomy );
-			if ( is_wp_error( $remove ) ) {
+			$remove = wp_remove_object_terms($object_id, $delete_term_ids, $taxonomy);
+			if (is_wp_error($remove)) {
 				return $remove;
 			}
 		}
 	}
 
 	$t = get_taxonomy($taxonomy);
-	if ( ! $append && isset($t->sort) && $t->sort ) {
+	if ( ! $append && isset($t->sort) && $t->sort) {
 		$values = array();
 		$term_order = 0;
 		$final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
-		foreach ( $tt_ids as $tt_id )
-			if ( in_array($tt_id, $final_tt_ids) )
-				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
-		if ( $values )
-			if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
-				return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
+		foreach ($tt_ids as $tt_id)
+			if (in_array($tt_id, $final_tt_ids))
+				$values[] = $wpdb->prepare("(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
+		if ($values)
+			if (false === $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES ".join(',', $values)." ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)"))
+				return new WP_Error('db_insert_error', __('Could not insert term relationship into the database'), $wpdb->last_error);
 	}
 
-	wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+	wp_cache_delete($object_id, $taxonomy.'_relationships');
 
 	/**
 	 * Fires after an object's terms have been set.
@@ -2575,7 +2575,7 @@ 
 	 * @param bool   $append     Whether to append new terms to the old terms.
 	 * @param array  $old_tt_ids Old array of term taxonomy IDs.
 	 */
-	do_action( 'set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids );
+	do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
 	return $tt_ids;
 }
 
@@ -2589,8 +2589,8 @@ 
  * @param array|string     $taxonomy  Taxonomy name.
  * @return array|WP_Error Term taxonomy IDs of the affected terms.
  */
-function wp_add_object_terms( $object_id, $terms, $taxonomy ) {
-	return wp_set_object_terms( $object_id, $terms, $taxonomy, true );
+function wp_add_object_terms($object_id, $terms, $taxonomy) {
+	return wp_set_object_terms($object_id, $terms, $taxonomy, true);
 }
 
 /**
@@ -2605,42 +2605,42 @@ 
  * @param array|string     $taxonomy  Taxonomy name.
  * @return bool|WP_Error True on success, false or WP_Error on failure.
  */
-function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
+function wp_remove_object_terms($object_id, $terms, $taxonomy) {
 	global $wpdb;
 
 	$object_id = (int) $object_id;
 
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 	}
 
-	if ( ! is_array( $terms ) ) {
-		$terms = array( $terms );
+	if ( ! is_array($terms)) {
+		$terms = array($terms);
 	}
 
 	$tt_ids = array();
 
-	foreach ( (array) $terms as $term ) {
-		if ( ! strlen( trim( $term ) ) ) {
+	foreach ((array) $terms as $term) {
+		if ( ! strlen(trim($term))) {
 			continue;
 		}
 
-		if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
+		if ( ! $term_info = term_exists($term, $taxonomy)) {
 			// Skip if a non-existent term ID is passed.
-			if ( is_int( $term ) ) {
+			if (is_int($term)) {
 				continue;
 			}
 		}
 
-		if ( is_wp_error( $term_info ) ) {
+		if (is_wp_error($term_info)) {
 			return $term_info;
 		}
 
 		$tt_ids[] = $term_info['term_taxonomy_id'];
 	}
 
-	if ( $tt_ids ) {
-		$in_tt_ids = "'" . implode( "', '", $tt_ids ) . "'";
+	if ($tt_ids) {
+		$in_tt_ids = "'".implode("', '", $tt_ids)."'";
 
 		/**
 		 * Fires immediately before an object-term relationship is deleted.
@@ -2650,10 +2650,10 @@ 
 		 * @param int   $object_id Object ID.
 		 * @param array $tt_ids    An array of term taxonomy IDs.
 		 */
-		do_action( 'delete_term_relationships', $object_id, $tt_ids );
-		$deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
+		do_action('delete_term_relationships', $object_id, $tt_ids);
+		$deleted = $wpdb->query($wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id));
 
-		wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+		wp_cache_delete($object_id, $taxonomy.'_relationships');
 
 		/**
 		 * Fires immediately after an object-term relationship is deleted.
@@ -2663,9 +2663,9 @@ 
 		 * @param int   $object_id Object ID.
 		 * @param array $tt_ids    An array of term taxonomy IDs.
 		 */
-		do_action( 'deleted_term_relationships', $object_id, $tt_ids );
+		do_action('deleted_term_relationships', $object_id, $tt_ids);
 
-		wp_update_term_count( $tt_ids, $taxonomy );
+		wp_update_term_count($tt_ids, $taxonomy);
 
 		return (bool) $deleted;
 	}
@@ -2696,14 +2696,14 @@ 
  * @param object $term The term object that the `$slug` will belong to.
  * @return string Will return a true unique slug.
  */
-function wp_unique_term_slug( $slug, $term ) {
+function wp_unique_term_slug($slug, $term) {
 	global $wpdb;
 
 	$needs_suffix = true;
 	$original_slug = $slug;
 
 	// As of 4.1, duplicate slugs are allowed as long as they're in different taxonomies.
-	if ( ! term_exists( $slug ) || get_option( 'db_version' ) >= 30133 && ! get_term_by( 'slug', $slug, $term->taxonomy ) ) {
+	if ( ! term_exists($slug) || get_option('db_version') >= 30133 && ! get_term_by('slug', $slug, $term->taxonomy)) {
 		$needs_suffix = false;
 	}
 
@@ -2712,18 +2712,18 @@ 
 	 * by incorporating parent slugs.
 	 */
 	$parent_suffix = '';
-	if ( $needs_suffix && is_taxonomy_hierarchical( $term->taxonomy ) && ! empty( $term->parent ) ) {
+	if ($needs_suffix && is_taxonomy_hierarchical($term->taxonomy) && ! empty($term->parent)) {
 		$the_parent = $term->parent;
-		while ( ! empty($the_parent) ) {
+		while ( ! empty($the_parent)) {
 			$parent_term = get_term($the_parent, $term->taxonomy);
-			if ( is_wp_error($parent_term) || empty($parent_term) )
+			if (is_wp_error($parent_term) || empty($parent_term))
 				break;
-			$parent_suffix .= '-' . $parent_term->slug;
-			if ( ! term_exists( $slug . $parent_suffix ) ) {
+			$parent_suffix .= '-'.$parent_term->slug;
+			if ( ! term_exists($slug.$parent_suffix)) {
 				break;
 			}
 
-			if ( empty($parent_term->parent) )
+			if (empty($parent_term->parent))
 				break;
 			$the_parent = $parent_term->parent;
 		}
@@ -2740,22 +2740,22 @@ 
 	 * @param string $slug         The slug.
 	 * @param object $term         Term object.
 	 */
-	if ( apply_filters( 'wp_unique_term_slug_is_bad_slug', $needs_suffix, $slug, $term ) ) {
-		if ( $parent_suffix ) {
+	if (apply_filters('wp_unique_term_slug_is_bad_slug', $needs_suffix, $slug, $term)) {
+		if ($parent_suffix) {
 			$slug .= $parent_suffix;
 		} else {
-			if ( ! empty( $term->term_id ) )
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
+			if ( ! empty($term->term_id))
+				$query = $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id);
 			else
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+				$query = $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug);
 
-			if ( $wpdb->get_var( $query ) ) {
+			if ($wpdb->get_var($query)) {
 				$num = 2;
 				do {
-					$alt_slug = $slug . "-$num";
+					$alt_slug = $slug."-$num";
 					$num++;
-					$slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug ) );
-				} while ( $slug_check );
+					$slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug));
+				} while ($slug_check);
 				$slug = $alt_slug;
 			}
 		}
@@ -2770,7 +2770,7 @@ 
 	 * @param object $term          Term object.
 	 * @param string $original_slug Slug originally passed to the function for testing.
 	 */
-	return apply_filters( 'wp_unique_term_slug', $slug, $term, $original_slug );
+	return apply_filters('wp_unique_term_slug', $slug, $term, $original_slug);
 }
 
 /**
@@ -2803,55 +2803,55 @@ 
  * @param array|string $args     Optional. Array of get_terms() arguments. Default empty array.
  * @return array|WP_Error Returns Term ID and Taxonomy Term ID
  */
-function wp_update_term( $term_id, $taxonomy, $args = array() ) {
+function wp_update_term($term_id, $taxonomy, $args = array()) {
 	global $wpdb;
 
-	if ( ! taxonomy_exists( $taxonomy ) ) {
-		return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+	if ( ! taxonomy_exists($taxonomy)) {
+		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
 	}
 
 	$term_id = (int) $term_id;
 
 	// First, get all of the original args
-	$term = get_term( $term_id, $taxonomy );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( is_wp_error( $term ) ) {
+	if (is_wp_error($term)) {
 		return $term;
 	}
 
-	if ( ! $term ) {
-		return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+	if ( ! $term) {
+		return new WP_Error('invalid_term', __('Empty Term'));
 	}
 
 	$term = (array) $term->data;
 
 	// Escape data pulled from DB.
-	$term = wp_slash( $term );
+	$term = wp_slash($term);
 
 	// Merge old and new args with new args overwriting old ones.
 	$args = array_merge($term, $args);
 
-	$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
+	$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
 	$args = wp_parse_args($args, $defaults);
 	$args = sanitize_term($args, $taxonomy, 'db');
 	$parsed_args = $args;
 
 	// expected_slashed ($name)
-	$name = wp_unslash( $args['name'] );
-	$description = wp_unslash( $args['description'] );
+	$name = wp_unslash($args['name']);
+	$description = wp_unslash($args['description']);
 
 	$parsed_args['name'] = $name;
 	$parsed_args['description'] = $description;
 
-	if ( '' == trim($name) )
+	if ('' == trim($name))
 		return new WP_Error('empty_term_name', __('A name is required for this term'));
 
-	if ( $parsed_args['parent'] > 0 && ! term_exists( (int) $parsed_args['parent'] ) ) {
-		return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
+	if ($parsed_args['parent'] > 0 && ! term_exists((int) $parsed_args['parent'])) {
+		return new WP_Error('missing_parent', __('Parent term does not exist.'));
 	}
 
 	$empty_slug = false;
-	if ( empty( $args['slug'] ) ) {
+	if (empty($args['slug'])) {
 		$empty_slug = true;
 		$slug = sanitize_title($name);
 	} else {
@@ -2860,22 +2860,22 @@ 
 
 	$parsed_args['slug'] = $slug;
 
-	$term_group = isset( $parsed_args['term_group'] ) ? $parsed_args['term_group'] : 0;
-	if ( $args['alias_of'] ) {
-		$alias = get_term_by( 'slug', $args['alias_of'], $taxonomy );
-		if ( ! empty( $alias->term_group ) ) {
+	$term_group = isset($parsed_args['term_group']) ? $parsed_args['term_group'] : 0;
+	if ($args['alias_of']) {
+		$alias = get_term_by('slug', $args['alias_of'], $taxonomy);
+		if ( ! empty($alias->term_group)) {
 			// The alias we want is already in a group, so let's use that one.
 			$term_group = $alias->term_group;
-		} elseif ( ! empty( $alias->term_id ) ) {
+		} elseif ( ! empty($alias->term_id)) {
 			/*
 			 * The alias is not in a group, so we create a new one
 			 * and add the alias to it.
 			 */
 			$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms") + 1;
 
-			wp_update_term( $alias->term_id, $taxonomy, array(
+			wp_update_term($alias->term_id, $taxonomy, array(
 				'term_group' => $term_group,
-			) );
+			));
 		}
 
 		$parsed_args['term_group'] = $term_group;
@@ -2894,24 +2894,24 @@ 
 	 * @param array  $parsed_args An array of potentially altered update arguments for the given term.
 	 * @param array  $args        An array of update arguments for the given term.
 	 */
-	$parent = apply_filters( 'wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args );
+	$parent = apply_filters('wp_update_term_parent', $args['parent'], $term_id, $taxonomy, $parsed_args, $args);
 
 	// Check for duplicate slug
-	$duplicate = get_term_by( 'slug', $slug, $taxonomy );
-	if ( $duplicate && $duplicate->term_id != $term_id ) {
+	$duplicate = get_term_by('slug', $slug, $taxonomy);
+	if ($duplicate && $duplicate->term_id != $term_id) {
 		// If an empty slug was passed or the parent changed, reset the slug to something unique.
 		// Otherwise, bail.
-		if ( $empty_slug || ( $parent != $term['parent']) )
+		if ($empty_slug || ($parent != $term['parent']))
 			$slug = wp_unique_term_slug($slug, (object) $args);
 		else
 			return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
 	}
 
-	$tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
+	$tt_id = (int) $wpdb->get_var($wpdb->prepare("SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id));
 
 	// Check whether this is a shared term that needs splitting.
-	$_term_id = _split_shared_term( $term_id, $tt_id );
-	if ( ! is_wp_error( $_term_id ) ) {
+	$_term_id = _split_shared_term($term_id, $tt_id);
+	if ( ! is_wp_error($_term_id)) {
 		$term_id = $_term_id;
 	}
 
@@ -2923,11 +2923,11 @@ 
 	 * @param int    $term_id  Term ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edit_terms', $term_id, $taxonomy );
-	$wpdb->update($wpdb->terms, compact( 'name', 'slug', 'term_group' ), compact( 'term_id' ) );
-	if ( empty($slug) ) {
+	do_action('edit_terms', $term_id, $taxonomy);
+	$wpdb->update($wpdb->terms, compact('name', 'slug', 'term_group'), compact('term_id'));
+	if (empty($slug)) {
 		$slug = sanitize_title($name, $term_id);
-		$wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) );
+		$wpdb->update($wpdb->terms, compact('slug'), compact('term_id'));
 	}
 
 	/**
@@ -2938,7 +2938,7 @@ 
 	 * @param int    $term_id  Term ID
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edited_terms', $term_id, $taxonomy );
+	do_action('edited_terms', $term_id, $taxonomy);
 
 	/**
 	 * Fires immediate before a term-taxonomy relationship is updated.
@@ -2948,9 +2948,9 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edit_term_taxonomy', $tt_id, $taxonomy );
+	do_action('edit_term_taxonomy', $tt_id, $taxonomy);
 
-	$wpdb->update( $wpdb->term_taxonomy, compact( 'term_id', 'taxonomy', 'description', 'parent' ), array( 'term_taxonomy_id' => $tt_id ) );
+	$wpdb->update($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent'), array('term_taxonomy_id' => $tt_id));
 
 	/**
 	 * Fires immediately after a term-taxonomy relationship is updated.
@@ -2960,7 +2960,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( 'edited_term_taxonomy', $tt_id, $taxonomy );
+	do_action('edited_term_taxonomy', $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a term has been updated, but before the term cache has been cleaned.
@@ -2971,7 +2971,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "edit_term", $term_id, $tt_id, $taxonomy );
+	do_action("edit_term", $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a term in a specific taxonomy has been updated, but before the term
@@ -2984,10 +2984,10 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "edit_$taxonomy", $term_id, $tt_id );
+	do_action("edit_$taxonomy", $term_id, $tt_id);
 
 	/** This filter is documented in wp-includes/taxonomy.php */
-	$term_id = apply_filters( 'term_id_filter', $term_id, $tt_id );
+	$term_id = apply_filters('term_id_filter', $term_id, $tt_id);
 
 	clean_term_cache($term_id, $taxonomy);
 
@@ -3000,7 +3000,7 @@ 
 	 * @param int    $tt_id    Term taxonomy ID.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	do_action( "edited_term", $term_id, $tt_id, $taxonomy );
+	do_action("edited_term", $term_id, $tt_id, $taxonomy);
 
 	/**
 	 * Fires after a term for a specific taxonomy has been updated, and the term
@@ -3013,7 +3013,7 @@ 
 	 * @param int $term_id Term ID.
 	 * @param int $tt_id   Term taxonomy ID.
 	 */
-	do_action( "edited_$taxonomy", $term_id, $tt_id );
+	do_action("edited_$taxonomy", $term_id, $tt_id);
 
 	return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id);
 }
@@ -3028,14 +3028,14 @@ 
  * @param bool $defer Optional. Enable if true, disable if false.
  * @return bool Whether term counting is enabled or disabled.
  */
-function wp_defer_term_counting($defer=null) {
+function wp_defer_term_counting($defer = null) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if (is_bool($defer)) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_term_count( null, null, true );
+		if ( ! $defer)
+			wp_update_term_count(null, null, true);
 	}
 
 	return $_defer;
@@ -3059,30 +3059,30 @@ 
  * @param bool      $do_deferred Whether to flush the deferred term counts too. Default false.
  * @return bool If no terms will return false, and if successful will return true.
  */
-function wp_update_term_count( $terms, $taxonomy, $do_deferred = false ) {
+function wp_update_term_count($terms, $taxonomy, $do_deferred = false) {
 	static $_deferred = array();
 
-	if ( $do_deferred ) {
-		foreach ( (array) array_keys($_deferred) as $tax ) {
-			wp_update_term_count_now( $_deferred[$tax], $tax );
-			unset( $_deferred[$tax] );
+	if ($do_deferred) {
+		foreach ((array) array_keys($_deferred) as $tax) {
+			wp_update_term_count_now($_deferred[$tax], $tax);
+			unset($_deferred[$tax]);
 		}
 	}
 
-	if ( empty($terms) )
+	if (empty($terms))
 		return false;
 
-	if ( !is_array($terms) )
+	if ( ! is_array($terms))
 		$terms = array($terms);
 
-	if ( wp_defer_term_counting() ) {
-		if ( !isset($_deferred[$taxonomy]) )
+	if (wp_defer_term_counting()) {
+		if ( ! isset($_deferred[$taxonomy]))
 			$_deferred[$taxonomy] = array();
-		$_deferred[$taxonomy] = array_unique( array_merge($_deferred[$taxonomy], $terms) );
+		$_deferred[$taxonomy] = array_unique(array_merge($_deferred[$taxonomy], $terms));
 		return true;
 	}
 
-	return wp_update_term_count_now( $terms, $taxonomy );
+	return wp_update_term_count_now($terms, $taxonomy);
 }
 
 /**
@@ -3094,25 +3094,25 @@ 
  * @param string $taxonomy The context of the term.
  * @return true Always true when complete.
  */
-function wp_update_term_count_now( $terms, $taxonomy ) {
+function wp_update_term_count_now($terms, $taxonomy) {
 	$terms = array_map('intval', $terms);
 
 	$taxonomy = get_taxonomy($taxonomy);
-	if ( !empty($taxonomy->update_count_callback) ) {
+	if ( ! empty($taxonomy->update_count_callback)) {
 		call_user_func($taxonomy->update_count_callback, $terms, $taxonomy);
 	} else {
 		$object_types = (array) $taxonomy->object_type;
-		foreach ( $object_types as &$object_type ) {
-			if ( 0 === strpos( $object_type, 'attachment:' ) )
-				list( $object_type ) = explode( ':', $object_type );
+		foreach ($object_types as &$object_type) {
+			if (0 === strpos($object_type, 'attachment:'))
+				list($object_type) = explode(':', $object_type);
 		}
 
-		if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {
+		if ($object_types == array_filter($object_types, 'post_type_exists')) {
 			// Only post types are attached to this taxonomy
-			_update_post_term_count( $terms, $taxonomy );
+			_update_post_term_count($terms, $taxonomy);
 		} else {
 			// Default count updater
-			_update_generic_term_count( $terms, $taxonomy );
+			_update_generic_term_count($terms, $taxonomy);
 		}
 	}
 
@@ -3144,17 +3144,17 @@ 
 function clean_object_term_cache($object_ids, $object_type) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+	if ( ! empty($_wp_suspend_cache_invalidation)) {
 		return;
 	}
 
-	if ( !is_array($object_ids) )
+	if ( ! is_array($object_ids))
 		$object_ids = array($object_ids);
 
-	$taxonomies = get_object_taxonomies( $object_type );
+	$taxonomies = get_object_taxonomies($object_type);
 
-	foreach ( $object_ids as $id ) {
-		foreach ( $taxonomies as $taxonomy ) {
+	foreach ($object_ids as $id) {
+		foreach ($taxonomies as $taxonomy) {
 			wp_cache_delete($id, "{$taxonomy}_relationships");
 		}
 	}
@@ -3167,7 +3167,7 @@ 
 	 * @param array  $object_ids An array of object IDs.
 	 * @param string $objet_type Object type.
 	 */
-	do_action( 'clean_object_term_cache', $object_ids, $object_type );
+	do_action('clean_object_term_cache', $object_ids, $object_type);
 }
 
 /**
@@ -3187,37 +3187,37 @@ 
 function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) {
 	global $wpdb, $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+	if ( ! empty($_wp_suspend_cache_invalidation)) {
 		return;
 	}
 
-	if ( !is_array($ids) )
+	if ( ! is_array($ids))
 		$ids = array($ids);
 
 	$taxonomies = array();
 	// If no taxonomy, assume tt_ids.
-	if ( empty($taxonomy) ) {
+	if (empty($taxonomy)) {
 		$tt_ids = array_map('intval', $ids);
 		$tt_ids = implode(', ', $tt_ids);
 		$terms = $wpdb->get_results("SELECT term_id, taxonomy FROM $wpdb->term_taxonomy WHERE term_taxonomy_id IN ($tt_ids)");
 		$ids = array();
-		foreach ( (array) $terms as $term ) {
+		foreach ((array) $terms as $term) {
 			$taxonomies[] = $term->taxonomy;
 			$ids[] = $term->term_id;
-			wp_cache_delete( $term->term_id, 'terms' );
+			wp_cache_delete($term->term_id, 'terms');
 		}
 		$taxonomies = array_unique($taxonomies);
 	} else {
 		$taxonomies = array($taxonomy);
-		foreach ( $taxonomies as $taxonomy ) {
-			foreach ( $ids as $id ) {
-				wp_cache_delete( $id, 'terms' );
+		foreach ($taxonomies as $taxonomy) {
+			foreach ($ids as $id) {
+				wp_cache_delete($id, 'terms');
 			}
 		}
 	}
 
-	foreach ( $taxonomies as $taxonomy ) {
-		if ( $clean_taxonomy ) {
+	foreach ($taxonomies as $taxonomy) {
+		if ($clean_taxonomy) {
 			wp_cache_delete('all_ids', $taxonomy);
 			wp_cache_delete('get', $taxonomy);
 			delete_option("{$taxonomy}_children");
@@ -3235,10 +3235,10 @@ 
 		 * @param string $taxonomy       Taxonomy slug.
 		 * @param bool   $clean_taxonomy Whether or not to clean taxonomy-wide caches
 		 */
-		do_action( 'clean_term_cache', $ids, $taxonomy, $clean_taxonomy );
+		do_action('clean_term_cache', $ids, $taxonomy, $clean_taxonomy);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'terms' );
+	wp_cache_set('last_changed', microtime(), 'terms');
 }
 
 /**
@@ -3254,33 +3254,33 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return bool|array Array of `WP_Term` objects, if cached False if cache is empty for `$taxonomy` and `$id`.
  */
-function get_object_term_cache( $id, $taxonomy ) {
-	$_term_ids = wp_cache_get( $id, "{$taxonomy}_relationships" );
+function get_object_term_cache($id, $taxonomy) {
+	$_term_ids = wp_cache_get($id, "{$taxonomy}_relationships");
 
 	// We leave the priming of relationship caches to upstream functions.
-	if ( false === $_term_ids ) {
+	if (false === $_term_ids) {
 		return false;
 	}
 
 	// Backward compatibility for if a plugin is putting objects into the cache, rather than IDs.
 	$term_ids = array();
-	foreach ( $_term_ids as $term_id ) {
-		if ( is_numeric( $term_id ) ) {
-			$term_ids[] = intval( $term_id );
-		} elseif ( isset( $term_id->term_id ) ) {
-			$term_ids[] = intval( $term_id->term_id );
+	foreach ($_term_ids as $term_id) {
+		if (is_numeric($term_id)) {
+			$term_ids[] = intval($term_id);
+		} elseif (isset($term_id->term_id)) {
+			$term_ids[] = intval($term_id->term_id);
 		}
 	}
 
 	// Fill the term objects.
-	_prime_term_caches( $term_ids );
+	_prime_term_caches($term_ids);
 
 	$terms = array();
-	foreach ( $term_ids as $term_id ) {
-		$terms[] = wp_cache_get( $term_id, 'terms' );
+	foreach ($term_ids as $term_id) {
+		$terms[] = wp_cache_get($term_id, 'terms');
 	}
 
-	return array_map( 'get_term', $terms );
+	return array_map('get_term', $terms);
 }
 
 /**
@@ -3300,10 +3300,10 @@ 
  * @return void|false False if all of the terms in `$object_ids` are already cached.
  */
 function update_object_term_cache($object_ids, $object_type) {
-	if ( empty($object_ids) )
+	if (empty($object_ids))
 		return;
 
-	if ( !is_array($object_ids) )
+	if ( ! is_array($object_ids))
 		$object_ids = explode(',', $object_ids);
 
 	$object_ids = array_map('intval', $object_ids);
@@ -3311,42 +3311,42 @@ 
 	$taxonomies = get_object_taxonomies($object_type);
 
 	$ids = array();
-	foreach ( (array) $object_ids as $id ) {
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( false === wp_cache_get($id, "{$taxonomy}_relationships") ) {
+	foreach ((array) $object_ids as $id) {
+		foreach ($taxonomies as $taxonomy) {
+			if (false === wp_cache_get($id, "{$taxonomy}_relationships")) {
 				$ids[] = $id;
 				break;
 			}
 		}
 	}
 
-	if ( empty( $ids ) )
+	if (empty($ids))
 		return false;
 
-	$terms = wp_get_object_terms( $ids, $taxonomies, array(
+	$terms = wp_get_object_terms($ids, $taxonomies, array(
 		'fields' => 'all_with_object_id',
 		'orderby' => 'name',
 		'update_term_meta_cache' => false,
-	) );
+	));
 
 	$object_terms = array();
-	foreach ( (array) $terms as $term ) {
-		$object_terms[ $term->object_id ][ $term->taxonomy ][] = $term->term_id;
+	foreach ((array) $terms as $term) {
+		$object_terms[$term->object_id][$term->taxonomy][] = $term->term_id;
 	}
 
-	foreach ( $ids as $id ) {
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( ! isset($object_terms[$id][$taxonomy]) ) {
-				if ( !isset($object_terms[$id]) )
+	foreach ($ids as $id) {
+		foreach ($taxonomies as $taxonomy) {
+			if ( ! isset($object_terms[$id][$taxonomy])) {
+				if ( ! isset($object_terms[$id]))
 					$object_terms[$id] = array();
 				$object_terms[$id][$taxonomy] = array();
 			}
 		}
 	}
 
-	foreach ( $object_terms as $id => $value ) {
-		foreach ( $value as $taxonomy => $terms ) {
-			wp_cache_add( $id, $terms, "{$taxonomy}_relationships" );
+	foreach ($object_terms as $id => $value) {
+		foreach ($value as $taxonomy => $terms) {
+			wp_cache_add($id, $terms, "{$taxonomy}_relationships");
 		}
 	}
 }
@@ -3359,15 +3359,15 @@ 
  * @param array  $terms    List of term objects to change.
  * @param string $taxonomy Optional. Update Term to this taxonomy in cache. Default empty.
  */
-function update_term_cache( $terms, $taxonomy = '' ) {
-	foreach ( (array) $terms as $term ) {
+function update_term_cache($terms, $taxonomy = '') {
+	foreach ((array) $terms as $term) {
 		// Create a copy in case the array was passed by reference.
 		$_term = clone $term;
 
 		// Object ID should not be cached.
-		unset( $_term->object_id );
+		unset($_term->object_id);
 
-		wp_cache_add( $term->term_id, $_term, 'terms' );
+		wp_cache_add($term->term_id, $_term, 'terms');
 	}
 }
 
@@ -3384,17 +3384,17 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return array Empty if $taxonomy isn't hierarchical or returns children as Term IDs.
  */
-function _get_term_hierarchy( $taxonomy ) {
-	if ( !is_taxonomy_hierarchical($taxonomy) )
+function _get_term_hierarchy($taxonomy) {
+	if ( ! is_taxonomy_hierarchical($taxonomy))
 		return array();
 	$children = get_option("{$taxonomy}_children");
 
-	if ( is_array($children) )
+	if (is_array($children))
 		return $children;
 	$children = array();
 	$terms = get_terms($taxonomy, array('get' => 'all', 'orderby' => 'id', 'fields' => 'id=>parent'));
-	foreach ( $terms as $term_id => $parent ) {
-		if ( $parent > 0 )
+	foreach ($terms as $term_id => $parent) {
+		if ($parent > 0)
 			$children[$parent][] = $term_id;
 	}
 	update_option("{$taxonomy}_children", $children);
@@ -3421,48 +3421,48 @@ 
  *                          with 1 as value. Default empty array.
  * @return array|WP_Error The subset of $terms that are descendants of $term_id.
  */
-function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array() ) {
+function _get_term_children($term_id, $terms, $taxonomy, &$ancestors = array()) {
 	$empty_array = array();
-	if ( empty($terms) )
+	if (empty($terms))
 		return $empty_array;
 
 	$term_list = array();
 	$has_children = _get_term_hierarchy($taxonomy);
 
-	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
+	if ((0 != $term_id) && ! isset($has_children[$term_id]))
 		return $empty_array;
 
 	// Include the term itself in the ancestors array, so we can properly detect when a loop has occurred.
-	if ( empty( $ancestors ) ) {
-		$ancestors[ $term_id ] = 1;
+	if (empty($ancestors)) {
+		$ancestors[$term_id] = 1;
 	}
 
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$use_id = false;
-		if ( !is_object($term) ) {
+		if ( ! is_object($term)) {
 			$term = get_term($term, $taxonomy);
-			if ( is_wp_error( $term ) )
+			if (is_wp_error($term))
 				return $term;
 			$use_id = true;
 		}
 
 		// Don't recurse if we've already identified the term as a child - this indicates a loop.
-		if ( isset( $ancestors[ $term->term_id ] ) ) {
+		if (isset($ancestors[$term->term_id])) {
 			continue;
 		}
 
-		if ( $term->parent == $term_id ) {
-			if ( $use_id )
+		if ($term->parent == $term_id) {
+			if ($use_id)
 				$term_list[] = $term->term_id;
 			else
 				$term_list[] = $term;
 
-			if ( !isset($has_children[$term->term_id]) )
+			if ( ! isset($has_children[$term->term_id]))
 				continue;
 
-			$ancestors[ $term->term_id ] = 1;
+			$ancestors[$term->term_id] = 1;
 
-			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) )
+			if ($children = _get_term_children($term->term_id, $terms, $taxonomy, $ancestors))
 				$term_list = array_merge($term_list, $children);
 		}
 	}
@@ -3484,23 +3484,23 @@ 
  * @param array  $terms    List of term objects, passed by reference.
  * @param string $taxonomy Term context.
  */
-function _pad_term_counts( &$terms, $taxonomy ) {
+function _pad_term_counts(&$terms, $taxonomy) {
 	global $wpdb;
 
 	// This function only works for hierarchical taxonomies like post categories.
-	if ( !is_taxonomy_hierarchical( $taxonomy ) )
+	if ( ! is_taxonomy_hierarchical($taxonomy))
 		return;
 
 	$term_hier = _get_term_hierarchy($taxonomy);
 
-	if ( empty($term_hier) )
+	if (empty($term_hier))
 		return;
 
 	$term_items = array();
 	$terms_by_id = array();
 	$term_ids = array();
 
-	foreach ( (array) $terms as $key => $term ) {
+	foreach ((array) $terms as $key => $term) {
 		$terms_by_id[$term->term_id] = & $terms[$key];
 		$term_ids[$term->term_taxonomy_id] = $term->term_id;
 	}
@@ -3508,33 +3508,33 @@ 
 	// Get the object and term ids and stick them in a lookup table.
 	$tax_obj = get_taxonomy($taxonomy);
 	$object_types = esc_sql($tax_obj->object_type);
-	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
-	foreach ( $results as $row ) {
+	$results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (".implode(',', array_keys($term_ids)).") AND post_type IN ('".implode("', '", $object_types)."') AND post_status = 'publish'");
+	foreach ($results as $row) {
 		$id = $term_ids[$row->term_taxonomy_id];
 		$term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;
 	}
 
 	// Touch every ancestor's lookup row for each post in each term.
-	foreach ( $term_ids as $term_id ) {
+	foreach ($term_ids as $term_id) {
 		$child = $term_id;
 		$ancestors = array();
-		while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
+		while ( ! empty($terms_by_id[$child]) && $parent = $terms_by_id[$child]->parent) {
 			$ancestors[] = $child;
-			if ( !empty( $term_items[$term_id] ) )
-				foreach ( $term_items[$term_id] as $item_id => $touches ) {
-					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;
+			if ( ! empty($term_items[$term_id]))
+				foreach ($term_items[$term_id] as $item_id => $touches) {
+					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id] : 1;
 				}
 			$child = $parent;
 
-			if ( in_array( $parent, $ancestors ) ) {
+			if (in_array($parent, $ancestors)) {
 				break;
 			}
 		}
 	}
 
 	// Transfer the touched cells.
-	foreach ( (array) $term_items as $id => $items )
-		if ( isset($terms_by_id[$id]) )
+	foreach ((array) $term_items as $id => $items)
+		if (isset($terms_by_id[$id]))
 			$terms_by_id[$id]->count = count($items);
 }
 
@@ -3549,17 +3549,17 @@ 
  * @param array $term_ids          Array of term IDs.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_term_caches( $term_ids, $update_meta_cache = true ) {
+function _prime_term_caches($term_ids, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $term_ids, 'terms' );
-	if ( ! empty( $non_cached_ids ) ) {
-		$fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($term_ids, 'terms');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_terms = $wpdb->get_results(sprintf("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_term_cache( $fresh_terms, $update_meta_cache );
+		update_term_cache($fresh_terms, $update_meta_cache);
 
-		if ( $update_meta_cache ) {
-			update_termmeta_cache( $non_cached_ids );
+		if ($update_meta_cache) {
+			update_termmeta_cache($non_cached_ids);
 		}
 	}
 }
@@ -3582,40 +3582,40 @@ 
  * @param array  $terms    List of Term taxonomy IDs.
  * @param object $taxonomy Current taxonomy object of terms.
  */
-function _update_post_term_count( $terms, $taxonomy ) {
+function _update_post_term_count($terms, $taxonomy) {
 	global $wpdb;
 
 	$object_types = (array) $taxonomy->object_type;
 
-	foreach ( $object_types as &$object_type )
-		list( $object_type ) = explode( ':', $object_type );
+	foreach ($object_types as &$object_type)
+		list($object_type) = explode(':', $object_type);
 
-	$object_types = array_unique( $object_types );
+	$object_types = array_unique($object_types);
 
-	if ( false !== ( $check_attachments = array_search( 'attachment', $object_types ) ) ) {
-		unset( $object_types[ $check_attachments ] );
+	if (false !== ($check_attachments = array_search('attachment', $object_types))) {
+		unset($object_types[$check_attachments]);
 		$check_attachments = true;
 	}
 
-	if ( $object_types )
-		$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	if ($object_types)
+		$object_types = esc_sql(array_filter($object_types, 'post_type_exists'));
 
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$count = 0;
 
 		// Attachments can be 'inherit' status, we need to base count off the parent's status if so.
-		if ( $check_attachments )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		if ($check_attachments)
+			$count += (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term));
 
-		if ( $object_types )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		if ($object_types)
+			$count += (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('".implode("', '", $object_types)."') AND term_taxonomy_id = %d", $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+		do_action('edit_term_taxonomy', $term, $taxonomy->name);
+		$wpdb->update($wpdb->term_taxonomy, compact('count'), array('term_taxonomy_id' => $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
+		do_action('edited_term_taxonomy', $term, $taxonomy->name);
 	}
 }
 
@@ -3631,18 +3631,18 @@ 
  * @param array  $terms    List of term taxonomy IDs.
  * @param object $taxonomy Current taxonomy object of terms.
  */
-function _update_generic_term_count( $terms, $taxonomy ) {
+function _update_generic_term_count($terms, $taxonomy) {
 	global $wpdb;
 
-	foreach ( (array) $terms as $term ) {
-		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term ) );
+	foreach ((array) $terms as $term) {
+		$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+		do_action('edit_term_taxonomy', $term, $taxonomy->name);
+		$wpdb->update($wpdb->term_taxonomy, compact('count'), array('term_taxonomy_id' => $term));
 
 		/** This action is documented in wp-includes/taxonomy.php */
-		do_action( 'edited_term_taxonomy', $term, $taxonomy->name );
+		do_action('edited_term_taxonomy', $term, $taxonomy->name);
 	}
 }
 
@@ -3669,23 +3669,23 @@ 
  *                      database schema), `$term_id` is returned. When the term is successfully split, the
  *                      new term_id is returned. A WP_Error is returned for miscellaneous errors.
  */
-function _split_shared_term( $term_id, $term_taxonomy_id, $record = true ) {
+function _split_shared_term($term_id, $term_taxonomy_id, $record = true) {
 	global $wpdb;
 
-	if ( is_object( $term_id ) ) {
+	if (is_object($term_id)) {
 		$shared_term = $term_id;
-		$term_id = intval( $shared_term->term_id );
+		$term_id = intval($shared_term->term_id);
 	}
 
-	if ( is_object( $term_taxonomy_id ) ) {
+	if (is_object($term_taxonomy_id)) {
 		$term_taxonomy = $term_taxonomy_id;
-		$term_taxonomy_id = intval( $term_taxonomy->term_taxonomy_id );
+		$term_taxonomy_id = intval($term_taxonomy->term_taxonomy_id);
 	}
 
 	// If there are no shared term_taxonomy rows, there's nothing to do here.
-	$shared_tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id ) );
+	$shared_tt_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy tt WHERE tt.term_id = %d AND tt.term_taxonomy_id != %d", $term_id, $term_taxonomy_id));
 
-	if ( ! $shared_tt_count ) {
+	if ( ! $shared_tt_count) {
 		return $term_id;
 	}
 
@@ -3693,14 +3693,14 @@ 
 	 * Verify that the term_taxonomy_id passed to the function is actually associated with the term_id.
 	 * If there's a mismatch, it may mean that the term is already split. Return the actual term_id from the db.
 	 */
-	$check_term_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
-	if ( $check_term_id != $term_id ) {
+	$check_term_id = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id));
+	if ($check_term_id != $term_id) {
 		return $check_term_id;
 	}
 
 	// Pull up data about the currently shared slug, which we'll use to populate the new one.
-	if ( empty( $shared_term ) ) {
-		$shared_term = $wpdb->get_row( $wpdb->prepare( "SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id ) );
+	if (empty($shared_term)) {
+		$shared_term = $wpdb->get_row($wpdb->prepare("SELECT t.* FROM $wpdb->terms t WHERE t.term_id = %d", $term_id));
 	}
 
 	$new_term_data = array(
@@ -3709,54 +3709,54 @@ 
 		'term_group' => $shared_term->term_group,
 	);
 
-	if ( false === $wpdb->insert( $wpdb->terms, $new_term_data ) ) {
-		return new WP_Error( 'db_insert_error', __( 'Could not split shared term.' ), $wpdb->last_error );
+	if (false === $wpdb->insert($wpdb->terms, $new_term_data)) {
+		return new WP_Error('db_insert_error', __('Could not split shared term.'), $wpdb->last_error);
 	}
 
 	$new_term_id = (int) $wpdb->insert_id;
 
 	// Update the existing term_taxonomy to point to the newly created term.
-	$wpdb->update( $wpdb->term_taxonomy,
-		array( 'term_id' => $new_term_id ),
-		array( 'term_taxonomy_id' => $term_taxonomy_id )
+	$wpdb->update($wpdb->term_taxonomy,
+		array('term_id' => $new_term_id),
+		array('term_taxonomy_id' => $term_taxonomy_id)
 	);
 
 	// Reassign child terms to the new parent.
-	if ( empty( $term_taxonomy ) ) {
-		$term_taxonomy = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id ) );
+	if (empty($term_taxonomy)) {
+		$term_taxonomy = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->term_taxonomy WHERE term_taxonomy_id = %d", $term_taxonomy_id));
 	}
 
-	$children_tt_ids = $wpdb->get_col( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = %s", $term_id, $term_taxonomy->taxonomy ) );
-	if ( ! empty( $children_tt_ids ) ) {
-		foreach ( $children_tt_ids as $child_tt_id ) {
-			$wpdb->update( $wpdb->term_taxonomy,
-				array( 'parent' => $new_term_id ),
-				array( 'term_taxonomy_id' => $child_tt_id )
+	$children_tt_ids = $wpdb->get_col($wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE parent = %d AND taxonomy = %s", $term_id, $term_taxonomy->taxonomy));
+	if ( ! empty($children_tt_ids)) {
+		foreach ($children_tt_ids as $child_tt_id) {
+			$wpdb->update($wpdb->term_taxonomy,
+				array('parent' => $new_term_id),
+				array('term_taxonomy_id' => $child_tt_id)
 			);
-			clean_term_cache( $term_id, $term_taxonomy->taxonomy );
+			clean_term_cache($term_id, $term_taxonomy->taxonomy);
 		}
 	} else {
 		// If the term has no children, we must force its taxonomy cache to be rebuilt separately.
-		clean_term_cache( $new_term_id, $term_taxonomy->taxonomy );
+		clean_term_cache($new_term_id, $term_taxonomy->taxonomy);
 	}
 
 	// Clean the cache for term taxonomies formerly shared with the current term.
-	$shared_term_taxonomies = $wpdb->get_row( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
-	if ( $shared_term_taxonomies ) {
-		foreach ( $shared_term_taxonomies as $shared_term_taxonomy ) {
-			clean_term_cache( $term_id, $shared_term_taxonomy );
+	$shared_term_taxonomies = $wpdb->get_row($wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id));
+	if ($shared_term_taxonomies) {
+		foreach ($shared_term_taxonomies as $shared_term_taxonomy) {
+			clean_term_cache($term_id, $shared_term_taxonomy);
 		}
 	}
 
 	// Keep a record of term_ids that have been split, keyed by old term_id. See wp_get_split_term().
-	if ( $record ) {
-		$split_term_data = get_option( '_split_terms', array() );
-		if ( ! isset( $split_term_data[ $term_id ] ) ) {
-			$split_term_data[ $term_id ] = array();
+	if ($record) {
+		$split_term_data = get_option('_split_terms', array());
+		if ( ! isset($split_term_data[$term_id])) {
+			$split_term_data[$term_id] = array();
 		}
 
-		$split_term_data[ $term_id ][ $term_taxonomy->taxonomy ] = $new_term_id;
-		update_option( '_split_terms', $split_term_data );
+		$split_term_data[$term_id][$term_taxonomy->taxonomy] = $new_term_id;
+		update_option('_split_terms', $split_term_data);
 	}
 
 	// If we've just split the final shared term, set the "finished" flag.
@@ -3767,8 +3767,8 @@ 
 		 HAVING term_tt_count > 1
 		 LIMIT 1"
 	);
-	if ( ! $shared_terms_exist ) {
-		update_option( 'finished_splitting_shared_terms', true );
+	if ( ! $shared_terms_exist) {
+		update_option('finished_splitting_shared_terms', true);
 	}
 
 	/**
@@ -3781,7 +3781,7 @@ 
 	 * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
 	 * @param string $taxonomy         Taxonomy for the split term.
 	 */
-	do_action( 'split_shared_term', $term_id, $new_term_id, $term_taxonomy_id, $term_taxonomy->taxonomy );
+	do_action('split_shared_term', $term_id, $new_term_id, $term_taxonomy_id, $term_taxonomy->taxonomy);
 
 	return $new_term_id;
 }
@@ -3799,20 +3799,20 @@ 
 	$lock_name = 'term_split.lock';
 
 	// Try to lock.
-	$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time() ) );
+	$lock_result = $wpdb->query($wpdb->prepare("INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time()));
 
-	if ( ! $lock_result ) {
-		$lock_result = get_option( $lock_name );
+	if ( ! $lock_result) {
+		$lock_result = get_option($lock_name);
 
 		// Bail if we were unable to create a lock, or if the existing lock is still valid.
-		if ( ! $lock_result || ( $lock_result > ( time() - HOUR_IN_SECONDS ) ) ) {
-			wp_schedule_single_event( time() + ( 5 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+		if ( ! $lock_result || ($lock_result > (time() - HOUR_IN_SECONDS))) {
+			wp_schedule_single_event(time() + (5 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 			return;
 		}
 	}
 
 	// Update the lock, as by this point we've definitely got a lock, just need to fire the actions.
-	update_option( $lock_name, time() );
+	update_option($lock_name, time());
 
 	// Get a list of shared terms (those with more than one associated row in term_taxonomy).
 	$shared_terms = $wpdb->get_results(
@@ -3824,61 +3824,61 @@ 
 	);
 
 	// No more terms, we're done here.
-	if ( ! $shared_terms ) {
-		update_option( 'finished_splitting_shared_terms', true );
-		delete_option( $lock_name );
+	if ( ! $shared_terms) {
+		update_option('finished_splitting_shared_terms', true);
+		delete_option($lock_name);
 		return;
 	}
 
 	// Shared terms found? We'll need to run this script again.
-	wp_schedule_single_event( time() + ( 2 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+	wp_schedule_single_event(time() + (2 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 
 	// Rekey shared term array for faster lookups.
 	$_shared_terms = array();
-	foreach ( $shared_terms as $shared_term ) {
-		$term_id = intval( $shared_term->term_id );
-		$_shared_terms[ $term_id ] = $shared_term;
+	foreach ($shared_terms as $shared_term) {
+		$term_id = intval($shared_term->term_id);
+		$_shared_terms[$term_id] = $shared_term;
 	}
 	$shared_terms = $_shared_terms;
 
 	// Get term taxonomy data for all shared terms.
-	$shared_term_ids = implode( ',', array_keys( $shared_terms ) );
-	$shared_tts = $wpdb->get_results( "SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})" );
+	$shared_term_ids = implode(',', array_keys($shared_terms));
+	$shared_tts = $wpdb->get_results("SELECT * FROM {$wpdb->term_taxonomy} WHERE `term_id` IN ({$shared_term_ids})");
 
 	// Split term data recording is slow, so we do it just once, outside the loop.
-	$split_term_data = get_option( '_split_terms', array() );
+	$split_term_data = get_option('_split_terms', array());
 	$skipped_first_term = $taxonomies = array();
-	foreach ( $shared_tts as $shared_tt ) {
-		$term_id = intval( $shared_tt->term_id );
+	foreach ($shared_tts as $shared_tt) {
+		$term_id = intval($shared_tt->term_id);
 
 		// Don't split the first tt belonging to a given term_id.
-		if ( ! isset( $skipped_first_term[ $term_id ] ) ) {
-			$skipped_first_term[ $term_id ] = 1;
+		if ( ! isset($skipped_first_term[$term_id])) {
+			$skipped_first_term[$term_id] = 1;
 			continue;
 		}
 
-		if ( ! isset( $split_term_data[ $term_id ] ) ) {
-			$split_term_data[ $term_id ] = array();
+		if ( ! isset($split_term_data[$term_id])) {
+			$split_term_data[$term_id] = array();
 		}
 
 		// Keep track of taxonomies whose hierarchies need flushing.
-		if ( ! isset( $taxonomies[ $shared_tt->taxonomy ] ) ) {
-			$taxonomies[ $shared_tt->taxonomy ] = 1;
+		if ( ! isset($taxonomies[$shared_tt->taxonomy])) {
+			$taxonomies[$shared_tt->taxonomy] = 1;
 		}
 
 		// Split the term.
-		$split_term_data[ $term_id ][ $shared_tt->taxonomy ] = _split_shared_term( $shared_terms[ $term_id ], $shared_tt, false );
+		$split_term_data[$term_id][$shared_tt->taxonomy] = _split_shared_term($shared_terms[$term_id], $shared_tt, false);
 	}
 
 	// Rebuild the cached hierarchy for each affected taxonomy.
-	foreach ( array_keys( $taxonomies ) as $tax ) {
-		delete_option( "{$tax}_children" );
-		_get_term_hierarchy( $tax );
+	foreach (array_keys($taxonomies) as $tax) {
+		delete_option("{$tax}_children");
+		_get_term_hierarchy($tax);
 	}
 
-	update_option( '_split_terms', $split_term_data );
+	update_option('_split_terms', $split_term_data);
 
-	delete_option( $lock_name );
+	delete_option($lock_name);
 }
 
 /**
@@ -3889,8 +3889,8 @@ 
  * @since 4.3.0
  */
 function _wp_check_for_scheduled_split_terms() {
-	if ( ! get_option( 'finished_splitting_shared_terms' ) && ! wp_next_scheduled( 'wp_split_shared_term_batch' ) ) {
-		wp_schedule_single_event( time() + MINUTE_IN_SECONDS, 'wp_split_shared_term_batch' );
+	if ( ! get_option('finished_splitting_shared_terms') && ! wp_next_scheduled('wp_split_shared_term_batch')) {
+		wp_schedule_single_event(time() + MINUTE_IN_SECONDS, 'wp_split_shared_term_batch');
 	}
 }
 
@@ -3905,14 +3905,14 @@ 
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
  * @param string $taxonomy         Taxonomy for the split term.
  */
-function _wp_check_split_default_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
-	if ( 'category' != $taxonomy ) {
+function _wp_check_split_default_terms($term_id, $new_term_id, $term_taxonomy_id, $taxonomy) {
+	if ('category' != $taxonomy) {
 		return;
 	}
 
-	foreach ( array( 'default_category', 'default_link_category', 'default_email_category' ) as $option ) {
-		if ( $term_id == get_option( $option, -1 ) ) {
-			update_option( $option, $new_term_id );
+	foreach (array('default_category', 'default_link_category', 'default_email_category') as $option) {
+		if ($term_id == get_option($option, -1)) {
+			update_option($option, $new_term_id);
 		}
 	}
 }
@@ -3930,9 +3930,9 @@ 
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
  * @param string $taxonomy         Taxonomy for the split term.
  */
-function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
+function _wp_check_split_terms_in_menus($term_id, $new_term_id, $term_taxonomy_id, $taxonomy) {
 	global $wpdb;
-	$post_ids = $wpdb->get_col( $wpdb->prepare(
+	$post_ids = $wpdb->get_col($wpdb->prepare(
 		"SELECT m1.post_id
 		FROM {$wpdb->postmeta} AS m1
 			INNER JOIN {$wpdb->postmeta} AS m2 ON ( m2.post_id = m1.post_id )
@@ -3942,11 +3942,11 @@ 
 			AND ( m3.meta_key = '_menu_item_object_id' AND m3.meta_value = %d )",
 		$taxonomy,
 		$term_id
-	) );
+	));
 
-	if ( $post_ids ) {
-		foreach ( $post_ids as $post_id ) {
-			update_post_meta( $post_id, '_menu_item_object_id', $new_term_id, $term_id );
+	if ($post_ids) {
+		foreach ($post_ids as $post_id) {
+			update_post_meta($post_id, '_menu_item_object_id', $new_term_id, $term_id);
 		}
 	}
 }
@@ -3962,19 +3962,19 @@ 
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
  * @param string $taxonomy         Taxonomy for the split term.
  */
-function _wp_check_split_nav_menu_terms( $term_id, $new_term_id, $term_taxonomy_id, $taxonomy ) {
-	if ( 'nav_menu' !== $taxonomy ) {
+function _wp_check_split_nav_menu_terms($term_id, $new_term_id, $term_taxonomy_id, $taxonomy) {
+	if ('nav_menu' !== $taxonomy) {
 		return;
 	}
 
 	// Update menu locations.
 	$locations = get_nav_menu_locations();
-	foreach ( $locations as $location => $menu_id ) {
-		if ( $term_id == $menu_id ) {
-			$locations[ $location ] = $new_term_id;
+	foreach ($locations as $location => $menu_id) {
+		if ($term_id == $menu_id) {
+			$locations[$location] = $new_term_id;
 		}
 	}
-	set_theme_mod( 'nav_menu_locations', $locations );
+	set_theme_mod('nav_menu_locations', $locations);
 }
 
 /**
@@ -3985,12 +3985,12 @@ 
  * @param int $old_term_id Term ID. This is the old, pre-split term ID.
  * @return array Array of new term IDs, keyed by taxonomy.
  */
-function wp_get_split_terms( $old_term_id ) {
-	$split_terms = get_option( '_split_terms', array() );
+function wp_get_split_terms($old_term_id) {
+	$split_terms = get_option('_split_terms', array());
 
 	$terms = array();
-	if ( isset( $split_terms[ $old_term_id ] ) ) {
-		$terms = $split_terms[ $old_term_id ];
+	if (isset($split_terms[$old_term_id])) {
+		$terms = $split_terms[$old_term_id];
 	}
 
 	return $terms;
@@ -4007,12 +4007,12 @@ 
  *                   the new term_id will be returned. If no previously split term is found matching
  *                   the parameters, returns false.
  */
-function wp_get_split_term( $old_term_id, $taxonomy ) {
-	$split_terms = wp_get_split_terms( $old_term_id );
+function wp_get_split_term($old_term_id, $taxonomy) {
+	$split_terms = wp_get_split_terms($old_term_id);
 
 	$term_id = false;
-	if ( isset( $split_terms[ $taxonomy ] ) ) {
-		$term_id = (int) $split_terms[ $taxonomy ];
+	if (isset($split_terms[$taxonomy])) {
+		$term_id = (int) $split_terms[$taxonomy];
 	}
 
 	return $term_id;
@@ -4029,14 +4029,14 @@ 
  * @param int $term_id
  * @return bool
  */
-function wp_term_is_shared( $term_id ) {
+function wp_term_is_shared($term_id) {
 	global $wpdb;
 
-	if ( get_option( 'finished_splitting_shared_terms' ) ) {
+	if (get_option('finished_splitting_shared_terms')) {
 		return false;
 	}
 
-	$tt_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id ) );
+	$tt_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term_id));
 
 	return $tt_count > 1;
 }
@@ -4052,21 +4052,21 @@ 
  * @param string            $taxonomy Optional. Taxonomy. Default empty.
  * @return string|WP_Error HTML link to taxonomy term archive on success, WP_Error if term does not exist.
  */
-function get_term_link( $term, $taxonomy = '' ) {
+function get_term_link($term, $taxonomy = '') {
 	global $wp_rewrite;
 
-	if ( !is_object($term) ) {
-		if ( is_int( $term ) ) {
-			$term = get_term( $term, $taxonomy );
+	if ( ! is_object($term)) {
+		if (is_int($term)) {
+			$term = get_term($term, $taxonomy);
 		} else {
-			$term = get_term_by( 'slug', $term, $taxonomy );
+			$term = get_term_by('slug', $term, $taxonomy);
 		}
 	}
 
-	if ( !is_object($term) )
+	if ( ! is_object($term))
 		$term = new WP_Error('invalid_term', __('Empty Term'));
 
-	if ( is_wp_error( $term ) )
+	if (is_wp_error($term))
 		return $term;
 
 	$taxonomy = $term->taxonomy;
@@ -4076,19 +4076,19 @@ 
 	$slug = $term->slug;
 	$t = get_taxonomy($taxonomy);
 
-	if ( empty($termlink) ) {
-		if ( 'category' == $taxonomy )
-			$termlink = '?cat=' . $term->term_id;
-		elseif ( $t->query_var )
+	if (empty($termlink)) {
+		if ('category' == $taxonomy)
+			$termlink = '?cat='.$term->term_id;
+		elseif ($t->query_var)
 			$termlink = "?$t->query_var=$slug";
 		else
 			$termlink = "?taxonomy=$taxonomy&term=$slug";
 		$termlink = home_url($termlink);
 	} else {
-		if ( $t->rewrite['hierarchical'] ) {
+		if ($t->rewrite['hierarchical']) {
 			$hierarchical_slugs = array();
-			$ancestors = get_ancestors( $term->term_id, $taxonomy, 'taxonomy' );
-			foreach ( (array)$ancestors as $ancestor ) {
+			$ancestors = get_ancestors($term->term_id, $taxonomy, 'taxonomy');
+			foreach ((array) $ancestors as $ancestor) {
 				$ancestor_term = get_term($ancestor, $taxonomy);
 				$hierarchical_slugs[] = $ancestor_term->slug;
 			}
@@ -4098,10 +4098,10 @@ 
 		} else {
 			$termlink = str_replace("%$taxonomy%", $slug, $termlink);
 		}
-		$termlink = home_url( user_trailingslashit($termlink, 'category') );
+		$termlink = home_url(user_trailingslashit($termlink, 'category'));
 	}
 	// Back Compat filters.
-	if ( 'post_tag' == $taxonomy ) {
+	if ('post_tag' == $taxonomy) {
 
 		/**
 		 * Filters the tag link.
@@ -4112,8 +4112,8 @@ 
 		 * @param string $termlink Tag link URL.
 		 * @param int    $term_id  Term ID.
 		 */
-		$termlink = apply_filters( 'tag_link', $termlink, $term->term_id );
-	} elseif ( 'category' == $taxonomy ) {
+		$termlink = apply_filters('tag_link', $termlink, $term->term_id);
+	} elseif ('category' == $taxonomy) {
 
 		/**
 		 * Filters the category link.
@@ -4124,7 +4124,7 @@ 
 		 * @param string $termlink Category link URL.
 		 * @param int    $term_id  Term ID.
 		 */
-		$termlink = apply_filters( 'category_link', $termlink, $term->term_id );
+		$termlink = apply_filters('category_link', $termlink, $term->term_id);
 	}
 
 	/**
@@ -4136,7 +4136,7 @@ 
 	 * @param object $term     Term object.
 	 * @param string $taxonomy Taxonomy slug.
 	 */
-	return apply_filters( 'term_link', $termlink, $term, $taxonomy );
+	return apply_filters('term_link', $termlink, $term, $taxonomy);
 }
 
 /**
@@ -4158,7 +4158,7 @@ 
  *     @type  string      $after  Displays after the taxonomies. Default empty string.
  * }
  */
-function the_taxonomies( $args = array() ) {
+function the_taxonomies($args = array()) {
 	$defaults = array(
 		'post' => 0,
 		'before' => '',
@@ -4166,9 +4166,9 @@ 
 		'after' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	echo $r['before'] . join( $r['sep'], get_the_taxonomies( $r['post'], $r ) ) . $r['after'];
+	echo $r['before'].join($r['sep'], get_the_taxonomies($r['post'], $r)).$r['after'];
 }
 
 /**
@@ -4190,47 +4190,47 @@ 
  * }
  * @return array List of taxonomies.
  */
-function get_the_taxonomies( $post = 0, $args = array() ) {
-	$post = get_post( $post );
+function get_the_taxonomies($post = 0, $args = array()) {
+	$post = get_post($post);
 
-	$args = wp_parse_args( $args, array(
+	$args = wp_parse_args($args, array(
 		/* translators: %s: taxonomy label, %l: list of terms formatted as per $term_template */
-		'template' => __( '%s: %l.' ),
+		'template' => __('%s: %l.'),
 		'term_template' => '<a href="%1$s">%2$s</a>',
-	) );
+	));
 
 	$taxonomies = array();
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return $taxonomies;
 	}
 
-	foreach ( get_object_taxonomies( $post ) as $taxonomy ) {
-		$t = (array) get_taxonomy( $taxonomy );
-		if ( empty( $t['label'] ) ) {
+	foreach (get_object_taxonomies($post) as $taxonomy) {
+		$t = (array) get_taxonomy($taxonomy);
+		if (empty($t['label'])) {
 			$t['label'] = $taxonomy;
 		}
-		if ( empty( $t['args'] ) ) {
+		if (empty($t['args'])) {
 			$t['args'] = array();
 		}
-		if ( empty( $t['template'] ) ) {
+		if (empty($t['template'])) {
 			$t['template'] = $args['template'];
 		}
-		if ( empty( $t['term_template'] ) ) {
+		if (empty($t['term_template'])) {
 			$t['term_template'] = $args['term_template'];
 		}
 
-		$terms = get_object_term_cache( $post->ID, $taxonomy );
-		if ( false === $terms ) {
-			$terms = wp_get_object_terms( $post->ID, $taxonomy, $t['args'] );
+		$terms = get_object_term_cache($post->ID, $taxonomy);
+		if (false === $terms) {
+			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 		}
 		$links = array();
 
-		foreach ( $terms as $term ) {
-			$links[] = wp_sprintf( $t['term_template'], esc_attr( get_term_link( $term ) ), $term->name );
+		foreach ($terms as $term) {
+			$links[] = wp_sprintf($t['term_template'], esc_attr(get_term_link($term)), $term->name);
 		}
-		if ( $links ) {
-			$taxonomies[$taxonomy] = wp_sprintf( $t['template'], $t['label'], $links, $terms );
+		if ($links) {
+			$taxonomies[$taxonomy] = wp_sprintf($t['template'], $t['label'], $links, $terms);
 		}
 	}
 	return $taxonomies;
@@ -4244,8 +4244,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array
  */
-function get_post_taxonomies( $post = 0 ) {
-	$post = get_post( $post );
+function get_post_taxonomies($post = 0) {
+	$post = get_post($post);
 
 	return get_object_taxonomies($post);
 }
@@ -4264,45 +4264,45 @@ 
  * @param int|string|array $terms     Optional. Term term_id, name, slug or array of said. Default null.
  * @return bool|WP_Error WP_Error on input error.
  */
-function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
-	if ( !$object_id = (int) $object_id )
-		return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+function is_object_in_term($object_id, $taxonomy, $terms = null) {
+	if ( ! $object_id = (int) $object_id)
+		return new WP_Error('invalid_object', __('Invalid object ID'));
 
-	$object_terms = get_object_term_cache( $object_id, $taxonomy );
-	if ( false === $object_terms ) {
-		$object_terms = wp_get_object_terms( $object_id, $taxonomy, array( 'update_term_meta_cache' => false ) );
-		wp_cache_set( $object_id, wp_list_pluck( $object_terms, 'term_id' ), "{$taxonomy}_relationships" );
+	$object_terms = get_object_term_cache($object_id, $taxonomy);
+	if (false === $object_terms) {
+		$object_terms = wp_get_object_terms($object_id, $taxonomy, array('update_term_meta_cache' => false));
+		wp_cache_set($object_id, wp_list_pluck($object_terms, 'term_id'), "{$taxonomy}_relationships");
 	}
 
-	if ( is_wp_error( $object_terms ) )
+	if (is_wp_error($object_terms))
 		return $object_terms;
-	if ( empty( $object_terms ) )
+	if (empty($object_terms))
 		return false;
-	if ( empty( $terms ) )
-		return ( !empty( $object_terms ) );
+	if (empty($terms))
+		return ( ! empty($object_terms));
 
 	$terms = (array) $terms;
 
-	if ( $ints = array_filter( $terms, 'is_int' ) )
-		$strs = array_diff( $terms, $ints );
+	if ($ints = array_filter($terms, 'is_int'))
+		$strs = array_diff($terms, $ints);
 	else
-		$strs =& $terms;
+		$strs = & $terms;
 
-	foreach ( $object_terms as $object_term ) {
+	foreach ($object_terms as $object_term) {
 		// If term is an int, check against term_ids only.
-		if ( $ints && in_array( $object_term->term_id, $ints ) ) {
+		if ($ints && in_array($object_term->term_id, $ints)) {
 			return true;
 		}
 
-		if ( $strs ) {
+		if ($strs) {
 			// Only check numeric strings against term_id, to avoid false matches due to type juggling.
-			$numeric_strs = array_map( 'intval', array_filter( $strs, 'is_numeric' ) );
-			if ( in_array( $object_term->term_id, $numeric_strs, true ) ) {
+			$numeric_strs = array_map('intval', array_filter($strs, 'is_numeric'));
+			if (in_array($object_term->term_id, $numeric_strs, true)) {
 				return true;
 			}
 
-			if ( in_array( $object_term->name, $strs ) ) return true;
-			if ( in_array( $object_term->slug, $strs ) ) return true;
+			if (in_array($object_term->name, $strs)) return true;
+			if (in_array($object_term->slug, $strs)) return true;
 		}
 	}
 
@@ -4318,12 +4318,12 @@ 
  * @param string $taxonomy    Single taxonomy name.
  * @return bool True if object is associated with the taxonomy, otherwise false.
  */
-function is_object_in_taxonomy( $object_type, $taxonomy ) {
-	$taxonomies = get_object_taxonomies( $object_type );
-	if ( empty( $taxonomies ) ) {
+function is_object_in_taxonomy($object_type, $taxonomy) {
+	$taxonomies = get_object_taxonomies($object_type);
+	if (empty($taxonomies)) {
 		return false;
 	}
-	return in_array( $taxonomy, $taxonomies );
+	return in_array($taxonomy, $taxonomies);
 }
 
 /**
@@ -4339,32 +4339,32 @@ 
  *                              or 'taxonomy'. Default empty.
  * @return array An array of ancestors from lowest to highest in the hierarchy.
  */
-function get_ancestors( $object_id = 0, $object_type = '', $resource_type = '' ) {
+function get_ancestors($object_id = 0, $object_type = '', $resource_type = '') {
 	$object_id = (int) $object_id;
 
 	$ancestors = array();
 
-	if ( empty( $object_id ) ) {
+	if (empty($object_id)) {
 
 		/** This filter is documented in wp-includes/taxonomy.php */
-		return apply_filters( 'get_ancestors', $ancestors, $object_id, $object_type, $resource_type );
+		return apply_filters('get_ancestors', $ancestors, $object_id, $object_type, $resource_type);
 	}
 
-	if ( ! $resource_type ) {
-		if ( is_taxonomy_hierarchical( $object_type ) ) {
+	if ( ! $resource_type) {
+		if (is_taxonomy_hierarchical($object_type)) {
 			$resource_type = 'taxonomy';
-		} elseif ( post_type_exists( $object_type ) ) {
+		} elseif (post_type_exists($object_type)) {
 			$resource_type = 'post_type';
 		}
 	}
 
-	if ( 'taxonomy' === $resource_type ) {
+	if ('taxonomy' === $resource_type) {
 		$term = get_term($object_id, $object_type);
-		while ( ! is_wp_error($term) && ! empty( $term->parent ) && ! in_array( $term->parent, $ancestors ) ) {
+		while ( ! is_wp_error($term) && ! empty($term->parent) && ! in_array($term->parent, $ancestors)) {
 			$ancestors[] = (int) $term->parent;
 			$term = get_term($term->parent, $object_type);
 		}
-	} elseif ( 'post_type' === $resource_type ) {
+	} elseif ('post_type' === $resource_type) {
 		$ancestors = get_post_ancestors($object_id);
 	}
 
@@ -4379,7 +4379,7 @@ 
 	 * @param string $object_type   Type of object.
 	 * @param string $resource_type Type of resource $object_type is.
 	 */
-	return apply_filters( 'get_ancestors', $ancestors, $object_id, $object_type, $resource_type );
+	return apply_filters('get_ancestors', $ancestors, $object_id, $object_type, $resource_type);
 }
 
 /**
@@ -4391,9 +4391,9 @@ 
  * @param string $taxonomy Taxonomy name.
  * @return int|false False on error.
  */
-function wp_get_term_taxonomy_parent_id( $term_id, $taxonomy ) {
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+function wp_get_term_taxonomy_parent_id($term_id, $taxonomy) {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return false;
 	}
 	return (int) $term->parent;
@@ -4413,26 +4413,26 @@ 
  *
  * @return int The new parent for the term.
  */
-function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
+function wp_check_term_hierarchy_for_loops($parent, $term_id, $taxonomy) {
 	// Nothing fancy here - bail
-	if ( !$parent )
+	if ( ! $parent)
 		return 0;
 
 	// Can't be its own parent.
-	if ( $parent == $term_id )
+	if ($parent == $term_id)
 		return 0;
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
+	if ( ! $loop = wp_find_hierarchy_loop('wp_get_term_taxonomy_parent_id', $term_id, $parent, array($taxonomy)))
 		return $parent; // No loop
 
 	// Setting $parent to the given value causes a loop.
-	if ( isset( $loop[$term_id] ) )
+	if (isset($loop[$term_id]))
 		return 0;
 
 	// There's a loop, but it doesn't contain $term_id. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	foreach (array_keys($loop) as $loop_member)
+		wp_update_term($loop_member, $taxonomy, array('parent' => 0));
 
 	return $parent;
 }

Braces +390 added lines, -265 removed lines

@@ -180,8 +180,9 @@ 
 	global $wp_taxonomies;
 
 	if ( is_object($object) ) {
-		if ( $object->post_type == 'attachment' )
-			return get_attachment_taxonomies($object);
+		if ( $object->post_type == 'attachment' ) {
+					return get_attachment_taxonomies($object);
+		}
 		$object = $object->post_type;
 	}
 
@@ -190,10 +191,11 @@ 
 	$taxonomies = array();
 	foreach ( (array) $wp_taxonomies as $tax_name => $tax_obj ) {
 		if ( array_intersect($object, (array) $tax_obj->object_type) ) {
-			if ( 'names' == $output )
-				$taxonomies[] = $tax_name;
-			else
-				$taxonomies[ $tax_name ] = $tax_obj;
+			if ( 'names' == $output ) {
+							$taxonomies[] = $tax_name;
+			} else {
+							$taxonomies[ $tax_name ] = $tax_obj;
+			}
 		}
 	}
 
@@ -216,8 +218,9 @@ 
 function get_taxonomy( $taxonomy ) {
 	global $wp_taxonomies;
 
-	if ( ! taxonomy_exists( $taxonomy ) )
-		return false;
+	if ( ! taxonomy_exists( $taxonomy ) ) {
+			return false;
+	}
 
 	return $wp_taxonomies[$taxonomy];
 }
@@ -254,8 +257,9 @@ 
  * @return bool Whether the taxonomy is hierarchical.
  */
 function is_taxonomy_hierarchical($taxonomy) {
-	if ( ! taxonomy_exists($taxonomy) )
-		return false;
+	if ( ! taxonomy_exists($taxonomy) ) {
+			return false;
+	}
 
 	$taxonomy = get_taxonomy($taxonomy);
 	return $taxonomy->hierarchical;
@@ -351,8 +355,9 @@ 
 function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
 	global $wp_taxonomies, $wp;
 
-	if ( ! is_array( $wp_taxonomies ) )
-		$wp_taxonomies = array();
+	if ( ! is_array( $wp_taxonomies ) ) {
+			$wp_taxonomies = array();
+	}
 
 	$args = wp_parse_args( $args );
 
@@ -400,10 +405,11 @@ 
 
 	// Non-publicly queryable taxonomies should not register query vars, except in the admin.
 	if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) {
-		if ( true === $args['query_var'] )
-			$args['query_var'] = $taxonomy;
-		else
-			$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
+		if ( true === $args['query_var'] ) {
+					$args['query_var'] = $taxonomy;
+		} else {
+					$args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
+		}
 		$wp->add_query_var( $args['query_var'] );
 	} else {
 		// Force query_var to false for non-public taxonomies.
@@ -417,33 +423,39 @@ 
 			'ep_mask' => EP_NONE,
 		) );
 
-		if ( empty( $args['rewrite']['slug'] ) )
-			$args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
+		if ( empty( $args['rewrite']['slug'] ) ) {
+					$args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy );
+		}
 
-		if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )
-			$tag = '(.+?)';
-		else
-			$tag = '([^/]+)';
+		if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] ) {
+					$tag = '(.+?)';
+		} else {
+					$tag = '([^/]+)';
+		}
 
 		add_rewrite_tag( "%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=" );
 		add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] );
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_ui'] )
-		$args['show_ui'] = $args['public'];
+	if ( null === $args['show_ui'] ) {
+			$args['show_ui'] = $args['public'];
+	}
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_in_menu' ] || ! $args['show_ui'] )
-		$args['show_in_menu' ] = $args['show_ui'];
+	if ( null === $args['show_in_menu' ] || ! $args['show_ui'] ) {
+			$args['show_in_menu' ] = $args['show_ui'];
+	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args['show_in_nav_menus'] )
-		$args['show_in_nav_menus'] = $args['public'];
+	if ( null === $args['show_in_nav_menus'] ) {
+			$args['show_in_nav_menus'] = $args['public'];
+	}
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args['show_tagcloud'] )
-		$args['show_tagcloud'] = $args['show_ui'];
+	if ( null === $args['show_tagcloud'] ) {
+			$args['show_tagcloud'] = $args['show_ui'];
+	}
 
 	// If not set, default to the setting for show_ui.
 	if ( null === $args['show_in_quick_edit'] ) {
@@ -467,10 +479,11 @@ 
 
 	// If not set, use the default meta box
 	if ( null === $args['meta_box_cb'] ) {
-		if ( $args['hierarchical'] )
-			$args['meta_box_cb'] = 'post_categories_meta_box';
-		else
-			$args['meta_box_cb'] = 'post_tags_meta_box';
+		if ( $args['hierarchical'] ) {
+					$args['meta_box_cb'] = 'post_categories_meta_box';
+		} else {
+					$args['meta_box_cb'] = 'post_tags_meta_box';
+		}
 	}
 
 	$wp_taxonomies[ $taxonomy ] = (object) $args;
@@ -585,11 +598,13 @@ 
 function get_taxonomy_labels( $tax ) {
 	$tax->labels = (array) $tax->labels;
 
-	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
-		$tax->labels['separate_items_with_commas'] = $tax->helps;
+	if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) ) {
+			$tax->labels['separate_items_with_commas'] = $tax->helps;
+	}
 
-	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
-		$tax->labels['not_found'] = $tax->no_tagcloud;
+	if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) ) {
+			$tax->labels['not_found'] = $tax->no_tagcloud;
+	}
 
 	$nohier_vs_hier_defaults = array(
 		'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
@@ -653,14 +668,17 @@ 
 function register_taxonomy_for_object_type( $taxonomy, $object_type) {
 	global $wp_taxonomies;
 
-	if ( !isset($wp_taxonomies[$taxonomy]) )
-		return false;
+	if ( !isset($wp_taxonomies[$taxonomy]) ) {
+			return false;
+	}
 
-	if ( ! get_post_type_object($object_type) )
-		return false;
+	if ( ! get_post_type_object($object_type) ) {
+			return false;
+	}
 
-	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) )
-		$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+	if ( ! in_array( $object_type, $wp_taxonomies[$taxonomy]->object_type ) ) {
+			$wp_taxonomies[$taxonomy]->object_type[] = $object_type;
+	}
 
 	// Filter out empties.
 	$wp_taxonomies[ $taxonomy ]->object_type = array_filter( $wp_taxonomies[ $taxonomy ]->object_type );
@@ -682,15 +700,18 @@ 
 function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
 	global $wp_taxonomies;
 
-	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) )
-		return false;
+	if ( ! isset( $wp_taxonomies[ $taxonomy ] ) ) {
+			return false;
+	}
 
-	if ( ! get_post_type_object( $object_type ) )
-		return false;
+	if ( ! get_post_type_object( $object_type ) ) {
+			return false;
+	}
 
 	$key = array_search( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true );
-	if ( false === $key )
-		return false;
+	if ( false === $key ) {
+			return false;
+	}
 
 	unset( $wp_taxonomies[ $taxonomy ]->object_type[ $key ] );
 	return true;
@@ -939,8 +960,9 @@ 
 	if ( 'slug' == $field ) {
 		$_field = 't.slug';
 		$value = sanitize_title($value);
-		if ( empty($value) )
-			return false;
+		if ( empty($value) ) {
+					return false;
+		}
 	} elseif ( 'name' == $field ) {
 		// Assume already escaped
 		$value = wp_unslash($value);
@@ -960,8 +982,9 @@ 
 	}
 
 	$term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value ) . " $tax_clause LIMIT 1" );
-	if ( ! $term )
-		return false;
+	if ( ! $term ) {
+			return false;
+	}
 
 	// In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.
 	if ( 'term_taxonomy_id' === $field ) {
@@ -988,15 +1011,17 @@ 
  * @return array|WP_Error List of Term IDs. WP_Error returned if `$taxonomy` does not exist.
  */
 function get_term_children( $term_id, $taxonomy ) {
-	if ( ! taxonomy_exists($taxonomy) )
-		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+	if ( ! taxonomy_exists($taxonomy) ) {
+			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+	}
 
 	$term_id = intval( $term_id );
 
 	$terms = _get_term_hierarchy($taxonomy);
 
-	if ( ! isset($terms[$term_id]) )
-		return array();
+	if ( ! isset($terms[$term_id]) ) {
+			return array();
+	}
 
 	$children = $terms[$term_id];
 
@@ -1005,8 +1030,9 @@ 
 			continue;
 		}
 
-		if ( isset($terms[$child]) )
-			$children = array_merge($children, get_term_children($child, $taxonomy));
+		if ( isset($terms[$child]) ) {
+					$children = array_merge($children, get_term_children($child, $taxonomy));
+		}
 	}
 
 	return $children;
@@ -1030,14 +1056,17 @@ 
  */
 function get_term_field( $field, $term, $taxonomy = '', $context = 'display' ) {
 	$term = get_term( $term, $taxonomy );
-	if ( is_wp_error($term) )
-		return $term;
+	if ( is_wp_error($term) ) {
+			return $term;
+	}
 
-	if ( !is_object($term) )
-		return '';
+	if ( !is_object($term) ) {
+			return '';
+	}
 
-	if ( !isset($term->$field) )
-		return '';
+	if ( !isset($term->$field) ) {
+			return '';
+	}
 
 	return sanitize_term_field( $field, $term->$field, $term->term_id, $term->taxonomy, $context );
 }
@@ -1057,11 +1086,13 @@ 
 function get_term_to_edit( $id, $taxonomy ) {
 	$term = get_term( $id, $taxonomy );
 
-	if ( is_wp_error($term) )
-		return $term;
+	if ( is_wp_error($term) ) {
+			return $term;
+	}
 
-	if ( !is_object($term) )
-		return '';
+	if ( !is_object($term) ) {
+			return '';
+	}
 
 	return sanitize_term($term, $taxonomy, 'edit');
 }
@@ -1393,13 +1424,15 @@ 
 	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
 
 	if ( is_int($term) ) {
-		if ( 0 == $term )
-			return 0;
+		if ( 0 == $term ) {
+					return 0;
+		}
 		$where = 't.term_id = %d';
-		if ( !empty($taxonomy) )
-			return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
-		else
-			return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+		if ( !empty($taxonomy) ) {
+					return $wpdb->get_row( $wpdb->prepare( $tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy ), ARRAY_A );
+		} else {
+					return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
+		}
 	}
 
 	$term = trim( wp_unslash( $term ) );
@@ -1423,14 +1456,16 @@ 
 		$where_fields[] = $taxonomy;
 		$else_where_fields[] = $taxonomy;
 
-		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) )
-			return $result;
+		if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s $orderby $limit", $where_fields), ARRAY_A) ) {
+					return $result;
+		}
 
 		return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s $orderby $limit", $else_where_fields), ARRAY_A);
 	}
 
-	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) )
-		return $result;
+	if ( $result = $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where $orderby $limit", $where_fields) ) ) {
+			return $result;
+	}
 
 	return $wpdb->get_var( $wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $else_where $orderby $limit", $else_where_fields) );
 }
@@ -1448,15 +1483,19 @@ 
  * @return bool Whether `$term2` is a child of `$term1`.
  */
 function term_is_ancestor_of( $term1, $term2, $taxonomy ) {
-	if ( ! isset( $term1->term_id ) )
-		$term1 = get_term( $term1, $taxonomy );
-	if ( ! isset( $term2->parent ) )
-		$term2 = get_term( $term2, $taxonomy );
+	if ( ! isset( $term1->term_id ) ) {
+			$term1 = get_term( $term1, $taxonomy );
+	}
+	if ( ! isset( $term2->parent ) ) {
+			$term2 = get_term( $term2, $taxonomy );
+	}
 
-	if ( empty( $term1->term_id ) || empty( $term2->parent ) )
-		return false;
-	if ( $term2->parent == $term1->term_id )
-		return true;
+	if ( empty( $term1->term_id ) || empty( $term2->parent ) ) {
+			return false;
+	}
+	if ( $term2->parent == $term1->term_id ) {
+			return true;
+	}
 
 	return term_is_ancestor_of( $term1, get_term( $term2->parent, $taxonomy ), $taxonomy );
 }
@@ -1487,18 +1526,21 @@ 
 
 	foreach ( (array) $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($term->$field) )
-				$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
+			if ( isset($term->$field) ) {
+							$term->$field = sanitize_term_field($field, $term->$field, $term_id, $taxonomy, $context);
+			}
 		} else {
-			if ( isset($term[$field]) )
-				$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
+			if ( isset($term[$field]) ) {
+							$term[$field] = sanitize_term_field($field, $term[$field], $term_id, $taxonomy, $context);
+			}
 		}
 	}
 
-	if ( $do_object )
-		$term->filter = $context;
-	else
-		$term['filter'] = $context;
+	if ( $do_object ) {
+			$term->filter = $context;
+	} else {
+			$term['filter'] = $context;
+	}
 
 	return $term;
 }
@@ -1530,12 +1572,14 @@ 
 	$int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
 	if ( in_array( $field, $int_fields ) ) {
 		$value = (int) $value;
-		if ( $value < 0 )
-			$value = 0;
+		if ( $value < 0 ) {
+					$value = 0;
+		}
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	if ( 'edit' == $context ) {
 
@@ -1565,10 +1609,13 @@ 
 		 */
 		$value = apply_filters( "edit_{$taxonomy}_{$field}", $value, $term_id );
 
-		if ( 'description' == $field )
-			$value = esc_html($value); // textarea_escaped
-		else
-			$value = esc_attr($value);
+		if ( 'description' == $field ) {
+					$value = esc_html($value);
+		}
+		// textarea_escaped
+		else {
+					$value = esc_attr($value);
+		}
 	} elseif ( 'db' == $context ) {
 
 		/**
@@ -1716,8 +1763,9 @@ 
 function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
 	$object_id = (int) $object_id;
 
-	if ( !is_array($taxonomies) )
-		$taxonomies = array($taxonomies);
+	if ( !is_array($taxonomies) ) {
+			$taxonomies = array($taxonomies);
+	}
 
 	foreach ( (array) $taxonomies as $taxonomy ) {
 		$term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
@@ -1758,10 +1806,12 @@ 
 
 	$term = (int) $term;
 
-	if ( ! $ids = term_exists($term, $taxonomy) )
-		return false;
-	if ( is_wp_error( $ids ) )
-		return $ids;
+	if ( ! $ids = term_exists($term, $taxonomy) ) {
+			return false;
+	}
+	if ( is_wp_error( $ids ) ) {
+			return $ids;
+	}
 
 	$tt_id = $ids['term_taxonomy_id'];
 
@@ -1769,8 +1819,10 @@ 
 
 	if ( 'category' == $taxonomy ) {
 		$defaults['default'] = get_option( 'default_category' );
-		if ( $defaults['default'] == $term )
-			return 0; // Don't delete the default category
+		if ( $defaults['default'] == $term ) {
+					return 0;
+		}
+		// Don't delete the default category
 	}
 
 	$args = wp_parse_args($args, $defaults);
@@ -1799,8 +1851,9 @@ 
 	// Update children to point to new parent
 	if ( is_taxonomy_hierarchical($taxonomy) ) {
 		$term_obj = get_term($term, $taxonomy);
-		if ( is_wp_error( $term_obj ) )
-			return $term_obj;
+		if ( is_wp_error( $term_obj ) ) {
+					return $term_obj;
+		}
 		$parent = $term_obj->parent;
 
 		$edit_ids = $wpdb->get_results( "SELECT term_id, term_taxonomy_id FROM $wpdb->term_taxonomy WHERE `parent` = " . (int)$term_obj->term_id );
@@ -1842,8 +1895,9 @@ 
 			$terms = array($default);
 		} else {
 			$terms = array_diff($terms, array($term));
-			if (isset($default) && isset($force_default) && $force_default)
-				$terms = array_merge($terms, array($default));
+			if (isset($default) && isset($force_default) && $force_default) {
+							$terms = array_merge($terms, array($default));
+			}
 		}
 		$terms = array_map('intval', $terms);
 		wp_set_object_terms( $object_id, $terms, $taxonomy );
@@ -1851,8 +1905,9 @@ 
 
 	// Clean the relationship caches for all object types using this term.
 	$tax_object = get_taxonomy( $taxonomy );
-	foreach ( $tax_object->object_type as $object_type )
-		clean_object_term_cache( $object_ids, $object_type );
+	foreach ( $tax_object->object_type as $object_type ) {
+			clean_object_term_cache( $object_ids, $object_type );
+	}
 
 	$term_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->termmeta WHERE term_id = %d ", $term ) );
 	foreach ( $term_meta_ids as $mid ) {
@@ -1879,8 +1934,9 @@ 
 	do_action( 'deleted_term_taxonomy', $tt_id );
 
 	// Delete the term if no taxonomies use it.
-	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) )
-		$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	if ( !$wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_taxonomy WHERE term_id = %d", $term) ) ) {
+			$wpdb->delete( $wpdb->terms, array( 'term_id' => $term ) );
+	}
 
 	clean_term_cache($term, $taxonomy);
 
@@ -1967,19 +2023,23 @@ 
 function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
 	global $wpdb;
 
-	if ( empty( $object_ids ) || empty( $taxonomies ) )
-		return array();
+	if ( empty( $object_ids ) || empty( $taxonomies ) ) {
+			return array();
+	}
 
-	if ( !is_array($taxonomies) )
-		$taxonomies = array($taxonomies);
+	if ( !is_array($taxonomies) ) {
+			$taxonomies = array($taxonomies);
+	}
 
 	foreach ( $taxonomies as $taxonomy ) {
-		if ( ! taxonomy_exists($taxonomy) )
-			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+		if ( ! taxonomy_exists($taxonomy) ) {
+					return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+		}
 	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = array($object_ids);
+	if ( !is_array($object_ids) ) {
+			$object_ids = array($object_ids);
+	}
 	$object_ids = array_map('intval', $object_ids);
 
 	$defaults = array(
@@ -2003,8 +2063,9 @@ 
 		}
 	} else {
 		$t = get_taxonomy($taxonomies[0]);
-		if ( isset($t->args) && is_array($t->args) )
-			$args = array_merge($args, $t->args);
+		if ( isset($t->args) && is_array($t->args) ) {
+					$args = array_merge($args, $t->args);
+		}
 	}
 
 	$orderby = $args['orderby'];
@@ -2025,15 +2086,18 @@ 
 	}
 
 	// tt_ids queries can only be none or tr.term_taxonomy_id
-	if ( ('tt_ids' == $fields) && !empty($orderby) )
-		$orderby = 'tr.term_taxonomy_id';
+	if ( ('tt_ids' == $fields) && !empty($orderby) ) {
+			$orderby = 'tr.term_taxonomy_id';
+	}
 
-	if ( !empty($orderby) )
-		$orderby = "ORDER BY $orderby";
+	if ( !empty($orderby) ) {
+			$orderby = "ORDER BY $orderby";
+	}
 
 	$order = strtoupper( $order );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) )
-		$order = 'ASC';
+	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
+			$order = 'ASC';
+	}
 
 	$taxonomy_array = $taxonomies;
 	$object_id_array = $object_ids;
@@ -2473,39 +2537,46 @@ 
 
 	$object_id = (int) $object_id;
 
-	if ( ! taxonomy_exists($taxonomy) )
-		return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+	if ( ! taxonomy_exists($taxonomy) ) {
+			return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+	}
 
-	if ( !is_array($terms) )
-		$terms = array($terms);
+	if ( !is_array($terms) ) {
+			$terms = array($terms);
+	}
 
-	if ( ! $append )
-		$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
-	else
-		$old_tt_ids = array();
+	if ( ! $append ) {
+			$old_tt_ids =  wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids', 'orderby' => 'none'));
+	} else {
+			$old_tt_ids = array();
+	}
 
 	$tt_ids = array();
 	$term_ids = array();
 	$new_tt_ids = array();
 
 	foreach ( (array) $terms as $term) {
-		if ( !strlen(trim($term)) )
-			continue;
+		if ( !strlen(trim($term)) ) {
+					continue;
+		}
 
 		if ( !$term_info = term_exists($term, $taxonomy) ) {
 			// Skip if a non-existent term ID is passed.
-			if ( is_int($term) )
-				continue;
+			if ( is_int($term) ) {
+							continue;
+			}
 			$term_info = wp_insert_term($term, $taxonomy);
 		}
-		if ( is_wp_error($term_info) )
-			return $term_info;
+		if ( is_wp_error($term_info) ) {
+					return $term_info;
+		}
 		$term_ids[] = $term_info['term_id'];
 		$tt_id = $term_info['term_taxonomy_id'];
 		$tt_ids[] = $tt_id;
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) )
-			continue;
+		if ( $wpdb->get_var( $wpdb->prepare( "SELECT term_taxonomy_id FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id = %d", $object_id, $tt_id ) ) ) {
+					continue;
+		}
 
 		/**
 		 * Fires immediately before an object-term relationship is added.
@@ -2530,8 +2601,9 @@ 
 		$new_tt_ids[] = $tt_id;
 	}
 
-	if ( $new_tt_ids )
-		wp_update_term_count( $new_tt_ids, $taxonomy );
+	if ( $new_tt_ids ) {
+			wp_update_term_count( $new_tt_ids, $taxonomy );
+	}
 
 	if ( ! $append ) {
 		$delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
@@ -2553,12 +2625,14 @@ 
 		$values = array();
 		$term_order = 0;
 		$final_tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
-		foreach ( $tt_ids as $tt_id )
-			if ( in_array($tt_id, $final_tt_ids) )
+		foreach ( $tt_ids as $tt_id ) {
+					if ( in_array($tt_id, $final_tt_ids) )
 				$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
-		if ( $values )
-			if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
+		}
+		if ( $values ) {
+					if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
 				return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
+		}
 	}
 
 	wp_cache_delete( $object_id, $taxonomy . '_relationships' );
@@ -2716,15 +2790,17 @@ 
 		$the_parent = $term->parent;
 		while ( ! empty($the_parent) ) {
 			$parent_term = get_term($the_parent, $term->taxonomy);
-			if ( is_wp_error($parent_term) || empty($parent_term) )
-				break;
+			if ( is_wp_error($parent_term) || empty($parent_term) ) {
+							break;
+			}
 			$parent_suffix .= '-' . $parent_term->slug;
 			if ( ! term_exists( $slug . $parent_suffix ) ) {
 				break;
 			}
 
-			if ( empty($parent_term->parent) )
-				break;
+			if ( empty($parent_term->parent) ) {
+							break;
+			}
 			$the_parent = $parent_term->parent;
 		}
 	}
@@ -2744,10 +2820,11 @@ 
 		if ( $parent_suffix ) {
 			$slug .= $parent_suffix;
 		} else {
-			if ( ! empty( $term->term_id ) )
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
-			else
-				$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+			if ( ! empty( $term->term_id ) ) {
+							$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s AND term_id != %d", $slug, $term->term_id );
+			} else {
+							$query = $wpdb->prepare( "SELECT slug FROM $wpdb->terms WHERE slug = %s", $slug );
+			}
 
 			if ( $wpdb->get_var( $query ) ) {
 				$num = 2;
@@ -2843,8 +2920,9 @@ 
 	$parsed_args['name'] = $name;
 	$parsed_args['description'] = $description;
 
-	if ( '' == trim($name) )
-		return new WP_Error('empty_term_name', __('A name is required for this term'));
+	if ( '' == trim($name) ) {
+			return new WP_Error('empty_term_name', __('A name is required for this term'));
+	}
 
 	if ( $parsed_args['parent'] > 0 && ! term_exists( (int) $parsed_args['parent'] ) ) {
 		return new WP_Error( 'missing_parent', __( 'Parent term does not exist.' ) );
@@ -2901,10 +2979,11 @@ 
 	if ( $duplicate && $duplicate->term_id != $term_id ) {
 		// If an empty slug was passed or the parent changed, reset the slug to something unique.
 		// Otherwise, bail.
-		if ( $empty_slug || ( $parent != $term['parent']) )
-			$slug = wp_unique_term_slug($slug, (object) $args);
-		else
-			return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
+		if ( $empty_slug || ( $parent != $term['parent']) ) {
+					$slug = wp_unique_term_slug($slug, (object) $args);
+		} else {
+					return new WP_Error('duplicate_term_slug', sprintf(__('The slug &#8220;%s&#8221; is already in use by another term'), $slug));
+		}
 	}
 
 	$tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) );
@@ -3034,8 +3113,9 @@ 
 	if ( is_bool($defer) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_term_count( null, null, true );
+		if ( !$defer ) {
+					wp_update_term_count( null, null, true );
+		}
 	}
 
 	return $_defer;
@@ -3069,15 +3149,18 @@ 
 		}
 	}
 
-	if ( empty($terms) )
-		return false;
+	if ( empty($terms) ) {
+			return false;
+	}
 
-	if ( !is_array($terms) )
-		$terms = array($terms);
+	if ( !is_array($terms) ) {
+			$terms = array($terms);
+	}
 
 	if ( wp_defer_term_counting() ) {
-		if ( !isset($_deferred[$taxonomy]) )
-			$_deferred[$taxonomy] = array();
+		if ( !isset($_deferred[$taxonomy]) ) {
+					$_deferred[$taxonomy] = array();
+		}
 		$_deferred[$taxonomy] = array_unique( array_merge($_deferred[$taxonomy], $terms) );
 		return true;
 	}
@@ -3103,8 +3186,9 @@ 
 	} else {
 		$object_types = (array) $taxonomy->object_type;
 		foreach ( $object_types as &$object_type ) {
-			if ( 0 === strpos( $object_type, 'attachment:' ) )
-				list( $object_type ) = explode( ':', $object_type );
+			if ( 0 === strpos( $object_type, 'attachment:' ) ) {
+							list( $object_type ) = explode( ':', $object_type );
+			}
 		}
 
 		if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {
@@ -3148,8 +3232,9 @@ 
 		return;
 	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = array($object_ids);
+	if ( !is_array($object_ids) ) {
+			$object_ids = array($object_ids);
+	}
 
 	$taxonomies = get_object_taxonomies( $object_type );
 
@@ -3191,8 +3276,9 @@ 
 		return;
 	}
 
-	if ( !is_array($ids) )
-		$ids = array($ids);
+	if ( !is_array($ids) ) {
+			$ids = array($ids);
+	}
 
 	$taxonomies = array();
 	// If no taxonomy, assume tt_ids.
@@ -3300,11 +3386,13 @@ 
  * @return void|false False if all of the terms in `$object_ids` are already cached.
  */
 function update_object_term_cache($object_ids, $object_type) {
-	if ( empty($object_ids) )
-		return;
+	if ( empty($object_ids) ) {
+			return;
+	}
 
-	if ( !is_array($object_ids) )
-		$object_ids = explode(',', $object_ids);
+	if ( !is_array($object_ids) ) {
+			$object_ids = explode(',', $object_ids);
+	}
 
 	$object_ids = array_map('intval', $object_ids);
 
@@ -3320,8 +3408,9 @@ 
 		}
 	}
 
-	if ( empty( $ids ) )
-		return false;
+	if ( empty( $ids ) ) {
+			return false;
+	}
 
 	$terms = wp_get_object_terms( $ids, $taxonomies, array(
 		'fields' => 'all_with_object_id',
@@ -3337,8 +3426,9 @@ 
 	foreach ( $ids as $id ) {
 		foreach ( $taxonomies as $taxonomy ) {
 			if ( ! isset($object_terms[$id][$taxonomy]) ) {
-				if ( !isset($object_terms[$id]) )
-					$object_terms[$id] = array();
+				if ( !isset($object_terms[$id]) ) {
+									$object_terms[$id] = array();
+				}
 				$object_terms[$id][$taxonomy] = array();
 			}
 		}
@@ -3385,17 +3475,20 @@ 
  * @return array Empty if $taxonomy isn't hierarchical or returns children as Term IDs.
  */
 function _get_term_hierarchy( $taxonomy ) {
-	if ( !is_taxonomy_hierarchical($taxonomy) )
-		return array();
+	if ( !is_taxonomy_hierarchical($taxonomy) ) {
+			return array();
+	}
 	$children = get_option("{$taxonomy}_children");
 
-	if ( is_array($children) )
-		return $children;
+	if ( is_array($children) ) {
+			return $children;
+	}
 	$children = array();
 	$terms = get_terms($taxonomy, array('get' => 'all', 'orderby' => 'id', 'fields' => 'id=>parent'));
 	foreach ( $terms as $term_id => $parent ) {
-		if ( $parent > 0 )
-			$children[$parent][] = $term_id;
+		if ( $parent > 0 ) {
+					$children[$parent][] = $term_id;
+		}
 	}
 	update_option("{$taxonomy}_children", $children);
 
@@ -3423,14 +3516,16 @@ 
  */
 function _get_term_children( $term_id, $terms, $taxonomy, &$ancestors = array() ) {
 	$empty_array = array();
-	if ( empty($terms) )
-		return $empty_array;
+	if ( empty($terms) ) {
+			return $empty_array;
+	}
 
 	$term_list = array();
 	$has_children = _get_term_hierarchy($taxonomy);
 
-	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) )
-		return $empty_array;
+	if  ( ( 0 != $term_id ) && ! isset($has_children[$term_id]) ) {
+			return $empty_array;
+	}
 
 	// Include the term itself in the ancestors array, so we can properly detect when a loop has occurred.
 	if ( empty( $ancestors ) ) {
@@ -3441,8 +3536,9 @@ 
 		$use_id = false;
 		if ( !is_object($term) ) {
 			$term = get_term($term, $taxonomy);
-			if ( is_wp_error( $term ) )
-				return $term;
+			if ( is_wp_error( $term ) ) {
+							return $term;
+			}
 			$use_id = true;
 		}
 
@@ -3452,18 +3548,21 @@ 
 		}
 
 		if ( $term->parent == $term_id ) {
-			if ( $use_id )
-				$term_list[] = $term->term_id;
-			else
-				$term_list[] = $term;
+			if ( $use_id ) {
+							$term_list[] = $term->term_id;
+			} else {
+							$term_list[] = $term;
+			}
 
-			if ( !isset($has_children[$term->term_id]) )
-				continue;
+			if ( !isset($has_children[$term->term_id]) ) {
+							continue;
+			}
 
 			$ancestors[ $term->term_id ] = 1;
 
-			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) )
-				$term_list = array_merge($term_list, $children);
+			if ( $children = _get_term_children( $term->term_id, $terms, $taxonomy, $ancestors) ) {
+							$term_list = array_merge($term_list, $children);
+			}
 		}
 	}
 
@@ -3488,13 +3587,15 @@ 
 	global $wpdb;
 
 	// This function only works for hierarchical taxonomies like post categories.
-	if ( !is_taxonomy_hierarchical( $taxonomy ) )
-		return;
+	if ( !is_taxonomy_hierarchical( $taxonomy ) ) {
+			return;
+	}
 
 	$term_hier = _get_term_hierarchy($taxonomy);
 
-	if ( empty($term_hier) )
-		return;
+	if ( empty($term_hier) ) {
+			return;
+	}
 
 	$term_items = array();
 	$terms_by_id = array();
@@ -3520,9 +3621,10 @@ 
 		$ancestors = array();
 		while ( !empty( $terms_by_id[$child] ) && $parent = $terms_by_id[$child]->parent ) {
 			$ancestors[] = $child;
-			if ( !empty( $term_items[$term_id] ) )
-				foreach ( $term_items[$term_id] as $item_id => $touches ) {
+			if ( !empty( $term_items[$term_id] ) ) {
+							foreach ( $term_items[$term_id] as $item_id => $touches ) {
 					$term_items[$parent][$item_id] = isset($term_items[$parent][$item_id]) ? ++$term_items[$parent][$item_id]: 1;
+			}
 				}
 			$child = $parent;
 
@@ -3533,10 +3635,11 @@ 
 	}
 
 	// Transfer the touched cells.
-	foreach ( (array) $term_items as $id => $items )
-		if ( isset($terms_by_id[$id]) )
+	foreach ( (array) $term_items as $id => $items ) {
+			if ( isset($terms_by_id[$id]) )
 			$terms_by_id[$id]->count = count($items);
-}
+	}
+	}
 
 /**
  * Adds any terms from the given IDs to the cache that do not already exist in cache.
@@ -3587,8 +3690,9 @@ 
 
 	$object_types = (array) $taxonomy->object_type;
 
-	foreach ( $object_types as &$object_type )
-		list( $object_type ) = explode( ':', $object_type );
+	foreach ( $object_types as &$object_type ) {
+			list( $object_type ) = explode( ':', $object_type );
+	}
 
 	$object_types = array_unique( $object_types );
 
@@ -3597,18 +3701,21 @@ 
 		$check_attachments = true;
 	}
 
-	if ( $object_types )
-		$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	if ( $object_types ) {
+			$object_types = esc_sql( array_filter( $object_types, 'post_type_exists' ) );
+	}
 
 	foreach ( (array) $terms as $term ) {
 		$count = 0;
 
 		// Attachments can be 'inherit' status, we need to base count off the parent's status if so.
-		if ( $check_attachments )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		if ( $check_attachments ) {
+					$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts p1 WHERE p1.ID = $wpdb->term_relationships.object_id AND ( post_status = 'publish' OR ( post_status = 'inherit' AND post_parent > 0 AND ( SELECT post_status FROM $wpdb->posts WHERE ID = p1.post_parent ) = 'publish' ) ) AND post_type = 'attachment' AND term_taxonomy_id = %d", $term ) );
+		}
 
-		if ( $object_types )
-			$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		if ( $object_types ) {
+					$count += (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type IN ('" . implode("', '", $object_types ) . "') AND term_taxonomy_id = %d", $term ) );
+		}
 
 		/** This action is documented in wp-includes/taxonomy.php */
 		do_action( 'edit_term_taxonomy', $term, $taxonomy->name );
@@ -4063,11 +4170,13 @@ 
 		}
 	}
 
-	if ( !is_object($term) )
-		$term = new WP_Error('invalid_term', __('Empty Term'));
+	if ( !is_object($term) ) {
+			$term = new WP_Error('invalid_term', __('Empty Term'));
+	}
 
-	if ( is_wp_error( $term ) )
-		return $term;
+	if ( is_wp_error( $term ) ) {
+			return $term;
+	}
 
 	$taxonomy = $term->taxonomy;
 
@@ -4077,12 +4186,13 @@ 
 	$t = get_taxonomy($taxonomy);
 
 	if ( empty($termlink) ) {
-		if ( 'category' == $taxonomy )
-			$termlink = '?cat=' . $term->term_id;
-		elseif ( $t->query_var )
-			$termlink = "?$t->query_var=$slug";
-		else
-			$termlink = "?taxonomy=$taxonomy&term=$slug";
+		if ( 'category' == $taxonomy ) {
+					$termlink = '?cat=' . $term->term_id;
+		} elseif ( $t->query_var ) {
+					$termlink = "?$t->query_var=$slug";
+		} else {
+					$termlink = "?taxonomy=$taxonomy&term=$slug";
+		}
 		$termlink = home_url($termlink);
 	} else {
 		if ( $t->rewrite['hierarchical'] ) {
@@ -4265,8 +4375,9 @@ 
  * @return bool|WP_Error WP_Error on input error.
  */
 function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
-	if ( !$object_id = (int) $object_id )
-		return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+	if ( !$object_id = (int) $object_id ) {
+			return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+	}
 
 	$object_terms = get_object_term_cache( $object_id, $taxonomy );
 	if ( false === $object_terms ) {
@@ -4274,19 +4385,23 @@ 
 		wp_cache_set( $object_id, wp_list_pluck( $object_terms, 'term_id' ), "{$taxonomy}_relationships" );
 	}
 
-	if ( is_wp_error( $object_terms ) )
-		return $object_terms;
-	if ( empty( $object_terms ) )
-		return false;
-	if ( empty( $terms ) )
-		return ( !empty( $object_terms ) );
+	if ( is_wp_error( $object_terms ) ) {
+			return $object_terms;
+	}
+	if ( empty( $object_terms ) ) {
+			return false;
+	}
+	if ( empty( $terms ) ) {
+			return ( !empty( $object_terms ) );
+	}
 
 	$terms = (array) $terms;
 
-	if ( $ints = array_filter( $terms, 'is_int' ) )
-		$strs = array_diff( $terms, $ints );
-	else
-		$strs =& $terms;
+	if ( $ints = array_filter( $terms, 'is_int' ) ) {
+			$strs = array_diff( $terms, $ints );
+	} else {
+			$strs =& $terms;
+	}
 
 	foreach ( $object_terms as $object_term ) {
 		// If term is an int, check against term_ids only.
@@ -4301,8 +4416,12 @@ 
 				return true;
 			}
 
-			if ( in_array( $object_term->name, $strs ) ) return true;
-			if ( in_array( $object_term->slug, $strs ) ) return true;
+			if ( in_array( $object_term->name, $strs ) ) {
+				return true;
+			}
+			if ( in_array( $object_term->slug, $strs ) ) {
+				return true;
+			}
 		}
 	}
 
@@ -4415,24 +4534,30 @@ 
  */
 function wp_check_term_hierarchy_for_loops( $parent, $term_id, $taxonomy ) {
 	// Nothing fancy here - bail
-	if ( !$parent )
-		return 0;
+	if ( !$parent ) {
+			return 0;
+	}
 
 	// Can't be its own parent.
-	if ( $parent == $term_id )
-		return 0;
+	if ( $parent == $term_id ) {
+			return 0;
+	}
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) )
-		return $parent; // No loop
+	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_term_taxonomy_parent_id', $term_id, $parent, array( $taxonomy ) ) ) {
+			return $parent;
+	}
+	// No loop
 
 	// Setting $parent to the given value causes a loop.
-	if ( isset( $loop[$term_id] ) )
-		return 0;
+	if ( isset( $loop[$term_id] ) ) {
+			return 0;
+	}
 
 	// There's a loop, but it doesn't contain $term_id. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	foreach ( array_keys( $loop ) as $loop_member ) {
+			wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
+	}
 
 	return $parent;
 }

src/wp-includes/template.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  * @since 1.5.0
  *
  * @param string $type      Filename without extension.
- * @param array  $templates An optional list of template candidates
+ * @param string[]  $templates An optional list of template candidates
  * @return string Full path to template file.
  */
 function get_query_template( $type, $templates = array() ) {

Spacing +63 added lines, -63 removed lines

@@ -20,13 +20,13 @@ 
  * @param array  $templates An optional list of template candidates
  * @return string Full path to template file.
  */
-function get_query_template( $type, $templates = array() ) {
-	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
+function get_query_template($type, $templates = array()) {
+	$type = preg_replace('|[^a-z0-9-]+|', '', $type);
 
-	if ( empty( $templates ) )
+	if (empty($templates))
 		$templates = array("{$type}.php");
 
-	$template = locate_template( $templates );
+	$template = locate_template($templates);
 
 	/**
 	 * Filter the path of the queried template by type.
@@ -42,7 +42,7 @@ 
 	 *
 	 * @param string $template Path to the template. See locate_template().
 	 */
-	return apply_filters( "{$type}_template", $template );
+	return apply_filters("{$type}_template", $template);
 }
 
 /**
@@ -90,17 +90,17 @@ 
  * @return string Full path to archive template file.
  */
 function get_archive_template() {
-	$post_types = array_filter( (array) get_query_var( 'post_type' ) );
+	$post_types = array_filter((array) get_query_var('post_type'));
 
 	$templates = array();
 
-	if ( count( $post_types ) == 1 ) {
-		$post_type = reset( $post_types );
+	if (count($post_types) == 1) {
+		$post_type = reset($post_types);
 		$templates[] = "archive-{$post_type}.php";
 	}
 	$templates[] = 'archive.php';
 
-	return get_query_template( 'archive', $templates );
+	return get_query_template('archive', $templates);
 }
 
 /**
@@ -116,12 +116,12 @@ 
  * @return string Full path to archive template file.
  */
 function get_post_type_archive_template() {
-	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	$post_type = get_query_var('post_type');
+	if (is_array($post_type))
+		$post_type = reset($post_type);
 
-	$obj = get_post_type_object( $post_type );
-	if ( ! $obj->has_archive )
+	$obj = get_post_type_object($post_type);
+	if ( ! $obj->has_archive)
 		return '';
 
 	return get_archive_template();
@@ -144,13 +144,13 @@ 
 
 	$templates = array();
 
-	if ( $author instanceof WP_User ) {
+	if ($author instanceof WP_User) {
 		$templates[] = "author-{$author->user_nicename}.php";
 		$templates[] = "author-{$author->ID}.php";
 	}
 	$templates[] = 'author.php';
 
-	return get_query_template( 'author', $templates );
+	return get_query_template('author', $templates);
 }
 
 /**
@@ -174,13 +174,13 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $category->slug ) ) {
+	if ( ! empty($category->slug)) {
 		$templates[] = "category-{$category->slug}.php";
 		$templates[] = "category-{$category->term_id}.php";
 	}
 	$templates[] = 'category.php';
 
-	return get_query_template( 'category', $templates );
+	return get_query_template('category', $templates);
 }
 
 /**
@@ -204,13 +204,13 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $tag->slug ) ) {
+	if ( ! empty($tag->slug)) {
 		$templates[] = "tag-{$tag->slug}.php";
 		$templates[] = "tag-{$tag->term_id}.php";
 	}
 	$templates[] = 'tag.php';
 
-	return get_query_template( 'tag', $templates );
+	return get_query_template('tag', $templates);
 }
 
 /**
@@ -239,14 +239,14 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $term->slug ) ) {
+	if ( ! empty($term->slug)) {
 		$taxonomy = $term->taxonomy;
 		$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
 		$templates[] = "taxonomy-$taxonomy.php";
 	}
 	$templates[] = 'taxonomy.php';
 
-	return get_query_template( 'taxonomy', $templates );
+	return get_query_template('taxonomy', $templates);
 }
 
 /**
@@ -281,9 +281,9 @@ 
  * @return string Full path to home template file.
  */
 function get_home_template() {
-	$templates = array( 'home.php', 'index.php' );
+	$templates = array('home.php', 'index.php');
 
-	return get_query_template( 'home', $templates );
+	return get_query_template('home', $templates);
 }
 
 /**
@@ -301,7 +301,7 @@ 
 function get_front_page_template() {
 	$templates = array('front-page.php');
 
-	return get_query_template( 'front_page', $templates );
+	return get_query_template('front_page', $templates);
 }
 
 /**
@@ -325,23 +325,23 @@ 
 	$template = get_page_template_slug();
 	$pagename = get_query_var('pagename');
 
-	if ( ! $pagename && $id ) {
+	if ( ! $pagename && $id) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
+		if ($post)
 			$pagename = $post->post_name;
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
+	if ($template && 0 === validate_file($template))
 		$templates[] = $template;
-	if ( $pagename )
+	if ($pagename)
 		$templates[] = "page-$pagename.php";
-	if ( $id )
+	if ($id)
 		$templates[] = "page-$id.php";
 	$templates[] = 'page.php';
 
-	return get_query_template( 'page', $templates );
+	return get_query_template('page', $templates);
 }
 
 /**
@@ -394,14 +394,14 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) ) {
+	if ( ! empty($object->post_type)) {
 		$templates[] = "single-{$object->post_type}-{$object->post_name}.php";
 		$templates[] = "single-{$object->post_type}.php";
 	}
 
 	$templates[] = "single.php";
 
-	return get_query_template( 'single', $templates );
+	return get_query_template('single', $templates);
 }
 
 /**
@@ -423,9 +423,9 @@ 
 
 	$templates = array();
 
-	if ( ! empty( $object->post_type ) ) {
-		$post_format = get_post_format( $object );
-		if ( $post_format ) {
+	if ( ! empty($object->post_type)) {
+		$post_format = get_post_format($object);
+		if ($post_format) {
 			$templates[] = "embed-{$object->post_type}-{$post_format}.php";
 		}
 		$templates[] = "embed-{$object->post_type}.php";
@@ -433,7 +433,7 @@ 
 
 	$templates[] = "embed.php";
 
-	return get_query_template( 'embed', $templates );
+	return get_query_template('embed', $templates);
 }
 
 /**
@@ -449,7 +449,7 @@ 
  * @return string Full path to singular template file
  */
 function get_singular_template() {
-	return get_query_template( 'singular' );
+	return get_query_template('singular');
 }
 
 /**
@@ -479,14 +479,14 @@ 
 
 	$templates = array();
 
-	if ( $attachment ) {
-		if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
-			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	if ($attachment) {
+		if (false !== strpos($attachment->post_mime_type, '/')) {
+			list($type, $subtype) = explode('/', $attachment->post_mime_type);
 		} else {
-			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+			list($type, $subtype) = array($attachment->post_mime_type, '');
 		}
 
-		if ( ! empty( $subtype ) ) {
+		if ( ! empty($subtype)) {
 			$templates[] = "{$type}-{$subtype}.php";
 			$templates[] = "{$subtype}.php";
 		}
@@ -494,7 +494,7 @@ 
 	}
 	$templates[] = 'attachment.php';
 
-	return get_query_template( 'attachment', $templates );
+	return get_query_template('attachment', $templates);
 }
 
 /**
@@ -510,25 +510,25 @@ 
  * @param bool         $require_once   Whether to require_once or require. Default true. Has no effect if $load is false.
  * @return string The template filename if one is located.
  */
-function locate_template($template_names, $load = false, $require_once = true ) {
+function locate_template($template_names, $load = false, $require_once = true) {
 	$located = '';
-	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
+	foreach ((array) $template_names as $template_name) {
+		if ( ! $template_name)
 			continue;
-		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
-			$located = STYLESHEETPATH . '/' . $template_name;
+		if (file_exists(STYLESHEETPATH.'/'.$template_name)) {
+			$located = STYLESHEETPATH.'/'.$template_name;
 			break;
-		} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
-			$located = TEMPLATEPATH . '/' . $template_name;
+		} elseif (file_exists(TEMPLATEPATH.'/'.$template_name)) {
+			$located = TEMPLATEPATH.'/'.$template_name;
 			break;
-		} elseif ( file_exists( ABSPATH . WPINC . '/theme-compat/' . $template_name ) ) {
-			$located = ABSPATH . WPINC . '/theme-compat/' . $template_name;
+		} elseif (file_exists(ABSPATH.WPINC.'/theme-compat/'.$template_name)) {
+			$located = ABSPATH.WPINC.'/theme-compat/'.$template_name;
 			break;
 		}
 	}
 
-	if ( $load && '' != $located )
-		load_template( $located, $require_once );
+	if ($load && '' != $located)
+		load_template($located, $require_once);
 
 	return $located;
 }
@@ -557,21 +557,21 @@ 
  * @param string $_template_file Path to template file.
  * @param bool   $require_once   Whether to require_once or require. Default true.
  */
-function load_template( $_template_file, $require_once = true ) {
+function load_template($_template_file, $require_once = true) {
 	global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
-	if ( is_array( $wp_query->query_vars ) ) {
-		extract( $wp_query->query_vars, EXTR_SKIP );
+	if (is_array($wp_query->query_vars)) {
+		extract($wp_query->query_vars, EXTR_SKIP);
 	}
 
-	if ( isset( $s ) ) {
-		$s = esc_attr( $s );
+	if (isset($s)) {
+		$s = esc_attr($s);
 	}
 
-	if ( $require_once ) {
-		require_once( $_template_file );
+	if ($require_once) {
+		require_once($_template_file);
 	} else {
-		require( $_template_file );
+		require($_template_file);
 	}
 }
 

Braces +27 added lines, -18 removed lines

@@ -23,8 +23,9 @@ 
 function get_query_template( $type, $templates = array() ) {
 	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
 
-	if ( empty( $templates ) )
-		$templates = array("{$type}.php");
+	if ( empty( $templates ) ) {
+			$templates = array("{$type}.php");
+	}
 
 	$template = locate_template( $templates );
 
@@ -117,12 +118,14 @@ 
  */
 function get_post_type_archive_template() {
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	if ( is_array( $post_type ) ) {
+			$post_type = reset( $post_type );
+	}
 
 	$obj = get_post_type_object( $post_type );
-	if ( ! $obj->has_archive )
-		return '';
+	if ( ! $obj->has_archive ) {
+			return '';
+	}
 
 	return get_archive_template();
 }
@@ -328,17 +331,21 @@ 
 	if ( ! $pagename && $id ) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
 		$post = get_queried_object();
-		if ( $post )
-			$pagename = $post->post_name;
+		if ( $post ) {
+					$pagename = $post->post_name;
+		}
 	}
 
 	$templates = array();
-	if ( $template && 0 === validate_file( $template ) )
-		$templates[] = $template;
-	if ( $pagename )
-		$templates[] = "page-$pagename.php";
-	if ( $id )
-		$templates[] = "page-$id.php";
+	if ( $template && 0 === validate_file( $template ) ) {
+			$templates[] = $template;
+	}
+	if ( $pagename ) {
+			$templates[] = "page-$pagename.php";
+	}
+	if ( $id ) {
+			$templates[] = "page-$id.php";
+	}
 	$templates[] = 'page.php';
 
 	return get_query_template( 'page', $templates );
@@ -513,8 +520,9 @@ 
 function locate_template($template_names, $load = false, $require_once = true ) {
 	$located = '';
 	foreach ( (array) $template_names as $template_name ) {
-		if ( !$template_name )
-			continue;
+		if ( !$template_name ) {
+					continue;
+		}
 		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
 			$located = STYLESHEETPATH . '/' . $template_name;
 			break;
@@ -527,8 +535,9 @@ 
 		}
 	}
 
-	if ( $load && '' != $located )
-		load_template( $located, $require_once );
+	if ( $load && '' != $located ) {
+			load_template( $located, $require_once );
+	}
 
 	return $located;
 }

src/wp-includes/Text/Diff/Engine/native.php

Doc Comments +5 added lines

@@ -145,6 +145,7 @@ 
      * the two files do not match, and likewise that the last lines do not
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
+     * @param double $nchunks
      */
     function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
@@ -265,6 +266,10 @@ 
      *
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
+     * @param integer $xoff
+     * @param integer $xlim
+     * @param integer $yoff
+     * @param integer $ylim
      */
     function _compareseq ($xoff, $xlim, $yoff, $ylim)
     {

Spacing +8 added lines, -8 removed lines

@@ -99,7 +99,7 @@ 
             // Skip matching "snake".
             $copy = array();
             while ($xi < $n_from && $yi < $n_to
-                   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+                   && ! $this->xchanged[$xi] && ! $this->ychanged[$yi]) {
                 $copy[] = $from_lines[$xi++];
                 ++$yi;
             }
@@ -146,7 +146,7 @@ 
      * match.  The caller must trim matching lines from the beginning and end
      * of the portions it is going to specify.
      */
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+    function _diag($xoff, $xlim, $yoff, $ylim, $nchunks)
     {
         $flip = false;
 
@@ -169,7 +169,7 @@ 
         }
 
         $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
+        $this->seq[0] = $yoff - 1;
         $this->in_seq = array();
         $ymids[0] = array();
 
@@ -182,7 +182,7 @@ 
                 }
             }
 
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $chunk) / $nchunks);
             for (; $x < $x1; $x++) {
                 $line = $flip ? $this->yv[$x] : $this->xv[$x];
                 if (empty($ymatches[$line])) {
@@ -218,7 +218,7 @@ 
         $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
         $ymid = $ymids[$this->lcs];
         for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+            $x1 = $xoff + (int) (($numer + ($xlim - $xoff) * $n) / $nchunks);
             $y1 = $ymid[$n] + 1;
             $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
         }
@@ -238,7 +238,7 @@ 
 
         $beg = 1;
         while ($beg < $end) {
-            $mid = (int)(($beg + $end) / 2);
+            $mid = (int) (($beg + $end) / 2);
             if ($ypos > $this->seq[$mid]) {
                 $beg = $mid + 1;
             } else {
@@ -266,7 +266,7 @@ 
      * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
      * origin-0 and discarded lines are not counted.
      */
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
+    function _compareseq($xoff, $xlim, $yoff, $ylim)
     {
         /* Slide down the bottom initial diagonal. */
         while ($xoff < $xlim && $yoff < $ylim
@@ -307,7 +307,7 @@ 
             reset($seps);
             $pt1 = $seps[0];
             while ($pt2 = next($seps)) {
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+                $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
                 $pt1 = $pt2;
             }
         }

Indentation +375 added lines, -375 removed lines

@@ -28,314 +28,314 @@ 
  */
 class Text_Diff_Engine_native {
 
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
-
-        $n_from = count($from_lines);
-        $n_to = count($to_lines);
-
-        $this->xchanged = $this->ychanged = array();
-        $this->xv = $this->yv = array();
-        $this->xind = $this->yind = array();
-        unset($this->seq);
-        unset($this->in_seq);
-        unset($this->lcs);
-
-        // Skip leading common lines.
-        for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
-            if ($from_lines[$skip] !== $to_lines[$skip]) {
-                break;
-            }
-            $this->xchanged[$skip] = $this->ychanged[$skip] = false;
-        }
-
-        // Skip trailing common lines.
-        $xi = $n_from; $yi = $n_to;
-        for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
-            if ($from_lines[$xi] !== $to_lines[$yi]) {
-                break;
-            }
-            $this->xchanged[$xi] = $this->ychanged[$yi] = false;
-        }
-
-        // Ignore lines which do not exist in both files.
-        for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-            $xhash[$from_lines[$xi]] = 1;
-        }
-        for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
-            $line = $to_lines[$yi];
-            if (($this->ychanged[$yi] = empty($xhash[$line]))) {
-                continue;
-            }
-            $yhash[$line] = 1;
-            $this->yv[] = $line;
-            $this->yind[] = $yi;
-        }
-        for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
-            $line = $from_lines[$xi];
-            if (($this->xchanged[$xi] = empty($yhash[$line]))) {
-                continue;
-            }
-            $this->xv[] = $line;
-            $this->xind[] = $xi;
-        }
-
-        // Find the LCS.
-        $this->_compareseq(0, count($this->xv), 0, count($this->yv));
-
-        // Merge edits when possible.
-        $this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
-        $this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
-
-        // Compute the edit operations.
-        $edits = array();
-        $xi = $yi = 0;
-        while ($xi < $n_from || $yi < $n_to) {
-            assert($yi < $n_to || $this->xchanged[$xi]);
-            assert($xi < $n_from || $this->ychanged[$yi]);
-
-            // Skip matching "snake".
-            $copy = array();
-            while ($xi < $n_from && $yi < $n_to
-                   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
-                $copy[] = $from_lines[$xi++];
-                ++$yi;
-            }
-            if ($copy) {
-                $edits[] = new Text_Diff_Op_copy($copy);
-            }
-
-            // Find deletes & adds.
-            $delete = array();
-            while ($xi < $n_from && $this->xchanged[$xi]) {
-                $delete[] = $from_lines[$xi++];
-            }
-
-            $add = array();
-            while ($yi < $n_to && $this->ychanged[$yi]) {
-                $add[] = $to_lines[$yi++];
-            }
-
-            if ($delete && $add) {
-                $edits[] = new Text_Diff_Op_change($delete, $add);
-            } elseif ($delete) {
-                $edits[] = new Text_Diff_Op_delete($delete);
-            } elseif ($add) {
-                $edits[] = new Text_Diff_Op_add($add);
-            }
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
-     * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
-     * segments.
-     *
-     * Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an array of
-     * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
-     * sequences.  The first sub-sequence is contained in (X0, X1), (Y0, Y1),
-     * the second in (X1, X2), (Y1, Y2) and so on.  Note that (X0, Y0) ==
-     * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
-     *
-     * This function assumes that the first lines of the specified portions of
-     * the two files do not match, and likewise that the last lines do not
-     * match.  The caller must trim matching lines from the beginning and end
-     * of the portions it is going to specify.
-     */
-    function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
-    {
-        $flip = false;
-
-        if ($xlim - $xoff > $ylim - $yoff) {
-            /* Things seems faster (I'm not sure I understand why) when the
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+
+		$n_from = count($from_lines);
+		$n_to = count($to_lines);
+
+		$this->xchanged = $this->ychanged = array();
+		$this->xv = $this->yv = array();
+		$this->xind = $this->yind = array();
+		unset($this->seq);
+		unset($this->in_seq);
+		unset($this->lcs);
+
+		// Skip leading common lines.
+		for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+			if ($from_lines[$skip] !== $to_lines[$skip]) {
+				break;
+			}
+			$this->xchanged[$skip] = $this->ychanged[$skip] = false;
+		}
+
+		// Skip trailing common lines.
+		$xi = $n_from; $yi = $n_to;
+		for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+			if ($from_lines[$xi] !== $to_lines[$yi]) {
+				break;
+			}
+			$this->xchanged[$xi] = $this->ychanged[$yi] = false;
+		}
+
+		// Ignore lines which do not exist in both files.
+		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+			$xhash[$from_lines[$xi]] = 1;
+		}
+		for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+			$line = $to_lines[$yi];
+			if (($this->ychanged[$yi] = empty($xhash[$line]))) {
+				continue;
+			}
+			$yhash[$line] = 1;
+			$this->yv[] = $line;
+			$this->yind[] = $yi;
+		}
+		for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+			$line = $from_lines[$xi];
+			if (($this->xchanged[$xi] = empty($yhash[$line]))) {
+				continue;
+			}
+			$this->xv[] = $line;
+			$this->xind[] = $xi;
+		}
+
+		// Find the LCS.
+		$this->_compareseq(0, count($this->xv), 0, count($this->yv));
+
+		// Merge edits when possible.
+		$this->_shiftBoundaries($from_lines, $this->xchanged, $this->ychanged);
+		$this->_shiftBoundaries($to_lines, $this->ychanged, $this->xchanged);
+
+		// Compute the edit operations.
+		$edits = array();
+		$xi = $yi = 0;
+		while ($xi < $n_from || $yi < $n_to) {
+			assert($yi < $n_to || $this->xchanged[$xi]);
+			assert($xi < $n_from || $this->ychanged[$yi]);
+
+			// Skip matching "snake".
+			$copy = array();
+			while ($xi < $n_from && $yi < $n_to
+				   && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+				$copy[] = $from_lines[$xi++];
+				++$yi;
+			}
+			if ($copy) {
+				$edits[] = new Text_Diff_Op_copy($copy);
+			}
+
+			// Find deletes & adds.
+			$delete = array();
+			while ($xi < $n_from && $this->xchanged[$xi]) {
+				$delete[] = $from_lines[$xi++];
+			}
+
+			$add = array();
+			while ($yi < $n_to && $this->ychanged[$yi]) {
+				$add[] = $to_lines[$yi++];
+			}
+
+			if ($delete && $add) {
+				$edits[] = new Text_Diff_Op_change($delete, $add);
+			} elseif ($delete) {
+				$edits[] = new Text_Diff_Op_delete($delete);
+			} elseif ($add) {
+				$edits[] = new Text_Diff_Op_add($add);
+			}
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Divides the Largest Common Subsequence (LCS) of the sequences (XOFF,
+	 * XLIM) and (YOFF, YLIM) into NCHUNKS approximately equally sized
+	 * segments.
+	 *
+	 * Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an array of
+	 * NCHUNKS+1 (X, Y) indexes giving the diving points between sub
+	 * sequences.  The first sub-sequence is contained in (X0, X1), (Y0, Y1),
+	 * the second in (X1, X2), (Y1, Y2) and so on.  Note that (X0, Y0) ==
+	 * (XOFF, YOFF) and (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+	 *
+	 * This function assumes that the first lines of the specified portions of
+	 * the two files do not match, and likewise that the last lines do not
+	 * match.  The caller must trim matching lines from the beginning and end
+	 * of the portions it is going to specify.
+	 */
+	function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
+	{
+		$flip = false;
+
+		if ($xlim - $xoff > $ylim - $yoff) {
+			/* Things seems faster (I'm not sure I understand why) when the
              * shortest sequence is in X. */
-            $flip = true;
-            list ($xoff, $xlim, $yoff, $ylim)
-                = array($yoff, $ylim, $xoff, $xlim);
-        }
-
-        if ($flip) {
-            for ($i = $ylim - 1; $i >= $yoff; $i--) {
-                $ymatches[$this->xv[$i]][] = $i;
-            }
-        } else {
-            for ($i = $ylim - 1; $i >= $yoff; $i--) {
-                $ymatches[$this->yv[$i]][] = $i;
-            }
-        }
-
-        $this->lcs = 0;
-        $this->seq[0]= $yoff - 1;
-        $this->in_seq = array();
-        $ymids[0] = array();
-
-        $numer = $xlim - $xoff + $nchunks - 1;
-        $x = $xoff;
-        for ($chunk = 0; $chunk < $nchunks; $chunk++) {
-            if ($chunk > 0) {
-                for ($i = 0; $i <= $this->lcs; $i++) {
-                    $ymids[$i][$chunk - 1] = $this->seq[$i];
-                }
-            }
-
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
-            for (; $x < $x1; $x++) {
-                $line = $flip ? $this->yv[$x] : $this->xv[$x];
-                if (empty($ymatches[$line])) {
-                    continue;
-                }
-                $matches = $ymatches[$line];
-                reset($matches);
-                while (list(, $y) = each($matches)) {
-                    if (empty($this->in_seq[$y])) {
-                        $k = $this->_lcsPos($y);
-                        assert($k > 0);
-                        $ymids[$k] = $ymids[$k - 1];
-                        break;
-                    }
-                }
-                while (list(, $y) = each($matches)) {
-                    if ($y > $this->seq[$k - 1]) {
-                        assert($y <= $this->seq[$k]);
-                        /* Optimization: this is a common case: next match is
+			$flip = true;
+			list ($xoff, $xlim, $yoff, $ylim)
+				= array($yoff, $ylim, $xoff, $xlim);
+		}
+
+		if ($flip) {
+			for ($i = $ylim - 1; $i >= $yoff; $i--) {
+				$ymatches[$this->xv[$i]][] = $i;
+			}
+		} else {
+			for ($i = $ylim - 1; $i >= $yoff; $i--) {
+				$ymatches[$this->yv[$i]][] = $i;
+			}
+		}
+
+		$this->lcs = 0;
+		$this->seq[0]= $yoff - 1;
+		$this->in_seq = array();
+		$ymids[0] = array();
+
+		$numer = $xlim - $xoff + $nchunks - 1;
+		$x = $xoff;
+		for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+			if ($chunk > 0) {
+				for ($i = 0; $i <= $this->lcs; $i++) {
+					$ymids[$i][$chunk - 1] = $this->seq[$i];
+				}
+			}
+
+			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $chunk) / $nchunks);
+			for (; $x < $x1; $x++) {
+				$line = $flip ? $this->yv[$x] : $this->xv[$x];
+				if (empty($ymatches[$line])) {
+					continue;
+				}
+				$matches = $ymatches[$line];
+				reset($matches);
+				while (list(, $y) = each($matches)) {
+					if (empty($this->in_seq[$y])) {
+						$k = $this->_lcsPos($y);
+						assert($k > 0);
+						$ymids[$k] = $ymids[$k - 1];
+						break;
+					}
+				}
+				while (list(, $y) = each($matches)) {
+					if ($y > $this->seq[$k - 1]) {
+						assert($y <= $this->seq[$k]);
+						/* Optimization: this is a common case: next match is
                          * just replacing previous match. */
-                        $this->in_seq[$this->seq[$k]] = false;
-                        $this->seq[$k] = $y;
-                        $this->in_seq[$y] = 1;
-                    } elseif (empty($this->in_seq[$y])) {
-                        $k = $this->_lcsPos($y);
-                        assert($k > 0);
-                        $ymids[$k] = $ymids[$k - 1];
-                    }
-                }
-            }
-        }
-
-        $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
-        $ymid = $ymids[$this->lcs];
-        for ($n = 0; $n < $nchunks - 1; $n++) {
-            $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
-            $y1 = $ymid[$n] + 1;
-            $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
-        }
-        $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
-
-        return array($this->lcs, $seps);
-    }
-
-    function _lcsPos($ypos)
-    {
-        $end = $this->lcs;
-        if ($end == 0 || $ypos > $this->seq[$end]) {
-            $this->seq[++$this->lcs] = $ypos;
-            $this->in_seq[$ypos] = 1;
-            return $this->lcs;
-        }
-
-        $beg = 1;
-        while ($beg < $end) {
-            $mid = (int)(($beg + $end) / 2);
-            if ($ypos > $this->seq[$mid]) {
-                $beg = $mid + 1;
-            } else {
-                $end = $mid;
-            }
-        }
-
-        assert($ypos != $this->seq[$end]);
-
-        $this->in_seq[$this->seq[$end]] = false;
-        $this->seq[$end] = $ypos;
-        $this->in_seq[$ypos] = 1;
-        return $end;
-    }
-
-    /**
-     * Finds LCS of two sequences.
-     *
-     * The results are recorded in the vectors $this->{x,y}changed[], by
-     * storing a 1 in the element for each line that is an insertion or
-     * deletion (ie. is not in the LCS).
-     *
-     * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
-     *
-     * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
-     * origin-0 and discarded lines are not counted.
-     */
-    function _compareseq ($xoff, $xlim, $yoff, $ylim)
-    {
-        /* Slide down the bottom initial diagonal. */
-        while ($xoff < $xlim && $yoff < $ylim
-               && $this->xv[$xoff] == $this->yv[$yoff]) {
-            ++$xoff;
-            ++$yoff;
-        }
-
-        /* Slide up the top initial diagonal. */
-        while ($xlim > $xoff && $ylim > $yoff
-               && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
-            --$xlim;
-            --$ylim;
-        }
-
-        if ($xoff == $xlim || $yoff == $ylim) {
-            $lcs = 0;
-        } else {
-            /* This is ad hoc but seems to work well.  $nchunks =
+						$this->in_seq[$this->seq[$k]] = false;
+						$this->seq[$k] = $y;
+						$this->in_seq[$y] = 1;
+					} elseif (empty($this->in_seq[$y])) {
+						$k = $this->_lcsPos($y);
+						assert($k > 0);
+						$ymids[$k] = $ymids[$k - 1];
+					}
+				}
+			}
+		}
+
+		$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+		$ymid = $ymids[$this->lcs];
+		for ($n = 0; $n < $nchunks - 1; $n++) {
+			$x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+			$y1 = $ymid[$n] + 1;
+			$seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+		}
+		$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+
+		return array($this->lcs, $seps);
+	}
+
+	function _lcsPos($ypos)
+	{
+		$end = $this->lcs;
+		if ($end == 0 || $ypos > $this->seq[$end]) {
+			$this->seq[++$this->lcs] = $ypos;
+			$this->in_seq[$ypos] = 1;
+			return $this->lcs;
+		}
+
+		$beg = 1;
+		while ($beg < $end) {
+			$mid = (int)(($beg + $end) / 2);
+			if ($ypos > $this->seq[$mid]) {
+				$beg = $mid + 1;
+			} else {
+				$end = $mid;
+			}
+		}
+
+		assert($ypos != $this->seq[$end]);
+
+		$this->in_seq[$this->seq[$end]] = false;
+		$this->seq[$end] = $ypos;
+		$this->in_seq[$ypos] = 1;
+		return $end;
+	}
+
+	/**
+	 * Finds LCS of two sequences.
+	 *
+	 * The results are recorded in the vectors $this->{x,y}changed[], by
+	 * storing a 1 in the element for each line that is an insertion or
+	 * deletion (ie. is not in the LCS).
+	 *
+	 * The subsequence of file 0 is (XOFF, XLIM) and likewise for file 1.
+	 *
+	 * Note that XLIM, YLIM are exclusive bounds.  All line numbers are
+	 * origin-0 and discarded lines are not counted.
+	 */
+	function _compareseq ($xoff, $xlim, $yoff, $ylim)
+	{
+		/* Slide down the bottom initial diagonal. */
+		while ($xoff < $xlim && $yoff < $ylim
+			   && $this->xv[$xoff] == $this->yv[$yoff]) {
+			++$xoff;
+			++$yoff;
+		}
+
+		/* Slide up the top initial diagonal. */
+		while ($xlim > $xoff && $ylim > $yoff
+			   && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+			--$xlim;
+			--$ylim;
+		}
+
+		if ($xoff == $xlim || $yoff == $ylim) {
+			$lcs = 0;
+		} else {
+			/* This is ad hoc but seems to work well.  $nchunks =
              * sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); $nchunks =
              * max(2,min(8,(int)$nchunks)); */
-            $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
-            list($lcs, $seps)
-                = $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
-        }
+			$nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+			list($lcs, $seps)
+				= $this->_diag($xoff, $xlim, $yoff, $ylim, $nchunks);
+		}
 
-        if ($lcs == 0) {
-            /* X and Y sequences have no common subsequence: mark all
+		if ($lcs == 0) {
+			/* X and Y sequences have no common subsequence: mark all
              * changed. */
-            while ($yoff < $ylim) {
-                $this->ychanged[$this->yind[$yoff++]] = 1;
-            }
-            while ($xoff < $xlim) {
-                $this->xchanged[$this->xind[$xoff++]] = 1;
-            }
-        } else {
-            /* Use the partitions to split this problem into subproblems. */
-            reset($seps);
-            $pt1 = $seps[0];
-            while ($pt2 = next($seps)) {
-                $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
-                $pt1 = $pt2;
-            }
-        }
-    }
-
-    /**
-     * Adjusts inserts/deletes of identical lines to join changes as much as
-     * possible.
-     *
-     * We do something when a run of changed lines include a line at one end
-     * and has an excluded, identical line at the other.  We are free to
-     * choose which identical line is included.  `compareseq' usually chooses
-     * the one at the beginning, but usually it is cleaner to consider the
-     * following identical line to be the "change".
-     *
-     * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
-     */
-    function _shiftBoundaries($lines, &$changed, $other_changed)
-    {
-        $i = 0;
-        $j = 0;
-
-        assert('count($lines) == count($changed)');
-        $len = count($lines);
-        $other_len = count($other_changed);
-
-        while (1) {
-            /* Scan forward to find the beginning of another run of
+			while ($yoff < $ylim) {
+				$this->ychanged[$this->yind[$yoff++]] = 1;
+			}
+			while ($xoff < $xlim) {
+				$this->xchanged[$this->xind[$xoff++]] = 1;
+			}
+		} else {
+			/* Use the partitions to split this problem into subproblems. */
+			reset($seps);
+			$pt1 = $seps[0];
+			while ($pt2 = next($seps)) {
+				$this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+				$pt1 = $pt2;
+			}
+		}
+	}
+
+	/**
+	 * Adjusts inserts/deletes of identical lines to join changes as much as
+	 * possible.
+	 *
+	 * We do something when a run of changed lines include a line at one end
+	 * and has an excluded, identical line at the other.  We are free to
+	 * choose which identical line is included.  `compareseq' usually chooses
+	 * the one at the beginning, but usually it is cleaner to consider the
+	 * following identical line to be the "change".
+	 *
+	 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+	 */
+	function _shiftBoundaries($lines, &$changed, $other_changed)
+	{
+		$i = 0;
+		$j = 0;
+
+		assert('count($lines) == count($changed)');
+		$len = count($lines);
+		$other_len = count($other_changed);
+
+		while (1) {
+			/* Scan forward to find the beginning of another run of
              * changes. Also keep track of the corresponding point in the
              * other file.
              *
@@ -346,91 +346,91 @@ 
              *
              * Furthermore, $j is always kept so that $j == $other_len or
              * $other_changed[$j] == false. */
-            while ($j < $other_len && $other_changed[$j]) {
-                $j++;
-            }
-
-            while ($i < $len && ! $changed[$i]) {
-                assert('$j < $other_len && ! $other_changed[$j]');
-                $i++; $j++;
-                while ($j < $other_len && $other_changed[$j]) {
-                    $j++;
-                }
-            }
-
-            if ($i == $len) {
-                break;
-            }
-
-            $start = $i;
-
-            /* Find the end of this run of changes. */
-            while (++$i < $len && $changed[$i]) {
-                continue;
-            }
-
-            do {
-                /* Record the length of this run of changes, so that we can
+			while ($j < $other_len && $other_changed[$j]) {
+				$j++;
+			}
+
+			while ($i < $len && ! $changed[$i]) {
+				assert('$j < $other_len && ! $other_changed[$j]');
+				$i++; $j++;
+				while ($j < $other_len && $other_changed[$j]) {
+					$j++;
+				}
+			}
+
+			if ($i == $len) {
+				break;
+			}
+
+			$start = $i;
+
+			/* Find the end of this run of changes. */
+			while (++$i < $len && $changed[$i]) {
+				continue;
+			}
+
+			do {
+				/* Record the length of this run of changes, so that we can
                  * later determine whether the run has grown. */
-                $runlength = $i - $start;
+				$runlength = $i - $start;
 
-                /* Move the changed region back, so long as the previous
+				/* Move the changed region back, so long as the previous
                  * unchanged line matches the last changed one.  This merges
                  * with previous changed regions. */
-                while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
-                    $changed[--$start] = 1;
-                    $changed[--$i] = false;
-                    while ($start > 0 && $changed[$start - 1]) {
-                        $start--;
-                    }
-                    assert('$j > 0');
-                    while ($other_changed[--$j]) {
-                        continue;
-                    }
-                    assert('$j >= 0 && !$other_changed[$j]');
-                }
-
-                /* Set CORRESPONDING to the end of the changed run, at the
+				while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+					$changed[--$start] = 1;
+					$changed[--$i] = false;
+					while ($start > 0 && $changed[$start - 1]) {
+						$start--;
+					}
+					assert('$j > 0');
+					while ($other_changed[--$j]) {
+						continue;
+					}
+					assert('$j >= 0 && !$other_changed[$j]');
+				}
+
+				/* Set CORRESPONDING to the end of the changed run, at the
                  * last point where it corresponds to a changed run in the
                  * other file. CORRESPONDING == LEN means no such point has
                  * been found. */
-                $corresponding = $j < $other_len ? $i : $len;
+				$corresponding = $j < $other_len ? $i : $len;
 
-                /* Move the changed region forward, so long as the first
+				/* Move the changed region forward, so long as the first
                  * changed line matches the following unchanged one.  This
                  * merges with following changed regions.  Do this second, so
                  * that if there are no merges, the changed region is moved
                  * forward as far as possible. */
-                while ($i < $len && $lines[$start] == $lines[$i]) {
-                    $changed[$start++] = false;
-                    $changed[$i++] = 1;
-                    while ($i < $len && $changed[$i]) {
-                        $i++;
-                    }
-
-                    assert('$j < $other_len && ! $other_changed[$j]');
-                    $j++;
-                    if ($j < $other_len && $other_changed[$j]) {
-                        $corresponding = $i;
-                        while ($j < $other_len && $other_changed[$j]) {
-                            $j++;
-                        }
-                    }
-                }
-            } while ($runlength != $i - $start);
-
-            /* If possible, move the fully-merged run of changes back to a
+				while ($i < $len && $lines[$start] == $lines[$i]) {
+					$changed[$start++] = false;
+					$changed[$i++] = 1;
+					while ($i < $len && $changed[$i]) {
+						$i++;
+					}
+
+					assert('$j < $other_len && ! $other_changed[$j]');
+					$j++;
+					if ($j < $other_len && $other_changed[$j]) {
+						$corresponding = $i;
+						while ($j < $other_len && $other_changed[$j]) {
+							$j++;
+						}
+					}
+				}
+			} while ($runlength != $i - $start);
+
+			/* If possible, move the fully-merged run of changes back to a
              * corresponding run in the other file. */
-            while ($corresponding < $i) {
-                $changed[--$start] = 1;
-                $changed[--$i] = 0;
-                assert('$j > 0');
-                while ($other_changed[--$j]) {
-                    continue;
-                }
-                assert('$j >= 0 && !$other_changed[$j]');
-            }
-        }
-    }
+			while ($corresponding < $i) {
+				$changed[--$start] = 1;
+				$changed[--$i] = 0;
+				assert('$j > 0');
+				while ($other_changed[--$j]) {
+					continue;
+				}
+				assert('$j >= 0 && !$other_changed[$j]');
+			}
+		}
+	}
 
 }

src/wp-includes/Text/Diff/Renderer.php

Doc Comments +9 added lines

@@ -148,6 +148,12 @@ 
         return $output . $this->_endDiff();
     }
 
+    /**
+     * @param integer $xbeg
+     * @param integer $xlen
+     * @param integer $ybeg
+     * @param integer $ylen
+     */
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
     {
         $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
@@ -204,6 +210,9 @@ 
         return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
     }
 
+    /**
+     * @param string $header
+     */
     function _startBlock($header)
     {
         return $header . "\n";

Indentation +211 added lines, -211 removed lines

@@ -14,34 +14,34 @@ 
  */
 class Text_Diff_Renderer {
 
-    /**
-     * Number of leading context "lines" to preserve.
-     *
-     * This should be left at zero for this class, but subclasses may want to
-     * set this to other values.
-     */
-    var $_leading_context_lines = 0;
-
-    /**
-     * Number of trailing context "lines" to preserve.
-     *
-     * This should be left at zero for this class, but subclasses may want to
-     * set this to other values.
-     */
-    var $_trailing_context_lines = 0;
-
-    /**
-     * Constructor.
-     */
-    function __construct( $params = array() )
-    {
-        foreach ($params as $param => $value) {
-            $v = '_' . $param;
-            if (isset($this->$v)) {
-                $this->$v = $value;
-            }
-        }
-    }
+	/**
+	 * Number of leading context "lines" to preserve.
+	 *
+	 * This should be left at zero for this class, but subclasses may want to
+	 * set this to other values.
+	 */
+	var $_leading_context_lines = 0;
+
+	/**
+	 * Number of trailing context "lines" to preserve.
+	 *
+	 * This should be left at zero for this class, but subclasses may want to
+	 * set this to other values.
+	 */
+	var $_trailing_context_lines = 0;
+
+	/**
+	 * Constructor.
+	 */
+	function __construct( $params = array() )
+	{
+		foreach ($params as $param => $value) {
+			$v = '_' . $param;
+			if (isset($this->$v)) {
+				$this->$v = $value;
+			}
+		}
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -50,193 +50,193 @@ 
 		self::__construct( $params );
 	}
 
-    /**
-     * Get any renderer parameters.
-     *
-     * @return array  All parameters of this renderer object.
-     */
-    function getParams()
-    {
-        $params = array();
-        foreach (get_object_vars($this) as $k => $v) {
-            if ($k[0] == '_') {
-                $params[substr($k, 1)] = $v;
-            }
-        }
-
-        return $params;
-    }
-
-    /**
-     * Renders a diff.
-     *
-     * @param Text_Diff $diff  A Text_Diff object.
-     *
-     * @return string  The formatted output.
-     */
-    function render($diff)
-    {
-        $xi = $yi = 1;
-        $block = false;
-        $context = array();
-
-        $nlead = $this->_leading_context_lines;
-        $ntrail = $this->_trailing_context_lines;
-
-        $output = $this->_startDiff();
-
-        $diffs = $diff->getDiff();
-        foreach ($diffs as $i => $edit) {
-            /* If these are unchanged (copied) lines, and we want to keep
+	/**
+	 * Get any renderer parameters.
+	 *
+	 * @return array  All parameters of this renderer object.
+	 */
+	function getParams()
+	{
+		$params = array();
+		foreach (get_object_vars($this) as $k => $v) {
+			if ($k[0] == '_') {
+				$params[substr($k, 1)] = $v;
+			}
+		}
+
+		return $params;
+	}
+
+	/**
+	 * Renders a diff.
+	 *
+	 * @param Text_Diff $diff  A Text_Diff object.
+	 *
+	 * @return string  The formatted output.
+	 */
+	function render($diff)
+	{
+		$xi = $yi = 1;
+		$block = false;
+		$context = array();
+
+		$nlead = $this->_leading_context_lines;
+		$ntrail = $this->_trailing_context_lines;
+
+		$output = $this->_startDiff();
+
+		$diffs = $diff->getDiff();
+		foreach ($diffs as $i => $edit) {
+			/* If these are unchanged (copied) lines, and we want to keep
              * leading or trailing context lines, extract them from the copy
              * block. */
-            if (is_a($edit, 'Text_Diff_Op_copy')) {
-                /* Do we have any diff blocks yet? */
-                if (is_array($block)) {
-                    /* How many lines to keep as context from the copy
+			if (is_a($edit, 'Text_Diff_Op_copy')) {
+				/* Do we have any diff blocks yet? */
+				if (is_array($block)) {
+					/* How many lines to keep as context from the copy
                      * block. */
-                    $keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
-                    if (count($edit->orig) <= $keep) {
-                        /* We have less lines in the block than we want for
+					$keep = $i == count($diffs) - 1 ? $ntrail : $nlead + $ntrail;
+					if (count($edit->orig) <= $keep) {
+						/* We have less lines in the block than we want for
                          * context => keep the whole block. */
-                        $block[] = $edit;
-                    } else {
-                        if ($ntrail) {
-                            /* Create a new block with as many lines as we need
+						$block[] = $edit;
+					} else {
+						if ($ntrail) {
+							/* Create a new block with as many lines as we need
                              * for the trailing context. */
-                            $context = array_slice($edit->orig, 0, $ntrail);
-                            $block[] = new Text_Diff_Op_copy($context);
-                        }
-                        /* @todo */
-                        $output .= $this->_block($x0, $ntrail + $xi - $x0,
-                                                 $y0, $ntrail + $yi - $y0,
-                                                 $block);
-                        $block = false;
-                    }
-                }
-                /* Keep the copy block as the context for the next block. */
-                $context = $edit->orig;
-            } else {
-                /* Don't we have any diff blocks yet? */
-                if (!is_array($block)) {
-                    /* Extract context lines from the preceding copy block. */
-                    $context = array_slice($context, count($context) - $nlead);
-                    $x0 = $xi - count($context);
-                    $y0 = $yi - count($context);
-                    $block = array();
-                    if ($context) {
-                        $block[] = new Text_Diff_Op_copy($context);
-                    }
-                }
-                $block[] = $edit;
-            }
-
-            if ($edit->orig) {
-                $xi += count($edit->orig);
-            }
-            if ($edit->final) {
-                $yi += count($edit->final);
-            }
-        }
-
-        if (is_array($block)) {
-            $output .= $this->_block($x0, $xi - $x0,
-                                     $y0, $yi - $y0,
-                                     $block);
-        }
-
-        return $output . $this->_endDiff();
-    }
-
-    function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
-    {
-        $output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
-
-        foreach ($edits as $edit) {
-            switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
-
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
-
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
-
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
-            }
-        }
-
-        return $output . $this->_endBlock();
-    }
-
-    function _startDiff()
-    {
-        return '';
-    }
-
-    function _endDiff()
-    {
-        return '';
-    }
-
-    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
-    {
-        if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
-        }
-        if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
-        }
-
-        // this matches the GNU Diff behaviour
-        if ($xlen && !$ylen) {
-            $ybeg--;
-        } elseif (!$xlen) {
-            $xbeg--;
-        }
-
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
-    }
-
-    function _startBlock($header)
-    {
-        return $header . "\n";
-    }
-
-    function _endBlock()
-    {
-        return '';
-    }
-
-    function _lines($lines, $prefix = ' ')
-    {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
-    }
-
-    function _context($lines)
-    {
-        return $this->_lines($lines, '  ');
-    }
-
-    function _added($lines)
-    {
-        return $this->_lines($lines, '> ');
-    }
-
-    function _deleted($lines)
-    {
-        return $this->_lines($lines, '< ');
-    }
-
-    function _changed($orig, $final)
-    {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
-    }
+							$context = array_slice($edit->orig, 0, $ntrail);
+							$block[] = new Text_Diff_Op_copy($context);
+						}
+						/* @todo */
+						$output .= $this->_block($x0, $ntrail + $xi - $x0,
+												 $y0, $ntrail + $yi - $y0,
+												 $block);
+						$block = false;
+					}
+				}
+				/* Keep the copy block as the context for the next block. */
+				$context = $edit->orig;
+			} else {
+				/* Don't we have any diff blocks yet? */
+				if (!is_array($block)) {
+					/* Extract context lines from the preceding copy block. */
+					$context = array_slice($context, count($context) - $nlead);
+					$x0 = $xi - count($context);
+					$y0 = $yi - count($context);
+					$block = array();
+					if ($context) {
+						$block[] = new Text_Diff_Op_copy($context);
+					}
+				}
+				$block[] = $edit;
+			}
+
+			if ($edit->orig) {
+				$xi += count($edit->orig);
+			}
+			if ($edit->final) {
+				$yi += count($edit->final);
+			}
+		}
+
+		if (is_array($block)) {
+			$output .= $this->_block($x0, $xi - $x0,
+									 $y0, $yi - $y0,
+									 $block);
+		}
+
+		return $output . $this->_endDiff();
+	}
+
+	function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
+	{
+		$output = $this->_startBlock($this->_blockHeader($xbeg, $xlen, $ybeg, $ylen));
+
+		foreach ($edits as $edit) {
+			switch (strtolower(get_class($edit))) {
+			case 'text_diff_op_copy':
+				$output .= $this->_context($edit->orig);
+				break;
+
+			case 'text_diff_op_add':
+				$output .= $this->_added($edit->final);
+				break;
+
+			case 'text_diff_op_delete':
+				$output .= $this->_deleted($edit->orig);
+				break;
+
+			case 'text_diff_op_change':
+				$output .= $this->_changed($edit->orig, $edit->final);
+				break;
+			}
+		}
+
+		return $output . $this->_endBlock();
+	}
+
+	function _startDiff()
+	{
+		return '';
+	}
+
+	function _endDiff()
+	{
+		return '';
+	}
+
+	function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+	{
+		if ($xlen > 1) {
+			$xbeg .= ',' . ($xbeg + $xlen - 1);
+		}
+		if ($ylen > 1) {
+			$ybeg .= ',' . ($ybeg + $ylen - 1);
+		}
+
+		// this matches the GNU Diff behaviour
+		if ($xlen && !$ylen) {
+			$ybeg--;
+		} elseif (!$xlen) {
+			$xbeg--;
+		}
+
+		return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+	}
+
+	function _startBlock($header)
+	{
+		return $header . "\n";
+	}
+
+	function _endBlock()
+	{
+		return '';
+	}
+
+	function _lines($lines, $prefix = ' ')
+	{
+		return $prefix . implode("\n$prefix", $lines) . "\n";
+	}
+
+	function _context($lines)
+	{
+		return $this->_lines($lines, '  ');
+	}
+
+	function _added($lines)
+	{
+		return $this->_lines($lines, '> ');
+	}
+
+	function _deleted($lines)
+	{
+		return $this->_lines($lines, '< ');
+	}
+
+	function _changed($orig, $final)
+	{
+		return $this->_deleted($orig) . "---\n" . $this->_added($final);
+	}
 
 }

Switch Indentation +12 added lines, -12 removed lines

@@ -154,21 +154,21 @@
 
         foreach ($edits as $edit) {
             switch (strtolower(get_class($edit))) {
-            case 'text_diff_op_copy':
-                $output .= $this->_context($edit->orig);
-                break;
+            	case 'text_diff_op_copy':
+                	$output .= $this->_context($edit->orig);
+                	break;
 
-            case 'text_diff_op_add':
-                $output .= $this->_added($edit->final);
-                break;
+            	case 'text_diff_op_add':
+                	$output .= $this->_added($edit->final);
+                	break;
 
-            case 'text_diff_op_delete':
-                $output .= $this->_deleted($edit->orig);
-                break;
+            	case 'text_diff_op_delete':
+                	$output .= $this->_deleted($edit->orig);
+                	break;
 
-            case 'text_diff_op_change':
-                $output .= $this->_changed($edit->orig, $edit->final);
-                break;
+            	case 'text_diff_op_change':
+                	$output .= $this->_changed($edit->orig, $edit->final);
+                	break;
             }
         }
 

Spacing +15 added lines, -15 removed lines

@@ -33,10 +33,10 @@ 
     /**
      * Constructor.
      */
-    function __construct( $params = array() )
+    function __construct($params = array())
     {
         foreach ($params as $param => $value) {
-            $v = '_' . $param;
+            $v = '_'.$param;
             if (isset($this->$v)) {
                 $this->$v = $value;
             }
@@ -46,8 +46,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function Text_Diff_Renderer( $params = array() ) {
-		self::__construct( $params );
+	public function Text_Diff_Renderer($params = array()) {
+		self::__construct($params);
 	}
 
     /**
@@ -118,7 +118,7 @@ 
                 $context = $edit->orig;
             } else {
                 /* Don't we have any diff blocks yet? */
-                if (!is_array($block)) {
+                if ( ! is_array($block)) {
                     /* Extract context lines from the preceding copy block. */
                     $context = array_slice($context, count($context) - $nlead);
                     $x0 = $xi - count($context);
@@ -145,7 +145,7 @@ 
                                      $block);
         }
 
-        return $output . $this->_endDiff();
+        return $output.$this->_endDiff();
     }
 
     function _block($xbeg, $xlen, $ybeg, $ylen, &$edits)
@@ -172,7 +172,7 @@ 
             }
         }
 
-        return $output . $this->_endBlock();
+        return $output.$this->_endBlock();
     }
 
     function _startDiff()
@@ -188,25 +188,25 @@ 
     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
     {
         if ($xlen > 1) {
-            $xbeg .= ',' . ($xbeg + $xlen - 1);
+            $xbeg .= ','.($xbeg + $xlen - 1);
         }
         if ($ylen > 1) {
-            $ybeg .= ',' . ($ybeg + $ylen - 1);
+            $ybeg .= ','.($ybeg + $ylen - 1);
         }
 
         // this matches the GNU Diff behaviour
-        if ($xlen && !$ylen) {
+        if ($xlen && ! $ylen) {
             $ybeg--;
-        } elseif (!$xlen) {
+        } elseif ( ! $xlen) {
             $xbeg--;
         }
 
-        return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+        return $xbeg.($xlen ? ($ylen ? 'c' : 'd') : 'a').$ybeg;
     }
 
     function _startBlock($header)
     {
-        return $header . "\n";
+        return $header."\n";
     }
 
     function _endBlock()
@@ -216,7 +216,7 @@ 
 
     function _lines($lines, $prefix = ' ')
     {
-        return $prefix . implode("\n$prefix", $lines) . "\n";
+        return $prefix.implode("\n$prefix", $lines)."\n";
     }
 
     function _context($lines)
@@ -236,7 +236,7 @@ 
 
     function _changed($orig, $final)
     {
-        return $this->_deleted($orig) . "---\n" . $this->_added($final);
+        return $this->_deleted($orig)."---\n".$this->_added($final);
     }
 
 }

src/wp-includes/Text/Diff/Renderer/inline.php

Doc Comments +6 added lines

@@ -100,6 +100,9 @@ 
         return $header;
     }
 
+    /**
+     * @param string[] $lines
+     */
     function _lines($lines, $prefix = ' ', $encode = true)
     {
         if ($encode) {
@@ -178,6 +181,9 @@ 
         return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
     }
 
+    /**
+     * @param string $string
+     */
     function _splitOnWords($string, $newlineEscape = "\n")
     {
         // Ignore \0; otherwise the while loop will never finish.

Indentation +174 added lines, -174 removed lines

@@ -26,181 +26,181 @@
  */
 class Text_Diff_Renderer_inline extends Text_Diff_Renderer {
 
-    /**
-     * Number of leading context "lines" to preserve.
-     *
-     * @var integer
-     */
-    var $_leading_context_lines = 10000;
-
-    /**
-     * Number of trailing context "lines" to preserve.
-     *
-     * @var integer
-     */
-    var $_trailing_context_lines = 10000;
-
-    /**
-     * Prefix for inserted text.
-     *
-     * @var string
-     */
-    var $_ins_prefix = '<ins>';
-
-    /**
-     * Suffix for inserted text.
-     *
-     * @var string
-     */
-    var $_ins_suffix = '</ins>';
-
-    /**
-     * Prefix for deleted text.
-     *
-     * @var string
-     */
-    var $_del_prefix = '<del>';
-
-    /**
-     * Suffix for deleted text.
-     *
-     * @var string
-     */
-    var $_del_suffix = '</del>';
-
-    /**
-     * Header for each change block.
-     *
-     * @var string
-     */
-    var $_block_header = '';
-
-    /**
-     * Whether to split down to character-level.
-     *
-     * @var boolean
-     */
-    var $_split_characters = false;
-
-    /**
-     * What are we currently splitting on? Used to recurse to show word-level
-     * or character-level changes.
-     *
-     * @var string
-     */
-    var $_split_level = 'lines';
-
-    function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
-    {
-        return $this->_block_header;
-    }
-
-    function _startBlock($header)
-    {
-        return $header;
-    }
-
-    function _lines($lines, $prefix = ' ', $encode = true)
-    {
-        if ($encode) {
-            array_walk($lines, array(&$this, '_encode'));
-        }
-
-        if ($this->_split_level == 'lines') {
-            return implode("\n", $lines) . "\n";
-        } else {
-            return implode('', $lines);
-        }
-    }
-
-    function _added($lines)
-    {
-        array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
-        $lines[count($lines) - 1] .= $this->_ins_suffix;
-        return $this->_lines($lines, ' ', false);
-    }
-
-    function _deleted($lines, $words = false)
-    {
-        array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
-        $lines[count($lines) - 1] .= $this->_del_suffix;
-        return $this->_lines($lines, ' ', false);
-    }
-
-    function _changed($orig, $final)
-    {
-        /* If we've already split on characters, just display. */
-        if ($this->_split_level == 'characters') {
-            return $this->_deleted($orig)
-                . $this->_added($final);
-        }
-
-        /* If we've already split on words, just display. */
-        if ($this->_split_level == 'words') {
-            $prefix = '';
-            while ($orig[0] !== false && $final[0] !== false &&
-                   substr($orig[0], 0, 1) == ' ' &&
-                   substr($final[0], 0, 1) == ' ') {
-                $prefix .= substr($orig[0], 0, 1);
-                $orig[0] = substr($orig[0], 1);
-                $final[0] = substr($final[0], 1);
-            }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
-        }
-
-        $text1 = implode("\n", $orig);
-        $text2 = implode("\n", $final);
-
-        /* Non-printing newline marker. */
-        $nl = "\0";
-
-        if ($this->_split_characters) {
-            $diff = new Text_Diff('native',
-                                  array(preg_split('//', $text1),
-                                        preg_split('//', $text2)));
-        } else {
-            /* We want to split on word boundaries, but we need to preserve
+	/**
+	 * Number of leading context "lines" to preserve.
+	 *
+	 * @var integer
+	 */
+	var $_leading_context_lines = 10000;
+
+	/**
+	 * Number of trailing context "lines" to preserve.
+	 *
+	 * @var integer
+	 */
+	var $_trailing_context_lines = 10000;
+
+	/**
+	 * Prefix for inserted text.
+	 *
+	 * @var string
+	 */
+	var $_ins_prefix = '<ins>';
+
+	/**
+	 * Suffix for inserted text.
+	 *
+	 * @var string
+	 */
+	var $_ins_suffix = '</ins>';
+
+	/**
+	 * Prefix for deleted text.
+	 *
+	 * @var string
+	 */
+	var $_del_prefix = '<del>';
+
+	/**
+	 * Suffix for deleted text.
+	 *
+	 * @var string
+	 */
+	var $_del_suffix = '</del>';
+
+	/**
+	 * Header for each change block.
+	 *
+	 * @var string
+	 */
+	var $_block_header = '';
+
+	/**
+	 * Whether to split down to character-level.
+	 *
+	 * @var boolean
+	 */
+	var $_split_characters = false;
+
+	/**
+	 * What are we currently splitting on? Used to recurse to show word-level
+	 * or character-level changes.
+	 *
+	 * @var string
+	 */
+	var $_split_level = 'lines';
+
+	function _blockHeader($xbeg, $xlen, $ybeg, $ylen)
+	{
+		return $this->_block_header;
+	}
+
+	function _startBlock($header)
+	{
+		return $header;
+	}
+
+	function _lines($lines, $prefix = ' ', $encode = true)
+	{
+		if ($encode) {
+			array_walk($lines, array(&$this, '_encode'));
+		}
+
+		if ($this->_split_level == 'lines') {
+			return implode("\n", $lines) . "\n";
+		} else {
+			return implode('', $lines);
+		}
+	}
+
+	function _added($lines)
+	{
+		array_walk($lines, array(&$this, '_encode'));
+		$lines[0] = $this->_ins_prefix . $lines[0];
+		$lines[count($lines) - 1] .= $this->_ins_suffix;
+		return $this->_lines($lines, ' ', false);
+	}
+
+	function _deleted($lines, $words = false)
+	{
+		array_walk($lines, array(&$this, '_encode'));
+		$lines[0] = $this->_del_prefix . $lines[0];
+		$lines[count($lines) - 1] .= $this->_del_suffix;
+		return $this->_lines($lines, ' ', false);
+	}
+
+	function _changed($orig, $final)
+	{
+		/* If we've already split on characters, just display. */
+		if ($this->_split_level == 'characters') {
+			return $this->_deleted($orig)
+				. $this->_added($final);
+		}
+
+		/* If we've already split on words, just display. */
+		if ($this->_split_level == 'words') {
+			$prefix = '';
+			while ($orig[0] !== false && $final[0] !== false &&
+				   substr($orig[0], 0, 1) == ' ' &&
+				   substr($final[0], 0, 1) == ' ') {
+				$prefix .= substr($orig[0], 0, 1);
+				$orig[0] = substr($orig[0], 1);
+				$final[0] = substr($final[0], 1);
+			}
+			return $prefix . $this->_deleted($orig) . $this->_added($final);
+		}
+
+		$text1 = implode("\n", $orig);
+		$text2 = implode("\n", $final);
+
+		/* Non-printing newline marker. */
+		$nl = "\0";
+
+		if ($this->_split_characters) {
+			$diff = new Text_Diff('native',
+								  array(preg_split('//', $text1),
+										preg_split('//', $text2)));
+		} else {
+			/* We want to split on word boundaries, but we need to preserve
              * whitespace as well. Therefore we split on words, but include
              * all blocks of whitespace in the wordlist. */
-            $diff = new Text_Diff('native',
-                                  array($this->_splitOnWords($text1, $nl),
-                                        $this->_splitOnWords($text2, $nl)));
-        }
-
-        /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
-                         array('split_level' => $this->_split_characters ? 'characters' : 'words')));
-
-        /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
-    }
-
-    function _splitOnWords($string, $newlineEscape = "\n")
-    {
-        // Ignore \0; otherwise the while loop will never finish.
-        $string = str_replace("\0", '', $string);
-
-        $words = array();
-        $length = strlen($string);
-        $pos = 0;
-
-        while ($pos < $length) {
-            // Eat a word with any preceding whitespace.
-            $spaces = strspn(substr($string, $pos), " \n");
-            $nextpos = strcspn(substr($string, $pos + $spaces), " \n");
-            $words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
-            $pos += $spaces + $nextpos;
-        }
-
-        return $words;
-    }
-
-    function _encode(&$string)
-    {
-        $string = htmlspecialchars($string);
-    }
+			$diff = new Text_Diff('native',
+								  array($this->_splitOnWords($text1, $nl),
+										$this->_splitOnWords($text2, $nl)));
+		}
+
+		/* Get the diff in inline format. */
+		$renderer = new Text_Diff_Renderer_inline
+			(array_merge($this->getParams(),
+						 array('split_level' => $this->_split_characters ? 'characters' : 'words')));
+
+		/* Run the diff and get the output. */
+		return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+	}
+
+	function _splitOnWords($string, $newlineEscape = "\n")
+	{
+		// Ignore \0; otherwise the while loop will never finish.
+		$string = str_replace("\0", '', $string);
+
+		$words = array();
+		$length = strlen($string);
+		$pos = 0;
+
+		while ($pos < $length) {
+			// Eat a word with any preceding whitespace.
+			$spaces = strspn(substr($string, $pos), " \n");
+			$nextpos = strcspn(substr($string, $pos + $spaces), " \n");
+			$words[] = str_replace("\n", $newlineEscape, substr($string, $pos, $spaces + $nextpos));
+			$pos += $spaces + $nextpos;
+		}
+
+		return $words;
+	}
+
+	function _encode(&$string)
+	{
+		$string = htmlspecialchars($string);
+	}
 
 }

Spacing +7 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
 /** Text_Diff_Renderer */
 
 // WP #7391
-require_once dirname(dirname(__FILE__)) . '/Renderer.php';
+require_once dirname(dirname(__FILE__)).'/Renderer.php';
 
 /**
  * "Inline" diff renderer.
@@ -107,7 +107,7 @@ 
         }
 
         if ($this->_split_level == 'lines') {
-            return implode("\n", $lines) . "\n";
+            return implode("\n", $lines)."\n";
         } else {
             return implode('', $lines);
         }
@@ -116,7 +116,7 @@ 
     function _added($lines)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_ins_prefix . $lines[0];
+        $lines[0] = $this->_ins_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_ins_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -124,7 +124,7 @@ 
     function _deleted($lines, $words = false)
     {
         array_walk($lines, array(&$this, '_encode'));
-        $lines[0] = $this->_del_prefix . $lines[0];
+        $lines[0] = $this->_del_prefix.$lines[0];
         $lines[count($lines) - 1] .= $this->_del_suffix;
         return $this->_lines($lines, ' ', false);
     }
@@ -147,7 +147,7 @@ 
                 $orig[0] = substr($orig[0], 1);
                 $final[0] = substr($final[0], 1);
             }
-            return $prefix . $this->_deleted($orig) . $this->_added($final);
+            return $prefix.$this->_deleted($orig).$this->_added($final);
         }
 
         $text1 = implode("\n", $orig);
@@ -170,12 +170,11 @@ 
         }
 
         /* Get the diff in inline format. */
-        $renderer = new Text_Diff_Renderer_inline
-            (array_merge($this->getParams(),
+        $renderer = new Text_Diff_Renderer_inline(array_merge($this->getParams(),
                          array('split_level' => $this->_split_characters ? 'characters' : 'words')));
 
         /* Run the diff and get the output. */
-        return str_replace($nl, "\n", $renderer->render($diff)) . "\n";
+        return str_replace($nl, "\n", $renderer->render($diff))."\n";
     }
 
     function _splitOnWords($string, $newlineEscape = "\n")

src/wp-includes/wp-diff.php

Doc Comments +2 added lines, -2 removed lines

@@ -495,7 +495,7 @@ 
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {
@@ -532,7 +532,7 @@ 
 	 *
 	 * @param string $string
 	 * @param string $newlineEscape
-	 * @return string
+	 * @return string[]
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);

Braces +49 added lines, -35 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function __construct( $params = array() ) {
 		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+		if ( isset( $params[ 'show_split_view' ] ) ) {
+					$this->_show_split_view = $params[ 'show_split_view' ];
+		}
 	}
 
 	/**
@@ -280,8 +281,10 @@ 
 					//	we double the length of chars not in those tags.
 					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
-						continue; // Too different. Don't save diffs.
+					if ( $diff_ratio > $this->_diff_threshold ) {
+											continue;
+					}
+					// Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
@@ -292,23 +295,26 @@ 
 
 		foreach ( array_keys($orig_rows) as $row ) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
-				continue;
+			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) {
+							continue;
+			}
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
-				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
-				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
-			else
-				$orig_line = '';
-
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
-				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
-				$final_line = htmlspecialchars($final[$final_rows[$row]]);
-			else
-				$final_line = '';
+			if ( isset( $orig_diffs[$orig_rows[$row]] ) ) {
+							$orig_line = $orig_diffs[$orig_rows[$row]];
+			} elseif ( isset( $orig[$orig_rows[$row]] ) ) {
+							$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
+			} else {
+							$orig_line = '';
+			}
+
+			if ( isset( $final_diffs[$final_rows[$row]] ) ) {
+							$final_line = $final_diffs[$final_rows[$row]];
+			} elseif ( isset( $final[$final_rows[$row]] ) ) {
+							$final_line = htmlspecialchars($final[$final_rows[$row]]);
+			} else {
+							$final_line = '';
+			}
 
 			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
 				$r .= $this->_added( array($final_line), false );
@@ -360,8 +366,9 @@ 
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
-				continue;
+			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) ) {
+							continue;
+			}
 
 			// First match for these guys. Must be best match
 			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
@@ -371,12 +378,14 @@ 
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
-				$final_matches[$f] = 'x';
+			if ( isset($orig_matches[$o]) ) {
+							$final_matches[$f] = 'x';
+			}
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
-				$orig_matches[$o] = 'x';
+			elseif ( isset($final_matches[$f]) ) {
+							$orig_matches[$o] = 'x';
+			}
 		}
 
 		// We read the text in this order
@@ -397,24 +406,28 @@ 
 				array_splice( $final_rows, $orig_pos, 0, -1 );
 			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
 		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
-				array_push($orig_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($orig_rows, $diff_count++);
+			}
 		} elseif ( $diff_count > 0 ) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
-				array_push($final_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($final_rows, $diff_count++);
+			}
 		}
 
 		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
@@ -438,8 +451,9 @@ 
 		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
-			return $difference;
+		if ( !$string1 ) {
+					return $difference;
+		}
 
 		// Return distance per character (of string1).
 		return $difference / strlen($string1);

Spacing +100 added lines, -100 removed lines

@@ -8,13 +8,13 @@ 
  * @subpackage Diff
  */
 
-if ( ! class_exists( 'Text_Diff', false ) ) {
+if ( ! class_exists('Text_Diff', false)) {
 	/** Text_Diff class */
-	require( dirname(__FILE__).'/Text/Diff.php' );
+	require(dirname(__FILE__).'/Text/Diff.php');
 	/** Text_Diff_Renderer class */
-	require( dirname(__FILE__).'/Text/Diff/Renderer.php' );
+	require(dirname(__FILE__).'/Text/Diff/Renderer.php');
 	/** Text_Diff_Renderer_inline class */
-	require( dirname(__FILE__).'/Text/Diff/Renderer/inline.php' );
+	require(dirname(__FILE__).'/Text/Diff/Renderer/inline.php');
 }
 
 /**
@@ -31,7 +31,7 @@ 
 	 * @access public
 	 * @since 2.6.0
 	 */
-	public $_leading_context_lines  = 10000;
+	public $_leading_context_lines = 10000;
 
 	/**
 	 * @see Text_Diff_Renderer::_trailing_context_lines
@@ -68,7 +68,7 @@ 
 	 */
 	protected $_show_split_view = true;
 
-	protected $compat_fields = array( '_show_split_view', 'inline_diff_renderer', '_diff_threshold' );
+	protected $compat_fields = array('_show_split_view', 'inline_diff_renderer', '_diff_threshold');
 
 	/**
 	 * Constructor - Call parent constructor with params array.
@@ -79,10 +79,10 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function __construct( $params = array() ) {
-		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+	public function __construct($params = array()) {
+		parent::__construct($params);
+		if (isset($params['show_split_view']))
+			$this->_show_split_view = $params['show_split_view'];
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @param string $header
 	 * @return string
 	 */
-	public function _startBlock( $header ) {
+	public function _startBlock($header) {
 		return '';
 	}
 
@@ -101,7 +101,7 @@ 
 	 * @param array $lines
 	 * @param string $prefix
 	 */
-	public function _lines( $lines, $prefix=' ' ) {
+	public function _lines($lines, $prefix = ' ') {
 	}
 
 	/**
@@ -110,7 +110,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function addedLine( $line ) {
+	public function addedLine($line) {
 		return "<td class='diff-addedline'>{$line}</td>";
 
 	}
@@ -121,7 +121,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function deletedLine( $line ) {
+	public function deletedLine($line) {
 		return "<td class='diff-deletedline'>{$line}</td>";
 	}
 
@@ -131,7 +131,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function contextLine( $line ) {
+	public function contextLine($line) {
 		return "<td class='diff-context'>{$line}</td>";
 	}
 
@@ -152,11 +152,11 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _added( $lines, $encode = true ) {
+	public function _added($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/**
 				 * Contextually filter a diffed line.
@@ -171,13 +171,13 @@ 
 				 * @param String $line           The unprocessed diffed line.
 		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'added');
 			}
 
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->emptyLine().$this->emptyLine().$this->addedLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->addedLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -191,19 +191,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _deleted( $lines, $encode = true ) {
+	public function _deleted($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'deleted' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'deleted');
 			}
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->deletedLine($line).$this->emptyLine().$this->emptyLine()."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->deletedLine($line)."</tr>\n";
 			}
 
 		}
@@ -218,19 +218,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _context( $lines, $encode = true ) {
+	public function _context($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'unchanged');
 			}
-			if (  $this->_show_split_view ) {
-				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->contextLine($line).$this->emptyLine().$this->contextLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->contextLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -249,7 +249,7 @@ 
 	 * @param array $final
 	 * @return string
 	 */
-	public function _changed( $orig, $final ) {
+	public function _changed($orig, $final) {
 		$r = '';
 
 		// Does the aforementioned additional processing
@@ -259,66 +259,66 @@ 
 		// *_rows are column vectors for the orig column and the final column.
 		//	row >= 0: an indix of the $orig or $final array
 		//	row  < 0: a blank row for that column
-		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
+		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines($orig, $final);
 
 		// These will hold the word changes as determined by an inline diff
 		$orig_diffs  = array();
 		$final_diffs = array();
 
 		// Compute word diffs for each matched pair using the inline diff
-		foreach ( $orig_matches as $o => $f ) {
-			if ( is_numeric($o) && is_numeric($f) ) {
-				$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) );
+		foreach ($orig_matches as $o => $f) {
+			if (is_numeric($o) && is_numeric($f)) {
+				$text_diff = new Text_Diff('auto', array(array($orig[$o]), array($final[$f])));
 				$renderer = new $this->inline_diff_renderer;
-				$diff = $renderer->render( $text_diff );
+				$diff = $renderer->render($text_diff);
 
 				// If they're too different, don't include any <ins> or <dels>
-				if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
+				if (preg_match_all('!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches)) {
 					// length of all text between <ins> or <del>
-					$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
+					$stripped_matches = strlen(strip_tags(join(' ', $diff_matches[0])));
 					// since we count lengith of text between <ins> or <del> (instead of picking just one),
 					//	we double the length of chars not in those tags.
-					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
+					$stripped_diff = strlen(strip_tags($diff)) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
+					if ($diff_ratio > $this->_diff_threshold)
 						continue; // Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
-				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
-				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
+				$orig_diffs[$o]  = preg_replace('|<ins>.*?</ins>|', '', $diff);
+				$final_diffs[$f] = preg_replace('|<del>.*?</del>|', '', $diff);
 			}
 		}
 
-		foreach ( array_keys($orig_rows) as $row ) {
+		foreach (array_keys($orig_rows) as $row) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
+			if ($orig_rows[$row] < 0 && $final_rows[$row] < 0)
 				continue;
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
+			if (isset($orig_diffs[$orig_rows[$row]]))
 				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
+			elseif (isset($orig[$orig_rows[$row]]))
 				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
 			else
 				$orig_line = '';
 
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
+			if (isset($final_diffs[$final_rows[$row]]))
 				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
+			elseif (isset($final[$final_rows[$row]]))
 				$final_line = htmlspecialchars($final[$final_rows[$row]]);
 			else
 				$final_line = '';
 
-			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
-				$r .= $this->_added( array($final_line), false );
-			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
-				$r .= $this->_deleted( array($orig_line), false );
+			if ($orig_rows[$row] < 0) { // Orig is blank. This is really an added row.
+				$r .= $this->_added(array($final_line), false);
+			} elseif ($final_rows[$row] < 0) { // Final is blank. This is really a deleted row.
+				$r .= $this->_deleted(array($orig_line), false);
 			} else { // A true changed row.
-				if ( $this->_show_split_view ) {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+				if ($this->_show_split_view) {
+					$r .= '<tr>'.$this->deletedLine($orig_line).$this->emptyLine().$this->addedLine($final_line)."</tr>\n";
 				} else {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
+					$r .= '<tr>'.$this->deletedLine($orig_line)."</tr><tr>".$this->addedLine($final_line)."</tr>\n";
 				}
 			}
 		}
@@ -340,13 +340,13 @@ 
 	 * @param array $final
 	 * @return array
 	 */
-	public function interleave_changed_lines( $orig, $final ) {
+	public function interleave_changed_lines($orig, $final) {
 
 		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
-		foreach ( array_keys($orig) as $o ) {
-			foreach ( array_keys($final) as $f ) {
-				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
+		foreach (array_keys($orig) as $o) {
+			foreach (array_keys($final) as $f) {
+				$matches["$o,$f"] = $this->compute_string_distance($orig[$o], $final[$f]);
 			}
 		}
 		asort($matches); // Order by string distance.
@@ -354,28 +354,28 @@ 
 		$orig_matches  = array();
 		$final_matches = array();
 
-		foreach ( $matches as $keys => $difference ) {
+		foreach ($matches as $keys => $difference) {
 			list($o, $f) = explode(',', $keys);
 			$o = (int) $o;
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
+			if (isset($orig_matches[$o]) && isset($final_matches[$f]))
 				continue;
 
 			// First match for these guys. Must be best match
-			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
+			if ( ! isset($orig_matches[$o]) && ! isset($final_matches[$f])) {
 				$orig_matches[$o] = $f;
 				$final_matches[$f] = $o;
 				continue;
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
+			if (isset($orig_matches[$o]))
 				$final_matches[$f] = 'x';
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
+			elseif (isset($final_matches[$f]))
 				$orig_matches[$o] = 'x';
 		}
 
@@ -389,31 +389,31 @@ 
 
 		// Interleaves rows with blanks to keep matches aligned.
 		// We may end up with some extraneous blank rows, but we'll just ignore them later.
-		foreach ( $orig_rows_copy as $orig_row ) {
+		foreach ($orig_rows_copy as $orig_row) {
 			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
 			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
 
-			if ( false === $final_pos ) { // This orig is paired with a blank final.
-				array_splice( $final_rows, $orig_pos, 0, -1 );
-			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
+			if (false === $final_pos) { // This orig is paired with a blank final.
+				array_splice($final_rows, $orig_pos, 0, -1);
+			} elseif ($final_pos < $orig_pos) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
-			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
+				while ($diff_pos < 0)
+					array_splice($final_rows, $orig_pos, 0, $diff_pos++);
+			} elseif ($final_pos > $orig_pos) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ($diff_pos < 0)
+					array_splice($orig_rows, $orig_pos, 0, $diff_pos++);
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
-		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
+		if ($diff_count < 0) {
+			while ($diff_count < 0)
 				array_push($orig_rows, $diff_count++);
-		} elseif ( $diff_count > 0 ) {
+		} elseif ($diff_count > 0) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
+			while ($diff_count < 0)
 				array_push($final_rows, $diff_count++);
 		}
 
@@ -429,16 +429,16 @@ 
 	 * @param string $string2
 	 * @return int
 	 */
-	public function compute_string_distance( $string1, $string2 ) {
+	public function compute_string_distance($string1, $string2) {
 		// Vectors containing character frequency for all chars in each string
 		$chars1 = count_chars($string1);
 		$chars2 = count_chars($string2);
 
 		// L1-norm of difference vector.
-		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
+		$difference = array_sum(array_map(array($this, 'difference'), $chars1, $chars2));
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
+		if ( ! $string1)
 			return $difference;
 
 		// Return distance per character (of string1).
@@ -453,8 +453,8 @@ 
 	 * @param int $b
 	 * @return int
 	 */
-	public function difference( $a, $b ) {
-		return abs( $a - $b );
+	public function difference($a, $b) {
+		return abs($a - $b);
 	}
 
 	/**
@@ -466,8 +466,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -482,8 +482,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -497,9 +497,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -511,9 +511,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 }
@@ -536,8 +536,8 @@ 
 	 */
 	public function _splitOnWords($string, $newlineEscape = "\n") {
 		$string = str_replace("\0", '', $string);
-		$words  = preg_split( '/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE );
-		$words  = str_replace( "\n", $newlineEscape, $words );
+		$words  = preg_split('/([^\w])/u', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+		$words  = str_replace("\n", $newlineEscape, $words);
 		return $words;
 	}
 

Indentation +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 				 *
 				 * @param String $processed_line The processed diffed line.
 				 * @param String $line           The unprocessed diffed line.
-		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}

src/wp-trackback.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  *
  * @since 0.71
  *
- * @param mixed  $error         Whether there was an error.
+ * @param integer  $error         Whether there was an error.
  *                              Default '0'. Accepts '0' or '1', true or false.
  * @param string $error_message Error message if an error occurred.
  */

Spacing +23 added lines, -23 removed lines

@@ -9,8 +9,8 @@ 
  */
 
 if (empty($wp)) {
-	require_once( dirname( __FILE__ ) . '/wp-load.php' );
-	wp( array( 'tb' => '1' ) );
+	require_once(dirname(__FILE__).'/wp-load.php');
+	wp(array('tb' => '1'));
 }
 
 /**
@@ -25,7 +25,7 @@ 
  * @param string $error_message Error message if an error occurred.
  */
 function trackback_response($error = 0, $error_message = '') {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 	if ($error) {
 		echo '<?xml version="1.0" encoding="utf-8"?'.">\n";
 		echo "<response>\n";
@@ -44,30 +44,30 @@ 
 // Trackback is done by a POST.
 $request_array = 'HTTP_POST_VARS';
 
-if ( !isset($_GET['tb_id']) || !$_GET['tb_id'] ) {
+if ( ! isset($_GET['tb_id']) || ! $_GET['tb_id']) {
 	$tb_id = explode('/', $_SERVER['REQUEST_URI']);
-	$tb_id = intval( $tb_id[ count($tb_id) - 1 ] );
+	$tb_id = intval($tb_id[count($tb_id) - 1]);
 }
 
-$tb_url  = isset($_POST['url'])     ? $_POST['url']     : '';
+$tb_url  = isset($_POST['url']) ? $_POST['url'] : '';
 $charset = isset($_POST['charset']) ? $_POST['charset'] : '';
 
 // These three are stripslashed here so they can be properly escaped after mb_convert_encoding().
-$title     = isset($_POST['title'])     ? wp_unslash($_POST['title'])      : '';
-$excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
-$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
+$title     = isset($_POST['title']) ? wp_unslash($_POST['title']) : '';
+$excerpt   = isset($_POST['excerpt']) ? wp_unslash($_POST['excerpt']) : '';
+$blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name']) : '';
 
 if ($charset)
-	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
+	$charset = str_replace(array(',', ' '), '', strtoupper(trim($charset)));
 else
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if (false !== strpos($charset, 'UTF-7'))
 	die;
 
 // For international trackbacks.
-if ( function_exists('mb_convert_encoding') ) {
+if (function_exists('mb_convert_encoding')) {
 	$title     = mb_convert_encoding($title, get_option('blog_charset'), $charset);
 	$excerpt   = mb_convert_encoding($excerpt, get_option('blog_charset'), $charset);
 	$blog_name = mb_convert_encoding($blog_name, get_option('blog_charset'), $charset);
@@ -78,10 +78,10 @@ 
 $excerpt   = wp_slash($excerpt);
 $blog_name = wp_slash($blog_name);
 
-if ( is_single() || is_page() )
+if (is_single() || is_page())
 	$tb_id = $posts[0]->ID;
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
+if ( ! isset($tb_id) || ! intval($tb_id))
 	trackback_response(1, 'I really need an ID for this to work.');
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
@@ -90,14 +90,14 @@ 
 	exit;
 }
 
-if ( !empty($tb_url) && !empty($title) ) {
-	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
+if ( ! empty($tb_url) && ! empty($title)) {
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'));
 
-	if ( !pings_open($tb_id) )
+	if ( ! pings_open($tb_id))
 		trackback_response(1, 'Sorry, trackbacks are closed for this item.');
 
-	$title =  wp_html_excerpt( $title, 250, '&#8230;' );
-	$excerpt = wp_html_excerpt( $excerpt, 252, '&#8230;' );
+	$title = wp_html_excerpt($title, 250, '&#8230;');
+	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	$comment_post_ID = (int) $tb_id;
 	$comment_author = $blog_name;
@@ -106,8 +106,8 @@ 
 	$comment_content = "<strong>$title</strong>\n\n$excerpt";
 	$comment_type = 'trackback';
 
-	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
+	$dupe = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url));
+	if ($dupe)
 		trackback_response(1, 'We already have a ping from that URL for this post.');
 
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');
@@ -122,6 +122,6 @@ 
 	 *
 	 * @param int $trackback_id Trackback ID.
 	 */
-	do_action( 'trackback_post', $trackback_id );
-	trackback_response( 0 );
+	do_action('trackback_post', $trackback_id);
+	trackback_response(0);
 }

Braces +15 added lines, -9 removed lines

@@ -57,14 +57,16 @@ 
 $excerpt   = isset($_POST['excerpt'])   ? wp_unslash($_POST['excerpt'])    : '';
 $blog_name = isset($_POST['blog_name']) ? wp_unslash($_POST['blog_name'])  : '';
 
-if ($charset)
+if ($charset) {
 	$charset = str_replace( array(',', ' '), '', strtoupper( trim($charset) ) );
-else
+} else {
 	$charset = 'ASCII, UTF-8, ISO-8859-1, JIS, EUC-JP, SJIS';
+}
 
 // No valid uses for UTF-7.
-if ( false !== strpos($charset, 'UTF-7') )
+if ( false !== strpos($charset, 'UTF-7') ) {
 	die;
+}
 
 // For international trackbacks.
 if ( function_exists('mb_convert_encoding') ) {
@@ -78,11 +80,13 @@ 
 $excerpt   = wp_slash($excerpt);
 $blog_name = wp_slash($blog_name);
 
-if ( is_single() || is_page() )
+if ( is_single() || is_page() ) {
 	$tb_id = $posts[0]->ID;
+}
 
-if ( !isset($tb_id) || !intval( $tb_id ) )
+if ( !isset($tb_id) || !intval( $tb_id ) ) {
 	trackback_response(1, 'I really need an ID for this to work.');
+}
 
 if (empty($title) && empty($tb_url) && empty($blog_name)) {
 	// If it doesn't look like a trackback at all.
@@ -93,8 +97,9 @@ 
 if ( !empty($tb_url) && !empty($title) ) {
 	header('Content-Type: text/xml; charset=' . get_option('blog_charset') );
 
-	if ( !pings_open($tb_id) )
-		trackback_response(1, 'Sorry, trackbacks are closed for this item.');
+	if ( !pings_open($tb_id) ) {
+			trackback_response(1, 'Sorry, trackbacks are closed for this item.');
+	}
 
 	$title =  wp_html_excerpt( $title, 250, '…' );
 	$excerpt = wp_html_excerpt( $excerpt, 252, '…' );
@@ -107,8 +112,9 @@ 
 	$comment_type = 'trackback';
 
 	$dupe = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url) );
-	if ( $dupe )
-		trackback_response(1, 'We already have a ping from that URL for this post.');
+	if ( $dupe ) {
+			trackback_response(1, 'We already have a ping from that URL for this post.');
+	}
 
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type');