ntwb / wordpress

src/wp-includes/class-wp-http-ixr-client.php

Spacing +19 added lines, -19 removed lines

@@ -20,21 +20,21 @@ 
 	 * @param int $timeout
 	 */
 	public function __construct($server, $path = false, $port = false, $timeout = 15) {
-		if ( ! $path ) {
+		if ( ! $path) {
 			// Assume we have been given a URL instead
 			$bits = parse_url($server);
 			$this->scheme = $bits['scheme'];
 			$this->server = $bits['host'];
 			$this->port = isset($bits['port']) ? $bits['port'] : $port;
-			$this->path = !empty($bits['path']) ? $bits['path'] : '/';
+			$this->path = ! empty($bits['path']) ? $bits['path'] : '/';
 
 			// Make absolutely sure we have a path
-			if ( ! $this->path ) {
+			if ( ! $this->path) {
 				$this->path = '/';
 			}
 
-			if ( ! empty( $bits['query'] ) ) {
-				$this->path .= '?' . $bits['query'];
+			if ( ! empty($bits['query'])) {
+				$this->path .= '?'.$bits['query'];
 			}
 		} else {
 			$this->scheme = 'http';
@@ -56,7 +56,7 @@ 
 		$xml = $request->getXml();
 
 		$port = $this->port ? ":$this->port" : '';
-		$url = $this->scheme . '://' . $this->server . $port . $this->path;
+		$url = $this->scheme.'://'.$this->server.$port.$this->path;
 		$args = array(
 			'headers'    => array('Content-Type' => 'text/xml'),
 			'user-agent' => $this->useragent,
@@ -64,7 +64,7 @@ 
 		);
 
 		// Merge Custom headers ala #8145
-		foreach ( $this->headers as $header => $value ) {
+		foreach ($this->headers as $header => $value) {
 			$args['headers'][$header] = $value;
 		}
 
@@ -75,45 +75,45 @@ 
 		 *
 		 * @param array $headers Array of headers to be sent.
 		 */
-		$args['headers'] = apply_filters( 'wp_http_ixr_client_headers', $args['headers'] );
+		$args['headers'] = apply_filters('wp_http_ixr_client_headers', $args['headers']);
 
-		if ( $this->timeout !== false ) {
+		if ($this->timeout !== false) {
 			$args['timeout'] = $this->timeout;
 		}
 
 		// Now send the request
-		if ( $this->debug ) {
-			echo '<pre class="ixr_request">' . htmlspecialchars($xml) . "\n</pre>\n\n";
+		if ($this->debug) {
+			echo '<pre class="ixr_request">'.htmlspecialchars($xml)."\n</pre>\n\n";
 		}
 
 		$response = wp_remote_post($url, $args);
 
-		if ( is_wp_error($response) ) {
+		if (is_wp_error($response)) {
 			$errno    = $response->get_error_code();
 			$errorstr = $response->get_error_message();
 			$this->error = new IXR_Error(-32300, "transport error: $errno $errorstr");
 			return false;
 		}
 
-		if ( 200 != wp_remote_retrieve_response_code( $response ) ) {
-			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 (' . wp_remote_retrieve_response_code( $response ) . ')');
+		if (200 != wp_remote_retrieve_response_code($response)) {
+			$this->error = new IXR_Error(-32301, 'transport error - HTTP status code was not 200 ('.wp_remote_retrieve_response_code($response).')');
 			return false;
 		}
 
-		if ( $this->debug ) {
-			echo '<pre class="ixr_response">' . htmlspecialchars( wp_remote_retrieve_body( $response ) ) . "\n</pre>\n\n";
+		if ($this->debug) {
+			echo '<pre class="ixr_response">'.htmlspecialchars(wp_remote_retrieve_body($response))."\n</pre>\n\n";
 		}
 
 		// Now parse what we've got back
-		$this->message = new IXR_Message( wp_remote_retrieve_body( $response ) );
-		if ( ! $this->message->parse() ) {
+		$this->message = new IXR_Message(wp_remote_retrieve_body($response));
+		if ( ! $this->message->parse()) {
 			// XML error
 			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
 			return false;
 		}
 
 		// Is the message a fault?
-		if ( $this->message->messageType == 'fault' ) {
+		if ($this->message->messageType == 'fault') {
 			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
 			return false;
 		}

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

Indentation +222 added lines, -222 removed lines

@@ -22,227 +22,227 @@
  */
 class Text_Diff_Engine_string {
 
-    /**
-     * Parses a unified or context diff.
-     *
-     * First param contains the whole diff and the second can be used to force
-     * a specific diff type. If the second parameter is 'autodetect', the
-     * diff will be examined to find out which type of diff this is.
-     *
-     * @param string $diff  The diff content.
-     * @param string $mode  The diff mode of the content in $diff. One of
-     *                      'context', 'unified', or 'autodetect'.
-     *
-     * @return array  List of all diff operations.
-     */
-    function diff($diff, $mode = 'autodetect')
-    {
-        // Detect line breaks.
-        $lnbr = "\n";
-        if (strpos($diff, "\r\n") !== false) {
-            $lnbr = "\r\n";
-        } elseif (strpos($diff, "\r") !== false) {
-            $lnbr = "\r";
-        }
-
-        // Make sure we have a line break at the EOF.
-        if (substr($diff, -strlen($lnbr)) != $lnbr) {
-            $diff .= $lnbr;
-        }
-
-        if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
-            return PEAR::raiseError('Type of diff is unsupported');
-        }
-
-        if ($mode == 'autodetect') {
-            $context = strpos($diff, '***');
-            $unified = strpos($diff, '---');
-            if ($context === $unified) {
-                return PEAR::raiseError('Type of diff could not be detected');
-            } elseif ($context === false || $unified === false) {
-                $mode = $context !== false ? 'context' : 'unified';
-            } else {
-                $mode = $context < $unified ? 'context' : 'unified';
-            }
-        }
-
-        // Split by new line and remove the diff header, if there is one.
-        $diff = explode($lnbr, $diff);
-        if (($mode == 'context' && strpos($diff[0], '***') === 0) ||
-            ($mode == 'unified' && strpos($diff[0], '---') === 0)) {
-            array_shift($diff);
-            array_shift($diff);
-        }
-
-        if ($mode == 'context') {
-            return $this->parseContextDiff($diff);
-        } else {
-            return $this->parseUnifiedDiff($diff);
-        }
-    }
-
-    /**
-     * Parses an array containing the unified diff.
-     *
-     * @param array $diff  Array of lines.
-     *
-     * @return array  List of all diff operations.
-     */
-    function parseUnifiedDiff($diff)
-    {
-        $edits = array();
-        $end = count($diff) - 1;
-        for ($i = 0; $i < $end;) {
-            $diff1 = array();
-            switch (substr($diff[$i], 0, 1)) {
-            case ' ':
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
-                $edits[] = new Text_Diff_Op_copy($diff1);
-                break;
-
-            case '+':
-                // get all new lines
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
-                $edits[] = new Text_Diff_Op_add($diff1);
-                break;
-
-            case '-':
-                // get changed or removed lines
-                $diff2 = array();
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
-
-                while ($i < $end && substr($diff[$i], 0, 1) == '+') {
-                    $diff2[] = substr($diff[$i++], 1);
-                }
-                if (count($diff2) == 0) {
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                } else {
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                }
-                break;
-
-            default:
-                $i++;
-                break;
-            }
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Parses an array containing the context diff.
-     *
-     * @param array $diff  Array of lines.
-     *
-     * @return array  List of all diff operations.
-     */
-    function parseContextDiff(&$diff)
-    {
-        $edits = array();
-        $i = $max_i = $j = $max_j = 0;
-        $end = count($diff) - 1;
-        while ($i < $end && $j < $end) {
-            while ($i >= $max_i && $j >= $max_j) {
-                // Find the boundaries of the diff output of the two files
-                for ($i = $j;
-                     $i < $end && substr($diff[$i], 0, 3) == '***';
-                     $i++);
-                for ($max_i = $i;
-                     $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
-                     $max_i++);
-                for ($j = $max_i;
-                     $j < $end && substr($diff[$j], 0, 3) == '---';
-                     $j++);
-                for ($max_j = $j;
-                     $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
-                     $max_j++);
-            }
-
-            // find what hasn't been changed
-            $array = array();
-            while ($i < $max_i &&
-                   $j < $max_j &&
-                   strcmp($diff[$i], $diff[$j]) == 0) {
-                $array[] = substr($diff[$i], 2);
-                $i++;
-                $j++;
-            }
-
-            while ($i < $max_i && ($max_j-$j) <= 1) {
-                if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
-                    break;
-                }
-                $array[] = substr($diff[$i++], 2);
-            }
-
-            while ($j < $max_j && ($max_i-$i) <= 1) {
-                if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
-                    break;
-                }
-                $array[] = substr($diff[$j++], 2);
-            }
-            if (count($array) > 0) {
-                $edits[] = new Text_Diff_Op_copy($array);
-            }
-
-            if ($i < $max_i) {
-                $diff1 = array();
-                switch (substr($diff[$i], 0, 1)) {
-                case '!':
-                    $diff2 = array();
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                        if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
-                            $diff2[] = substr($diff[$j++], 2);
-                        }
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                    break;
-
-                case '+':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff1);
-                    break;
-
-                case '-':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                    break;
-                }
-            }
-
-            if ($j < $max_j) {
-                $diff2 = array();
-                switch (substr($diff[$j], 0, 1)) {
-                case '+':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff2);
-                    break;
-
-                case '-':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff2);
-                    break;
-                }
-            }
-        }
-
-        return $edits;
-    }
+	/**
+	 * Parses a unified or context diff.
+	 *
+	 * First param contains the whole diff and the second can be used to force
+	 * a specific diff type. If the second parameter is 'autodetect', the
+	 * diff will be examined to find out which type of diff this is.
+	 *
+	 * @param string $diff  The diff content.
+	 * @param string $mode  The diff mode of the content in $diff. One of
+	 *                      'context', 'unified', or 'autodetect'.
+	 *
+	 * @return array  List of all diff operations.
+	 */
+	function diff($diff, $mode = 'autodetect')
+	{
+		// Detect line breaks.
+		$lnbr = "\n";
+		if (strpos($diff, "\r\n") !== false) {
+			$lnbr = "\r\n";
+		} elseif (strpos($diff, "\r") !== false) {
+			$lnbr = "\r";
+		}
+
+		// Make sure we have a line break at the EOF.
+		if (substr($diff, -strlen($lnbr)) != $lnbr) {
+			$diff .= $lnbr;
+		}
+
+		if ($mode != 'autodetect' && $mode != 'context' && $mode != 'unified') {
+			return PEAR::raiseError('Type of diff is unsupported');
+		}
+
+		if ($mode == 'autodetect') {
+			$context = strpos($diff, '***');
+			$unified = strpos($diff, '---');
+			if ($context === $unified) {
+				return PEAR::raiseError('Type of diff could not be detected');
+			} elseif ($context === false || $unified === false) {
+				$mode = $context !== false ? 'context' : 'unified';
+			} else {
+				$mode = $context < $unified ? 'context' : 'unified';
+			}
+		}
+
+		// Split by new line and remove the diff header, if there is one.
+		$diff = explode($lnbr, $diff);
+		if (($mode == 'context' && strpos($diff[0], '***') === 0) ||
+			($mode == 'unified' && strpos($diff[0], '---') === 0)) {
+			array_shift($diff);
+			array_shift($diff);
+		}
+
+		if ($mode == 'context') {
+			return $this->parseContextDiff($diff);
+		} else {
+			return $this->parseUnifiedDiff($diff);
+		}
+	}
+
+	/**
+	 * Parses an array containing the unified diff.
+	 *
+	 * @param array $diff  Array of lines.
+	 *
+	 * @return array  List of all diff operations.
+	 */
+	function parseUnifiedDiff($diff)
+	{
+		$edits = array();
+		$end = count($diff) - 1;
+		for ($i = 0; $i < $end;) {
+			$diff1 = array();
+			switch (substr($diff[$i], 0, 1)) {
+			case ' ':
+				do {
+					$diff1[] = substr($diff[$i], 1);
+				} while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+				$edits[] = new Text_Diff_Op_copy($diff1);
+				break;
+
+			case '+':
+				// get all new lines
+				do {
+					$diff1[] = substr($diff[$i], 1);
+				} while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+				$edits[] = new Text_Diff_Op_add($diff1);
+				break;
+
+			case '-':
+				// get changed or removed lines
+				$diff2 = array();
+				do {
+					$diff1[] = substr($diff[$i], 1);
+				} while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+
+				while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+					$diff2[] = substr($diff[$i++], 1);
+				}
+				if (count($diff2) == 0) {
+					$edits[] = new Text_Diff_Op_delete($diff1);
+				} else {
+					$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+				}
+				break;
+
+			default:
+				$i++;
+				break;
+			}
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Parses an array containing the context diff.
+	 *
+	 * @param array $diff  Array of lines.
+	 *
+	 * @return array  List of all diff operations.
+	 */
+	function parseContextDiff(&$diff)
+	{
+		$edits = array();
+		$i = $max_i = $j = $max_j = 0;
+		$end = count($diff) - 1;
+		while ($i < $end && $j < $end) {
+			while ($i >= $max_i && $j >= $max_j) {
+				// Find the boundaries of the diff output of the two files
+				for ($i = $j;
+					 $i < $end && substr($diff[$i], 0, 3) == '***';
+					 $i++);
+				for ($max_i = $i;
+					 $max_i < $end && substr($diff[$max_i], 0, 3) != '---';
+					 $max_i++);
+				for ($j = $max_i;
+					 $j < $end && substr($diff[$j], 0, 3) == '---';
+					 $j++);
+				for ($max_j = $j;
+					 $max_j < $end && substr($diff[$max_j], 0, 3) != '***';
+					 $max_j++);
+			}
+
+			// find what hasn't been changed
+			$array = array();
+			while ($i < $max_i &&
+				   $j < $max_j &&
+				   strcmp($diff[$i], $diff[$j]) == 0) {
+				$array[] = substr($diff[$i], 2);
+				$i++;
+				$j++;
+			}
+
+			while ($i < $max_i && ($max_j-$j) <= 1) {
+				if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
+					break;
+				}
+				$array[] = substr($diff[$i++], 2);
+			}
+
+			while ($j < $max_j && ($max_i-$i) <= 1) {
+				if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
+					break;
+				}
+				$array[] = substr($diff[$j++], 2);
+			}
+			if (count($array) > 0) {
+				$edits[] = new Text_Diff_Op_copy($array);
+			}
+
+			if ($i < $max_i) {
+				$diff1 = array();
+				switch (substr($diff[$i], 0, 1)) {
+				case '!':
+					$diff2 = array();
+					do {
+						$diff1[] = substr($diff[$i], 2);
+						if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+							$diff2[] = substr($diff[$j++], 2);
+						}
+					} while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+					$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+					break;
+
+				case '+':
+					do {
+						$diff1[] = substr($diff[$i], 2);
+					} while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+					$edits[] = new Text_Diff_Op_add($diff1);
+					break;
+
+				case '-':
+					do {
+						$diff1[] = substr($diff[$i], 2);
+					} while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+					$edits[] = new Text_Diff_Op_delete($diff1);
+					break;
+				}
+			}
+
+			if ($j < $max_j) {
+				$diff2 = array();
+				switch (substr($diff[$j], 0, 1)) {
+				case '+':
+					do {
+						$diff2[] = substr($diff[$j++], 2);
+					} while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+					$edits[] = new Text_Diff_Op_add($diff2);
+					break;
+
+				case '-':
+					do {
+						$diff2[] = substr($diff[$j++], 2);
+					} while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+					$edits[] = new Text_Diff_Op_delete($diff2);
+					break;
+				}
+			}
+		}
+
+		return $edits;
+	}
 
 }

Switch Indentation +72 added lines, -72 removed lines

@@ -95,41 +95,41 @@ 
         for ($i = 0; $i < $end;) {
             $diff1 = array();
             switch (substr($diff[$i], 0, 1)) {
-            case ' ':
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
-                $edits[] = new Text_Diff_Op_copy($diff1);
-                break;
-
-            case '+':
-                // get all new lines
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '+');
-                $edits[] = new Text_Diff_Op_add($diff1);
-                break;
-
-            case '-':
-                // get changed or removed lines
-                $diff2 = array();
-                do {
-                    $diff1[] = substr($diff[$i], 1);
-                } while (++$i < $end && substr($diff[$i], 0, 1) == '-');
-
-                while ($i < $end && substr($diff[$i], 0, 1) == '+') {
-                    $diff2[] = substr($diff[$i++], 1);
-                }
-                if (count($diff2) == 0) {
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                } else {
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                }
-                break;
-
-            default:
-                $i++;
-                break;
+            	case ' ':
+                	do {
+                    	$diff1[] = substr($diff[$i], 1);
+                	} while (++$i < $end && substr($diff[$i], 0, 1) == ' ');
+                	$edits[] = new Text_Diff_Op_copy($diff1);
+                	break;
+
+            	case '+':
+                	// get all new lines
+                	do {
+                    	$diff1[] = substr($diff[$i], 1);
+                	} while (++$i < $end && substr($diff[$i], 0, 1) == '+');
+                	$edits[] = new Text_Diff_Op_add($diff1);
+                	break;
+
+            	case '-':
+                	// get changed or removed lines
+                	$diff2 = array();
+                	do {
+                    	$diff1[] = substr($diff[$i], 1);
+                	} while (++$i < $end && substr($diff[$i], 0, 1) == '-');
+
+                	while ($i < $end && substr($diff[$i], 0, 1) == '+') {
+                    	$diff2[] = substr($diff[$i++], 1);
+                	}
+                	if (count($diff2) == 0) {
+                    	$edits[] = new Text_Diff_Op_delete($diff1);
+                	} else {
+                    	$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+                	}
+                	break;
+
+            	default:
+                	$i++;
+                	break;
             }
         }
 
@@ -195,49 +195,49 @@ 
             if ($i < $max_i) {
                 $diff1 = array();
                 switch (substr($diff[$i], 0, 1)) {
-                case '!':
-                    $diff2 = array();
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                        if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
-                            $diff2[] = substr($diff[$j++], 2);
-                        }
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
-                    $edits[] = new Text_Diff_Op_change($diff1, $diff2);
-                    break;
-
-                case '+':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff1);
-                    break;
-
-                case '-':
-                    do {
-                        $diff1[] = substr($diff[$i], 2);
-                    } while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff1);
-                    break;
+                	case '!':
+                    	$diff2 = array();
+                    	do {
+                        	$diff1[] = substr($diff[$i], 2);
+                        	if ($j < $max_j && substr($diff[$j], 0, 1) == '!') {
+                            	$diff2[] = substr($diff[$j++], 2);
+                        	}
+                    	} while (++$i < $max_i && substr($diff[$i], 0, 1) == '!');
+                    	$edits[] = new Text_Diff_Op_change($diff1, $diff2);
+                    	break;
+
+                	case '+':
+                    	do {
+                        	$diff1[] = substr($diff[$i], 2);
+                    	} while (++$i < $max_i && substr($diff[$i], 0, 1) == '+');
+                    	$edits[] = new Text_Diff_Op_add($diff1);
+                    	break;
+
+                	case '-':
+                    	do {
+                        	$diff1[] = substr($diff[$i], 2);
+                    	} while (++$i < $max_i && substr($diff[$i], 0, 1) == '-');
+                    	$edits[] = new Text_Diff_Op_delete($diff1);
+                    	break;
                 }
             }
 
             if ($j < $max_j) {
                 $diff2 = array();
                 switch (substr($diff[$j], 0, 1)) {
-                case '+':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
-                    $edits[] = new Text_Diff_Op_add($diff2);
-                    break;
-
-                case '-':
-                    do {
-                        $diff2[] = substr($diff[$j++], 2);
-                    } while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
-                    $edits[] = new Text_Diff_Op_delete($diff2);
-                    break;
+                	case '+':
+                    	do {
+                        	$diff2[] = substr($diff[$j++], 2);
+                    	} while ($j < $max_j && substr($diff[$j], 0, 1) == '+');
+                    	$edits[] = new Text_Diff_Op_add($diff2);
+                    	break;
+
+                	case '-':
+                    	do {
+                        	$diff2[] = substr($diff[$j++], 2);
+                    	} while ($j < $max_j && substr($diff[$j], 0, 1) == '-');
+                    	$edits[] = new Text_Diff_Op_delete($diff2);
+                    	break;
                 }
             }
         }

Spacing +2 added lines, -2 removed lines

@@ -175,14 +175,14 @@
                 $j++;
             }
 
-            while ($i < $max_i && ($max_j-$j) <= 1) {
+            while ($i < $max_i && ($max_j - $j) <= 1) {
                 if ($diff[$i] != '' && substr($diff[$i], 0, 1) != ' ') {
                     break;
                 }
                 $array[] = substr($diff[$i++], 2);
             }
 
-            while ($j < $max_j && ($max_i-$i) <= 1) {
+            while ($j < $max_j && ($max_i - $i) <= 1) {
                 if ($diff[$j] != '' && substr($diff[$j], 0, 1) != ' ') {
                     break;
                 }

src/wp-includes/comment-template.php

Indentation +15 added lines, -15 removed lines

@@ -2126,11 +2126,11 @@ 
 	$html5    = 'html5' === $args['format'];
 	$fields   =  array(
 		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
+					'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
 		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+					'<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
 		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
+					'<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 
 	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
@@ -2148,20 +2148,20 @@ 
 		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'must_log_in'          => '<p class="must-log-in">' . sprintf(
-		                              /* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+									  /* translators: %s: login URL */
+									  __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
+									  wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+								  ) . '</p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
-		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
-		                              get_edit_user_link(),
-		                              /* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-		                              $user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+									  /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+									  __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+									  get_edit_user_link(),
+									  /* translators: %s: user name */
+									  esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+									  $user_identity,
+									  wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+								  ) . '</p>',
 		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
 		'comment_notes_after'  => '',
 		'id_form'              => 'commentform',

Doc Comments +21 added lines, -21 removed lines

@@ -17,7 +17,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
  *									 Default current comment.
  * @return string The comment author
  */
@@ -52,7 +52,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
  *									 Default current comment.
  */
 function comment_author( $comment_ID = 0 ) {
@@ -77,7 +77,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
  *									 Default current comment.
  * @return string The current comment author's email
  */
@@ -109,7 +109,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *									 Default current comment.
  */
 function comment_author_email( $comment_ID = 0 ) {
@@ -209,7 +209,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
  *									 Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
@@ -243,7 +243,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *									 Default current comment.
  */
 function comment_author_link( $comment_ID = 0 ) {
@@ -256,7 +256,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
  *									 Default current comment.
  * @return string Comment author's IP address.
  */
@@ -282,7 +282,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *									 Default current comment.
  */
 function comment_author_IP( $comment_ID = 0 ) {
@@ -295,7 +295,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
  *									 Default current comment.
  * @return string Comment author URL.
  */
@@ -328,7 +328,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *									 Default current comment.
  */
 function comment_author_url( $comment_ID = 0 ) {
@@ -366,7 +366,7 @@ 
  *                                 Default empty.
  * @param string         $after    Optional. The text or HTML to display after the email link.
  *                                 Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
+ * @param integer $comment  Optional. Comment ID or WP_Comment object.
  *                                 Default is the current comment.
  * @return string The HTML link between the $before and $after parameters.
  */
@@ -404,7 +404,7 @@ 
  *                                 Default empty.
  * @param string         $after    Optional. Text or HTML to display after the email link.
  *                                 Default empty.
- * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
+ * @param integer $comment  Optional. Comment ID or WP_Comment object.
  *                                 Default is the current comment.
  */
 function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
@@ -532,7 +532,7 @@ 
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param string          $d          Optional. The format of the date. Default user's setting.
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the date.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to get the date.
  *                                    Default current comment.
  * @return string The comment's date.
  */
@@ -561,7 +561,7 @@ 
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param string         $d          Optional. The format of the date. Default user's settings.
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
+ * @param integer $comment_ID WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
 function comment_date( $d = '', $comment_ID = 0 ) {
@@ -578,7 +578,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
+ * @param integer $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
  *                                    Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
@@ -624,7 +624,7 @@ 
  * @since 1.2.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
+ * @param integer $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
  *                                    Default current comment.
  */
 function comment_excerpt( $comment_ID = 0 ) {
@@ -795,7 +795,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
 function get_comments_link( $post_id = 0 ) {
@@ -834,7 +834,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
 function get_comments_number( $post_id = 0 ) {
@@ -922,7 +922,7 @@ 
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the text.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to get the text.
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
@@ -952,7 +952,7 @@ 
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to print the text.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to print the text.
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
  */
@@ -1025,7 +1025,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
+ * @param integer $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
  *                                   Default current comment.
  * @return string The comment type.
  */

Spacing +418 added lines, -418 removed lines

@@ -21,11 +21,11 @@ 
  *									 Default current comment.
  * @return string The comment author
  */
-function get_comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
-	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+	if (empty($comment->comment_author)) {
+		if ($comment->user_id && $user = get_userdata($comment->user_id))
 			$author = $user->display_name;
 		else
 			$author = __('Anonymous');
@@ -43,7 +43,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author', $author, $comment->comment_ID, $comment);
 }
 
 /**
@@ -55,9 +55,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
  *									 Default current comment.
  */
-function comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$author  = get_comment_author( $comment );
+function comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$author  = get_comment_author($comment);
 
 	/**
 	 * Filters the comment author's name for display.
@@ -68,7 +68,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_author', $author, $comment->comment_ID );
+	echo apply_filters('comment_author', $author, $comment->comment_ID);
 }
 
 /**
@@ -81,8 +81,8 @@ 
  *									 Default current comment.
  * @return string The current comment author's email
  */
-function get_comment_author_email( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_email($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filters the comment author's returned email address.
@@ -94,7 +94,7 @@ 
 	 * @param int        $comment_ID           The comment ID.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment);
 }
 
 /**
@@ -112,9 +112,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *									 Default current comment.
  */
-function comment_author_email( $comment_ID = 0 ) {
-	$comment      = get_comment( $comment_ID );
-	$author_email = get_comment_author_email( $comment );
+function comment_author_email($comment_ID = 0) {
+	$comment      = get_comment($comment_ID);
+	$author_email = get_comment_author_email($comment);
 
 	/**
 	 * Filters the comment author's email for display.
@@ -125,7 +125,7 @@ 
 	 * @param string $author_email The comment author's email address.
 	 * @param int    $comment_ID   The comment ID.
 	 */
-	echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
+	echo apply_filters('author_email', $author_email, $comment->comment_ID);
 }
 
 /**
@@ -146,8 +146,8 @@ 
  * @param string         $after    Optional. Text or HTML to display after the email link. Default empty.
  * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object. Default is the current comment.
  */
-function comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after, $comment ) ) {
+function comment_author_email_link($linktext = '', $before = '', $after = '', $comment = null) {
+	if ($link = get_comment_author_email_link($linktext, $before, $after, $comment)) {
 		echo $link;
 	}
 }
@@ -172,8 +172,8 @@ 
  * @return string HTML markup for the comment author email link. By default, the email address is obfuscated
  *                via the {@see 'comment_email'} filter with antispambot().
  */
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '', $comment = null ) {
-	$comment = get_comment( $comment );
+function get_comment_author_email_link($linktext = '', $before = '', $after = '', $comment = null) {
+	$comment = get_comment($comment);
 
 	/**
 	 * Filters the comment author's email for display.
@@ -187,12 +187,12 @@ 
 	 * @param string     $comment_author_email The comment author's email address.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
+	$email = apply_filters('comment_email', $comment->comment_author_email, $comment);
 
-	if ((!empty($email)) && ($email != '@')) {
+	if (( ! empty($email)) && ($email != '@')) {
 	$display = ($linktext != '') ? $linktext : $email;
 		$return  = $before;
-		$return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
+		$return .= sprintf('<a href="%1$s">%2$s</a>', esc_url('mailto:'.$email), esc_html($display));
 	 	$return .= $after;
 		return $return;
 	} else {
@@ -213,12 +213,12 @@ 
  *									 Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
-function get_comment_author_link( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$url     = get_comment_author_url( $comment );
-	$author  = get_comment_author( $comment );
+function get_comment_author_link($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$url     = get_comment_author_url($comment);
+	$author  = get_comment_author($comment);
 
-	if ( empty( $url ) || 'http://' == $url )
+	if (empty($url) || 'http://' == $url)
 		$return = $author;
 	else
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
@@ -234,7 +234,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID );
+	return apply_filters('get_comment_author_link', $return, $author, $comment->comment_ID);
 }
 
 /**
@@ -246,8 +246,8 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *									 Default current comment.
  */
-function comment_author_link( $comment_ID = 0 ) {
-	echo get_comment_author_link( $comment_ID );
+function comment_author_link($comment_ID = 0) {
+	echo get_comment_author_link($comment_ID);
 }
 
 /**
@@ -260,8 +260,8 @@ 
  *									 Default current comment.
  * @return string Comment author's IP address.
  */
-function get_comment_author_IP( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_IP($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filters the comment author's returned IP address.
@@ -273,7 +273,7 @@ 
 	 * @param int        $comment_ID        The comment ID.
 	 * @param WP_Comment $comment           The comment object.
 	 */
-	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment);
 }
 
 /**
@@ -285,8 +285,8 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *									 Default current comment.
  */
-function comment_author_IP( $comment_ID = 0 ) {
-	echo esc_html( get_comment_author_IP( $comment_ID ) );
+function comment_author_IP($comment_ID = 0) {
+	echo esc_html(get_comment_author_IP($comment_ID));
 }
 
 /**
@@ -299,13 +299,13 @@ 
  *									 Default current comment.
  * @return string Comment author URL.
  */
-function get_comment_author_url( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_url($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 	$url = '';
 	$id = 0;
-	if ( ! empty( $comment ) ) {
-		$author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
-		$url = esc_url( $author_url, array( 'http', 'https' ) );
+	if ( ! empty($comment)) {
+		$author_url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
+		$url = esc_url($author_url, array('http', 'https'));
 		$id = $comment->ID;
 	}
 
@@ -319,7 +319,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $id, $comment );
+	return apply_filters('get_comment_author_url', $url, $id, $comment);
 }
 
 /**
@@ -331,9 +331,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *									 Default current comment.
  */
-function comment_author_url( $comment_ID = 0 ) {
-	$comment    = get_comment( $comment_ID );
-	$author_url = get_comment_author_url( $comment );
+function comment_author_url($comment_ID = 0) {
+	$comment    = get_comment($comment_ID);
+	$author_url = get_comment_author_url($comment);
 
 	/**
 	 * Filters the comment author's URL for display.
@@ -344,7 +344,7 @@ 
 	 * @param string $author_url The comment author's URL.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
+	echo apply_filters('comment_url', $author_url, $comment->comment_ID);
 }
 
 /**
@@ -370,13 +370,13 @@ 
  *                                 Default is the current comment.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	$url = get_comment_author_url( $comment );
+function get_comment_author_url_link($linktext = '', $before = '', $after = '', $comment = 0) {
+	$url = get_comment_author_url($comment);
 	$display = ($linktext != '') ? $linktext : $url;
-	$display = str_replace( 'http://www.', '', $display );
-	$display = str_replace( 'http://', '', $display );
+	$display = str_replace('http://www.', '', $display);
+	$display = str_replace('http://', '', $display);
 
-	if ( '/' == substr($display, -1) ) {
+	if ('/' == substr($display, -1)) {
 		$display = substr($display, 0, -1);
 	}
 
@@ -389,7 +389,7 @@ 
 	 *
 	 * @param string $return The HTML-formatted comment author URL link.
 	 */
-	return apply_filters( 'get_comment_author_url_link', $return );
+	return apply_filters('get_comment_author_url_link', $return);
 }
 
 /**
@@ -407,8 +407,8 @@ 
  * @param int|WP_Comment $comment  Optional. Comment ID or WP_Comment object.
  *                                 Default is the current comment.
  */
-function comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
-	echo get_comment_author_url_link( $linktext, $before, $after, $comment );
+function comment_author_url_link($linktext = '', $before = '', $after = '', $comment = 0) {
+	echo get_comment_author_url_link($linktext, $before, $after, $comment);
 }
 
 /**
@@ -425,10 +425,10 @@ 
  *                                 Default true.
  * @return string If `$echo` is false, the class will be returned. Void otherwise.
  */
-function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
+function comment_class($class = '', $comment = null, $post_id = null, $echo = true) {
 	// Separates classes with a single space, collates classes for comment DIV
-	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
+	$class = 'class="'.join(' ', get_comment_class($class, $comment, $post_id)).'"';
+	if ($echo)
 		echo $class;
 	else
 		return $class;
@@ -449,39 +449,39 @@ 
  * @param int|WP_Post    $post_id    Post ID or WP_Post object. Default current post.
  * @return array An array of classes.
  */
-function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
+function get_comment_class($class = '', $comment_id = null, $post_id = null) {
 	global $comment_alt, $comment_depth, $comment_thread_alt;
 
 	$classes = array();
 
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return $classes;
 	}
 
 	// Get the comment type (comment, trackback),
-	$classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
+	$classes[] = (empty($comment->comment_type)) ? 'comment' : $comment->comment_type;
 
 	// Add classes for comment authors that are registered users.
-	if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
+	if ($comment->user_id > 0 && $user = get_userdata($comment->user_id)) {
 		$classes[] = 'byuser';
-		$classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
+		$classes[] = 'comment-author-'.sanitize_html_class($user->user_nicename, $comment->user_id);
 		// For comment authors who are the author of the post
-		if ( $post = get_post($post_id) ) {
-			if ( $comment->user_id === $post->post_author ) {
+		if ($post = get_post($post_id)) {
+			if ($comment->user_id === $post->post_author) {
 				$classes[] = 'bypostauthor';
 			}
 		}
 	}
 
-	if ( empty($comment_alt) )
+	if (empty($comment_alt))
 		$comment_alt = 0;
-	if ( empty($comment_depth) )
+	if (empty($comment_depth))
 		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
+	if (empty($comment_thread_alt))
 		$comment_thread_alt = 0;
 
-	if ( $comment_alt % 2 ) {
+	if ($comment_alt % 2) {
 		$classes[] = 'odd';
 		$classes[] = 'alt';
 	} else {
@@ -491,8 +491,8 @@ 
 	$comment_alt++;
 
 	// Alt for top-level comments
-	if ( 1 == $comment_depth ) {
-		if ( $comment_thread_alt % 2 ) {
+	if (1 == $comment_depth) {
+		if ($comment_thread_alt % 2) {
 			$classes[] = 'thread-odd';
 			$classes[] = 'thread-alt';
 		} else {
@@ -503,8 +503,8 @@ 
 
 	$classes[] = "depth-$comment_depth";
 
-	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
 			$class = preg_split('#\s+#', $class);
 		$classes = array_merge($classes, $class);
 	}
@@ -522,7 +522,7 @@ 
 	 * @param WP_Comment  $comment    The comment object.
 	 * @param int|WP_Post $post_id    The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id );
+	return apply_filters('comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id);
 }
 
 /**
@@ -536,9 +536,9 @@ 
  *                                    Default current comment.
  * @return string The comment's date.
  */
-function get_comment_date( $d = '', $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
+function get_comment_date($d = '', $comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $d)
 		$date = mysql2date(get_option('date_format'), $comment->comment_date);
 	else
 		$date = mysql2date($d, $comment->comment_date);
@@ -551,7 +551,7 @@ 
 	 * @param string     $d       The format of the date.
 	 * @param WP_Comment $comment The comment object.
 	 */
-	return apply_filters( 'get_comment_date', $date, $d, $comment );
+	return apply_filters('get_comment_date', $date, $d, $comment);
 }
 
 /**
@@ -564,8 +564,8 @@ 
  * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
-function comment_date( $d = '', $comment_ID = 0 ) {
-	echo get_comment_date( $d, $comment_ID );
+function comment_date($d = '', $comment_ID = 0) {
+	echo get_comment_date($d, $comment_ID);
 }
 
 /**
@@ -582,10 +582,10 @@ 
  *                                    Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
-function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
-	$words = explode( ' ', $comment_text );
+function get_comment_excerpt($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$comment_text = strip_tags(str_replace(array("\n", "\r"), ' ', $comment->comment_content));
+	$words = explode(' ', $comment_text);
 
 	/**
 	 * Filters the amount of words used in the comment excerpt.
@@ -594,15 +594,15 @@ 
 	 *
 	 * @param int $comment_excerpt_length The amount of words you want to display in the comment excerpt.
 	 */
-	$comment_excerpt_length = apply_filters( 'comment_excerpt_length', 20 );
+	$comment_excerpt_length = apply_filters('comment_excerpt_length', 20);
 
-	$use_ellipsis = count( $words ) > $comment_excerpt_length;
-	if ( $use_ellipsis ) {
-		$words = array_slice( $words, 0, $comment_excerpt_length );
+	$use_ellipsis = count($words) > $comment_excerpt_length;
+	if ($use_ellipsis) {
+		$words = array_slice($words, 0, $comment_excerpt_length);
 	}
 
-	$excerpt = trim( join( ' ', $words ) );
-	if ( $use_ellipsis ) {
+	$excerpt = trim(join(' ', $words));
+	if ($use_ellipsis) {
 		$excerpt .= '&hellip;';
 	}
 	/**
@@ -615,7 +615,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_excerpt', $excerpt, $comment->comment_ID, $comment);
 }
 
 /**
@@ -627,9 +627,9 @@ 
  * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
  *                                    Default current comment.
  */
-function comment_excerpt( $comment_ID = 0 ) {
-	$comment         = get_comment( $comment_ID );
-	$comment_excerpt = get_comment_excerpt( $comment );
+function comment_excerpt($comment_ID = 0) {
+	$comment         = get_comment($comment_ID);
+	$comment_excerpt = get_comment_excerpt($comment);
 
 	/**
 	 * Filters the comment excerpt for display.
@@ -640,7 +640,7 @@ 
 	 * @param string $comment_excerpt The comment excerpt text.
 	 * @param int    $comment_ID      The comment ID.
 	 */
-	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID );
+	echo apply_filters('comment_excerpt', $comment_excerpt, $comment->comment_ID);
 }
 
 /**
@@ -662,7 +662,7 @@ 
 	 * @param int        $comment_ID The current comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment );
+	return apply_filters('get_comment_ID', $comment->comment_ID, $comment);
 }
 
 /**
@@ -699,14 +699,14 @@ 
  * }
  * @return string The permalink to the given comment.
  */
-function get_comment_link( $comment = null, $args = array() ) {
+function get_comment_link($comment = null, $args = array()) {
 	global $wp_rewrite, $in_comment_loop;
 
 	$comment = get_comment($comment);
 
 	// Back-compat.
-	if ( ! is_array( $args ) ) {
-		$args = array( 'page' => $args );
+	if ( ! is_array($args)) {
+		$args = array('page' => $args);
 	}
 
 	$defaults = array(
@@ -716,33 +716,33 @@ 
 		'max_depth' => '',
 		'cpage'     => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$link = get_permalink( $comment->comment_post_ID );
+	$link = get_permalink($comment->comment_post_ID);
 
 	// The 'cpage' param takes precedence.
-	if ( ! is_null( $args['cpage'] ) ) {
+	if ( ! is_null($args['cpage'])) {
 		$cpage = $args['cpage'];
 
 	// No 'cpage' is provided, so we calculate one.
 	} else {
-		if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
+		if ('' === $args['per_page'] && get_option('page_comments')) {
 			$args['per_page'] = get_option('comments_per_page');
 		}
 
-		if ( empty( $args['per_page'] ) ) {
+		if (empty($args['per_page'])) {
 			$args['per_page'] = 0;
 			$args['page'] = 0;
 		}
 
 		$cpage = $args['page'];
 
-		if ( '' == $cpage ) {
-			if ( ! empty( $in_comment_loop ) ) {
-				$cpage = get_query_var( 'cpage' );
+		if ('' == $cpage) {
+			if ( ! empty($in_comment_loop)) {
+				$cpage = get_query_var('cpage');
 			} else {
 				// Requires a database hit, so we only do it when we can't figure out from context.
-				$cpage = get_page_of_comment( $comment->comment_ID, $args );
+				$cpage = get_page_of_comment($comment->comment_ID, $args);
 			}
 		}
 
@@ -750,29 +750,29 @@ 
 		 * If the default page displays the oldest comments, the permalinks for comments on the default page
 		 * do not need a 'cpage' query var.
 		 */
-		if ( 'oldest' === get_option( 'default_comments_page' ) && 1 === $cpage ) {
+		if ('oldest' === get_option('default_comments_page') && 1 === $cpage) {
 			$cpage = '';
 		}
 	}
 
-	if ( $cpage && get_option( 'page_comments' ) ) {
-		if ( $wp_rewrite->using_permalinks() ) {
-			if ( $cpage ) {
-				$link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
+	if ($cpage && get_option('page_comments')) {
+		if ($wp_rewrite->using_permalinks()) {
+			if ($cpage) {
+				$link = trailingslashit($link).$wp_rewrite->comments_pagination_base.'-'.$cpage;
 			}
 
-			$link = user_trailingslashit( $link, 'comment' );
-		} elseif ( $cpage ) {
-			$link = add_query_arg( 'cpage', $cpage, $link );
+			$link = user_trailingslashit($link, 'comment');
+		} elseif ($cpage) {
+			$link = add_query_arg('cpage', $cpage, $link);
 		}
 
 	}
 
-	if ( $wp_rewrite->using_permalinks() ) {
-		$link = user_trailingslashit( $link, 'comment' );
+	if ($wp_rewrite->using_permalinks()) {
+		$link = user_trailingslashit($link, 'comment');
 	}
 
-	$link = $link . '#comment-' . $comment->comment_ID;
+	$link = $link.'#comment-'.$comment->comment_ID;
 
 	/**
 	 * Filters the returned single comment permalink.
@@ -787,7 +787,7 @@ 
 	 * @param array      $args    An array of arguments to override the defaults.
 	 * @param int        $cpage   The calculated 'cpage' value.
 	 */
-	return apply_filters( 'get_comment_link', $link, $comment, $args, $cpage );
+	return apply_filters('get_comment_link', $link, $comment, $args, $cpage);
 }
 
 /**
@@ -798,9 +798,9 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
-function get_comments_link( $post_id = 0 ) {
-	$hash = get_comments_number( $post_id ) ? '#comments' : '#respond';
-	$comments_link = get_permalink( $post_id ) . $hash;
+function get_comments_link($post_id = 0) {
+	$hash = get_comments_number($post_id) ? '#comments' : '#respond';
+	$comments_link = get_permalink($post_id).$hash;
 
 	/**
 	 * Filters the returned post comments permalink.
@@ -810,7 +810,7 @@ 
 	 * @param string      $comments_link Post comments permalink with '#comments' appended.
 	 * @param int|WP_Post $post_id       Post ID or WP_Post object.
 	 */
-	return apply_filters( 'get_comments_link', $comments_link, $post_id );
+	return apply_filters('get_comments_link', $comments_link, $post_id);
 }
 
 /**
@@ -821,12 +821,12 @@ 
  * @param string $deprecated   Not Used.
  * @param string $deprecated_2 Not Used.
  */
-function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3.0' );
-	echo esc_url( get_comments_link() );
+function comments_link($deprecated = '', $deprecated_2 = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.72');
+	if ( ! empty($deprecated_2))
+		_deprecated_argument(__FUNCTION__, '1.3.0');
+	echo esc_url(get_comments_link());
 }
 
 /**
@@ -837,10 +837,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
-function get_comments_number( $post_id = 0 ) {
-	$post = get_post( $post_id );
+function get_comments_number($post_id = 0) {
+	$post = get_post($post_id);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$count = 0;
 	} else {
 		$count = $post->comment_count;
@@ -855,7 +855,7 @@ 
 	 * @param int $count   Number of comments a post has.
 	 * @param int $post_id Post ID.
 	 */
-	return apply_filters( 'get_comments_number', $count, $post_id );
+	return apply_filters('get_comments_number', $count, $post_id);
 }
 
 /**
@@ -868,11 +868,11 @@ 
  * @param string $more       Optional. Text for more than one comment. Default false.
  * @param string $deprecated Not used.
  */
-function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '1.3.0' );
+function comments_number($zero = false, $one = false, $more = false, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '1.3.0');
 	}
-	echo get_comments_number_text( $zero, $one, $more );
+	echo get_comments_number_text($zero, $one, $more);
 }
 
 /**
@@ -884,42 +884,42 @@ 
  * @param string $one  Optional. Text for one comment. Default false.
  * @param string $more Optional. Text for more than one comment. Default false.
  */
-function get_comments_number_text( $zero = false, $one = false, $more = false ) {
+function get_comments_number_text($zero = false, $one = false, $more = false) {
 	$number = get_comments_number();
 
-	if ( $number > 1 ) {
-		if ( false === $more ) {
+	if ($number > 1) {
+		if (false === $more) {
 			/* translators: %s: number of comments */
-			$output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
+			$output = sprintf(_n('%s Comment', '%s Comments', $number), number_format_i18n($number));
 		} else {
 			// % Comments
 			/* translators: If comment number in your language requires declension,
 			 * translate this to 'on'. Do not translate into your own language.
 			 */
-			if ( 'on' === _x( 'off', 'Comment number declension: on or off' ) ) {
-				$text = preg_replace( '#<span class="screen-reader-text">.+?</span>#', '', $more );
-				$text = preg_replace( '/&.+?;/', '', $text ); // Kill entities
-				$text = trim( strip_tags( $text ), '% ' );
+			if ('on' === _x('off', 'Comment number declension: on or off')) {
+				$text = preg_replace('#<span class="screen-reader-text">.+?</span>#', '', $more);
+				$text = preg_replace('/&.+?;/', '', $text); // Kill entities
+				$text = trim(strip_tags($text), '% ');
 
 				// Replace '% Comments' with a proper plural form
-				if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
+				if ($text && ! preg_match('/[0-9]+/', $text) && false !== strpos($more, '%')) {
 					/* translators: %s: number of comments */
-					$new_text = _n( '%s Comment', '%s Comments', $number );
-					$new_text = trim( sprintf( $new_text, '' ) );
+					$new_text = _n('%s Comment', '%s Comments', $number);
+					$new_text = trim(sprintf($new_text, ''));
 
-					$more = str_replace( $text, $new_text, $more );
-					if ( false === strpos( $more, '%' ) ) {
-						$more = '% ' . $more;
+					$more = str_replace($text, $new_text, $more);
+					if (false === strpos($more, '%')) {
+						$more = '% '.$more;
 					}
 				}
 			}
 
-			$output = str_replace( '%', number_format_i18n( $number ), $more );
+			$output = str_replace('%', number_format_i18n($number), $more);
 		}
-	} elseif ( $number == 0 ) {
-		$output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
+	} elseif ($number == 0) {
+		$output = (false === $zero) ? __('No Comments') : $zero;
 	} else { // must be one
-		$output = ( false === $one ) ? __( '1 Comment' ) : $one;
+		$output = (false === $one) ? __('1 Comment') : $one;
 	}
 	/**
 	 * Filters the comments count for display.
@@ -932,7 +932,7 @@ 
 	 *                       is equal to 0, 1, or 1+.
 	 * @param int    $number The number of post comments.
 	 */
-	return apply_filters( 'comments_number', $output, $number );
+	return apply_filters('comments_number', $output, $number);
 }
 
 /**
@@ -948,8 +948,8 @@ 
  * @param array           $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
  */
-function get_comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filters the text of a comment.
@@ -962,7 +962,7 @@ 
 	 * @param WP_Comment $comment         The comment object.
 	 * @param array      $args            An array of arguments.
 	 */
-	return apply_filters( 'get_comment_text', $comment->comment_content, $comment, $args );
+	return apply_filters('get_comment_text', $comment->comment_content, $comment, $args);
 }
 
 /**
@@ -977,10 +977,10 @@ 
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
  */
-function comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
-	$comment_text = get_comment_text( $comment, $args );
+	$comment_text = get_comment_text($comment, $args);
 	/**
 	 * Filters the text of a comment to be displayed.
 	 *
@@ -992,7 +992,7 @@ 
 	 * @param WP_Comment $comment      The comment object.
 	 * @param array      $args         An array of arguments.
 	 */
-	echo apply_filters( 'comment_text', $comment_text, $comment, $args );
+	echo apply_filters('comment_text', $comment_text, $comment, $args);
 }
 
 /**
@@ -1006,11 +1006,11 @@ 
  *                          Default true.
  * @return string The formatted time.
  */
-function get_comment_time( $d = '', $gmt = false, $translate = true ) {
+function get_comment_time($d = '', $gmt = false, $translate = true) {
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
+	if ('' == $d)
 		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
 	else
 		$date = mysql2date($d, $comment_date, $translate);
@@ -1026,7 +1026,7 @@ 
 	 * @param bool       $translate Whether the time is translated.
 	 * @param WP_Comment $comment   The comment object.
 	 */
-	return apply_filters( 'get_comment_time', $date, $d, $gmt, $translate, $comment );
+	return apply_filters('get_comment_time', $date, $d, $gmt, $translate, $comment);
 }
 
 /**
@@ -1036,7 +1036,7 @@ 
  *
  * @param string $d Optional. The format of the time. Default user's settings.
  */
-function comment_time( $d = '' ) {
+function comment_time($d = '') {
 	echo get_comment_time($d);
 }
 
@@ -1050,9 +1050,9 @@ 
  *                                   Default current comment.
  * @return string The comment type.
  */
-function get_comment_type( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
+function get_comment_type($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $comment->comment_type)
 		$comment->comment_type = 'comment';
 
 	/**
@@ -1065,7 +1065,7 @@ 
 	 * @param int 	     $comment_ID   The comment ID.
 	 * @param WP_Comment $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_type', $comment->comment_type, $comment->comment_ID, $comment);
 }
 
 /**
@@ -1077,12 +1077,12 @@ 
  * @param string $trackbacktxt Optional. String to display for trackback type. Default false.
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
-function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
+	if (false === $commenttxt) $commenttxt = _x('Comment', 'noun');
+	if (false === $trackbacktxt) $trackbacktxt = __('Trackback');
+	if (false === $pingbacktxt) $pingbacktxt = __('Pingback');
 	$type = get_comment_type();
-	switch( $type ) {
+	switch ($type) {
 		case 'trackback' :
 			echo $trackbacktxt;
 			break;
@@ -1106,10 +1106,10 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	if ('' != get_option('permalink_structure'))
+		$tb_url = trailingslashit(get_permalink()).user_trailingslashit('trackback', 'single_trackback');
 	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+		$tb_url = get_option('siteurl').'/wp-trackback.php?p='.get_the_ID();
 
 	/**
 	 * Filters the returned trackback URL.
@@ -1118,7 +1118,7 @@ 
 	 *
 	 * @param string $tb_url The trackback URL.
 	 */
-	return apply_filters( 'trackback_url', $tb_url );
+	return apply_filters('trackback_url', $tb_url);
 }
 
 /**
@@ -1130,17 +1130,17 @@ 
  * @return void|string Should only be used to echo the trackback URL, use get_trackback_url()
  *                     for the result instead.
  */
-function trackback_url( $deprecated_echo = true ) {
-	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '2.5.0',
+function trackback_url($deprecated_echo = true) {
+	if (true !== $deprecated_echo) {
+		_deprecated_argument(__FUNCTION__, '2.5.0',
 			/* translators: %s: get_trackback_url() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(__('Use %s instead if you do not want the value echoed.'),
 				'<code>get_trackback_url()</code>'
 			)
 		);
 	}
 
-	if ( $deprecated_echo ) {
+	if ($deprecated_echo) {
 		echo get_trackback_url();
 	} else {
 		return get_trackback_url();
@@ -1156,12 +1156,12 @@ 
  *
  * @param int $deprecated Not used (Was $timezone = 0).
  */
-function trackback_rdf( $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.5.0' );
+function trackback_rdf($deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.5.0');
 	}
 
-	if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && false !== stripos( $_SERVER['HTTP_USER_AGENT'], 'W3C_Validator' ) ) {
+	if (isset($_SERVER['HTTP_USER_AGENT']) && false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
 		return;
 	}
 
@@ -1187,11 +1187,11 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if the comments are open.
  */
-function comments_open( $post_id = null ) {
+function comments_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
-	$open = ( 'open' == $_post->comment_status );
+	$open = ('open' == $_post->comment_status);
 
 	/**
 	 * Filters whether the current post is open for comments.
@@ -1201,7 +1201,7 @@ 
 	 * @param bool        $open    Whether the current post is open for comments.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comments_open', $open, $post_id );
+	return apply_filters('comments_open', $open, $post_id);
 }
 
 /**
@@ -1212,11 +1212,11 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if pings are accepted
  */
-function pings_open( $post_id = null ) {
+function pings_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
-	$open = ( 'open' == $_post->ping_status );
+	$open = ('open' == $_post->ping_status);
 
 	/**
 	 * Filters whether the current post is open for pings.
@@ -1226,7 +1226,7 @@ 
 	 * @param bool        $open    Whether the current post is open for pings.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'pings_open', $open, $post_id );
+	return apply_filters('pings_open', $open, $post_id);
 }
 
 /**
@@ -1247,8 +1247,8 @@ 
 	$post = get_post();
 	$post_id = $post ? $post->ID : 0;
 
-	if ( current_user_can( 'unfiltered_html' ) ) {
-		wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
+	if (current_user_can('unfiltered_html')) {
+		wp_nonce_field('unfiltered-html-comment_'.$post_id, '_wp_unfiltered_html_comment_disabled', false);
 		echo "<script>(function(){if(window===window.parent){document.getElementById('_wp_unfiltered_html_comment_disabled').name='_wp_unfiltered_html_comment';}})();</script>\n";
 	}
 }
@@ -1288,13 +1288,13 @@ 
  * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
  *                                  Default false.
  */
-function comments_template( $file = '/comments.php', $separate_comments = false ) {
+function comments_template($file = '/comments.php', $separate_comments = false) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+	if ( ! (is_single() || is_page() || $withcomments) || empty($post))
 		return;
 
-	if ( empty($file) )
+	if (empty($file))
 		$file = '/comments.php';
 
 	$req = get_option('require_name_email');
@@ -1330,31 +1330,31 @@ 
 		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
 
-	if ( get_option('thread_comments') ) {
+	if (get_option('thread_comments')) {
 		$comment_args['hierarchical'] = 'threaded';
 	} else {
 		$comment_args['hierarchical'] = false;
 	}
 
-	if ( $user_ID ) {
-		$comment_args['include_unapproved'] = array( $user_ID );
-	} elseif ( ! empty( $comment_author_email ) ) {
-		$comment_args['include_unapproved'] = array( $comment_author_email );
+	if ($user_ID) {
+		$comment_args['include_unapproved'] = array($user_ID);
+	} elseif ( ! empty($comment_author_email)) {
+		$comment_args['include_unapproved'] = array($comment_author_email);
 	}
 
 	$per_page = 0;
-	if ( get_option( 'page_comments' ) ) {
-		$per_page = (int) get_query_var( 'comments_per_page' );
-		if ( 0 === $per_page ) {
-			$per_page = (int) get_option( 'comments_per_page' );
+	if (get_option('page_comments')) {
+		$per_page = (int) get_query_var('comments_per_page');
+		if (0 === $per_page) {
+			$per_page = (int) get_option('comments_per_page');
 		}
 
 		$comment_args['number'] = $per_page;
-		$page = (int) get_query_var( 'cpage' );
+		$page = (int) get_query_var('cpage');
 
-		if ( $page ) {
-			$comment_args['offset'] = ( $page - 1 ) * $per_page;
-		} elseif ( 'oldest' === get_option( 'default_comments_page' ) ) {
+		if ($page) {
+			$comment_args['offset'] = ($page - 1) * $per_page;
+		} elseif ('oldest' === get_option('default_comments_page')) {
 			$comment_args['offset'] = 0;
 		} else {
 			// If fetching the first page of 'newest', we need a top-level comment count.
@@ -1366,17 +1366,17 @@ 
 				'status'  => 'approve',
 			);
 
-			if ( $comment_args['hierarchical'] ) {
+			if ($comment_args['hierarchical']) {
 				$top_level_args['parent'] = 0;
 			}
 
-			if ( isset( $comment_args['include_unapproved'] ) ) {
+			if (isset($comment_args['include_unapproved'])) {
 				$top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
 			}
 
-			$top_level_count = $top_level_query->query( $top_level_args );
+			$top_level_count = $top_level_query->query($top_level_args);
 
-			$comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;
+			$comment_args['offset'] = (ceil($top_level_count / $per_page) - 1) * $per_page;
 		}
 	}
 
@@ -1403,22 +1403,22 @@ 
 	 *     @type int          $number                    Number of comments to fetch.
 	 * }
 	 */
-	$comment_args = apply_filters( 'comments_template_query_args', $comment_args );
-	$comment_query = new WP_Comment_Query( $comment_args );
+	$comment_args = apply_filters('comments_template_query_args', $comment_args);
+	$comment_query = new WP_Comment_Query($comment_args);
 	$_comments = $comment_query->comments;
 
 	// Trees must be flattened before they're passed to the walker.
-	if ( $comment_args['hierarchical'] ) {
+	if ($comment_args['hierarchical']) {
 		$comments_flat = array();
-		foreach ( $_comments as $_comment ) {
+		foreach ($_comments as $_comment) {
 			$comments_flat[]  = $_comment;
-			$comment_children = $_comment->get_children( array(
+			$comment_children = $_comment->get_children(array(
 				'format' => 'flat',
 				'status' => $comment_args['status'],
 				'orderby' => $comment_args['orderby']
-			) );
+			));
 
-			foreach ( $comment_children as $comment_child ) {
+			foreach ($comment_children as $comment_child) {
 				$comments_flat[] = $comment_child;
 			}
 		}
@@ -1434,13 +1434,13 @@ 
 	 * @param array $comments Array of comments supplied to the comments template.
 	 * @param int   $post_ID  Post ID.
 	 */
-	$wp_query->comments = apply_filters( 'comments_array', $comments_flat, $post->ID );
+	$wp_query->comments = apply_filters('comments_array', $comments_flat, $post->ID);
 
 	$comments = &$wp_query->comments;
 	$wp_query->comment_count = count($wp_query->comments);
 	$wp_query->max_num_comment_pages = $comment_query->max_num_pages;
 
-	if ( $separate_comments ) {
+	if ($separate_comments) {
 		$wp_query->comments_by_type = separate_comments($comments);
 		$comments_by_type = &$wp_query->comments_by_type;
 	} else {
@@ -1448,15 +1448,15 @@ 
 	}
 
 	$overridden_cpage = false;
-	if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
-		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+	if ('' == get_query_var('cpage') && $wp_query->max_num_comment_pages > 1) {
+		set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
+	if ( ! defined('COMMENTS_TEMPLATE'))
 		define('COMMENTS_TEMPLATE', true);
 
-	$theme_template = STYLESHEETPATH . $file;
+	$theme_template = STYLESHEETPATH.$file;
 	/**
 	 * Filters the path to the theme template file used for the comments template.
 	 *
@@ -1464,13 +1464,13 @@ 
 	 *
 	 * @param string $theme_template The path to the theme template file.
 	 */
-	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
+	$include = apply_filters('comments_template', $theme_template);
+	if (file_exists($include))
+		require($include);
+	elseif (file_exists(TEMPLATEPATH.$file))
+		require(TEMPLATEPATH.$file);
 	else // Backward compat code will be removed in a future release
-		require( ABSPATH . WPINC . '/theme-compat/comments.php');
+		require(ABSPATH.WPINC.'/theme-compat/comments.php');
 }
 
 /**
@@ -1487,45 +1487,45 @@ 
  * @param string $none      Optional. String to display when comments have been turned off.
  *                          Default false.
  */
-function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
+function comments_popup_link($zero = false, $one = false, $more = false, $css_class = '', $none = false) {
 	$id = get_the_ID();
 	$title = get_the_title();
-	$number = get_comments_number( $id );
+	$number = get_comments_number($id);
 
-	if ( false === $zero ) {
+	if (false === $zero) {
 		/* translators: %s: post title */
-		$zero = sprintf( __( 'No Comments<span class="screen-reader-text"> on %s</span>' ), $title );
+		$zero = sprintf(__('No Comments<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $one ) {
+	if (false === $one) {
 		/* translators: %s: post title */
-		$one = sprintf( __( '1 Comment<span class="screen-reader-text"> on %s</span>' ), $title );
+		$one = sprintf(__('1 Comment<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $more ) {
+	if (false === $more) {
 		/* translators: 1: Number of comments 2: post title */
-		$more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
-		$more = sprintf( $more, number_format_i18n( $number ), $title );
+		$more = _n('%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number);
+		$more = sprintf($more, number_format_i18n($number), $title);
 	}
 
-	if ( false === $none ) {
+	if (false === $none) {
 		/* translators: %s: post title */
-		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
+		$none = sprintf(__('Comments Off<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( 0 == $number && !comments_open() && !pings_open() ) {
-		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+	if (0 == $number && ! comments_open() && ! pings_open()) {
+		echo '<span'.(( ! empty($css_class)) ? ' class="'.esc_attr($css_class).'"' : '').'>'.$none.'</span>';
 		return;
 	}
 
-	if ( post_password_required() ) {
-		_e( 'Enter your password to view comments.' );
+	if (post_password_required()) {
+		_e('Enter your password to view comments.');
 		return;
 	}
 
 	echo '<a href="';
-	if ( 0 == $number ) {
-		$respond_link = get_permalink() . '#respond';
+	if (0 == $number) {
+		$respond_link = get_permalink().'#respond';
 		/**
 		 * Filters the respond link when a post has no comments.
 		 *
@@ -1534,13 +1534,13 @@ 
 		 * @param string $respond_link The default response link.
 		 * @param integer $id The post ID.
 		 */
-		echo apply_filters( 'respond_link', $respond_link, $id );
+		echo apply_filters('respond_link', $respond_link, $id);
 	} else {
 		comments_link();
 	}
 	echo '"';
 
-	if ( !empty( $css_class ) ) {
+	if ( ! empty($css_class)) {
 		echo ' class="'.$css_class.'" ';
 	}
 
@@ -1552,10 +1552,10 @@ 
 	 *
 	 * @param string $attributes The comments link attributes. Default empty.
 	 */
-	echo apply_filters( 'comments_popup_link_attributes', $attributes );
+	echo apply_filters('comments_popup_link_attributes', $attributes);
 
 	echo '>';
-	comments_number( $zero, $one, $more );
+	comments_number($zero, $one, $more);
 	echo '</a>';
 }
 
@@ -1587,35 +1587,35 @@ 
  *                                Default current post.
  * @return void|false|string Link to show comment form, if successful. False, if comments are closed.
  */
-function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
+function get_comment_reply_link($args = array(), $comment = null, $post = null) {
 	$defaults = array(
 		'add_below'     => 'comment',
 		'respond_id'    => 'respond',
-		'reply_text'    => __( 'Reply' ),
+		'reply_text'    => __('Reply'),
 		/* translators: Comment reply button text. 1: Comment author name */
-		'reply_to_text' => __( 'Reply to %s' ),
-		'login_text'    => __( 'Log in to Reply' ),
+		'reply_to_text' => __('Reply to %s'),
+		'login_text'    => __('Log in to Reply'),
 		'max_depth'     => 0,
 		'depth'         => 0,
 		'before'        => '',
 		'after'         => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) {
+	if (0 == $args['depth'] || $args['max_depth'] <= $args['depth']) {
 		return;
 	}
 
-	$comment = get_comment( $comment );
+	$comment = get_comment($comment);
 
-	if ( empty( $post ) ) {
+	if (empty($post)) {
 		$post = $comment->comment_post_ID;
 	}
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
@@ -1629,22 +1629,22 @@ 
 	 * @param WP_Comment $comment The object of the comment being replied to.
 	 * @param WP_Post    $post    The WP_Post object.
 	 */
-	$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
+	$args = apply_filters('comment_reply_link_args', $args, $comment, $post);
 
-	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			esc_url( wp_login_url( get_permalink() ) ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			esc_url(wp_login_url(get_permalink())),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
 			$args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+			esc_url(add_query_arg('replytocom', $comment->comment_ID, get_permalink($post->ID)))."#".$args['respond_id'],
 			$onclick,
-			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
+			esc_attr(sprintf($args['reply_to_text'], $comment->comment_author)),
 			$args['reply_text']
 		);
 	}
@@ -1659,7 +1659,7 @@ 
 	 * @param object  $comment The object of the comment being replied.
 	 * @param WP_Post $post    The WP_Post object.
 	 */
-	return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post );
+	return apply_filters('comment_reply_link', $args['before'].$link.$args['after'], $args, $comment, $post);
 }
 
 /**
@@ -1716,27 +1716,27 @@ 
 
 	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
-	if ( get_option('comment_registration') && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			wp_login_url( get_permalink() ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			wp_login_url(get_permalink()),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
 			$args['add_below'], $post->ID, $args['respond_id']
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
-			get_permalink( $post->ID ) . '#' . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+			get_permalink($post->ID).'#'.$args['respond_id'],
 			$onclick,
 			$args['reply_text']
 		);
 	}
-	$formatted_link = $args['before'] . $link . $args['after'];
+	$formatted_link = $args['before'].$link.$args['after'];
 
 	/**
 	 * Filters the formatted post comments link HTML.
@@ -1746,7 +1746,7 @@ 
 	 * @param string      $formatted The HTML-formatted post comments link.
 	 * @param int|WP_Post $post      The post ID or WP_Post object.
 	 */
-	return apply_filters( 'post_comments_link', $formatted_link, $post );
+	return apply_filters('post_comments_link', $formatted_link, $post);
 }
 
 /**
@@ -1773,14 +1773,14 @@ 
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  * @return string
  */
-function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
+function get_cancel_comment_reply_link($text = '') {
+	if (empty($text))
 		$text = __('Click here to cancel reply.');
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+	$link = esc_html(remove_query_arg('replytocom')).'#respond';
 
-	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
+	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="'.$link.'"'.$style.'>'.$text.'</a>';
 
 	/**
 	 * Filters the cancel comment reply link HTML.
@@ -1791,7 +1791,7 @@ 
 	 * @param string $link           Cancel comment reply link URL.
 	 * @param string $text           Cancel comment reply link text.
 	 */
-	return apply_filters( 'cancel_comment_reply_link', $formatted_link, $link, $text );
+	return apply_filters('cancel_comment_reply_link', $formatted_link, $link, $text);
 }
 
 /**
@@ -1801,7 +1801,7 @@ 
  *
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
-function cancel_comment_reply_link( $text = '' ) {
+function cancel_comment_reply_link($text = '') {
 	echo get_cancel_comment_reply_link($text);
 }
 
@@ -1813,8 +1813,8 @@ 
  * @param int $id Optional. Post ID. Default current post ID.
  * @return string Hidden input HTML for replying to comments
  */
-function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
+function get_comment_id_fields($id = 0) {
+	if (empty($id))
 		$id = get_the_ID();
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
@@ -1830,7 +1830,7 @@ 
 	 * @param int    $id        The post ID.
 	 * @param int    $replytoid The id of the comment being replied to.
 	 */
-	return apply_filters( 'comment_id_fields', $result, $id, $replytoid );
+	return apply_filters('comment_id_fields', $result, $id, $replytoid);
 }
 
 /**
@@ -1840,8 +1840,8 @@ 
  *
  * @param int $id Optional. Post ID. Default current post ID.
  */
-function comment_id_fields( $id = 0 ) {
-	echo get_comment_id_fields( $id );
+function comment_id_fields($id = 0) {
+	echo get_comment_id_fields($id);
 }
 
 /**
@@ -1864,21 +1864,21 @@ 
  * @param string $linktoparent Optional. Boolean to control making the author's name a link
  *                             to their comment. Default true.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
+function comment_form_title($noreplytext = false, $replytext = false, $linktoparent = true) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if (false === $noreplytext) $noreplytext = __('Leave a Reply');
+	if (false === $replytext) $replytext = __('Leave a Reply to %s');
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
+	if (0 == $replytoid)
 		echo $noreplytext;
 	else {
 		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
-		printf( $replytext, $author );
+		$author = ($linktoparent) ? '<a href="#comment-'.get_comment_ID().'">'.get_comment_author($comment).'</a>' : get_comment_author($comment);
+		printf($replytext, $author);
 	}
 }
 
@@ -1920,7 +1920,7 @@ 
  * }
  * @param array $comments Optional. Array of WP_Comment objects.
  */
-function wp_list_comments( $args = array(), $comments = null ) {
+function wp_list_comments($args = array(), $comments = null) {
 	global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
 
 	$in_comment_loop = true;
@@ -1940,12 +1940,12 @@ 
 		'avatar_size'       => 32,
 		'reverse_top_level' => null,
 		'reverse_children'  => '',
-		'format'            => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
+		'format'            => current_theme_supports('html5', 'comment-list') ? 'html5' : 'xhtml',
 		'short_ping'        => false,
 		'echo'              => true,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters the arguments used in retrieving the comment list.
@@ -1956,16 +1956,16 @@ 
 	 *
 	 * @param array $r An array of arguments for displaying comments.
 	 */
-	$r = apply_filters( 'wp_list_comments_args', $r );
+	$r = apply_filters('wp_list_comments_args', $r);
 
 	// Figure out what comments we'll be looping through ($_comments)
-	if ( null !== $comments ) {
+	if (null !== $comments) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
+		if (empty($comments))
 			return;
-		if ( 'all' != $r['type'] ) {
+		if ('all' != $r['type']) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
+			if (empty($comments_by_type[$r['type']]))
 				return;
 			$_comments = $comments_by_type[$r['type']];
 		} else {
@@ -1976,14 +1976,14 @@ 
 		 * If 'page' or 'per_page' has been passed, and does not match what's in $wp_query,
 		 * perform a separate comment query and allow Walker_Comment to paginate.
 		 */
-		if ( $r['page'] || $r['per_page'] ) {
-			$current_cpage = get_query_var( 'cpage' );
-			if ( ! $current_cpage ) {
-				$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
+		if ($r['page'] || $r['per_page']) {
+			$current_cpage = get_query_var('cpage');
+			if ( ! $current_cpage) {
+				$current_cpage = 'newest' === get_option('default_comments_page') ? 1 : $wp_query->max_num_comment_pages;
 			}
 
-			$current_per_page = get_query_var( 'comments_per_page' );
-			if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
+			$current_per_page = get_query_var('comments_per_page');
+			if ($r['page'] != $current_cpage || $r['per_page'] != $current_per_page) {
 				$comment_args = array(
 					'post_id' => get_the_ID(),
 					'orderby' => 'comment_date_gmt',
@@ -1991,24 +1991,24 @@ 
 					'status' => 'approve',
 				);
 
-				if ( is_user_logged_in() ) {
+				if (is_user_logged_in()) {
 					$comment_args['include_unapproved'] = get_current_user_id();
 				} else {
 					$commenter = wp_get_current_commenter();
-					if ( $commenter['comment_author_email'] ) {
+					if ($commenter['comment_author_email']) {
 						$comment_args['include_unapproved'] = $commenter['comment_author_email'];
 					}
 				}
 
-				$comments = get_comments( $comment_args );
+				$comments = get_comments($comment_args);
 
-				if ( 'all' != $r['type'] ) {
-					$comments_by_type = separate_comments( $comments );
-					if ( empty( $comments_by_type[ $r['type'] ] ) ) {
+				if ('all' != $r['type']) {
+					$comments_by_type = separate_comments($comments);
+					if (empty($comments_by_type[$r['type']])) {
 						return;
 					}
 
-					$_comments = $comments_by_type[ $r['type'] ];
+					$_comments = $comments_by_type[$r['type']];
 				} else {
 					$_comments = $comments;
 				}
@@ -2016,29 +2016,29 @@ 
 
 		// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
+			if (empty($wp_query->comments))
 				return;
-			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
+			if ('all' != $r['type']) {
+				if (empty($wp_query->comments_by_type))
 					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
+				if (empty($wp_query->comments_by_type[$r['type']]))
 					return;
 				$_comments = $wp_query->comments_by_type[$r['type']];
 			} else {
 				$_comments = $wp_query->comments;
 			}
 
-			if ( $wp_query->max_num_comment_pages ) {
-				$default_comments_page = get_option( 'default_comments_page' );
-				$cpage = get_query_var( 'cpage' );
-				if ( 'newest' === $default_comments_page ) {
+			if ($wp_query->max_num_comment_pages) {
+				$default_comments_page = get_option('default_comments_page');
+				$cpage = get_query_var('cpage');
+				if ('newest' === $default_comments_page) {
 					$r['cpage'] = $cpage;
 
 				/*
 				 * When first page shows oldest comments, post permalink is the same as
 				 * the comment permalink.
 				 */
-				} elseif ( $cpage == 1 ) {
+				} elseif ($cpage == 1) {
 					$r['cpage'] = '';
 				} else {
 					$r['cpage'] = $cpage;
@@ -2050,52 +2050,52 @@ 
 		}
 	}
 
-	if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
+	if ('' === $r['per_page'] && get_option('page_comments')) {
 		$r['per_page'] = get_query_var('comments_per_page');
 	}
 
-	if ( empty($r['per_page']) ) {
+	if (empty($r['per_page'])) {
 		$r['per_page'] = 0;
 		$r['page'] = 0;
 	}
 
-	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
+	if ('' === $r['max_depth']) {
+		if (get_option('thread_comments'))
 			$r['max_depth'] = get_option('thread_comments_depth');
 		else
 			$r['max_depth'] = -1;
 	}
 
-	if ( '' === $r['page'] ) {
-		if ( empty($overridden_cpage) ) {
+	if ('' === $r['page']) {
+		if (empty($overridden_cpage)) {
 			$r['page'] = get_query_var('cpage');
 		} else {
 			$threaded = ( -1 != $r['max_depth'] );
-			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
-			set_query_var( 'cpage', $r['page'] );
+			$r['page'] = ('newest' == get_option('default_comments_page')) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+			set_query_var('cpage', $r['page']);
 		}
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
+	if (0 == $r['page'] && 0 != $r['per_page'])
 		$r['page'] = 1;
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if (null === $r['reverse_top_level'])
+		$r['reverse_top_level'] = ('desc' == get_option('comment_order'));
 
-	wp_queue_comments_for_comment_meta_lazyload( $_comments );
+	wp_queue_comments_for_comment_meta_lazyload($_comments);
 
-	if ( empty( $r['walker'] ) ) {
+	if (empty($r['walker'])) {
 		$walker = new Walker_Comment;
 	} else {
 		$walker = $r['walker'];
 	}
 
-	$output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
+	$output = $walker->paged_walk($_comments, $r['max_depth'], $r['page'], $r['per_page'], $r);
 
 	$in_comment_loop = false;
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -2164,18 +2164,18 @@ 
  * }
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
-function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
+function comment_form($args = array(), $post_id = null) {
+	if (null === $post_id)
 		$post_id = get_the_ID();
 
 	// Exit the function when comments for the post are closed.
-	if ( ! comments_open( $post_id ) ) {
+	if ( ! comments_open($post_id)) {
 		/**
 		 * Fires after the comment form if comments are closed.
 		 *
 		 * @since 3.0.0
 		 */
-		do_action( 'comment_form_comments_closed' );
+		do_action('comment_form_comments_closed');
 
 		return;
 	}
@@ -2184,24 +2184,24 @@ 
 	$user = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
-	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	$args = wp_parse_args($args);
+	if ( ! isset($args['format']))
+		$args['format'] = current_theme_supports('html5', 'comment-form') ? 'html5' : 'xhtml';
 
-	$req      = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
-	$html_req = ( $req ? " required='required'" : '' );
+	$req      = get_option('require_name_email');
+	$aria_req = ($req ? " aria-required='true'" : '');
+	$html_req = ($req ? " required='required'" : '');
 	$html5    = 'html5' === $args['format'];
-	$fields   =  array(
-		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
-		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
-		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
+	$fields   = array(
+		'author' => '<p class="comment-form-author">'.'<label for="author">'.__('Name').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="author" name="author" type="text" value="'.esc_attr($commenter['comment_author']).'" size="30" maxlength="245"'.$aria_req.$html_req.' /></p>',
+		'email'  => '<p class="comment-form-email"><label for="email">'.__('Email').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="email" name="email" '.($html5 ? 'type="email"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_email']).'" size="30" maxlength="100" aria-describedby="email-notes"'.$aria_req.$html_req.' /></p>',
+		'url'    => '<p class="comment-form-url"><label for="url">'.__('Website').'</label> '.
+		            '<input id="url" name="url" '.($html5 ? 'type="url"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_url']).'" size="30" maxlength="200" /></p>',
 	);
 
-	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	$required_text = sprintf(' '.__('Required fields are marked %s'), '<span class="required">*</span>');
 
 	/**
 	 * Filters the default comment form fields.
@@ -2210,42 +2210,42 @@ 
 	 *
 	 * @param array $fields The default comment fields.
 	 */
-	$fields = apply_filters( 'comment_form_default_fields', $fields );
+	$fields = apply_filters('comment_form_default_fields', $fields);
 	$defaults = array(
 		'fields'               => $fields,
-		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
+		'comment_field'        => '<p class="comment-form-comment"><label for="comment">'._x('Comment', 'noun').'</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'must_log_in'          => '<p class="must-log-in">' . sprintf(
+		'must_log_in'          => '<p class="must-log-in">'.sprintf(
 		                              /* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+		                              __('You must be <a href="%s">logged in</a> to post a comment.'),
+		                              wp_login_url(apply_filters('the_permalink', get_permalink($post_id)))
+		                          ).'</p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
+		'logged_in_as'         => '<p class="logged-in-as">'.sprintf(
 		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+		                              __('<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>'),
 		                              get_edit_user_link(),
 		                              /* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+		                              esc_attr(sprintf(__('Logged in as %s. Edit your profile.'), $user_identity)),
 		                              $user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
-		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+		                              wp_logout_url(apply_filters('the_permalink', get_permalink($post_id)))
+		                          ).'</p>',
+		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">'.__('Your email address will not be published.').'</span>'.($req ? $required_text : '').'</p>',
 		'comment_notes_after'  => '',
-		'action'               => site_url( '/wp-comments-post.php' ),
+		'action'               => site_url('/wp-comments-post.php'),
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
 		'class_form'           => 'comment-form',
 		'class_submit'         => 'submit',
 		'name_submit'          => 'submit',
-		'title_reply'          => __( 'Leave a Reply' ),
-		'title_reply_to'       => __( 'Leave a Reply to %s' ),
+		'title_reply'          => __('Leave a Reply'),
+		'title_reply_to'       => __('Leave a Reply to %s'),
 		'title_reply_before'   => '<h3 id="reply-title" class="comment-reply-title">',
 		'title_reply_after'    => '</h3>',
 		'cancel_reply_before'  => ' <small>',
 		'cancel_reply_after'   => '</small>',
-		'cancel_reply_link'    => __( 'Cancel reply' ),
-		'label_submit'         => __( 'Post Comment' ),
+		'cancel_reply_link'    => __('Cancel reply'),
+		'label_submit'         => __('Post Comment'),
 		'submit_button'        => '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />',
 		'submit_field'         => '<p class="form-submit">%1$s %2$s</p>',
 		'format'               => 'xhtml',
@@ -2260,51 +2260,51 @@ 
 	 *
 	 * @param array $defaults The default comment form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('comment_form_defaults', $defaults));
 
 	// Ensure that the filtered args contain all required default values.
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
 	/**
 	 * Fires before the comment form.
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'comment_form_before' );
+	do_action('comment_form_before');
 	?>
 	<div id="respond" class="comment-respond">
 		<?php
 		echo $args['title_reply_before'];
 
-		comment_form_title( $args['title_reply'], $args['title_reply_to'] );
+		comment_form_title($args['title_reply'], $args['title_reply_to']);
 
 		echo $args['cancel_reply_before'];
 
-		cancel_comment_reply_link( $args['cancel_reply_link'] );
+		cancel_comment_reply_link($args['cancel_reply_link']);
 
 		echo $args['cancel_reply_after'];
 
 		echo $args['title_reply_after'];
 
-		if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+		if (get_option('comment_registration') && ! is_user_logged_in()) :
 			echo $args['must_log_in'];
 			/**
 			 * Fires after the HTML-formatted 'must log in after' message in the comment form.
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'comment_form_must_log_in_after' );
+			do_action('comment_form_must_log_in_after');
 		else : ?>
-			<form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+			<form action="<?php echo esc_url($args['action']); ?>" method="post" id="<?php echo esc_attr($args['id_form']); ?>" class="<?php echo esc_attr($args['class_form']); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 				<?php
 				/**
 				 * Fires at the top of the comment form, inside the form tag.
 				 *
 				 * @since 3.0.0
 				 */
-				do_action( 'comment_form_top' );
+				do_action('comment_form_top');
 
-				if ( is_user_logged_in() ) :
+				if (is_user_logged_in()) :
 					/**
 					 * Filters the 'logged in' message for the comment form for display.
 					 *
@@ -2316,7 +2316,7 @@ 
 					 * @param string $user_identity  If the commenter is a registered user,
 					 *                               the display name, blank otherwise.
 					 */
-					echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+					echo apply_filters('comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity);
 
 					/**
 					 * Fires after the is_user_logged_in() check in the comment form.
@@ -2328,7 +2328,7 @@ 
 					 * @param string $user_identity If the commenter is a registered user,
 					 *                              the display name, blank otherwise.
 					 */
-					do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+					do_action('comment_form_logged_in_after', $commenter, $user_identity);
 
 				else :
 
@@ -2337,7 +2337,7 @@ 
 				endif;
 
 				// Prepare an array of all fields, including the textarea
-				$comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
+				$comment_fields = array('comment' => $args['comment_field']) + (array) $args['fields'];
 
 				/**
 				 * Filters the comment form fields, including the textarea.
@@ -2346,18 +2346,18 @@ 
 				 *
 				 * @param array $comment_fields The comment fields.
 				 */
-				$comment_fields = apply_filters( 'comment_form_fields', $comment_fields );
+				$comment_fields = apply_filters('comment_form_fields', $comment_fields);
 
 				// Get an array of field names, excluding the textarea
-				$comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );
+				$comment_field_keys = array_diff(array_keys($comment_fields), array('comment'));
 
 				// Get the first and the last field name, excluding the textarea
-				$first_field = reset( $comment_field_keys );
-				$last_field  = end( $comment_field_keys );
+				$first_field = reset($comment_field_keys);
+				$last_field  = end($comment_field_keys);
 
-				foreach ( $comment_fields as $name => $field ) {
+				foreach ($comment_fields as $name => $field) {
 
-					if ( 'comment' === $name ) {
+					if ('comment' === $name) {
 
 						/**
 						 * Filters the content of the comment textarea field for display.
@@ -2366,19 +2366,19 @@ 
 						 *
 						 * @param string $args_comment_field The content of the comment textarea field.
 						 */
-						echo apply_filters( 'comment_form_field_comment', $field );
+						echo apply_filters('comment_form_field_comment', $field);
 
 						echo $args['comment_notes_after'];
 
-					} elseif ( ! is_user_logged_in() ) {
+					} elseif ( ! is_user_logged_in()) {
 
-						if ( $first_field === $name ) {
+						if ($first_field === $name) {
 							/**
 							 * Fires before the comment fields in the comment form, excluding the textarea.
 							 *
 							 * @since 3.0.0
 							 */
-							do_action( 'comment_form_before_fields' );
+							do_action('comment_form_before_fields');
 						}
 
 						/**
@@ -2391,25 +2391,25 @@ 
 						 *
 						 * @param string $field The HTML-formatted output of the comment form field.
 						 */
-						echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+						echo apply_filters("comment_form_field_{$name}", $field)."\n";
 
-						if ( $last_field === $name ) {
+						if ($last_field === $name) {
 							/**
 							 * Fires after the comment fields in the comment form, excluding the textarea.
 							 *
 							 * @since 3.0.0
 							 */
-							do_action( 'comment_form_after_fields' );
+							do_action('comment_form_after_fields');
 						}
 					}
 				}
 
 				$submit_button = sprintf(
 					$args['submit_button'],
-					esc_attr( $args['name_submit'] ),
-					esc_attr( $args['id_submit'] ),
-					esc_attr( $args['class_submit'] ),
-					esc_attr( $args['label_submit'] )
+					esc_attr($args['name_submit']),
+					esc_attr($args['id_submit']),
+					esc_attr($args['class_submit']),
+					esc_attr($args['label_submit'])
 				);
 
 				/**
@@ -2420,12 +2420,12 @@ 
 				 * @param string $submit_button HTML markup for the submit button.
 				 * @param array  $args          Arguments passed to `comment_form()`.
 				 */
-				$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
+				$submit_button = apply_filters('comment_form_submit_button', $submit_button, $args);
 
 				$submit_field = sprintf(
 					$args['submit_field'],
 					$submit_button,
-					get_comment_id_fields( $post_id )
+					get_comment_id_fields($post_id)
 				);
 
 				/**
@@ -2439,7 +2439,7 @@ 
 				 * @param string $submit_field HTML markup for the submit field.
 				 * @param array  $args         Arguments passed to comment_form().
 				 */
-				echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+				echo apply_filters('comment_form_submit_field', $submit_field, $args);
 
 				/**
 				 * Fires at the bottom of the comment form, inside the closing </form> tag.
@@ -2448,7 +2448,7 @@ 
 				 *
 				 * @param int $post_id The post ID.
 				 */
-				do_action( 'comment_form', $post_id );
+				do_action('comment_form', $post_id);
 				?>
 			</form>
 		<?php endif; ?>
@@ -2460,5 +2460,5 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'comment_form_after' );
+	do_action('comment_form_after');
 }

Braces +133 added lines, -88 removed lines

@@ -25,10 +25,11 @@ 
 	$comment = get_comment( $comment_ID );
 
 	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
-			$author = $user->display_name;
-		else
-			$author = __('Anonymous');
+		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) ) {
+					$author = $user->display_name;
+		} else {
+					$author = __('Anonymous');
+		}
 	} else {
 		$author = $comment->comment_author;
 	}
@@ -218,10 +219,11 @@ 
 	$url     = get_comment_author_url( $comment );
 	$author  = get_comment_author( $comment );
 
-	if ( empty( $url ) || 'http://' == $url )
-		$return = $author;
-	else
-		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	if ( empty( $url ) || 'http://' == $url ) {
+			$return = $author;
+	} else {
+			$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	}
 
 	/**
 	 * Filters the comment author's link for display.
@@ -428,11 +430,12 @@ 
 function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
 	// Separates classes with a single space, collates classes for comment DIV
 	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
-		echo $class;
-	else
-		return $class;
-}
+	if ( $echo) {
+			echo $class;
+	} else {
+			return $class;
+	}
+	}
 
 /**
  * Returns the classes for the comment div as an array.
@@ -474,12 +477,15 @@ 
 		}
 	}
 
-	if ( empty($comment_alt) )
-		$comment_alt = 0;
-	if ( empty($comment_depth) )
-		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
-		$comment_thread_alt = 0;
+	if ( empty($comment_alt) ) {
+			$comment_alt = 0;
+	}
+	if ( empty($comment_depth) ) {
+			$comment_depth = 1;
+	}
+	if ( empty($comment_thread_alt) ) {
+			$comment_thread_alt = 0;
+	}
 
 	if ( $comment_alt % 2 ) {
 		$classes[] = 'odd';
@@ -504,8 +510,9 @@ 
 	$classes[] = "depth-$comment_depth";
 
 	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split('#\s+#', $class);
+		if ( !is_array( $class ) ) {
+					$class = preg_split('#\s+#', $class);
+		}
 		$classes = array_merge($classes, $class);
 	}
 
@@ -538,10 +545,11 @@ 
  */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
-		$date = mysql2date(get_option('date_format'), $comment->comment_date);
-	else
-		$date = mysql2date($d, $comment->comment_date);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('date_format'), $comment->comment_date);
+	} else {
+			$date = mysql2date($d, $comment->comment_date);
+	}
 	/**
 	 * Filters the returned comment date.
 	 *
@@ -822,10 +830,12 @@ 
  * @param string $deprecated_2 Not Used.
  */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.72' );
+	}
+	if ( !empty( $deprecated_2 ) ) {
+			_deprecated_argument( __FUNCTION__, '1.3.0' );
+	}
 	echo esc_url( get_comments_link() );
 }
 
@@ -1010,10 +1020,11 @@ 
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
-		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
-	else
-		$date = mysql2date($d, $comment_date, $translate);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('time_format'), $comment_date, $translate);
+	} else {
+			$date = mysql2date($d, $comment_date, $translate);
+	}
 
 	/**
 	 * Filters the returned comment time.
@@ -1052,8 +1063,9 @@ 
  */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
-		$comment->comment_type = 'comment';
+	if ( '' == $comment->comment_type ) {
+			$comment->comment_type = 'comment';
+	}
 
 	/**
 	 * Filters the returned comment type.
@@ -1078,9 +1090,15 @@ 
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
 function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $commenttxt ) {
+		$commenttxt = _x( 'Comment', 'noun' );
+	}
+	if ( false === $trackbacktxt ) {
+		$trackbacktxt = __( 'Trackback' );
+	}
+	if ( false === $pingbacktxt ) {
+		$pingbacktxt = __( 'Pingback' );
+	}
 	$type = get_comment_type();
 	switch( $type ) {
 		case 'trackback' :
@@ -1106,10 +1124,11 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
-	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	if ( '' != get_option('permalink_structure') ) {
+			$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	} else {
+			$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	}
 
 	/**
 	 * Filters the returned trackback URL.
@@ -1291,11 +1310,13 @@ 
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
-		return;
+	if ( !(is_single() || is_page() || $withcomments) || empty($post) ) {
+			return;
+	}
 
-	if ( empty($file) )
-		$file = '/comments.php';
+	if ( empty($file) ) {
+			$file = '/comments.php';
+	}
 
 	$req = get_option('require_name_email');
 
@@ -1453,8 +1474,9 @@ 
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
-		define('COMMENTS_TEMPLATE', true);
+	if ( !defined('COMMENTS_TEMPLATE') ) {
+			define('COMMENTS_TEMPLATE', true);
+	}
 
 	$theme_template = STYLESHEETPATH . $file;
 	/**
@@ -1465,13 +1487,15 @@ 
 	 * @param string $theme_template The path to the theme template file.
 	 */
 	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
-	else // Backward compat code will be removed in a future release
+	if ( file_exists( $include ) ) {
+			require( $include );
+	} elseif ( file_exists( TEMPLATEPATH . $file ) ) {
+			require( TEMPLATEPATH . $file );
+	} else {
+		// Backward compat code will be removed in a future release
 		require( ABSPATH . WPINC . '/theme-compat/comments.php');
-}
+	}
+	}
 
 /**
  * Displays the link to the comments for the current post ID.
@@ -1774,8 +1798,9 @@ 
  * @return string
  */
 function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
-		$text = __('Click here to cancel reply.');
+	if ( empty($text) ) {
+			$text = __('Click here to cancel reply.');
+	}
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
 	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
@@ -1814,8 +1839,9 @@ 
  * @return string Hidden input HTML for replying to comments
  */
 function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
-		$id = get_the_ID();
+	if ( empty( $id ) ) {
+			$id = get_the_ID();
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 	$result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
@@ -1867,14 +1893,18 @@ 
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if ( false === $noreplytext ) {
+		$noreplytext = __( 'Leave a Reply' );
+	}
+	if ( false === $replytext ) {
+		$replytext = __( 'Leave a Reply to %s' );
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
-		echo $noreplytext;
-	else {
+	if ( 0 == $replytoid ) {
+			echo $noreplytext;
+	} else {
 		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
 		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
@@ -1961,12 +1991,14 @@ 
 	// Figure out what comments we'll be looping through ($_comments)
 	if ( null !== $comments ) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
-			return;
+		if ( empty($comments) ) {
+					return;
+		}
 		if ( 'all' != $r['type'] ) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
-				return;
+			if ( empty($comments_by_type[$r['type']]) ) {
+							return;
+			}
 			$_comments = $comments_by_type[$r['type']];
 		} else {
 			$_comments = $comments;
@@ -2016,13 +2048,16 @@ 
 
 		// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
-				return;
+			if ( empty($wp_query->comments) ) {
+							return;
+			}
 			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
-					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
-					return;
+				if ( empty($wp_query->comments_by_type) ) {
+									$wp_query->comments_by_type = separate_comments($wp_query->comments);
+				}
+				if ( empty($wp_query->comments_by_type[$r['type']]) ) {
+									return;
+				}
 				$_comments = $wp_query->comments_by_type[$r['type']];
 			} else {
 				$_comments = $wp_query->comments;
@@ -2060,10 +2095,11 @@ 
 	}
 
 	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
-			$r['max_depth'] = get_option('thread_comments_depth');
-		else
-			$r['max_depth'] = -1;
+		if ( get_option('thread_comments') ) {
+					$r['max_depth'] = get_option('thread_comments_depth');
+		} else {
+					$r['max_depth'] = -1;
+		}
 	}
 
 	if ( '' === $r['page'] ) {
@@ -2077,11 +2113,13 @@ 
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
-		$r['page'] = 1;
+	if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
+			$r['page'] = 1;
+	}
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if ( null === $r['reverse_top_level'] ) {
+			$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	}
 
 	wp_queue_comments_for_comment_meta_lazyload( $_comments );
 
@@ -2165,8 +2203,9 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
 function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
-		$post_id = get_the_ID();
+	if ( null === $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	// Exit the function when comments for the post are closed.
 	if ( ! comments_open( $post_id ) ) {
@@ -2185,8 +2224,9 @@ 
 	$user_identity = $user->exists() ? $user->display_name : '';
 
 	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	if ( ! isset( $args['format'] ) ) {
+			$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	}
 
 	$req      = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
@@ -2294,8 +2334,11 @@ 
 			 * @since 3.0.0
 			 */
 			do_action( 'comment_form_must_log_in_after' );
-		else : ?>
-			<form action="<?php echo esc_url( $args['action'] ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+		else {
+			: ?>
+			<form action="<?php echo esc_url( $args['action'] );
+		}
+		?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 				<?php
 				/**
 				 * Fires at the top of the comment form, inside the form tag.
@@ -2330,9 +2373,11 @@ 
 					 */
 					do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
 
-				else :
+				else {
+					:
 
 					echo $args['comment_notes_before'];
+				}
 
 				endif;
 

src/wp-includes/random_compat/byte_safe_strings.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
  * SOFTWARE.
  */
 
-if (!function_exists('RandomCompat_strlen')) {
+if ( ! function_exists('RandomCompat_strlen')) {
     if (
         defined('MB_OVERLOAD_STRING') &&
         ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
@@ -45,7 +45,7 @@ 
          */
         function RandomCompat_strlen($binary_string)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
                 );
@@ -68,7 +68,7 @@ 
          */
         function RandomCompat_strlen($binary_string)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
                 );
@@ -78,7 +78,7 @@ 
     }
 }
 
-if (!function_exists('RandomCompat_substr')) {
+if ( ! function_exists('RandomCompat_substr')) {
 
     if (
         defined('MB_OVERLOAD_STRING')
@@ -101,13 +101,13 @@ 
          */
         function RandomCompat_substr($binary_string, $start, $length = null)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
 
-            if (!is_int($start)) {
+            if ( ! is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
@@ -119,7 +119,7 @@ 
                  * PHP 5.3, so we have to find the length ourselves.
                  */
                 $length = RandomCompat_strlen($length) - $start;
-            } elseif (!is_int($length)) {
+            } elseif ( ! is_int($length)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Third argument should be an integer, or omitted'
                 );
@@ -145,20 +145,20 @@ 
          */
         function RandomCompat_substr($binary_string, $start, $length = null)
         {
-            if (!is_string($binary_string)) {
+            if ( ! is_string($binary_string)) {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
 
-            if (!is_int($start)) {
+            if ( ! is_int($start)) {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
 
             if ($length !== null) {
-                if (!is_int($length)) {
+                if ( ! is_int($length)) {
                     throw new TypeError(
                         'RandomCompat_substr(): Third argument should be an integer, or omitted'
                     );

Indentation +128 added lines, -128 removed lines

@@ -27,147 +27,147 @@
  */
 
 if (!function_exists('RandomCompat_strlen')) {
-    if (
-        defined('MB_OVERLOAD_STRING') &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
+	if (
+		defined('MB_OVERLOAD_STRING') &&
+		ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+	) {
+		/**
+		 * strlen() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version uses mb_strlen() in '8bit' mode to treat strings as raw
+		 * binary rather than UTF-8, ISO-8859-1, etc
+		 *
+		 * @param string $binary_string
+		 *
+		 * @throws TypeError
+		 *
+		 * @return int
+		 */
+		function RandomCompat_strlen($binary_string)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_strlen() expects a string'
+				);
+			}
 
-            return mb_strlen($binary_string, '8bit');
-        }
+			return mb_strlen($binary_string, '8bit');
+		}
 
-    } else {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just used the default strlen()
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-            return strlen($binary_string);
-        }
-    }
+	} else {
+		/**
+		 * strlen() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version just used the default strlen()
+		 *
+		 * @param string $binary_string
+		 *
+		 * @throws TypeError
+		 *
+		 * @return int
+		 */
+		function RandomCompat_strlen($binary_string)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_strlen() expects a string'
+				);
+			}
+			return strlen($binary_string);
+		}
+	}
 }
 
 if (!function_exists('RandomCompat_substr')) {
 
-    if (
-        defined('MB_OVERLOAD_STRING')
-        &&
-        ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_substr() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+	if (
+		defined('MB_OVERLOAD_STRING')
+		&&
+		ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING
+	) {
+		/**
+		 * substr() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version uses mb_substr() in '8bit' mode to treat strings as raw
+		 * binary rather than UTF-8, ISO-8859-1, etc
+		 *
+		 * @param string $binary_string
+		 * @param int $start
+		 * @param int $length (optional)
+		 *
+		 * @throws TypeError
+		 *
+		 * @return string
+		 */
+		function RandomCompat_substr($binary_string, $start, $length = null)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_substr(): First argument should be a string'
+				);
+			}
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+			if (!is_int($start)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Second argument should be an integer'
+				);
+			}
 
-            if ($length === null) {
-                /**
-                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
-                 * PHP 5.3, so we have to find the length ourselves.
-                 */
-                $length = RandomCompat_strlen($length) - $start;
-            } elseif (!is_int($length)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                );
-            }
+			if ($length === null) {
+				/**
+				 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
+				 * PHP 5.3, so we have to find the length ourselves.
+				 */
+				$length = RandomCompat_strlen($length) - $start;
+			} elseif (!is_int($length)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Third argument should be an integer, or omitted'
+				);
+			}
 
-            return mb_substr($binary_string, $start, $length, '8bit');
-        }
+			return mb_substr($binary_string, $start, $length, '8bit');
+		}
 
-    } else {
+	} else {
 
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just uses the default substr()
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+		/**
+		 * substr() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version just uses the default substr()
+		 *
+		 * @param string $binary_string
+		 * @param int $start
+		 * @param int $length (optional)
+		 *
+		 * @throws TypeError
+		 *
+		 * @return string
+		 */
+		function RandomCompat_substr($binary_string, $start, $length = null)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_substr(): First argument should be a string'
+				);
+			}
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+			if (!is_int($start)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Second argument should be an integer'
+				);
+			}
 
-            if ($length !== null) {
-                if (!is_int($length)) {
-                    throw new TypeError(
-                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                    );
-                }
+			if ($length !== null) {
+				if (!is_int($length)) {
+					throw new TypeError(
+						'RandomCompat_substr(): Third argument should be an integer, or omitted'
+					);
+				}
 
-                return substr($binary_string, $start, $length);
-            }
+				return substr($binary_string, $start, $length);
+			}
 
-            return substr($binary_string, $start);
-        }
-    }
+			return substr($binary_string, $start);
+		}
+	}
 }

src/wp-includes/random_compat/random_bytes_dev_urandom.php

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
  * SOFTWARE.
  */
 
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+if ( ! defined('RANDOM_COMPAT_READ_BUFFER')) {
     define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
@@ -55,7 +55,7 @@ 
          * We never fall back to /dev/random
          */
         $fp = fopen('/dev/urandom', 'rb');
-        if (!empty($fp)) {
+        if ( ! empty($fp)) {
             $st = fstat($fp);
             if (($st['mode'] & 0170000) !== 020000) {
                 fclose($fp);
@@ -63,7 +63,7 @@ 
             }
         }
 
-        if (!empty($fp)) {
+        if ( ! empty($fp)) {
             /**
              * stream_set_read_buffer() does not exist in HHVM
              * 
@@ -102,7 +102,7 @@ 
      * if (empty($fp)) line is logic that should only be run once per
      * page load.
      */
-    if (!empty($fp)) {
+    if ( ! empty($fp)) {
         $remaining = $bytes;
         $buf = '';
 

Indentation +94 added lines, -94 removed lines

@@ -27,7 +27,7 @@ 
  */
 
 if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
+	define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
 /**
@@ -45,104 +45,104 @@ 
  */
 function random_bytes($bytes)
 {
-    static $fp = null;
-    /**
-     * This block should only be run once
-     */
-    if (empty($fp)) {
-        /**
-         * We use /dev/urandom if it is a char device.
-         * We never fall back to /dev/random
-         */
-        $fp = fopen('/dev/urandom', 'rb');
-        if (!empty($fp)) {
-            $st = fstat($fp);
-            if (($st['mode'] & 0170000) !== 020000) {
-                fclose($fp);
-                $fp = false;
-            }
-        }
+	static $fp = null;
+	/**
+	 * This block should only be run once
+	 */
+	if (empty($fp)) {
+		/**
+		 * We use /dev/urandom if it is a char device.
+		 * We never fall back to /dev/random
+		 */
+		$fp = fopen('/dev/urandom', 'rb');
+		if (!empty($fp)) {
+			$st = fstat($fp);
+			if (($st['mode'] & 0170000) !== 020000) {
+				fclose($fp);
+				$fp = false;
+			}
+		}
 
-        if (!empty($fp)) {
-            /**
-             * stream_set_read_buffer() does not exist in HHVM
-             * 
-             * If we don't set the stream's read buffer to 0, PHP will
-             * internally buffer 8192 bytes, which can waste entropy
-             * 
-             * stream_set_read_buffer returns 0 on success
-             */
-            if (function_exists('stream_set_read_buffer')) {
-                stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-            }
-            if (function_exists('stream_set_chunk_size')) {
-                stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-            }
-        }
-    }
+		if (!empty($fp)) {
+			/**
+			 * stream_set_read_buffer() does not exist in HHVM
+			 * 
+			 * If we don't set the stream's read buffer to 0, PHP will
+			 * internally buffer 8192 bytes, which can waste entropy
+			 * 
+			 * stream_set_read_buffer returns 0 on success
+			 */
+			if (function_exists('stream_set_read_buffer')) {
+				stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+			}
+			if (function_exists('stream_set_chunk_size')) {
+				stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+			}
+		}
+	}
 
-    try {
-        $bytes = RandomCompat_intval($bytes);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_bytes(): $bytes must be an integer'
-        );
-    }
+	try {
+		$bytes = RandomCompat_intval($bytes);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_bytes(): $bytes must be an integer'
+		);
+	}
 
-    if ($bytes < 1) {
-        throw new Error(
-            'Length must be greater than 0'
-        );
-    }
+	if ($bytes < 1) {
+		throw new Error(
+			'Length must be greater than 0'
+		);
+	}
 
-    /**
-     * This if() block only runs if we managed to open a file handle
-     * 
-     * It does not belong in an else {} block, because the above 
-     * if (empty($fp)) line is logic that should only be run once per
-     * page load.
-     */
-    if (!empty($fp)) {
-        $remaining = $bytes;
-        $buf = '';
+	/**
+	 * This if() block only runs if we managed to open a file handle
+	 * 
+	 * It does not belong in an else {} block, because the above 
+	 * if (empty($fp)) line is logic that should only be run once per
+	 * page load.
+	 */
+	if (!empty($fp)) {
+		$remaining = $bytes;
+		$buf = '';
 
-        /**
-         * We use fread() in a loop to protect against partial reads
-         */
-        do {
-            $read = fread($fp, $remaining); 
-            if ($read === false) {
-                /**
-                 * We cannot safely read from the file. Exit the
-                 * do-while loop and trigger the exception condition
-                 */
-                $buf = false;
-                break;
-            }
-            /**
-             * Decrease the number of bytes returned from remaining
-             */
-            $remaining -= RandomCompat_strlen($read);
-            $buf .= $read;
-        } while ($remaining > 0);
+		/**
+		 * We use fread() in a loop to protect against partial reads
+		 */
+		do {
+			$read = fread($fp, $remaining); 
+			if ($read === false) {
+				/**
+				 * We cannot safely read from the file. Exit the
+				 * do-while loop and trigger the exception condition
+				 */
+				$buf = false;
+				break;
+			}
+			/**
+			 * Decrease the number of bytes returned from remaining
+			 */
+			$remaining -= RandomCompat_strlen($read);
+			$buf .= $read;
+		} while ($remaining > 0);
         
-        /**
-         * Is our result valid?
-         */
-        if ($buf !== false) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                /**
-                 * Return our random entropy buffer here:
-                 */
-                return $buf;
-            }
-        }
-    }
+		/**
+		 * Is our result valid?
+		 */
+		if ($buf !== false) {
+			if (RandomCompat_strlen($buf) === $bytes) {
+				/**
+				 * Return our random entropy buffer here:
+				 */
+				return $buf;
+			}
+		}
+	}
 
-    /**
-     * If we reach here, PHP has failed us.
-     */
-    throw new Exception(
-        'Error reading from source device'
-    );
+	/**
+	 * If we reach here, PHP has failed us.
+	 */
+	throw new Exception(
+		'Error reading from source device'
+	);
 }

src/wp-includes/random_compat/random_int.php

Spacing +2 added lines, -2 removed lines

@@ -99,7 +99,7 @@ 
     /**
      * Test for integer overflow:
      */
-    if (!is_int($range)) {
+    if ( ! is_int($range)) {
 
         /**
          * Still safely calculate wider ranges.
@@ -185,7 +185,7 @@ 
          * ... or smaller than $min,
          * then try again.
          */
-    } while (!is_int($val) || $val > $max || $val < $min);
+    } while ( ! is_int($val) || $val > $max || $val < $min);
 
     return (int) $val;
 }

Indentation +134 added lines, -134 removed lines

@@ -38,154 +38,154 @@
  */
 function random_int($min, $max)
 {
-    /**
-     * Type and input logic checks
-     * 
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
-     */
+	/**
+	 * Type and input logic checks
+	 * 
+	 * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+	 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+	 * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+	 * lose precision, so the <= and => operators might accidentally let a float
+	 * through.
+	 */
     
-    try {
-        $min = RandomCompat_intval($min);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_int(): $min must be an integer'
-        );
-    }
+	try {
+		$min = RandomCompat_intval($min);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_int(): $min must be an integer'
+		);
+	}
 
-    try {
-        $max = RandomCompat_intval($max);
-    } catch (TypeError $ex) {
-        throw new TypeError(
-            'random_int(): $max must be an integer'
-        );
-    }
+	try {
+		$max = RandomCompat_intval($max);
+	} catch (TypeError $ex) {
+		throw new TypeError(
+			'random_int(): $max must be an integer'
+		);
+	}
     
-    /**
-     * Now that we've verified our weak typing system has given us an integer,
-     * let's validate the logic then we can move forward with generating random
-     * integers along a given range.
-     */
-    if ($min > $max) {
-        throw new Error(
-            'Minimum value must be less than or equal to the maximum value'
-        );
-    }
+	/**
+	 * Now that we've verified our weak typing system has given us an integer,
+	 * let's validate the logic then we can move forward with generating random
+	 * integers along a given range.
+	 */
+	if ($min > $max) {
+		throw new Error(
+			'Minimum value must be less than or equal to the maximum value'
+		);
+	}
 
-    if ($max === $min) {
-        return $min;
-    }
+	if ($max === $min) {
+		return $min;
+	}
 
-    /**
-     * Initialize variables to 0
-     * 
-     * We want to store:
-     * $bytes => the number of random bytes we need
-     * $mask => an integer bitmask (for use with the &) operator
-     *          so we can minimize the number of discards
-     */
-    $attempts = $bits = $bytes = $mask = $valueShift = 0;
+	/**
+	 * Initialize variables to 0
+	 * 
+	 * We want to store:
+	 * $bytes => the number of random bytes we need
+	 * $mask => an integer bitmask (for use with the &) operator
+	 *          so we can minimize the number of discards
+	 */
+	$attempts = $bits = $bytes = $mask = $valueShift = 0;
 
-    /**
-     * At this point, $range is a positive number greater than 0. It might
-     * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
-     * a float and we will lose some precision.
-     */
-    $range = $max - $min;
+	/**
+	 * At this point, $range is a positive number greater than 0. It might
+	 * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to
+	 * a float and we will lose some precision.
+	 */
+	$range = $max - $min;
 
-    /**
-     * Test for integer overflow:
-     */
-    if (!is_int($range)) {
+	/**
+	 * Test for integer overflow:
+	 */
+	if (!is_int($range)) {
 
-        /**
-         * Still safely calculate wider ranges.
-         * Provided by @CodesInChaos, @oittaa
-         * 
-         * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
-         * 
-         * We use ~0 as a mask in this case because it generates all 1s
-         * 
-         * @ref https://eval.in/400356 (32-bit)
-         * @ref http://3v4l.org/XX9r5  (64-bit)
-         */
-        $bytes = PHP_INT_SIZE;
-        $mask = ~0;
+		/**
+		 * Still safely calculate wider ranges.
+		 * Provided by @CodesInChaos, @oittaa
+		 * 
+		 * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435
+		 * 
+		 * We use ~0 as a mask in this case because it generates all 1s
+		 * 
+		 * @ref https://eval.in/400356 (32-bit)
+		 * @ref http://3v4l.org/XX9r5  (64-bit)
+		 */
+		$bytes = PHP_INT_SIZE;
+		$mask = ~0;
 
-    } else {
+	} else {
 
-        /**
-         * $bits is effectively ceil(log($range, 2)) without dealing with 
-         * type juggling
-         */
-        while ($range > 0) {
-            if ($bits % 8 === 0) {
-               ++$bytes;
-            }
-            ++$bits;
-            $range >>= 1;
-            $mask = $mask << 1 | 1;
-        }
-        $valueShift = $min;
-    }
+		/**
+		 * $bits is effectively ceil(log($range, 2)) without dealing with 
+		 * type juggling
+		 */
+		while ($range > 0) {
+			if ($bits % 8 === 0) {
+			   ++$bytes;
+			}
+			++$bits;
+			$range >>= 1;
+			$mask = $mask << 1 | 1;
+		}
+		$valueShift = $min;
+	}
 
-    /**
-     * Now that we have our parameters set up, let's begin generating
-     * random integers until one falls between $min and $max
-     */
-    do {
-        /**
-         * The rejection probability is at most 0.5, so this corresponds
-         * to a failure probability of 2^-128 for a working RNG
-         */
-        if ($attempts > 128) {
-            throw new Exception(
-                'random_int: RNG is broken - too many rejections'
-            );
-        }
+	/**
+	 * Now that we have our parameters set up, let's begin generating
+	 * random integers until one falls between $min and $max
+	 */
+	do {
+		/**
+		 * The rejection probability is at most 0.5, so this corresponds
+		 * to a failure probability of 2^-128 for a working RNG
+		 */
+		if ($attempts > 128) {
+			throw new Exception(
+				'random_int: RNG is broken - too many rejections'
+			);
+		}
 
-        /**
-         * Let's grab the necessary number of random bytes
-         */
-        $randomByteString = random_bytes($bytes);
-        if ($randomByteString === false) {
-            throw new Exception(
-                'Random number generator failure'
-            );
-        }
+		/**
+		 * Let's grab the necessary number of random bytes
+		 */
+		$randomByteString = random_bytes($bytes);
+		if ($randomByteString === false) {
+			throw new Exception(
+				'Random number generator failure'
+			);
+		}
 
-        /**
-         * Let's turn $randomByteString into an integer
-         * 
-         * This uses bitwise operators (<< and |) to build an integer
-         * out of the values extracted from ord()
-         * 
-         * Example: [9F] | [6D] | [32] | [0C] =>
-         *   159 + 27904 + 3276800 + 201326592 =>
-         *   204631455
-         */
-        $val = 0;
-        for ($i = 0; $i < $bytes; ++$i) {
-            $val |= ord($randomByteString[$i]) << ($i * 8);
-        }
+		/**
+		 * Let's turn $randomByteString into an integer
+		 * 
+		 * This uses bitwise operators (<< and |) to build an integer
+		 * out of the values extracted from ord()
+		 * 
+		 * Example: [9F] | [6D] | [32] | [0C] =>
+		 *   159 + 27904 + 3276800 + 201326592 =>
+		 *   204631455
+		 */
+		$val = 0;
+		for ($i = 0; $i < $bytes; ++$i) {
+			$val |= ord($randomByteString[$i]) << ($i * 8);
+		}
 
-        /**
-         * Apply mask
-         */
-        $val &= $mask;
-        $val += $valueShift;
+		/**
+		 * Apply mask
+		 */
+		$val &= $mask;
+		$val += $valueShift;
 
-        ++$attempts;
-        /**
-         * If $val overflows to a floating point number,
-         * ... or is larger than $max,
-         * ... or smaller than $min,
-         * then try again.
-         */
-    } while (!is_int($val) || $val > $max || $val < $min);
+		++$attempts;
+		/**
+		 * If $val overflows to a floating point number,
+		 * ... or is larger than $max,
+		 * ... or smaller than $min,
+		 * then try again.
+		 */
+	} while (!is_int($val) || $val > $max || $val < $min);
 
-    return (int) $val;
+	return (int) $val;
 }

src/wp-includes/random_compat/cast_to_int.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
  * SOFTWARE.
  */
 
-if (!function_exists('RandomCompat_intval')) {
+if ( ! function_exists('RandomCompat_intval')) {
     
     /**
      * Cast to an integer if we can, safely.

Indentation +37 added lines, -37 removed lines

@@ -28,44 +28,44 @@
 
 if (!function_exists('RandomCompat_intval')) {
     
-    /**
-     * Cast to an integer if we can, safely.
-     * 
-     * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
-     * (non-inclusive), it will sanely cast it to an int. If you it's equal to
-     * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
-     * lose precision, so the <= and => operators might accidentally let a float
-     * through.
-     * 
-     * @param int|float $number    The number we want to convert to an int
-     * @param boolean   $fail_open Set to true to not throw an exception
-     * 
-     * @return int (or float if $fail_open)
-     *
-     * @throws TypeError
-     */
-    function RandomCompat_intval($number, $fail_open = false)
-    {
-        if (is_numeric($number)) {
-            $number += 0;
-        }
+	/**
+	 * Cast to an integer if we can, safely.
+	 * 
+	 * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
+	 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
+	 * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats 
+	 * lose precision, so the <= and => operators might accidentally let a float
+	 * through.
+	 * 
+	 * @param int|float $number    The number we want to convert to an int
+	 * @param boolean   $fail_open Set to true to not throw an exception
+	 * 
+	 * @return int (or float if $fail_open)
+	 *
+	 * @throws TypeError
+	 */
+	function RandomCompat_intval($number, $fail_open = false)
+	{
+		if (is_numeric($number)) {
+			$number += 0;
+		}
 
-        if (
-            is_float($number)
-            &&
-            $number > ~PHP_INT_MAX
-            &&
-            $number < PHP_INT_MAX
-        ) {
-            $number = (int) $number;
-        }
+		if (
+			is_float($number)
+			&&
+			$number > ~PHP_INT_MAX
+			&&
+			$number < PHP_INT_MAX
+		) {
+			$number = (int) $number;
+		}
 
-        if (is_int($number) || $fail_open) {
-            return $number;
-        }
+		if (is_int($number) || $fail_open) {
+			return $number;
+		}
 
-        throw new TypeError(
-            'Expected an integer.'
-        );
-    }
+		throw new TypeError(
+			'Expected an integer.'
+		);
+	}
 }

src/wp-includes/random_compat/error_polyfill.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
  * SOFTWARE.
  */
 
-if (!class_exists('Error', false)) {
+if ( ! class_exists('Error', false)) {
     // We can't really avoid making this extend Exception in PHP 5.
     class Error extends Exception
     {
@@ -34,7 +34,7 @@ 
     }
 }
 
-if (!class_exists('TypeError', false)) {
+if ( ! class_exists('TypeError', false)) {
     class TypeError extends Error
     {
         

Indentation +7 added lines, -7 removed lines

@@ -27,16 +27,16 @@
  */
 
 if (!class_exists('Error', false)) {
-    // We can't really avoid making this extend Exception in PHP 5.
-    class Error extends Exception
-    {
+	// We can't really avoid making this extend Exception in PHP 5.
+	class Error extends Exception
+	{
         
-    }
+	}
 }
 
 if (!class_exists('TypeError', false)) {
-    class TypeError extends Error
-    {
+	class TypeError extends Error
+	{
         
-    }
+	}
 }

src/wp-includes/category.php

Braces +12 added lines, -8 removed lines

@@ -90,8 +90,9 @@ 
 function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
 	$category = get_term( $category, 'category', $output, $filter );
 
-	if ( is_wp_error( $category ) )
-		return $category;
+	if ( is_wp_error( $category ) ) {
+			return $category;
+	}
 
 	_make_cat_compat( $category );
 
@@ -170,8 +171,9 @@ 
  */
 function get_category_by_slug( $slug  ) {
 	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+	if ( $category ) {
+			_make_cat_compat( $category );
+	}
 
 	return $category;
 }
@@ -186,8 +188,9 @@ 
  */
 function get_cat_ID( $cat_name ) {
 	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
-		return $cat->term_id;
+	if ( $cat ) {
+			return $cat->term_id;
+	}
 	return 0;
 }
 
@@ -202,8 +205,9 @@ 
 function get_cat_name( $cat_id ) {
 	$cat_id = (int) $cat_id;
 	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
-		return '';
+	if ( ! $category || is_wp_error( $category ) ) {
+			return '';
+	}
 	return $category->name;
 }
 

Spacing +65 added lines, -65 removed lines

@@ -23,9 +23,9 @@ 
  * }
  * @return array List of categories.
  */
-function get_categories( $args = '' ) {
-	$defaults = array( 'taxonomy' => 'category' );
-	$args = wp_parse_args( $args, $defaults );
+function get_categories($args = '') {
+	$defaults = array('taxonomy' => 'category');
+	$args = wp_parse_args($args, $defaults);
 
 	$taxonomy = $args['taxonomy'];
 
@@ -37,13 +37,13 @@ 
 	 * @param string $taxonomy Taxonomy to retrieve terms from.
 	 * @param array  $args     An array of arguments. See get_terms().
 	 */
-	$taxonomy = apply_filters( 'get_categories_taxonomy', $taxonomy, $args );
+	$taxonomy = apply_filters('get_categories_taxonomy', $taxonomy, $args);
 
 	// Back compat
-	if ( isset($args['type']) && 'link' == $args['type'] ) {
+	if (isset($args['type']) && 'link' == $args['type']) {
 		/* translators: 1: "type => link", 2: "taxonomy => link_category" alternative */
-		_deprecated_argument( __FUNCTION__, '3.0.0',
-			sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+		_deprecated_argument(__FUNCTION__, '3.0.0',
+			sprintf(__('%1$s is deprecated. Use %2$s instead.'),
 				'<code>type => link</code>',
 				'<code>taxonomy => link_category</code>'
 			)
@@ -51,14 +51,14 @@ 
 		$taxonomy = $args['taxonomy'] = 'link_category';
 	}
 
-	$categories = get_terms( $taxonomy, $args );
+	$categories = get_terms($taxonomy, $args);
 
-	if ( is_wp_error( $categories ) ) {
+	if (is_wp_error($categories)) {
 		$categories = array();
 	} else {
 		$categories = (array) $categories;
-		foreach ( array_keys( $categories ) as $k ) {
-			_make_cat_compat( $categories[ $k ] );
+		foreach (array_keys($categories) as $k) {
+			_make_cat_compat($categories[$k]);
 		}
 	}
 
@@ -87,13 +87,13 @@ 
  * @return object|array|WP_Error|null Category data in type defined by $output parameter.
  *                                    WP_Error if $category is empty, null if it does not exist.
  */
-function get_category( $category, $output = OBJECT, $filter = 'raw' ) {
-	$category = get_term( $category, 'category', $output, $filter );
+function get_category($category, $output = OBJECT, $filter = 'raw') {
+	$category = get_term($category, 'category', $output, $filter);
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return $category;
 
-	_make_cat_compat( $category );
+	_make_cat_compat($category);
 
 	return $category;
 }
@@ -117,45 +117,45 @@ 
  * @param string $output Optional. Constant OBJECT, ARRAY_A, or ARRAY_N
  * @return object|array|WP_Error|void Type is based on $output value.
  */
-function get_category_by_path( $category_path, $full_match = true, $output = OBJECT ) {
-	$category_path = rawurlencode( urldecode( $category_path ) );
-	$category_path = str_replace( '%2F', '/', $category_path );
-	$category_path = str_replace( '%20', ' ', $category_path );
-	$category_paths = '/' . trim( $category_path, '/' );
-	$leaf_path  = sanitize_title( basename( $category_paths ) );
-	$category_paths = explode( '/', $category_paths );
+function get_category_by_path($category_path, $full_match = true, $output = OBJECT) {
+	$category_path = rawurlencode(urldecode($category_path));
+	$category_path = str_replace('%2F', '/', $category_path);
+	$category_path = str_replace('%20', ' ', $category_path);
+	$category_paths = '/'.trim($category_path, '/');
+	$leaf_path = sanitize_title(basename($category_paths));
+	$category_paths = explode('/', $category_paths);
 	$full_path = '';
-	foreach ( (array) $category_paths as $pathdir ) {
-		$full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
+	foreach ((array) $category_paths as $pathdir) {
+		$full_path .= ($pathdir != '' ? '/' : '').sanitize_title($pathdir);
 	}
-	$categories = get_terms( 'category', array('get' => 'all', 'slug' => $leaf_path) );
+	$categories = get_terms('category', array('get' => 'all', 'slug' => $leaf_path));
 
-	if ( empty( $categories ) ) {
+	if (empty($categories)) {
 		return;
 	}
 
-	foreach ( $categories as $category ) {
-		$path = '/' . $leaf_path;
+	foreach ($categories as $category) {
+		$path = '/'.$leaf_path;
 		$curcategory = $category;
-		while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
-			$curcategory = get_term( $curcategory->parent, 'category' );
-			if ( is_wp_error( $curcategory ) ) {
+		while (($curcategory->parent != 0) && ($curcategory->parent != $curcategory->term_id)) {
+			$curcategory = get_term($curcategory->parent, 'category');
+			if (is_wp_error($curcategory)) {
 				return $curcategory;
 			}
-			$path = '/' . $curcategory->slug . $path;
+			$path = '/'.$curcategory->slug.$path;
 		}
 
-		if ( $path == $full_path ) {
-			$category = get_term( $category->term_id, 'category', $output );
-			_make_cat_compat( $category );
+		if ($path == $full_path) {
+			$category = get_term($category->term_id, 'category', $output);
+			_make_cat_compat($category);
 			return $category;
 		}
 	}
 
 	// If full matching is not required, return the first cat that matches the leaf.
-	if ( ! $full_match ) {
-		$category = get_term( reset( $categories )->term_id, 'category', $output );
-		_make_cat_compat( $category );
+	if ( ! $full_match) {
+		$category = get_term(reset($categories)->term_id, 'category', $output);
+		_make_cat_compat($category);
 		return $category;
 	}
 }
@@ -168,10 +168,10 @@ 
  * @param string $slug The category slug.
  * @return object Category data object
  */
-function get_category_by_slug( $slug  ) {
-	$category = get_term_by( 'slug', $slug, 'category' );
-	if ( $category )
-		_make_cat_compat( $category );
+function get_category_by_slug($slug) {
+	$category = get_term_by('slug', $slug, 'category');
+	if ($category)
+		_make_cat_compat($category);
 
 	return $category;
 }
@@ -184,9 +184,9 @@ 
  * @param string $cat_name Category name.
  * @return int 0, if failure and ID of category on success.
  */
-function get_cat_ID( $cat_name ) {
-	$cat = get_term_by( 'name', $cat_name, 'category' );
-	if ( $cat )
+function get_cat_ID($cat_name) {
+	$cat = get_term_by('name', $cat_name, 'category');
+	if ($cat)
 		return $cat->term_id;
 	return 0;
 }
@@ -199,10 +199,10 @@ 
  * @param int $cat_id Category ID
  * @return string Category name, or an empty string if category doesn't exist.
  */
-function get_cat_name( $cat_id ) {
+function get_cat_name($cat_id) {
 	$cat_id = (int) $cat_id;
-	$category = get_term( $cat_id, 'category' );
-	if ( ! $category || is_wp_error( $category ) )
+	$category = get_term($cat_id, 'category');
+	if ( ! $category || is_wp_error($category))
 		return '';
 	return $category->name;
 }
@@ -219,8 +219,8 @@ 
  * @param int|object $cat2 The child category.
  * @return bool Whether $cat2 is child of $cat1
  */
-function cat_is_ancestor_of( $cat1, $cat2 ) {
-	return term_is_ancestor_of( $cat1, $cat2, 'category' );
+function cat_is_ancestor_of($cat1, $cat2) {
+	return term_is_ancestor_of($cat1, $cat2, 'category');
 }
 
 /**
@@ -232,8 +232,8 @@ 
  * @param string $context Optional. Default is 'display'.
  * @return object|array Same type as $category with sanitized data for safe use.
  */
-function sanitize_category( $category, $context = 'display' ) {
-	return sanitize_term( $category, 'category', $context );
+function sanitize_category($category, $context = 'display') {
+	return sanitize_term($category, 'category', $context);
 }
 
 /**
@@ -247,8 +247,8 @@ 
  * @param string $context What filter to use, 'raw', 'display', etc.
  * @return mixed Same type as $value after $value has been sanitized.
  */
-function sanitize_category_field( $field, $value, $cat_id, $context ) {
-	return sanitize_term_field( $field, $value, $cat_id, 'category', $context );
+function sanitize_category_field($field, $value, $cat_id, $context) {
+	return sanitize_term_field($field, $value, $cat_id, 'category', $context);
 }
 
 /* Tags */
@@ -262,10 +262,10 @@ 
  * @param string|array $args Tag arguments to use when retrieving tags.
  * @return array List of tags.
  */
-function get_tags( $args = '' ) {
-	$tags = get_terms( 'post_tag', $args );
+function get_tags($args = '') {
+	$tags = get_terms('post_tag', $args);
 
-	if ( empty( $tags ) ) {
+	if (empty($tags)) {
 		$return = array();
 		return $return;
 	}
@@ -278,7 +278,7 @@ 
 	 * @param array $tags Array of 'post_tag' term objects.
 	 * @param array $args An array of arguments. @see get_terms()
 	 */
-	$tags = apply_filters( 'get_tags', $tags, $args );
+	$tags = apply_filters('get_tags', $tags, $args);
 	return $tags;
 }
 
@@ -301,8 +301,8 @@ 
  * @param string $filter Optional. Default is raw or no WordPress defined filter will applied.
  * @return object|array|WP_Error|null Tag data in type defined by $output parameter. WP_Error if $tag is empty, null if it does not exist.
  */
-function get_tag( $tag, $output = OBJECT, $filter = 'raw' ) {
-	return get_term( $tag, 'post_tag', $output, $filter );
+function get_tag($tag, $output = OBJECT, $filter = 'raw') {
+	return get_term($tag, 'post_tag', $output, $filter);
 }
 
 /* Cache */
@@ -314,8 +314,8 @@ 
  *
  * @param int $id Category ID
  */
-function clean_category_cache( $id ) {
-	clean_term_cache( $id, 'category' );
+function clean_category_cache($id) {
+	clean_term_cache($id, 'category');
 }
 
 /**
@@ -338,15 +338,15 @@ 
  *
  * @param array|object|WP_Term $category Category Row object or array
  */
-function _make_cat_compat( &$category ) {
-	if ( is_object( $category ) && ! is_wp_error( $category ) ) {
+function _make_cat_compat(&$category) {
+	if (is_object($category) && ! is_wp_error($category)) {
 		$category->cat_ID = $category->term_id;
 		$category->category_count = $category->count;
 		$category->category_description = $category->description;
 		$category->cat_name = $category->name;
 		$category->category_nicename = $category->slug;
 		$category->category_parent = $category->parent;
-	} elseif ( is_array( $category ) && isset( $category['term_id'] ) ) {
+	} elseif (is_array($category) && isset($category['term_id'])) {
 		$category['cat_ID'] = &$category['term_id'];
 		$category['category_count'] = &$category['count'];
 		$category['category_description'] = &$category['description'];