ntwb / wordpress

src/wp-includes/template.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +63 added lines, -63 removed lines

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

Braces +27 added lines, -18 removed lines

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

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

Doc Comments +5 added lines

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

Spacing +8 added lines, -8 removed lines

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

Indentation +375 added lines, -375 removed lines

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

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

Doc Comments +9 added lines

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

Indentation +211 added lines, -211 removed lines

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

Switch Indentation +12 added lines, -12 removed lines

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

Spacing +15 added lines, -15 removed lines

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

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

Doc Comments +6 added lines

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

Indentation +174 added lines, -174 removed lines

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

Spacing +7 added lines, -8 removed lines

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

src/wp-includes/theme.php

Doc Comments +1 added lines, -1 removed lines

@@ -1309,7 +1309,7 @@
  *
  * @global array $editor_styles
  *
- * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ * @param string[] $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	                               Defaults to 'editor-style.css'
  */
 function add_editor_style( $stylesheet = 'editor-style.css' ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Theme, template, and stylesheet functions.
- *
- * @package WordPress
- * @subpackage Theme
- */
+	 * Theme, template, and stylesheet functions.
+	 *
+	 * @package WordPress
+	 * @subpackage Theme
+	 */
 
 /**
  * Returns an array of WP_Theme objects based on the arguments.

Spacing +486 added lines, -486 removed lines

@@ -27,55 +27,55 @@ 
  *                      synonymous for the current blog.
  * @return array Array of WP_Theme objects.
  */
-function wp_get_themes( $args = array() ) {
+function wp_get_themes($args = array()) {
 	global $wp_theme_directories;
 
-	$defaults = array( 'errors' => false, 'allowed' => null, 'blog_id' => 0 );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('errors' => false, 'allowed' => null, 'blog_id' => 0);
+	$args = wp_parse_args($args, $defaults);
 
 	$theme_directories = search_theme_directories();
 
-	if ( count( $wp_theme_directories ) > 1 ) {
+	if (count($wp_theme_directories) > 1) {
 		// Make sure the current theme wins out, in case search_theme_directories() picks the wrong
 		// one in the case of a conflict. (Normally, last registered theme root wins.)
 		$current_theme = get_stylesheet();
-		if ( isset( $theme_directories[ $current_theme ] ) ) {
-			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
-				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
-			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
+		if (isset($theme_directories[$current_theme])) {
+			$root_of_current_theme = get_raw_theme_root($current_theme);
+			if ( ! in_array($root_of_current_theme, $wp_theme_directories))
+				$root_of_current_theme = WP_CONTENT_DIR.$root_of_current_theme;
+			$theme_directories[$current_theme]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
+	if (empty($theme_directories))
 		return array();
 
-	if ( is_multisite() && null !== $args['allowed'] ) {
+	if (is_multisite() && null !== $args['allowed']) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		if ('network' === $allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed_on_network());
+		elseif ('site' === $allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed_on_site($args['blog_id']));
+		elseif ($allowed)
+			$theme_directories = array_intersect_key($theme_directories, WP_Theme::get_allowed($args['blog_id']));
 		else
-			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+			$theme_directories = array_diff_key($theme_directories, WP_Theme::get_allowed($args['blog_id']));
 	}
 
 	$themes = array();
 	static $_themes = array();
 
-	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
+	foreach ($theme_directories as $theme => $theme_root) {
+		if (isset($_themes[$theme_root['theme_root'].'/'.$theme]))
+			$themes[$theme] = $_themes[$theme_root['theme_root'].'/'.$theme];
 		else
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+			$themes[$theme] = $_themes[$theme_root['theme_root'].'/'.$theme] = new WP_Theme($theme, $theme_root['theme_root']);
 	}
 
-	if ( null !== $args['errors'] ) {
-		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
-				unset( $themes[ $theme ] );
+	if (null !== $args['errors']) {
+		foreach ($themes as $theme => $wp_theme) {
+			if ($wp_theme->errors() != $args['errors'])
+				unset($themes[$theme]);
 		}
 	}
 
@@ -94,21 +94,21 @@ 
  * 	                         is used to calculate the theme root for the $stylesheet provided (or current theme).
  * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
  */
-function wp_get_theme( $stylesheet = null, $theme_root = null ) {
+function wp_get_theme($stylesheet = null, $theme_root = null) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
+	if (empty($stylesheet))
 		$stylesheet = get_stylesheet();
 
-	if ( empty( $theme_root ) ) {
-		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
-			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+	if (empty($theme_root)) {
+		$theme_root = get_raw_theme_root($stylesheet);
+		if (false === $theme_root)
+			$theme_root = WP_CONTENT_DIR.'/themes';
+		elseif ( ! in_array($theme_root, (array) $wp_theme_directories))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 	}
 
-	return new WP_Theme( $stylesheet, $theme_root );
+	return new WP_Theme($stylesheet, $theme_root);
 }
 
 /**
@@ -117,11 +117,11 @@ 
  * @since 3.5.0
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
-function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_themes' );
-	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
+function wp_clean_themes_cache($clear_update_cache = true) {
+	if ($clear_update_cache)
+		delete_site_transient('update_themes');
+	search_theme_directories(true);
+	foreach (wp_get_themes(array('errors' => null)) as $theme)
 		$theme->cache_delete();
 }
 
@@ -133,7 +133,7 @@ 
  * @return bool true if a child theme is in use, false otherwise.
  **/
 function is_child_theme() {
-	return ( TEMPLATEPATH !== STYLESHEETPATH );
+	return (TEMPLATEPATH !== STYLESHEETPATH);
 }
 
 /**
@@ -157,7 +157,7 @@ 
 	 *
 	 * @param string $stylesheet Name of the current stylesheet.
 	 */
-	return apply_filters( 'stylesheet', get_option( 'stylesheet' ) );
+	return apply_filters('stylesheet', get_option('stylesheet'));
 }
 
 /**
@@ -169,7 +169,7 @@ 
  */
 function get_stylesheet_directory() {
 	$stylesheet = get_stylesheet();
-	$theme_root = get_theme_root( $stylesheet );
+	$theme_root = get_theme_root($stylesheet);
 	$stylesheet_dir = "$theme_root/$stylesheet";
 
 	/**
@@ -181,7 +181,7 @@ 
 	 * @param string $stylesheet     Directory name of the current theme.
 	 * @param string $theme_root     Absolute path to themes directory.
 	 */
-	return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root );
+	return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root);
 }
 
 /**
@@ -192,8 +192,8 @@ 
  * @return string
  */
 function get_stylesheet_directory_uri() {
-	$stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
-	$theme_root_uri = get_theme_root_uri( $stylesheet );
+	$stylesheet = str_replace('%2F', '/', rawurlencode(get_stylesheet()));
+	$theme_root_uri = get_theme_root_uri($stylesheet);
 	$stylesheet_dir_uri = "$theme_root_uri/$stylesheet";
 
 	/**
@@ -205,7 +205,7 @@ 
 	 * @param string $stylesheet         Name of the activated theme's directory.
 	 * @param string $theme_root_uri     Themes root URI.
 	 */
-	return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri );
+	return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri);
 }
 
 /**
@@ -220,7 +220,7 @@ 
  */
 function get_stylesheet_uri() {
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
-	$stylesheet_uri = $stylesheet_dir_uri . '/style.css';
+	$stylesheet_uri = $stylesheet_dir_uri.'/style.css';
 	/**
 	 * Filter the URI of the current theme stylesheet.
 	 *
@@ -229,7 +229,7 @@ 
 	 * @param string $stylesheet_uri     Stylesheet URI for the current theme/child theme.
 	 * @param string $stylesheet_dir_uri Stylesheet directory URI for the current theme/child theme.
 	 */
-	return apply_filters( 'stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
+	return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
 /**
@@ -257,9 +257,9 @@ 
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
 	$dir = get_stylesheet_directory();
 	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
+	if (file_exists("$dir/$locale.css"))
 		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
+	elseif ( ! empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css"))
 		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
 	else
 		$stylesheet_uri = '';
@@ -271,7 +271,7 @@ 
 	 * @param string $stylesheet_uri     Localized stylesheet URI.
 	 * @param string $stylesheet_dir_uri Stylesheet directory URI.
 	 */
-	return apply_filters( 'locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
+	return apply_filters('locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
 /**
@@ -289,7 +289,7 @@ 
 	 *
 	 * @param string $template Current theme's directory name.
 	 */
-	return apply_filters( 'template', get_option( 'template' ) );
+	return apply_filters('template', get_option('template'));
 }
 
 /**
@@ -301,7 +301,7 @@ 
  */
 function get_template_directory() {
 	$template = get_template();
-	$theme_root = get_theme_root( $template );
+	$theme_root = get_theme_root($template);
 	$template_dir = "$theme_root/$template";
 
 	/**
@@ -313,7 +313,7 @@ 
 	 * @param string $template     Directory name of the current theme.
 	 * @param string $theme_root   Absolute path to the themes directory.
 	 */
-	return apply_filters( 'template_directory', $template_dir, $template, $theme_root );
+	return apply_filters('template_directory', $template_dir, $template, $theme_root);
 }
 
 /**
@@ -324,8 +324,8 @@ 
  * @return string Template directory URI.
  */
 function get_template_directory_uri() {
-	$template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
-	$theme_root_uri = get_theme_root_uri( $template );
+	$template = str_replace('%2F', '/', rawurlencode(get_template()));
+	$theme_root_uri = get_theme_root_uri($template);
 	$template_dir_uri = "$theme_root_uri/$template";
 
 	/**
@@ -337,7 +337,7 @@ 
 	 * @param string $template         Directory name of the current theme.
 	 * @param string $theme_root_uri   The themes root URI.
 	 */
-	return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri );
+	return apply_filters('template_directory_uri', $template_dir_uri, $template, $theme_root_uri);
 }
 
 /**
@@ -352,13 +352,13 @@ 
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if (count($wp_theme_directories) <= 1)
 		return '/themes';
 
-	$theme_roots = get_site_transient( 'theme_roots' );
-	if ( false === $theme_roots ) {
-		search_theme_directories( true ); // Regenerate the transient.
-		$theme_roots = get_site_transient( 'theme_roots' );
+	$theme_roots = get_site_transient('theme_roots');
+	if (false === $theme_roots) {
+		search_theme_directories(true); // Regenerate the transient.
+		$theme_roots = get_site_transient('theme_roots');
 	}
 	return $theme_roots;
 }
@@ -373,24 +373,24 @@ 
  * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR
  * @return bool
  */
-function register_theme_directory( $directory ) {
+function register_theme_directory($directory) {
 	global $wp_theme_directories;
 
-	if ( ! file_exists( $directory ) ) {
+	if ( ! file_exists($directory)) {
 		// Try prepending as the theme directory could be relative to the content directory
-		$directory = WP_CONTENT_DIR . '/' . $directory;
+		$directory = WP_CONTENT_DIR.'/'.$directory;
 		// If this directory does not exist, return and do not register
-		if ( ! file_exists( $directory ) ) {
+		if ( ! file_exists($directory)) {
 			return false;
 		}
 	}
 
-	if ( ! is_array( $wp_theme_directories ) ) {
+	if ( ! is_array($wp_theme_directories)) {
 		$wp_theme_directories = array();
 	}
 
-	$untrailed = untrailingslashit( $directory );
-	if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
+	$untrailed = untrailingslashit($directory);
+	if ( ! empty($untrailed) && ! in_array($untrailed, $wp_theme_directories)) {
 		$wp_theme_directories[] = $untrailed;
 	}
 
@@ -408,14 +408,14 @@ 
  * @param bool $force Optional. Whether to force a new directory scan. Defaults to false.
  * @return array|false Valid themes found
  */
-function search_theme_directories( $force = false ) {
+function search_theme_directories($force = false) {
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
+	if (empty($wp_theme_directories))
 		return false;
 
-	if ( ! $force && isset( $found_themes ) )
+	if ( ! $force && isset($found_themes))
 		return $found_themes;
 
 	$found_themes = array();
@@ -426,11 +426,11 @@ 
 	// Set up maybe-relative, maybe-absolute array of theme directories.
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
-	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+	foreach ($wp_theme_directories as $theme_root) {
+		if (0 === strpos($theme_root, WP_CONTENT_DIR))
+			$relative_theme_roots[str_replace(WP_CONTENT_DIR, '', $theme_root)] = $theme_root;
 		else
-			$relative_theme_roots[ $theme_root ] = $theme_root;
+			$relative_theme_roots[$theme_root] = $theme_root;
 	}
 
 	/**
@@ -441,87 +441,87 @@ 
 	 * @param bool   $cache_expiration Whether to get the cache of the theme directories. Default false.
 	 * @param string $cache_directory  Directory to be searched for the cache.
 	 */
-	if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
-		$cached_roots = get_site_transient( 'theme_roots' );
-		if ( is_array( $cached_roots ) ) {
-			foreach ( $cached_roots as $theme_dir => $theme_root ) {
+	if ($cache_expiration = apply_filters('wp_cache_themes_persistently', false, 'search_theme_directories')) {
+		$cached_roots = get_site_transient('theme_roots');
+		if (is_array($cached_roots)) {
+			foreach ($cached_roots as $theme_dir => $theme_root) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
+				if ( ! isset($relative_theme_roots[$theme_root]))
 					continue;
-				$found_themes[ $theme_dir ] = array(
-					'theme_file' => $theme_dir . '/style.css',
-					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
+				$found_themes[$theme_dir] = array(
+					'theme_file' => $theme_dir.'/style.css',
+					'theme_root' => $relative_theme_roots[$theme_root], // Convert relative to absolute.
 				);
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
+		if ( ! is_int($cache_expiration))
 			$cache_expiration = 1800; // half hour
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
 
 	/* Loop the registered theme directories and extract all themes */
-	foreach ( $wp_theme_directories as $theme_root ) {
+	foreach ($wp_theme_directories as $theme_root) {
 
 		// Start with directories in the root of the current theme directory.
-		$dirs = @ scandir( $theme_root );
-		if ( ! $dirs ) {
-			trigger_error( "$theme_root is not readable", E_USER_NOTICE );
+		$dirs = @ scandir($theme_root);
+		if ( ! $dirs) {
+			trigger_error("$theme_root is not readable", E_USER_NOTICE);
 			continue;
 		}
-		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
+		foreach ($dirs as $dir) {
+			if ( ! is_dir($theme_root.'/'.$dir) || $dir[0] == '.' || $dir == 'CVS')
 				continue;
-			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
+			if (file_exists($theme_root.'/'.$dir.'/style.css')) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
-				$found_themes[ $dir ] = array(
-					'theme_file' => $dir . '/style.css',
+				$found_themes[$dir] = array(
+					'theme_file' => $dir.'/style.css',
 					'theme_root' => $theme_root,
 				);
 			} else {
 				$found_theme = false;
 				// wp-content/themes/a-folder-of-themes/*
 				// wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs
-				$sub_dirs = @ scandir( $theme_root . '/' . $dir );
-				if ( ! $sub_dirs ) {
-					trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
+				$sub_dirs = @ scandir($theme_root.'/'.$dir);
+				if ( ! $sub_dirs) {
+					trigger_error("$theme_root/$dir is not readable", E_USER_NOTICE);
 					continue;
 				}
-				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
+				foreach ($sub_dirs as $sub_dir) {
+					if ( ! is_dir($theme_root.'/'.$dir.'/'.$sub_dir) || $dir[0] == '.' || $dir == 'CVS')
 						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
+					if ( ! file_exists($theme_root.'/'.$dir.'/'.$sub_dir.'/style.css'))
 						continue;
-					$found_themes[ $dir . '/' . $sub_dir ] = array(
-						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
+					$found_themes[$dir.'/'.$sub_dir] = array(
+						'theme_file' => $dir.'/'.$sub_dir.'/style.css',
 						'theme_root' => $theme_root,
 					);
 					$found_theme = true;
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
-					$found_themes[ $dir ] = array(
-						'theme_file' => $dir . '/style.css',
+				if ( ! $found_theme)
+					$found_themes[$dir] = array(
+						'theme_file' => $dir.'/style.css',
 						'theme_root' => $theme_root,
 					);
 			}
 		}
 	}
 
-	asort( $found_themes );
+	asort($found_themes);
 
 	$theme_roots = array();
-	$relative_theme_roots = array_flip( $relative_theme_roots );
+	$relative_theme_roots = array_flip($relative_theme_roots);
 
-	foreach ( $found_themes as $theme_dir => $theme_data ) {
-		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
+	foreach ($found_themes as $theme_dir => $theme_data) {
+		$theme_roots[$theme_dir] = $relative_theme_roots[$theme_data['theme_root']]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
-		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	if ($theme_roots != get_site_transient('theme_roots'))
+		set_site_transient('theme_roots', $theme_roots, $cache_expiration);
 
 	return $found_themes;
 }
@@ -538,16 +538,16 @@ 
  * @param string $stylesheet_or_template The stylesheet or template name of the theme
  * @return string Theme path.
  */
-function get_theme_root( $stylesheet_or_template = false ) {
+function get_theme_root($stylesheet_or_template = false) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
+	if ($stylesheet_or_template && $theme_root = get_raw_theme_root($stylesheet_or_template)) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( ! in_array($theme_root, (array) $wp_theme_directories))
+			$theme_root = WP_CONTENT_DIR.$theme_root;
 	} else {
-		$theme_root = WP_CONTENT_DIR . '/themes';
+		$theme_root = WP_CONTENT_DIR.'/themes';
 	}
 
 	/**
@@ -557,7 +557,7 @@ 
 	 *
 	 * @param string $theme_root Absolute path to themes directory.
 	 */
-	return apply_filters( 'theme_root', $theme_root );
+	return apply_filters('theme_root', $theme_root);
 }
 
 /**
@@ -575,28 +575,28 @@ 
  * 	                                     the need for a get_raw_theme_root() call.
  * @return string Themes URI.
  */
-function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
+function get_theme_root_uri($stylesheet_or_template = false, $theme_root = false) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
-		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	if ($stylesheet_or_template && ! $theme_root)
+		$theme_root = get_raw_theme_root($stylesheet_or_template);
 
-	if ( $stylesheet_or_template && $theme_root ) {
-		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
+	if ($stylesheet_or_template && $theme_root) {
+		if (in_array($theme_root, (array) $wp_theme_directories)) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
-				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
-				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
+			if (0 === strpos($theme_root, WP_CONTENT_DIR))
+				$theme_root_uri = content_url(str_replace(WP_CONTENT_DIR, '', $theme_root));
+			elseif (0 === strpos($theme_root, ABSPATH))
+				$theme_root_uri = site_url(str_replace(ABSPATH, '', $theme_root));
+			elseif (0 === strpos($theme_root, WP_PLUGIN_DIR) || 0 === strpos($theme_root, WPMU_PLUGIN_DIR))
+				$theme_root_uri = plugins_url(basename($theme_root), $theme_root);
 			else
 				$theme_root_uri = $theme_root;
 		} else {
-			$theme_root_uri = content_url( $theme_root );
+			$theme_root_uri = content_url($theme_root);
 		}
 	} else {
-		$theme_root_uri = content_url( 'themes' );
+		$theme_root_uri = content_url('themes');
 	}
 
 	/**
@@ -608,7 +608,7 @@ 
 	 * @param string $siteurl                WordPress web address which is set in General Options.
 	 * @param string $stylesheet_or_template Stylesheet or template name of the theme.
 	 */
-	return apply_filters( 'theme_root_uri', $theme_root_uri, get_option( 'siteurl' ), $stylesheet_or_template );
+	return apply_filters('theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template);
 }
 
 /**
@@ -623,25 +623,25 @@ 
  *                                       Defaults to false, meaning the cache is used.
  * @return string Theme root
  */
-function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
+function get_raw_theme_root($stylesheet_or_template, $skip_cache = false) {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
+	if (count($wp_theme_directories) <= 1)
 		return '/themes';
 
 	$theme_root = false;
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
-	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
+	if ( ! $skip_cache) {
+		if (get_option('stylesheet') == $stylesheet_or_template)
 			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
+		elseif (get_option('template') == $stylesheet_or_template)
 			$theme_root = get_option('template_root');
 	}
 
-	if ( empty($theme_root) ) {
+	if (empty($theme_root)) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
+		if ( ! empty($theme_roots[$stylesheet_or_template]))
 			$theme_root = $theme_roots[$stylesheet_or_template];
 	}
 
@@ -655,9 +655,9 @@ 
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
+	if (empty($stylesheet))
 		return;
-	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
+	echo '<link rel="stylesheet" href="'.$stylesheet.'" type="text/css" media="screen" />';
 }
 
 /**
@@ -674,71 +674,71 @@ 
  *
  * @param string $stylesheet Stylesheet name
  */
-function switch_theme( $stylesheet ) {
+function switch_theme($stylesheet) {
 	global $wp_theme_directories, $wp_customize, $sidebars_widgets;
 
 	$_sidebars_widgets = null;
-	if ( 'wp_ajax_customize_save' === current_action() ) {
-		$_sidebars_widgets = $wp_customize->post_value( $wp_customize->get_setting( 'old_sidebars_widgets_data' ) );
-	} elseif ( is_array( $sidebars_widgets ) ) {
+	if ('wp_ajax_customize_save' === current_action()) {
+		$_sidebars_widgets = $wp_customize->post_value($wp_customize->get_setting('old_sidebars_widgets_data'));
+	} elseif (is_array($sidebars_widgets)) {
 		$_sidebars_widgets = $sidebars_widgets;
 	}
 
-	if ( is_array( $_sidebars_widgets ) ) {
-		set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
+	if (is_array($_sidebars_widgets)) {
+		set_theme_mod('sidebars_widgets', array('time' => time(), 'data' => $_sidebars_widgets));
 	}
 
-	$nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
+	$nav_menu_locations = get_theme_mod('nav_menu_locations');
 
-	if ( func_num_args() > 1 ) {
-		$stylesheet = func_get_arg( 1 );
+	if (func_num_args() > 1) {
+		$stylesheet = func_get_arg(1);
 	}
 
 	$old_theme = wp_get_theme();
-	$new_theme = wp_get_theme( $stylesheet );
+	$new_theme = wp_get_theme($stylesheet);
 	$template  = $new_theme->get_template();
 
-	update_option( 'template', $template );
-	update_option( 'stylesheet', $stylesheet );
+	update_option('template', $template);
+	update_option('stylesheet', $stylesheet);
 
-	if ( count( $wp_theme_directories ) > 1 ) {
-		update_option( 'template_root', get_raw_theme_root( $template, true ) );
-		update_option( 'stylesheet_root', get_raw_theme_root( $stylesheet, true ) );
+	if (count($wp_theme_directories) > 1) {
+		update_option('template_root', get_raw_theme_root($template, true));
+		update_option('stylesheet_root', get_raw_theme_root($stylesheet, true));
 	} else {
-		delete_option( 'template_root' );
-		delete_option( 'stylesheet_root' );
+		delete_option('template_root');
+		delete_option('stylesheet_root');
 	}
 
-	$new_name  = $new_theme->get('Name');
+	$new_name = $new_theme->get('Name');
 
-	update_option( 'current_theme', $new_name );
+	update_option('current_theme', $new_name);
 
 	// Migrate from the old mods_{name} option to theme_mods_{slug}.
-	if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
-		$default_theme_mods = (array) get_option( 'mods_' . $new_name );
-		if ( ! empty( $nav_menu_locations ) && empty( $default_theme_mods['nav_menu_locations'] ) ) {
+	if (is_admin() && false === get_option('theme_mods_'.$stylesheet)) {
+		$default_theme_mods = (array) get_option('mods_'.$new_name);
+		if ( ! empty($nav_menu_locations) && empty($default_theme_mods['nav_menu_locations'])) {
 			$default_theme_mods['nav_menu_locations'] = $nav_menu_locations;
 		}
-		add_option( "theme_mods_$stylesheet", $default_theme_mods );
+		add_option("theme_mods_$stylesheet", $default_theme_mods);
 	} else {
 		/*
 		 * Since retrieve_widgets() is called when initializing a theme in the Customizer,
 		 * we need to remove the theme mods to avoid overwriting changes made via
 		 * the Customizer when accessing wp-admin/widgets.php.
 		 */
-		if ( 'wp_ajax_customize_save' === current_action() ) {
-			remove_theme_mod( 'sidebars_widgets' );
+		if ('wp_ajax_customize_save' === current_action()) {
+			remove_theme_mod('sidebars_widgets');
 		}
 
-		if ( ! empty( $nav_menu_locations ) ) {
-			$nav_mods = get_theme_mod( 'nav_menu_locations' );
-			if ( empty( $nav_mods ) ) {
-				set_theme_mod( 'nav_menu_locations', $nav_menu_locations );
+		if ( ! empty($nav_menu_locations)) {
+			$nav_mods = get_theme_mod('nav_menu_locations');
+			if (empty($nav_mods)) {
+				set_theme_mod('nav_menu_locations', $nav_menu_locations);
 			}
 		}
 	}
 
-	update_option( 'theme_switched', $old_theme->get_stylesheet() );
+	update_option('theme_switched', $old_theme->get_stylesheet());
 
 	/**
 	 * Fires after the theme is switched.
@@ -750,7 +750,7 @@ 
 	 * @param WP_Theme $new_theme WP_Theme instance of the new theme.
 	 * @param WP_Theme $old_theme WP_Theme instance of the old theme.
 	 */
-	do_action( 'switch_theme', $new_name, $new_theme, $old_theme );
+	do_action('switch_theme', $new_name, $new_theme, $old_theme);
 }
 
 /**
@@ -776,23 +776,23 @@ 
 	 *
 	 * @param bool $validate Whether to validate the current theme. Default true.
 	 */
-	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
+	if (wp_installing() || ! apply_filters('validate_current_theme', true))
 		return true;
 
-	if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
+	if ( ! file_exists(get_template_directory().'/index.php')) {
 		// Invalid.
-	} elseif ( ! file_exists( get_template_directory() . '/style.css' ) ) {
+	} elseif ( ! file_exists(get_template_directory().'/style.css')) {
 		// Invalid.
-	} elseif ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
+	} elseif (is_child_theme() && ! file_exists(get_stylesheet_directory().'/style.css')) {
 		// Invalid.
 	} else {
 		// Valid.
 		return true;
 	}
 
-	$default = wp_get_theme( WP_DEFAULT_THEME );
-	if ( $default->exists() ) {
-		switch_theme( WP_DEFAULT_THEME );
+	$default = wp_get_theme(WP_DEFAULT_THEME);
+	if ($default->exists()) {
+		switch_theme(WP_DEFAULT_THEME);
 		return false;
 	}
 
@@ -806,11 +806,11 @@ 
 	 * if it turns out there is no default theme installed. (That's `false`.)
 	 */
 	$default = WP_Theme::get_core_default_theme();
-	if ( false === $default || get_stylesheet() == $default->get_stylesheet() ) {
+	if (false === $default || get_stylesheet() == $default->get_stylesheet()) {
 		return true;
 	}
 
-	switch_theme( $default->get_stylesheet() );
+	switch_theme($default->get_stylesheet());
 	return false;
 }
 
@@ -822,16 +822,16 @@ 
  * @return array|void Theme modifications.
  */
 function get_theme_mods() {
-	$theme_slug = get_option( 'stylesheet' );
-	$mods = get_option( "theme_mods_$theme_slug" );
-	if ( false === $mods ) {
-		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
+	$theme_slug = get_option('stylesheet');
+	$mods = get_option("theme_mods_$theme_slug");
+	if (false === $mods) {
+		$theme_name = get_option('current_theme');
+		if (false === $theme_name)
 			$theme_name = wp_get_theme()->get('Name');
-		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
-		if ( is_admin() && false !== $mods ) {
-			update_option( "theme_mods_$theme_slug", $mods );
-			delete_option( "mods_$theme_name" );
+		$mods = get_option("mods_$theme_name"); // Deprecated location.
+		if (is_admin() && false !== $mods) {
+			update_option("theme_mods_$theme_slug", $mods);
+			delete_option("mods_$theme_name");
 		}
 	}
 	return $mods;
@@ -851,10 +851,10 @@ 
  * @param bool|string $default
  * @return string
  */
-function get_theme_mod( $name, $default = false ) {
+function get_theme_mod($name, $default = false) {
 	$mods = get_theme_mods();
 
-	if ( isset( $mods[$name] ) ) {
+	if (isset($mods[$name])) {
 		/**
 		 * Filter the theme modification, or 'theme_mod', value.
 		 *
@@ -867,14 +867,14 @@ 
 		 *
 		 * @param string $current_mod The value of the current theme modification.
 		 */
-		return apply_filters( "theme_mod_{$name}", $mods[$name] );
+		return apply_filters("theme_mod_{$name}", $mods[$name]);
 	}
 
-	if ( is_string( $default ) )
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	if (is_string($default))
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 	/** This filter is documented in wp-includes/theme.php */
-	return apply_filters( "theme_mod_{$name}", $default );
+	return apply_filters("theme_mod_{$name}", $default);
 }
 
 /**
@@ -885,9 +885,9 @@ 
  * @param string $name  Theme modification name.
  * @param mixed  $value Theme modification value.
  */
-function set_theme_mod( $name, $value ) {
+function set_theme_mod($name, $value) {
 	$mods = get_theme_mods();
-	$old_value = isset( $mods[ $name ] ) ? $mods[ $name ] : false;
+	$old_value = isset($mods[$name]) ? $mods[$name] : false;
 
 	/**
 	 * Filter the theme mod value on save.
@@ -901,10 +901,10 @@ 
 	 * @param string $value     The new value of the theme mod.
 	 * @param string $old_value The current value of the theme mod.
 	 */
-	$mods[ $name ] = apply_filters( "pre_set_theme_mod_$name", $value, $old_value );
+	$mods[$name] = apply_filters("pre_set_theme_mod_$name", $value, $old_value);
 
-	$theme = get_option( 'stylesheet' );
-	update_option( "theme_mods_$theme", $mods );
+	$theme = get_option('stylesheet');
+	update_option("theme_mods_$theme", $mods);
 }
 
 /**
@@ -917,20 +917,20 @@ 
  *
  * @param string $name Theme modification name.
  */
-function remove_theme_mod( $name ) {
+function remove_theme_mod($name) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
+	if ( ! isset($mods[$name]))
 		return;
 
-	unset( $mods[ $name ] );
+	unset($mods[$name]);
 
-	if ( empty( $mods ) ) {
+	if (empty($mods)) {
 		remove_theme_mods();
 		return;
 	}
-	$theme = get_option( 'stylesheet' );
-	update_option( "theme_mods_$theme", $mods );
+	$theme = get_option('stylesheet');
+	update_option("theme_mods_$theme", $mods);
 }
 
 /**
@@ -939,13 +939,13 @@ 
  * @since 2.1.0
  */
 function remove_theme_mods() {
-	delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+	delete_option('theme_mods_'.get_option('stylesheet'));
 
 	// Old style.
-	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
+	$theme_name = get_option('current_theme');
+	if (false === $theme_name)
 		$theme_name = wp_get_theme()->get('Name');
-	delete_option( 'mods_' . $theme_name );
+	delete_option('mods_'.$theme_name);
 }
 
 /**
@@ -956,7 +956,7 @@ 
  * @return string
  */
 function get_header_textcolor() {
-	return get_theme_mod('header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	return get_theme_mod('header_textcolor', get_theme_support('custom-header', 'default-text-color'));
 }
 
 /**
@@ -976,10 +976,10 @@ 
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
+	if ( ! current_theme_supports('custom-header', 'header-text'))
 		return false;
 
-	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
+	$text_color = get_theme_mod('header_textcolor', get_theme_support('custom-header', 'default-text-color'));
 	return 'blank' !== $text_color;
 }
 
@@ -1004,15 +1004,15 @@ 
  * @return string|false
  */
 function get_header_image() {
-	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
+	$url = get_theme_mod('header_image', get_theme_support('custom-header', 'default-image'));
 
-	if ( 'remove-header' == $url )
+	if ('remove-header' == $url)
 		return false;
 
-	if ( is_random_header_image() )
+	if (is_random_header_image())
 		$url = get_random_header_image();
 
-	return esc_url_raw( set_url_scheme( $url ) );
+	return esc_url_raw(set_url_scheme($url));
 }
 
 /**
@@ -1024,15 +1024,15 @@ 
  *                              to override the default attributes. Default empty.
  * @return string HTML image element markup or empty string on failure.
  */
-function get_header_image_tag( $attr = array() ) {
+function get_header_image_tag($attr = array()) {
 	$header = get_custom_header();
 
-	if ( empty( $header->url ) ) {
+	if (empty($header->url)) {
 		return '';
 	}
 
-	$width = absint( $header->width );
-	$height = absint( $header->height );
+	$width = absint($header->width);
+	$height = absint($header->height);
 
 	$attr = wp_parse_args(
 		$attr,
@@ -1040,31 +1040,31 @@ 
 			'src' => $header->url,
 			'width' => $width,
 			'height' => $height,
-			'alt' => get_bloginfo( 'name' ),
+			'alt' => get_bloginfo('name'),
 		)
 	);
 
 	// Generate 'srcset' and 'sizes' if not already present.
-	if ( empty( $attr['srcset'] ) && ! empty( $header->attachment_id ) ) {
-		$image_meta = get_post_meta( $header->attachment_id, '_wp_attachment_metadata', true );
-		$size_array = array( $width, $height );
+	if (empty($attr['srcset']) && ! empty($header->attachment_id)) {
+		$image_meta = get_post_meta($header->attachment_id, '_wp_attachment_metadata', true);
+		$size_array = array($width, $height);
 
-		if ( is_array( $image_meta ) ) {
-			$srcset = wp_calculate_image_srcset( $size_array, $header->url, $image_meta, $header->attachment_id );
-			$sizes = ! empty( $attr['sizes'] ) ? $attr['sizes'] : wp_calculate_image_sizes( $size_array, $header->url, $image_meta, $header->attachment_id );
+		if (is_array($image_meta)) {
+			$srcset = wp_calculate_image_srcset($size_array, $header->url, $image_meta, $header->attachment_id);
+			$sizes = ! empty($attr['sizes']) ? $attr['sizes'] : wp_calculate_image_sizes($size_array, $header->url, $image_meta, $header->attachment_id);
 
-			if ( $srcset && $sizes ) {
+			if ($srcset && $sizes) {
 				$attr['srcset'] = $srcset;
 				$attr['sizes'] = $sizes;
 			}
 		}
 	}
 
-	$attr = array_map( 'esc_attr', $attr );
+	$attr = array_map('esc_attr', $attr);
 	$html = '<img';
 
-	foreach ( $attr as $name => $value ) {
-		$html .= ' ' . $name . '="' . $value . '"';
+	foreach ($attr as $name => $value) {
+		$html .= ' '.$name.'="'.$value.'"';
 	}
 
 	$html .= ' />';
@@ -1078,7 +1078,7 @@ 
 	 * @param object $header The custom header object returned by 'get_custom_header()'.
 	 * @param array  $attr   Array of the attributes for the image tag.
 	 */
-	return apply_filters( 'get_header_image_tag', $html, $header, $attr );
+	return apply_filters('get_header_image_tag', $html, $header, $attr);
 }
 
 /**
@@ -1088,8 +1088,8 @@ 
  *
  * @param array $attr Optional. Attributes for the image markup. Default empty.
  */
-function the_header_image_tag( $attr = array() ) {
-	echo get_header_image_tag( $attr );
+function the_header_image_tag($attr = array()) {
+	echo get_header_image_tag($attr);
 }
 
 /**
@@ -1107,29 +1107,29 @@ 
 function _get_random_header_data() {
 	static $_wp_random_header = null;
 
-	if ( empty( $_wp_random_header ) ) {
+	if (empty($_wp_random_header)) {
 		global $_wp_default_headers;
-		$header_image_mod = get_theme_mod( 'header_image', '' );
+		$header_image_mod = get_theme_mod('header_image', '');
 		$headers = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
+		if ('random-uploaded-image' == $header_image_mod)
 			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
-			if ( 'random-default-image' == $header_image_mod ) {
+		elseif ( ! empty($_wp_default_headers)) {
+			if ('random-default-image' == $header_image_mod) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
+				if (current_theme_supports('custom-header', 'random-default'))
 					$headers = $_wp_default_headers;
 			}
 		}
 
-		if ( empty( $headers ) )
+		if (empty($headers))
 			return new stdClass;
 
-		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
+		$_wp_random_header = (object) $headers[array_rand($headers)];
 
-		$_wp_random_header->url =  sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
-		$_wp_random_header->thumbnail_url =  sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$_wp_random_header->url = sprintf($_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri());
+		$_wp_random_header->thumbnail_url = sprintf($_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri());
 	}
 	return $_wp_random_header;
 }
@@ -1143,7 +1143,7 @@ 
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
+	if (empty($random_image->url))
 		return '';
 	return $random_image->url;
 }
@@ -1160,16 +1160,16 @@ 
  * @param string $type The random pool to use. any|default|uploaded
  * @return bool
  */
-function is_random_header_image( $type = 'any' ) {
-	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
+function is_random_header_image($type = 'any') {
+	$header_image_mod = get_theme_mod('header_image', get_theme_support('custom-header', 'default-image'));
 
-	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
+	if ('any' == $type) {
+		if ('random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ('' != get_random_header_image() && empty($header_image_mod)))
 			return true;
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
+		if ("random-$type-image" == $header_image_mod)
 			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
+		elseif ('default' == $type && empty($header_image_mod) && '' != get_random_header_image())
 			return true;
 	}
 
@@ -1183,8 +1183,8 @@ 
  */
 function header_image() {
 	$image = get_header_image();
-	if ( $image ) {
-		echo esc_url( $image );
+	if ($image) {
+		echo esc_url($image);
 	}
 }
 
@@ -1199,25 +1199,25 @@ 
 	$header_images = array();
 
 	// @todo caching
-	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
+	$headers = get_posts(array('post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true));
 
-	if ( empty( $headers ) )
+	if (empty($headers))
 		return array();
 
-	foreach ( (array) $headers as $header ) {
-		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
-		$header_data = wp_get_attachment_metadata( $header->ID );
+	foreach ((array) $headers as $header) {
+		$url = esc_url_raw(wp_get_attachment_url($header->ID));
+		$header_data = wp_get_attachment_metadata($header->ID);
 		$header_index = $header->ID;
 
 		$header_images[$header_index] = array();
 		$header_images[$header_index]['attachment_id'] = $header->ID;
-		$header_images[$header_index]['url'] =  $url;
+		$header_images[$header_index]['url'] = $url;
 		$header_images[$header_index]['thumbnail_url'] = $url;
-		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
+		$header_images[$header_index]['alt_text'] = get_post_meta($header->ID, '_wp_attachment_image_alt', true);
 
-		if ( isset( $header_data['width'] ) )
+		if (isset($header_data['width']))
 			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
+		if (isset($header_data['height']))
 			$header_images[$header_index]['height'] = $header_data['height'];
 	}
 
@@ -1236,21 +1236,21 @@ 
 function get_custom_header() {
 	global $_wp_default_headers;
 
-	if ( is_random_header_image() ) {
+	if (is_random_header_image()) {
 		$data = _get_random_header_data();
 	} else {
-		$data = get_theme_mod( 'header_image_data' );
-		if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
-			$directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$data = get_theme_mod('header_image_data');
+		if ( ! $data && current_theme_supports('custom-header', 'default-image')) {
+			$directory_args = array(get_template_directory_uri(), get_stylesheet_directory_uri());
 			$data = array();
-			$data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
-			if ( ! empty( $_wp_default_headers ) ) {
-				foreach ( (array) $_wp_default_headers as $default_header ) {
-					$url = vsprintf( $default_header['url'], $directory_args );
-					if ( $data['url'] == $url ) {
+			$data['url'] = $data['thumbnail_url'] = vsprintf(get_theme_support('custom-header', 'default-image'), $directory_args);
+			if ( ! empty($_wp_default_headers)) {
+				foreach ((array) $_wp_default_headers as $default_header) {
+					$url = vsprintf($default_header['url'], $directory_args);
+					if ($data['url'] == $url) {
 						$data = $default_header;
 						$data['url'] = $url;
-						$data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
+						$data['thumbnail_url'] = vsprintf($data['thumbnail_url'], $directory_args);
 						break;
 					}
 				}
@@ -1261,10 +1261,10 @@ 
 	$default = array(
 		'url'           => '',
 		'thumbnail_url' => '',
-		'width'         => get_theme_support( 'custom-header', 'width' ),
-		'height'        => get_theme_support( 'custom-header', 'height' ),
+		'width'         => get_theme_support('custom-header', 'width'),
+		'height'        => get_theme_support('custom-header', 'height'),
 	);
-	return (object) wp_parse_args( $data, $default );
+	return (object) wp_parse_args($data, $default);
 }
 
 /**
@@ -1276,10 +1276,10 @@ 
  *
  * @param array $headers Array of headers keyed by a string id. The ids point to arrays containing 'url', 'thumbnail_url', and 'description' keys.
  */
-function register_default_headers( $headers ) {
+function register_default_headers($headers) {
 	global $_wp_default_headers;
 
-	$_wp_default_headers = array_merge( (array) $_wp_default_headers, (array) $headers );
+	$_wp_default_headers = array_merge((array) $_wp_default_headers, (array) $headers);
 }
 
 /**
@@ -1297,12 +1297,12 @@ 
  * @return bool|void A single header returns true on success, false on failure.
  *                   There is currently no return value for multiple headers.
  */
-function unregister_default_headers( $header ) {
+function unregister_default_headers($header) {
 	global $_wp_default_headers;
-	if ( is_array( $header ) ) {
-		array_map( 'unregister_default_headers', $header );
-	} elseif ( isset( $_wp_default_headers[ $header ] ) ) {
-		unset( $_wp_default_headers[ $header ] );
+	if (is_array($header)) {
+		array_map('unregister_default_headers', $header);
+	} elseif (isset($_wp_default_headers[$header])) {
+		unset($_wp_default_headers[$header]);
 		return true;
 	} else {
 		return false;
@@ -1317,7 +1317,7 @@ 
  * @return string
  */
 function get_background_image() {
-	return get_theme_mod('background_image', get_theme_support( 'custom-background', 'default-image' ) );
+	return get_theme_mod('background_image', get_theme_support('custom-background', 'default-image'));
 }
 
 /**
@@ -1337,7 +1337,7 @@ 
  * @return string
  */
 function get_background_color() {
-	return get_theme_mod('background_color', get_theme_support( 'custom-background', 'default-color' ) );
+	return get_theme_mod('background_color', get_theme_support('custom-background', 'default-color'));
 }
 
 /**
@@ -1357,44 +1357,44 @@ 
  */
 function _custom_background_cb() {
 	// $background is the saved custom image, or the default image.
-	$background = set_url_scheme( get_background_image() );
+	$background = set_url_scheme(get_background_image());
 
 	// $color is the saved custom color.
 	// A default has to be specified in style.css. It will not be printed here.
 	$color = get_background_color();
 
-	if ( $color === get_theme_support( 'custom-background', 'default-color' ) ) {
+	if ($color === get_theme_support('custom-background', 'default-color')) {
 		$color = false;
 	}
 
-	if ( ! $background && ! $color )
+	if ( ! $background && ! $color)
 		return;
 
 	$style = $color ? "background-color: #$color;" : '';
 
-	if ( $background ) {
+	if ($background) {
 		$image = " background-image: url('$background');";
 
-		$repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-		if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
+		$repeat = get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'));
+		if ( ! in_array($repeat, array('no-repeat', 'repeat-x', 'repeat-y', 'repeat')))
 			$repeat = 'repeat';
 		$repeat = " background-repeat: $repeat;";
 
-		$position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-		if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
+		$position = get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'));
+		if ( ! in_array($position, array('center', 'right', 'left')))
 			$position = 'left';
 		$position = " background-position: top $position;";
 
-		$attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
-		if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
+		$attachment = get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'));
+		if ( ! in_array($attachment, array('fixed', 'scroll')))
 			$attachment = 'scroll';
 		$attachment = " background-attachment: $attachment;";
 
-		$style .= $image . $repeat . $position . $attachment;
+		$style .= $image.$repeat.$position.$attachment;
 	}
 ?>
 <style type="text/css" id="custom-background-css">
-body.custom-background { <?php echo trim( $style ); ?> }
+body.custom-background { <?php echo trim($style); ?> }
 </style>
 <?php
 }
@@ -1421,21 +1421,21 @@ 
  * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
  * 	                               Defaults to 'editor-style.css'
  */
-function add_editor_style( $stylesheet = 'editor-style.css' ) {
-	add_theme_support( 'editor-style' );
+function add_editor_style($stylesheet = 'editor-style.css') {
+	add_theme_support('editor-style');
 
-	if ( ! is_admin() )
+	if ( ! is_admin())
 		return;
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
 	$stylesheet    = (array) $stylesheet;
-	if ( is_rtl() ) {
+	if (is_rtl()) {
 		$rtl_stylesheet = str_replace('.css', '-rtl.css', $stylesheet[0]);
 		$stylesheet[] = $rtl_stylesheet;
 	}
 
-	$editor_styles = array_merge( $editor_styles, $stylesheet );
+	$editor_styles = array_merge($editor_styles, $stylesheet);
 }
 
 /**
@@ -1448,10 +1448,10 @@ 
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
+	if ( ! current_theme_supports('editor-style'))
 		return false;
-	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
+	_remove_theme_support('editor-style');
+	if (is_admin())
 		$GLOBALS['editor_styles'] = array();
 	return true;
 }
@@ -1468,35 +1468,35 @@ 
 function get_editor_stylesheets() {
 	$stylesheets = array();
 	// load editor_style.css if the current theme supports it
-	if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
+	if ( ! empty($GLOBALS['editor_styles']) && is_array($GLOBALS['editor_styles'])) {
 		$editor_styles = $GLOBALS['editor_styles'];
 
-		$editor_styles = array_unique( array_filter( $editor_styles ) );
+		$editor_styles = array_unique(array_filter($editor_styles));
 		$style_uri = get_stylesheet_directory_uri();
 		$style_dir = get_stylesheet_directory();
 
 		// Support externally referenced styles (like, say, fonts).
-		foreach ( $editor_styles as $key => $file ) {
-			if ( preg_match( '~^(https?:)?//~', $file ) ) {
-				$stylesheets[] = esc_url_raw( $file );
-				unset( $editor_styles[ $key ] );
+		foreach ($editor_styles as $key => $file) {
+			if (preg_match('~^(https?:)?//~', $file)) {
+				$stylesheets[] = esc_url_raw($file);
+				unset($editor_styles[$key]);
 			}
 		}
 
 		// Look in a parent theme first, that way child theme CSS overrides.
-		if ( is_child_theme() ) {
+		if (is_child_theme()) {
 			$template_uri = get_template_directory_uri();
 			$template_dir = get_template_directory();
 
-			foreach ( $editor_styles as $key => $file ) {
-				if ( $file && file_exists( "$template_dir/$file" ) ) {
+			foreach ($editor_styles as $key => $file) {
+				if ($file && file_exists("$template_dir/$file")) {
 					$stylesheets[] = "$template_uri/$file";
 				}
 			}
 		}
 
-		foreach ( $editor_styles as $file ) {
-			if ( $file && file_exists( "$style_dir/$file" ) ) {
+		foreach ($editor_styles as $file) {
+			if ($file && file_exists("$style_dir/$file")) {
 				$stylesheets[] = "$style_uri/$file";
 			}
 		}
@@ -1509,7 +1509,7 @@ 
 	 *
 	 * @param array $stylesheets Array of stylesheets to be applied to the editor.
 	 */
-	return apply_filters( 'editor_stylesheets', $stylesheets );
+	return apply_filters('editor_stylesheets', $stylesheets);
 }
 
 /**
@@ -1526,45 +1526,45 @@ 
  * @param string $feature The feature being added.
  * @return void|bool False on failure, void otherwise.
  */
-function add_theme_support( $feature ) {
+function add_theme_support($feature) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
+	if (func_num_args() == 1)
 		$args = true;
 	else
-		$args = array_slice( func_get_args(), 1 );
+		$args = array_slice(func_get_args(), 1);
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'post-formats' :
-			if ( is_array( $args[0] ) ) {
+			if (is_array($args[0])) {
 				$post_formats = get_post_format_slugs();
-				unset( $post_formats['standard'] );
+				unset($post_formats['standard']);
 
-				$args[0] = array_intersect( $args[0], array_keys( $post_formats ) );
+				$args[0] = array_intersect($args[0], array_keys($post_formats));
 			}
 			break;
 
 		case 'html5' :
 			// You can't just pass 'html5', you need to pass an array of types.
-			if ( empty( $args[0] ) ) {
+			if (empty($args[0])) {
 				// Build an array of types for back-compat.
-				$args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
-			} elseif ( ! is_array( $args[0] ) ) {
-				_doing_it_wrong( "add_theme_support( 'html5' )", __( 'You need to pass an array of types.' ), '3.6.1' );
+				$args = array(0 => array('comment-list', 'comment-form', 'search-form'));
+			} elseif ( ! is_array($args[0])) {
+				_doing_it_wrong("add_theme_support( 'html5' )", __('You need to pass an array of types.'), '3.6.1');
 				return false;
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
-				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			if (isset($_wp_theme_features['html5']))
+				$args[0] = array_merge($_wp_theme_features['html5'][0], $args[0]);
 			break;
 
 		case 'custom-header-uploads' :
-			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
+			return add_theme_support('custom-header', array('uploads' => true));
 
 		case 'custom-header' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array($args))
+				$args = array(0 => array());
 
 			$defaults = array(
 				'default-image' => '',
@@ -1581,18 +1581,18 @@ 
 				'admin-preview-callback' => '',
 			);
 
-			$jit = isset( $args[0]['__jit'] );
-			unset( $args[0]['__jit'] );
+			$jit = isset($args[0]['__jit']);
+			unset($args[0]['__jit']);
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			if (isset($_wp_theme_features['custom-header']))
+				$args[0] = wp_parse_args($_wp_theme_features['custom-header'][0], $args[0]);
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ($jit)
+				$args[0] = wp_parse_args($args[0], $defaults);
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -1600,48 +1600,48 @@ 
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backwards compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
+			if (defined('NO_HEADER_TEXT'))
 				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
-				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			elseif (isset($args[0]['header-text']))
+				define('NO_HEADER_TEXT', empty($args[0]['header-text']));
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
+			if (defined('HEADER_IMAGE_WIDTH'))
 				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
-				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			elseif (isset($args[0]['width']))
+				define('HEADER_IMAGE_WIDTH', (int) $args[0]['width']);
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
+			if (defined('HEADER_IMAGE_HEIGHT'))
 				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
-				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			elseif (isset($args[0]['height']))
+				define('HEADER_IMAGE_HEIGHT', (int) $args[0]['height']);
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
+			if (defined('HEADER_TEXTCOLOR'))
 				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
-				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			elseif (isset($args[0]['default-text-color']))
+				define('HEADER_TEXTCOLOR', $args[0]['default-text-color']);
 
-			if ( defined( 'HEADER_IMAGE' ) )
+			if (defined('HEADER_IMAGE'))
 				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
-				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			elseif (isset($args[0]['default-image']))
+				define('HEADER_IMAGE', $args[0]['default-image']);
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
+			if ($jit && ! empty($args[0]['default-image']))
 				$args[0]['random-default'] = false;
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
-			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
+			if ($jit) {
+				if (empty($args[0]['width']) && empty($args[0]['flex-width']))
 					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
+				if (empty($args[0]['height']) && empty($args[0]['flex-height']))
 					$args[0]['flex-height'] = true;
 			}
 
 			break;
 
 		case 'custom-background' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array($args))
+				$args = array(0 => array());
 
 			$defaults = array(
 				'default-image'          => '',
@@ -1654,41 +1654,41 @@ 
 				'admin-preview-callback' => '',
 			);
 
-			$jit = isset( $args[0]['__jit'] );
-			unset( $args[0]['__jit'] );
+			$jit = isset($args[0]['__jit']);
+			unset($args[0]['__jit']);
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			if (isset($_wp_theme_features['custom-background']))
+				$args[0] = wp_parse_args($_wp_theme_features['custom-background'][0], $args[0]);
 
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ($jit)
+				$args[0] = wp_parse_args($args[0], $defaults);
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
+			if (defined('BACKGROUND_COLOR'))
 				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
-				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			elseif (isset($args[0]['default-color']) || $jit)
+				define('BACKGROUND_COLOR', $args[0]['default-color']);
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
+			if (defined('BACKGROUND_IMAGE'))
 				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
-				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			elseif (isset($args[0]['default-image']) || $jit)
+				define('BACKGROUND_IMAGE', $args[0]['default-image']);
 
 			break;
 
 		// Ensure that 'title-tag' is accessible in the admin.
 		case 'title-tag' :
 			// Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
-			if ( did_action( 'wp_loaded' ) ) {
+			if (did_action('wp_loaded')) {
 				/* translators: 1: Theme support 2: hook name */
-				_doing_it_wrong( "add_theme_support( 'title-tag' )", sprintf( __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
-					'<code>title-tag</code>', '<code>wp_loaded</code>' ), '4.1' );
+				_doing_it_wrong("add_theme_support( 'title-tag' )", sprintf(__('Theme support for %1$s should be registered before the %2$s hook.'),
+					'<code>title-tag</code>', '<code>wp_loaded</code>'), '4.1');
 
 				return false;
 			}
 	}
 
-	$_wp_theme_features[ $feature ] = $args;
+	$_wp_theme_features[$feature] = $args;
 }
 
 /**
@@ -1703,30 +1703,30 @@ 
 function _custom_header_background_just_in_time() {
 	global $custom_image_header, $custom_background;
 
-	if ( current_theme_supports( 'custom-header' ) ) {
+	if (current_theme_supports('custom-header')) {
 		// In case any constants were defined after an add_custom_image_header() call, re-run.
-		add_theme_support( 'custom-header', array( '__jit' => true ) );
+		add_theme_support('custom-header', array('__jit' => true));
 
-		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
-			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		$args = get_theme_support('custom-header');
+		if ($args[0]['wp-head-callback'])
+			add_action('wp_head', $args[0]['wp-head-callback']);
 
-		if ( is_admin() ) {
-			require_once( ABSPATH . 'wp-admin/custom-header.php' );
-			$custom_image_header = new Custom_Image_Header( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+		if (is_admin()) {
+			require_once(ABSPATH.'wp-admin/custom-header.php');
+			$custom_image_header = new Custom_Image_Header($args[0]['admin-head-callback'], $args[0]['admin-preview-callback']);
 		}
 	}
 
-	if ( current_theme_supports( 'custom-background' ) ) {
+	if (current_theme_supports('custom-background')) {
 		// In case any constants were defined after an add_custom_background() call, re-run.
-		add_theme_support( 'custom-background', array( '__jit' => true ) );
+		add_theme_support('custom-background', array('__jit' => true));
 
-		$args = get_theme_support( 'custom-background' );
-		add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		$args = get_theme_support('custom-background');
+		add_action('wp_head', $args[0]['wp-head-callback']);
 
-		if ( is_admin() ) {
-			require_once( ABSPATH . 'wp-admin/custom-background.php' );
-			$custom_background = new Custom_Background( $args[0]['admin-head-callback'], $args[0]['admin-preview-callback'] );
+		if (is_admin()) {
+			require_once(ABSPATH.'wp-admin/custom-background.php');
+			$custom_background = new Custom_Background($args[0]['admin-head-callback'], $args[0]['admin-preview-callback']);
 		}
 	}
 }
@@ -1738,10 +1738,10 @@ 
  * @access private
  */
 function _custom_logo_header_styles() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) && get_theme_support( 'custom-logo', 'header-text' ) && ! get_theme_mod( 'header_text', true ) ) {
-		$classes = (array) get_theme_support( 'custom-logo', 'header-text' );
-		$classes = array_map( 'sanitize_html_class', $classes );
-		$classes = '.' . implode( ', .', $classes );
+	if ( ! current_theme_supports('custom-header', 'header-text') && get_theme_support('custom-logo', 'header-text') && ! get_theme_mod('header_text', true)) {
+		$classes = (array) get_theme_support('custom-logo', 'header-text');
+		$classes = array_map('sanitize_html_class', $classes);
+		$classes = '.'.implode(', .', $classes);
 
 		?>
 		<!-- Custom Logo: hide header text -->
@@ -1765,25 +1765,25 @@ 
  * @param string $feature the feature to check
  * @return mixed The array of extra arguments or the value for the registered feature.
  */
-function get_theme_support( $feature ) {
+function get_theme_support($feature) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	if ( func_num_args() <= 1 )
-		return $_wp_theme_features[ $feature ];
+	if (func_num_args() <= 1)
+		return $_wp_theme_features[$feature];
 
-	$args = array_slice( func_get_args(), 1 );
-	switch ( $feature ) {
+	$args = array_slice(func_get_args(), 1);
+	switch ($feature) {
 		case 'custom-logo' :
 		case 'custom-header' :
 		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
-				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			if (isset($_wp_theme_features[$feature][0][$args[0]]))
+				return $_wp_theme_features[$feature][0][$args[0]];
 			return false;
 
 		default :
-			return $_wp_theme_features[ $feature ];
+			return $_wp_theme_features[$feature];
 	}
 }
 
@@ -1798,12 +1798,12 @@ 
  * @param string $feature the feature being added
  * @return bool|void Whether feature was removed.
  */
-function remove_theme_support( $feature ) {
+function remove_theme_support($feature) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
+	if (in_array($feature, array('editor-style', 'widgets', 'menus')))
 		return false;
 
-	return _remove_theme_support( $feature );
+	return _remove_theme_support($feature);
 }
 
 /**
@@ -1818,42 +1818,42 @@ 
  *
  * @param string $feature
  */
-function _remove_theme_support( $feature ) {
+function _remove_theme_support($feature) {
 	global $_wp_theme_features;
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
+			if ( ! isset($_wp_theme_features['custom-header']))
 				return false;
-			add_theme_support( 'custom-header', array( 'uploads' => false ) );
+			add_theme_support('custom-header', array('uploads' => false));
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
+			if ( ! did_action('wp_loaded'))
 				break;
-			$support = get_theme_support( 'custom-header' );
-			if ( $support[0]['wp-head-callback'] )
-				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-			remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
-			unset( $GLOBALS['custom_image_header'] );
+			$support = get_theme_support('custom-header');
+			if ($support[0]['wp-head-callback'])
+				remove_action('wp_head', $support[0]['wp-head-callback']);
+			remove_action('admin_menu', array($GLOBALS['custom_image_header'], 'init'));
+			unset($GLOBALS['custom_image_header']);
 			break;
 
 		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
+			if ( ! did_action('wp_loaded'))
 				break;
-			$support = get_theme_support( 'custom-background' );
-			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
-			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
-			unset( $GLOBALS['custom_background'] );
+			$support = get_theme_support('custom-background');
+			remove_action('wp_head', $support[0]['wp-head-callback']);
+			remove_action('admin_menu', array($GLOBALS['custom_background'], 'init'));
+			unset($GLOBALS['custom_background']);
 			break;
 	}
 
-	unset( $_wp_theme_features[ $feature ] );
+	unset($_wp_theme_features[$feature]);
 	return true;
 }
 
@@ -1867,30 +1867,30 @@ 
  * @param string $feature the feature being checked
  * @return bool
  */
-function current_theme_supports( $feature ) {
+function current_theme_supports($feature) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
-		return current_theme_supports( 'custom-header', 'uploads' );
+	if ('custom-header-uploads' == $feature)
+		return current_theme_supports('custom-header', 'uploads');
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
+	if ( ! isset($_wp_theme_features[$feature]))
 		return false;
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
+	if (func_num_args() <= 1)
 		return true;
 
-	$args = array_slice( func_get_args(), 1 );
+	$args = array_slice(func_get_args(), 1);
 
-	switch ( $feature ) {
+	switch ($feature) {
 		case 'post-thumbnails':
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if (true === $_wp_theme_features[$feature])  // Registered for all types
 				return true;
 			$content_type = $args[0];
-			return in_array( $content_type, $_wp_theme_features[$feature][0] );
+			return in_array($content_type, $_wp_theme_features[$feature][0]);
 
 		case 'html5':
 		case 'post-formats':
@@ -1900,13 +1900,13 @@ 
 			// Specific areas of HTML5 support *must* be passed via an array to add_theme_support()
 
 			$type = $args[0];
-			return in_array( $type, $_wp_theme_features[$feature][0] );
+			return in_array($type, $_wp_theme_features[$feature][0]);
 
 		case 'custom-logo':
 		case 'custom-header':
 		case 'custom-background':
 			// Specific capabilities can be registered by passing an array to add_theme_support().
-			return ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) && $_wp_theme_features[ $feature ][0][ $args[0] ] );
+			return (isset($_wp_theme_features[$feature][0][$args[0]]) && $_wp_theme_features[$feature][0][$args[0]]);
 	}
 
 	/**
@@ -1922,7 +1922,7 @@ 
 	 * @param array  $args    Array of arguments for the feature.
 	 * @param string $feature The theme feature.
 	 */
-	return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature] );
+	return apply_filters("current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature]);
 }
 
 /**
@@ -1934,9 +1934,9 @@ 
  * @param string $include Path to the file.
  * @return bool True if the current theme supports the supplied feature, false otherwise.
  */
-function require_if_theme_supports( $feature, $include ) {
-	if ( current_theme_supports( $feature ) ) {
-		require ( $include );
+function require_if_theme_supports($feature, $include) {
+	if (current_theme_supports($feature)) {
+		require ($include);
 		return true;
 	}
 	return false;
@@ -1955,24 +1955,24 @@ 
  *
  * @param int $id The attachment id.
  */
-function _delete_attachment_theme_mod( $id ) {
-	$attachment_image = wp_get_attachment_url( $id );
+function _delete_attachment_theme_mod($id) {
+	$attachment_image = wp_get_attachment_url($id);
 	$header_image     = get_header_image();
 	$background_image = get_background_image();
-	$custom_logo_id   = get_theme_mod( 'custom_logo' );
+	$custom_logo_id   = get_theme_mod('custom_logo');
 
-	if ( $custom_logo_id && $custom_logo_id == $id ) {
-		remove_theme_mod( 'custom_logo' );
-		remove_theme_mod( 'header_text' );
+	if ($custom_logo_id && $custom_logo_id == $id) {
+		remove_theme_mod('custom_logo');
+		remove_theme_mod('header_text');
 	}
 
-	if ( $header_image && $header_image == $attachment_image ) {
-		remove_theme_mod( 'header_image' );
-		remove_theme_mod( 'header_image_data' );
+	if ($header_image && $header_image == $attachment_image) {
+		remove_theme_mod('header_image');
+		remove_theme_mod('header_image_data');
 	}
 
-	if ( $background_image && $background_image == $attachment_image ) {
-		remove_theme_mod( 'background_image' );
+	if ($background_image && $background_image == $attachment_image) {
+		remove_theme_mod('background_image');
 	}
 }
 
@@ -1982,16 +1982,16 @@ 
  * @since 3.3.0
  */
 function check_theme_switched() {
-	if ( $stylesheet = get_option( 'theme_switched' ) ) {
-		$old_theme = wp_get_theme( $stylesheet );
+	if ($stylesheet = get_option('theme_switched')) {
+		$old_theme = wp_get_theme($stylesheet);
 
 		// Prevent retrieve_widgets() from running since Customizer already called it up front
-		if ( get_option( 'theme_switched_via_customizer' ) ) {
-			remove_action( 'after_switch_theme', '_wp_sidebars_changed' );
-			update_option( 'theme_switched_via_customizer', false );
+		if (get_option('theme_switched_via_customizer')) {
+			remove_action('after_switch_theme', '_wp_sidebars_changed');
+			update_option('theme_switched_via_customizer', false);
 		}
 
-		if ( $old_theme->exists() ) {
+		if ($old_theme->exists()) {
 			/**
 			 * Fires on the first WP load after a theme switch if the old theme still exists.
 			 *
@@ -2005,14 +2005,14 @@ 
 			 * @param string   $old_name  Old theme name.
 			 * @param WP_Theme $old_theme WP_Theme instance of the old theme.
 			 */
-			do_action( 'after_switch_theme', $old_theme->get( 'Name' ), $old_theme );
+			do_action('after_switch_theme', $old_theme->get('Name'), $old_theme);
 		} else {
 			/** This action is documented in wp-includes/theme.php */
-			do_action( 'after_switch_theme', $stylesheet );
+			do_action('after_switch_theme', $stylesheet);
 		}
 		flush_rewrite_rules();
 
-		update_option( 'theme_switched', false );
+		update_option('theme_switched', false);
 	}
 }
 
@@ -2030,13 +2030,13 @@ 
  * @global WP_Customize_Manager $wp_customize
  */
 function _wp_customize_include() {
-	if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
-		|| ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) )
-	) ) {
+	if ( ! ((isset($_REQUEST['wp_customize']) && 'on' == $_REQUEST['wp_customize'])
+		|| (is_admin() && 'customize.php' == basename($_SERVER['PHP_SELF']))
+	)) {
 		return;
 	}
 
-	require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
+	require_once ABSPATH.WPINC.'/class-wp-customize-manager.php';
 	$GLOBALS['wp_customize'] = new WP_Customize_Manager();
 }
 
@@ -2046,33 +2046,33 @@ 
  * @since 3.4.0
  */
 function _wp_customize_loader_settings() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
 	$browser = array(
 		'mobile' => wp_is_mobile(),
-		'ios'    => wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] ),
+		'ios'    => wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']),
 	);
 
 	$settings = array(
-		'url'           => esc_url( admin_url( 'customize.php' ) ),
+		'url'           => esc_url(admin_url('customize.php')),
 		'isCrossDomain' => $cross_domain,
 		'browser'       => $browser,
 		'l10n'          => array(
-			'saveAlert'       => __( 'The changes you made will be lost if you navigate away from this page.' ),
-			'mainIframeTitle' => __( 'Customizer' ),
+			'saveAlert'       => __('The changes you made will be lost if you navigate away from this page.'),
+			'mainIframeTitle' => __('Customizer'),
 		),
 	);
 
-	$script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
+	$script = 'var _wpCustomizeLoaderSettings = '.wp_json_encode($settings).';';
 
 	$wp_scripts = wp_scripts();
-	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
+	$data = $wp_scripts->get_data('customize-loader', 'data');
+	if ($data)
 		$script = "$data\n$script";
 
-	$wp_scripts->add_data( 'customize-loader', 'data', $script );
+	$wp_scripts->add_data('customize-loader', 'data', $script);
 }
 
 /**
@@ -2084,11 +2084,11 @@ 
  * 	                         The theme's stylesheet will be urlencoded if necessary.
  * @return string
  */
-function wp_customize_url( $stylesheet = null ) {
-	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
-		$url .= '?theme=' . urlencode( $stylesheet );
-	return esc_url( $url );
+function wp_customize_url($stylesheet = null) {
+	$url = admin_url('customize.php');
+	if ($stylesheet)
+		$url .= '?theme='.urlencode($stylesheet);
+	return esc_url($url);
 }
 
 /**
@@ -2107,16 +2107,16 @@ 
  * @since 3.4.0
  */
 function wp_customize_support_script() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin  = parse_url( home_url() );
-	$cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) );
+	$admin_origin = parse_url(admin_url());
+	$home_origin  = parse_url(home_url());
+	$cross_domain = (strtolower($admin_origin['host']) != strtolower($home_origin['host']));
 
 	?>
 	<script type="text/javascript">
 		(function() {
 			var request, b = document.body, c = 'className', cs = 'customize-support', rcs = new RegExp('(^|\\s+)(no-)?'+cs+'(\\s+|$)');
 
-<?php		if ( $cross_domain ): ?>
+<?php		if ($cross_domain): ?>
 			request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
 <?php		else: ?>
 			request = true;
@@ -2141,5 +2141,5 @@ 
 function is_customize_preview() {
 	global $wp_customize;
 
-	return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+	return ($wp_customize instanceof WP_Customize_Manager) && $wp_customize->is_preview();
 }

Braces +307 added lines, -217 removed lines

@@ -41,41 +41,46 @@ 
 		$current_theme = get_stylesheet();
 		if ( isset( $theme_directories[ $current_theme ] ) ) {
 			$root_of_current_theme = get_raw_theme_root( $current_theme );
-			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) )
-				$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) ) {
+							$root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
+			}
 			$theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
 		}
 	}
 
-	if ( empty( $theme_directories ) )
-		return array();
+	if ( empty( $theme_directories ) ) {
+			return array();
+	}
 
 	if ( is_multisite() && null !== $args['allowed'] ) {
 		$allowed = $args['allowed'];
-		if ( 'network' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
-		elseif ( 'site' === $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
-		elseif ( $allowed )
-			$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
-		else
-			$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		if ( 'network' === $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_network() );
+		} elseif ( 'site' === $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed_on_site( $args['blog_id'] ) );
+		} elseif ( $allowed ) {
+					$theme_directories = array_intersect_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		} else {
+					$theme_directories = array_diff_key( $theme_directories, WP_Theme::get_allowed( $args['blog_id'] ) );
+		}
 	}
 
 	$themes = array();
 	static $_themes = array();
 
 	foreach ( $theme_directories as $theme => $theme_root ) {
-		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) )
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
-		else
-			$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		if ( isset( $_themes[ $theme_root['theme_root'] . '/' . $theme ] ) ) {
+					$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
+		} else {
+					$themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+		}
 	}
 
 	if ( null !== $args['errors'] ) {
 		foreach ( $themes as $theme => $wp_theme ) {
-			if ( $wp_theme->errors() != $args['errors'] )
-				unset( $themes[ $theme ] );
+			if ( $wp_theme->errors() != $args['errors'] ) {
+							unset( $themes[ $theme ] );
+			}
 		}
 	}
 
@@ -97,15 +102,17 @@ 
 function wp_get_theme( $stylesheet = null, $theme_root = null ) {
 	global $wp_theme_directories;
 
-	if ( empty( $stylesheet ) )
-		$stylesheet = get_stylesheet();
+	if ( empty( $stylesheet ) ) {
+			$stylesheet = get_stylesheet();
+	}
 
 	if ( empty( $theme_root ) ) {
 		$theme_root = get_raw_theme_root( $stylesheet );
-		if ( false === $theme_root )
-			$theme_root = WP_CONTENT_DIR . '/themes';
-		elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( false === $theme_root ) {
+					$theme_root = WP_CONTENT_DIR . '/themes';
+		} elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	}
 
 	return new WP_Theme( $stylesheet, $theme_root );
@@ -118,12 +125,14 @@ 
  * @param bool $clear_update_cache Whether to clear the Theme updates cache
  */
 function wp_clean_themes_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_themes' );
+	if ( $clear_update_cache ) {
+			delete_site_transient( 'update_themes' );
+	}
 	search_theme_directories( true );
-	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
-		$theme->cache_delete();
-}
+	foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme ) {
+			$theme->cache_delete();
+	}
+	}
 
 /**
  * Whether a child theme is in use.
@@ -257,12 +266,13 @@ 
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
 	$dir = get_stylesheet_directory();
 	$locale = get_locale();
-	if ( file_exists("$dir/$locale.css") )
-		$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
-	elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") )
-		$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
-	else
-		$stylesheet_uri = '';
+	if ( file_exists("$dir/$locale.css") ) {
+			$stylesheet_uri = "$stylesheet_dir_uri/$locale.css";
+	} elseif ( !empty($wp_locale->text_direction) && file_exists("$dir/{$wp_locale->text_direction}.css") ) {
+			$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
+	} else {
+			$stylesheet_uri = '';
+	}
 	/**
 	 * Filter the localized stylesheet URI.
 	 *
@@ -352,8 +362,9 @@ 
 function get_theme_roots() {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
-		return '/themes';
+	if ( count($wp_theme_directories) <= 1 ) {
+			return '/themes';
+	}
 
 	$theme_roots = get_site_transient( 'theme_roots' );
 	if ( false === $theme_roots ) {
@@ -412,11 +423,13 @@ 
 	global $wp_theme_directories;
 	static $found_themes = null;
 
-	if ( empty( $wp_theme_directories ) )
-		return false;
+	if ( empty( $wp_theme_directories ) ) {
+			return false;
+	}
 
-	if ( ! $force && isset( $found_themes ) )
-		return $found_themes;
+	if ( ! $force && isset( $found_themes ) ) {
+			return $found_themes;
+	}
 
 	$found_themes = array();
 
@@ -427,10 +440,11 @@ 
 	// We always want to return absolute, but we need to cache relative
 	// to use in get_theme_root().
 	foreach ( $wp_theme_directories as $theme_root ) {
-		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-			$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
-		else
-			$relative_theme_roots[ $theme_root ] = $theme_root;
+		if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+					$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
+		} else {
+					$relative_theme_roots[ $theme_root ] = $theme_root;
+		}
 	}
 
 	/**
@@ -446,8 +460,9 @@ 
 		if ( is_array( $cached_roots ) ) {
 			foreach ( $cached_roots as $theme_dir => $theme_root ) {
 				// A cached theme root is no longer around, so skip it.
-				if ( ! isset( $relative_theme_roots[ $theme_root ] ) )
-					continue;
+				if ( ! isset( $relative_theme_roots[ $theme_root ] ) ) {
+									continue;
+				}
 				$found_themes[ $theme_dir ] = array(
 					'theme_file' => $theme_dir . '/style.css',
 					'theme_root' => $relative_theme_roots[ $theme_root ], // Convert relative to absolute.
@@ -455,8 +470,10 @@ 
 			}
 			return $found_themes;
 		}
-		if ( ! is_int( $cache_expiration ) )
-			$cache_expiration = 1800; // half hour
+		if ( ! is_int( $cache_expiration ) ) {
+					$cache_expiration = 1800;
+		}
+		// half hour
 	} else {
 		$cache_expiration = 1800; // half hour
 	}
@@ -471,8 +488,9 @@ 
 			continue;
 		}
 		foreach ( $dirs as $dir ) {
-			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
-				continue;
+			if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
+							continue;
+			}
 			if ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
 				// wp-content/themes/a-single-theme
 				// wp-content/themes is $theme_root, a-single-theme is $dir
@@ -490,10 +508,12 @@ 
 					continue;
 				}
 				foreach ( $sub_dirs as $sub_dir ) {
-					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
-						continue;
-					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) )
-						continue;
+					if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
+											continue;
+					}
+					if ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) ) {
+											continue;
+					}
 					$found_themes[ $dir . '/' . $sub_dir ] = array(
 						'theme_file' => $dir . '/' . $sub_dir . '/style.css',
 						'theme_root' => $theme_root,
@@ -502,11 +522,12 @@ 
 				}
 				// Never mind the above, it's just a theme missing a style.css.
 				// Return it; WP_Theme will catch the error.
-				if ( ! $found_theme )
-					$found_themes[ $dir ] = array(
+				if ( ! $found_theme ) {
+									$found_themes[ $dir ] = array(
 						'theme_file' => $dir . '/style.css',
 						'theme_root' => $theme_root,
 					);
+				}
 			}
 		}
 	}
@@ -520,8 +541,9 @@ 
 		$theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
 	}
 
-	if ( $theme_roots != get_site_transient( 'theme_roots' ) )
-		set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	if ( $theme_roots != get_site_transient( 'theme_roots' ) ) {
+			set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
+	}
 
 	return $found_themes;
 }
@@ -544,8 +566,9 @@ 
 	if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
 		// Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
 		// This gives relative theme roots the benefit of the doubt when things go haywire.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) )
-			$theme_root = WP_CONTENT_DIR . $theme_root;
+		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+					$theme_root = WP_CONTENT_DIR . $theme_root;
+		}
 	} else {
 		$theme_root = WP_CONTENT_DIR . '/themes';
 	}
@@ -578,20 +601,22 @@ 
 function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
 	global $wp_theme_directories;
 
-	if ( $stylesheet_or_template && ! $theme_root )
-		$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	if ( $stylesheet_or_template && ! $theme_root ) {
+			$theme_root = get_raw_theme_root( $stylesheet_or_template );
+	}
 
 	if ( $stylesheet_or_template && $theme_root ) {
 		if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
 			// Absolute path. Make an educated guess. YMMV -- but note the filter below.
-			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
-				$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, ABSPATH ) )
-				$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
-			elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) )
-				$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
-			else
-				$theme_root_uri = $theme_root;
+			if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
+							$theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
+			} elseif ( 0 === strpos( $theme_root, ABSPATH ) ) {
+							$theme_root_uri = site_url( str_replace( ABSPATH, '', $theme_root ) );
+			} elseif ( 0 === strpos( $theme_root, WP_PLUGIN_DIR ) || 0 === strpos( $theme_root, WPMU_PLUGIN_DIR ) ) {
+							$theme_root_uri = plugins_url( basename( $theme_root ), $theme_root );
+			} else {
+							$theme_root_uri = $theme_root;
+			}
 		} else {
 			$theme_root_uri = content_url( $theme_root );
 		}
@@ -626,23 +651,26 @@ 
 function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
 	global $wp_theme_directories;
 
-	if ( count($wp_theme_directories) <= 1 )
-		return '/themes';
+	if ( count($wp_theme_directories) <= 1 ) {
+			return '/themes';
+	}
 
 	$theme_root = false;
 
 	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
 	if ( ! $skip_cache ) {
-		if ( get_option('stylesheet') == $stylesheet_or_template )
-			$theme_root = get_option('stylesheet_root');
-		elseif ( get_option('template') == $stylesheet_or_template )
-			$theme_root = get_option('template_root');
+		if ( get_option('stylesheet') == $stylesheet_or_template ) {
+					$theme_root = get_option('stylesheet_root');
+		} elseif ( get_option('template') == $stylesheet_or_template ) {
+					$theme_root = get_option('template_root');
+		}
 	}
 
 	if ( empty($theme_root) ) {
 		$theme_roots = get_theme_roots();
-		if ( !empty($theme_roots[$stylesheet_or_template]) )
-			$theme_root = $theme_roots[$stylesheet_or_template];
+		if ( !empty($theme_roots[$stylesheet_or_template]) ) {
+					$theme_root = $theme_roots[$stylesheet_or_template];
+		}
 	}
 
 	return $theme_root;
@@ -655,8 +683,9 @@ 
  */
 function locale_stylesheet() {
 	$stylesheet = get_locale_stylesheet_uri();
-	if ( empty($stylesheet) )
-		return;
+	if ( empty($stylesheet) ) {
+			return;
+	}
 	echo '<link rel="stylesheet" href="' . $stylesheet . '" type="text/css" media="screen" />';
 }
 
@@ -776,8 +805,9 @@ 
 	 *
 	 * @param bool $validate Whether to validate the current theme. Default true.
 	 */
-	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) )
-		return true;
+	if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) ) {
+			return true;
+	}
 
 	if ( ! file_exists( get_template_directory() . '/index.php' ) ) {
 		// Invalid.
@@ -826,8 +856,9 @@ 
 	$mods = get_option( "theme_mods_$theme_slug" );
 	if ( false === $mods ) {
 		$theme_name = get_option( 'current_theme' );
-		if ( false === $theme_name )
-			$theme_name = wp_get_theme()->get('Name');
+		if ( false === $theme_name ) {
+					$theme_name = wp_get_theme()->get('Name');
+		}
 		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
 		if ( is_admin() && false !== $mods ) {
 			update_option( "theme_mods_$theme_slug", $mods );
@@ -870,8 +901,9 @@ 
 		return apply_filters( "theme_mod_{$name}", $mods[$name] );
 	}
 
-	if ( is_string( $default ) )
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	if ( is_string( $default ) ) {
+			$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+	}
 
 	/** This filter is documented in wp-includes/theme.php */
 	return apply_filters( "theme_mod_{$name}", $default );
@@ -920,8 +952,9 @@ 
 function remove_theme_mod( $name ) {
 	$mods = get_theme_mods();
 
-	if ( ! isset( $mods[ $name ] ) )
-		return;
+	if ( ! isset( $mods[ $name ] ) ) {
+			return;
+	}
 
 	unset( $mods[ $name ] );
 
@@ -943,8 +976,9 @@ 
 
 	// Old style.
 	$theme_name = get_option( 'current_theme' );
-	if ( false === $theme_name )
-		$theme_name = wp_get_theme()->get('Name');
+	if ( false === $theme_name ) {
+			$theme_name = wp_get_theme()->get('Name');
+	}
 	delete_option( 'mods_' . $theme_name );
 }
 
@@ -976,8 +1010,9 @@ 
  * @return bool
  */
 function display_header_text() {
-	if ( ! current_theme_supports( 'custom-header', 'header-text' ) )
-		return false;
+	if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
+			return false;
+	}
 
 	$text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) );
 	return 'blank' !== $text_color;
@@ -1006,11 +1041,13 @@ 
 function get_header_image() {
 	$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
-	if ( 'remove-header' == $url )
-		return false;
+	if ( 'remove-header' == $url ) {
+			return false;
+	}
 
-	if ( is_random_header_image() )
-		$url = get_random_header_image();
+	if ( is_random_header_image() ) {
+			$url = get_random_header_image();
+	}
 
 	return esc_url_raw( set_url_scheme( $url ) );
 }
@@ -1112,19 +1149,21 @@ 
 		$header_image_mod = get_theme_mod( 'header_image', '' );
 		$headers = array();
 
-		if ( 'random-uploaded-image' == $header_image_mod )
-			$headers = get_uploaded_header_images();
-		elseif ( ! empty( $_wp_default_headers ) ) {
+		if ( 'random-uploaded-image' == $header_image_mod ) {
+					$headers = get_uploaded_header_images();
+		} elseif ( ! empty( $_wp_default_headers ) ) {
 			if ( 'random-default-image' == $header_image_mod ) {
 				$headers = $_wp_default_headers;
 			} else {
-				if ( current_theme_supports( 'custom-header', 'random-default' ) )
-					$headers = $_wp_default_headers;
+				if ( current_theme_supports( 'custom-header', 'random-default' ) ) {
+									$headers = $_wp_default_headers;
+				}
 			}
 		}
 
-		if ( empty( $headers ) )
-			return new stdClass;
+		if ( empty( $headers ) ) {
+					return new stdClass;
+		}
 
 		$_wp_random_header = (object) $headers[ array_rand( $headers ) ];
 
@@ -1143,8 +1182,9 @@ 
  */
 function get_random_header_image() {
 	$random_image = _get_random_header_data();
-	if ( empty( $random_image->url ) )
-		return '';
+	if ( empty( $random_image->url ) ) {
+			return '';
+	}
 	return $random_image->url;
 }
 
@@ -1164,13 +1204,15 @@ 
 	$header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
 
 	if ( 'any' == $type ) {
-		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
-			return true;
+		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) ) {
+					return true;
+		}
 	} else {
-		if ( "random-$type-image" == $header_image_mod )
-			return true;
-		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
-			return true;
+		if ( "random-$type-image" == $header_image_mod ) {
+					return true;
+		} elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() ) {
+					return true;
+		}
 	}
 
 	return false;
@@ -1201,8 +1243,9 @@ 
 	// @todo caching
 	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
 
-	if ( empty( $headers ) )
-		return array();
+	if ( empty( $headers ) ) {
+			return array();
+	}
 
 	foreach ( (array) $headers as $header ) {
 		$url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
@@ -1215,10 +1258,12 @@ 
 		$header_images[$header_index]['thumbnail_url'] = $url;
 		$header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
 
-		if ( isset( $header_data['width'] ) )
-			$header_images[$header_index]['width'] = $header_data['width'];
-		if ( isset( $header_data['height'] ) )
-			$header_images[$header_index]['height'] = $header_data['height'];
+		if ( isset( $header_data['width'] ) ) {
+					$header_images[$header_index]['width'] = $header_data['width'];
+		}
+		if ( isset( $header_data['height'] ) ) {
+					$header_images[$header_index]['height'] = $header_data['height'];
+		}
 	}
 
 	return $header_images;
@@ -1367,8 +1412,9 @@ 
 		$color = false;
 	}
 
-	if ( ! $background && ! $color )
-		return;
+	if ( ! $background && ! $color ) {
+			return;
+	}
 
 	$style = $color ? "background-color: #$color;" : '';
 
@@ -1376,18 +1422,21 @@ 
 		$image = " background-image: url('$background');";
 
 		$repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-		if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
-			$repeat = 'repeat';
+		if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) ) {
+					$repeat = 'repeat';
+		}
 		$repeat = " background-repeat: $repeat;";
 
 		$position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-		if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
-			$position = 'left';
+		if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) ) {
+					$position = 'left';
+		}
 		$position = " background-position: top $position;";
 
 		$attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
-		if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
-			$attachment = 'scroll';
+		if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) ) {
+					$attachment = 'scroll';
+		}
 		$attachment = " background-attachment: $attachment;";
 
 		$style .= $image . $repeat . $position . $attachment;
@@ -1424,8 +1473,9 @@ 
 function add_editor_style( $stylesheet = 'editor-style.css' ) {
 	add_theme_support( 'editor-style' );
 
-	if ( ! is_admin() )
-		return;
+	if ( ! is_admin() ) {
+			return;
+	}
 
 	global $editor_styles;
 	$editor_styles = (array) $editor_styles;
@@ -1448,11 +1498,13 @@ 
  * @return bool True on success, false if there were no stylesheets to remove.
  */
 function remove_editor_styles() {
-	if ( ! current_theme_supports( 'editor-style' ) )
-		return false;
+	if ( ! current_theme_supports( 'editor-style' ) ) {
+			return false;
+	}
 	_remove_theme_support( 'editor-style' );
-	if ( is_admin() )
-		$GLOBALS['editor_styles'] = array();
+	if ( is_admin() ) {
+			$GLOBALS['editor_styles'] = array();
+	}
 	return true;
 }
 
@@ -1529,10 +1581,11 @@ 
 function add_theme_support( $feature ) {
 	global $_wp_theme_features;
 
-	if ( func_num_args() == 1 )
-		$args = true;
-	else
-		$args = array_slice( func_get_args(), 1 );
+	if ( func_num_args() == 1 ) {
+			$args = true;
+	} else {
+			$args = array_slice( func_get_args(), 1 );
+	}
 
 	switch ( $feature ) {
 		case 'post-formats' :
@@ -1555,16 +1608,18 @@ 
 			}
 
 			// Calling 'html5' again merges, rather than overwrites.
-			if ( isset( $_wp_theme_features['html5'] ) )
-				$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			if ( isset( $_wp_theme_features['html5'] ) ) {
+							$args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+			}
 			break;
 
 		case 'custom-header-uploads' :
 			return add_theme_support( 'custom-header', array( 'uploads' => true ) );
 
 		case 'custom-header' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array( $args ) ) {
+							$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image' => '',
@@ -1586,13 +1641,15 @@ 
 
 			// Merge in data from previous add_theme_support() calls.
 			// The first value registered wins. (A child theme is set up first.)
-			if ( isset( $_wp_theme_features['custom-header'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			if ( isset( $_wp_theme_features['custom-header'] ) ) {
+							$args[0] = wp_parse_args( $_wp_theme_features['custom-header'][0], $args[0] );
+			}
 
 			// Load in the defaults at the end, as we need to insure first one wins.
 			// This will cause all constants to be defined, as each arg will then be set to the default.
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ( $jit ) {
+							$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
 			// If a constant was defined, use that value. Otherwise, define the constant to ensure
 			// the constant is always accurate (and is not defined later,  overriding our value).
@@ -1600,48 +1657,57 @@ 
 			// Once we get to wp_loaded (just-in-time), define any constants we haven't already.
 			// Constants are lame. Don't reference them. This is just for backwards compatibility.
 
-			if ( defined( 'NO_HEADER_TEXT' ) )
-				$args[0]['header-text'] = ! NO_HEADER_TEXT;
-			elseif ( isset( $args[0]['header-text'] ) )
-				define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			if ( defined( 'NO_HEADER_TEXT' ) ) {
+							$args[0]['header-text'] = ! NO_HEADER_TEXT;
+			} elseif ( isset( $args[0]['header-text'] ) ) {
+							define( 'NO_HEADER_TEXT', empty( $args[0]['header-text'] ) );
+			}
 
-			if ( defined( 'HEADER_IMAGE_WIDTH' ) )
-				$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
-			elseif ( isset( $args[0]['width'] ) )
-				define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			if ( defined( 'HEADER_IMAGE_WIDTH' ) ) {
+							$args[0]['width'] = (int) HEADER_IMAGE_WIDTH;
+			} elseif ( isset( $args[0]['width'] ) ) {
+							define( 'HEADER_IMAGE_WIDTH', (int) $args[0]['width'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE_HEIGHT' ) )
-				$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
-			elseif ( isset( $args[0]['height'] ) )
-				define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			if ( defined( 'HEADER_IMAGE_HEIGHT' ) ) {
+							$args[0]['height'] = (int) HEADER_IMAGE_HEIGHT;
+			} elseif ( isset( $args[0]['height'] ) ) {
+							define( 'HEADER_IMAGE_HEIGHT', (int) $args[0]['height'] );
+			}
 
-			if ( defined( 'HEADER_TEXTCOLOR' ) )
-				$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
-			elseif ( isset( $args[0]['default-text-color'] ) )
-				define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			if ( defined( 'HEADER_TEXTCOLOR' ) ) {
+							$args[0]['default-text-color'] = HEADER_TEXTCOLOR;
+			} elseif ( isset( $args[0]['default-text-color'] ) ) {
+							define( 'HEADER_TEXTCOLOR', $args[0]['default-text-color'] );
+			}
 
-			if ( defined( 'HEADER_IMAGE' ) )
-				$args[0]['default-image'] = HEADER_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) )
-				define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			if ( defined( 'HEADER_IMAGE' ) ) {
+							$args[0]['default-image'] = HEADER_IMAGE;
+			} elseif ( isset( $args[0]['default-image'] ) ) {
+							define( 'HEADER_IMAGE', $args[0]['default-image'] );
+			}
 
-			if ( $jit && ! empty( $args[0]['default-image'] ) )
-				$args[0]['random-default'] = false;
+			if ( $jit && ! empty( $args[0]['default-image'] ) ) {
+							$args[0]['random-default'] = false;
+			}
 
 			// If headers are supported, and we still don't have a defined width or height,
 			// we have implicit flex sizes.
 			if ( $jit ) {
-				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) )
-					$args[0]['flex-width'] = true;
-				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) )
-					$args[0]['flex-height'] = true;
+				if ( empty( $args[0]['width'] ) && empty( $args[0]['flex-width'] ) ) {
+									$args[0]['flex-width'] = true;
+				}
+				if ( empty( $args[0]['height'] ) && empty( $args[0]['flex-height'] ) ) {
+									$args[0]['flex-height'] = true;
+				}
 			}
 
 			break;
 
 		case 'custom-background' :
-			if ( ! is_array( $args ) )
-				$args = array( 0 => array() );
+			if ( ! is_array( $args ) ) {
+							$args = array( 0 => array() );
+			}
 
 			$defaults = array(
 				'default-image'          => '',
@@ -1658,21 +1724,25 @@ 
 			unset( $args[0]['__jit'] );
 
 			// Merge in data from previous add_theme_support() calls. The first value registered wins.
-			if ( isset( $_wp_theme_features['custom-background'] ) )
-				$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			if ( isset( $_wp_theme_features['custom-background'] ) ) {
+							$args[0] = wp_parse_args( $_wp_theme_features['custom-background'][0], $args[0] );
+			}
 
-			if ( $jit )
-				$args[0] = wp_parse_args( $args[0], $defaults );
+			if ( $jit ) {
+							$args[0] = wp_parse_args( $args[0], $defaults );
+			}
 
-			if ( defined( 'BACKGROUND_COLOR' ) )
-				$args[0]['default-color'] = BACKGROUND_COLOR;
-			elseif ( isset( $args[0]['default-color'] ) || $jit )
-				define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			if ( defined( 'BACKGROUND_COLOR' ) ) {
+							$args[0]['default-color'] = BACKGROUND_COLOR;
+			} elseif ( isset( $args[0]['default-color'] ) || $jit ) {
+							define( 'BACKGROUND_COLOR', $args[0]['default-color'] );
+			}
 
-			if ( defined( 'BACKGROUND_IMAGE' ) )
-				$args[0]['default-image'] = BACKGROUND_IMAGE;
-			elseif ( isset( $args[0]['default-image'] ) || $jit )
-				define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			if ( defined( 'BACKGROUND_IMAGE' ) ) {
+							$args[0]['default-image'] = BACKGROUND_IMAGE;
+			} elseif ( isset( $args[0]['default-image'] ) || $jit ) {
+							define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
+			}
 
 			break;
 
@@ -1708,8 +1778,9 @@ 
 		add_theme_support( 'custom-header', array( '__jit' => true ) );
 
 		$args = get_theme_support( 'custom-header' );
-		if ( $args[0]['wp-head-callback'] )
-			add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		if ( $args[0]['wp-head-callback'] ) {
+					add_action( 'wp_head', $args[0]['wp-head-callback'] );
+		}
 
 		if ( is_admin() ) {
 			require_once( ABSPATH . 'wp-admin/custom-header.php' );
@@ -1767,19 +1838,22 @@ 
  */
 function get_theme_support( $feature ) {
 	global $_wp_theme_features;
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
-		return false;
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
+			return false;
+	}
 
-	if ( func_num_args() <= 1 )
-		return $_wp_theme_features[ $feature ];
+	if ( func_num_args() <= 1 ) {
+			return $_wp_theme_features[ $feature ];
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	switch ( $feature ) {
 		case 'custom-logo' :
 		case 'custom-header' :
 		case 'custom-background' :
-			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
-				return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) ) {
+							return $_wp_theme_features[ $feature ][0][ $args[0] ];
+			}
 			return false;
 
 		default :
@@ -1800,8 +1874,9 @@ 
  */
 function remove_theme_support( $feature ) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) )
-		return false;
+	if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) ) {
+			return false;
+	}
 
 	return _remove_theme_support( $feature );
 }
@@ -1823,29 +1898,34 @@ 
 
 	switch ( $feature ) {
 		case 'custom-header-uploads' :
-			if ( ! isset( $_wp_theme_features['custom-header'] ) )
-				return false;
+			if ( ! isset( $_wp_theme_features['custom-header'] ) ) {
+							return false;
+			}
 			add_theme_support( 'custom-header', array( 'uploads' => false ) );
 			return; // Do not continue - custom-header-uploads no longer exists.
 	}
 
-	if ( ! isset( $_wp_theme_features[ $feature ] ) )
-		return false;
+	if ( ! isset( $_wp_theme_features[ $feature ] ) ) {
+			return false;
+	}
 
 	switch ( $feature ) {
 		case 'custom-header' :
-			if ( ! did_action( 'wp_loaded' ) )
-				break;
+			if ( ! did_action( 'wp_loaded' ) ) {
+							break;
+			}
 			$support = get_theme_support( 'custom-header' );
-			if ( $support[0]['wp-head-callback'] )
-				remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+			if ( $support[0]['wp-head-callback'] ) {
+							remove_action( 'wp_head', $support[0]['wp-head-callback'] );
+			}
 			remove_action( 'admin_menu', array( $GLOBALS['custom_image_header'], 'init' ) );
 			unset( $GLOBALS['custom_image_header'] );
 			break;
 
 		case 'custom-background' :
-			if ( ! did_action( 'wp_loaded' ) )
-				break;
+			if ( ! did_action( 'wp_loaded' ) ) {
+							break;
+			}
 			$support = get_theme_support( 'custom-background' );
 			remove_action( 'wp_head', $support[0]['wp-head-callback'] );
 			remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
@@ -1870,15 +1950,18 @@ 
 function current_theme_supports( $feature ) {
 	global $_wp_theme_features;
 
-	if ( 'custom-header-uploads' == $feature )
-		return current_theme_supports( 'custom-header', 'uploads' );
+	if ( 'custom-header-uploads' == $feature ) {
+			return current_theme_supports( 'custom-header', 'uploads' );
+	}
 
-	if ( !isset( $_wp_theme_features[$feature] ) )
-		return false;
+	if ( !isset( $_wp_theme_features[$feature] ) ) {
+			return false;
+	}
 
 	// If no args passed then no extra checks need be performed
-	if ( func_num_args() <= 1 )
-		return true;
+	if ( func_num_args() <= 1 ) {
+			return true;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 
@@ -1887,8 +1970,10 @@ 
 			// post-thumbnails can be registered for only certain content/post types by passing
 			// an array of types to add_theme_support(). If no array was passed, then
 			// any type is accepted
-			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+			if ( true === $_wp_theme_features[$feature] ) {
+				// Registered for all types
 				return true;
+			}
 			$content_type = $args[0];
 			return in_array( $content_type, $_wp_theme_features[$feature][0] );
 
@@ -2069,8 +2154,9 @@ 
 
 	$wp_scripts = wp_scripts();
 	$data = $wp_scripts->get_data( 'customize-loader', 'data' );
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'customize-loader', 'data', $script );
 }
@@ -2086,8 +2172,9 @@ 
  */
 function wp_customize_url( $stylesheet = null ) {
 	$url = admin_url( 'customize.php' );
-	if ( $stylesheet )
-		$url .= '?theme=' . urlencode( $stylesheet );
+	if ( $stylesheet ) {
+			$url .= '?theme=' . urlencode( $stylesheet );
+	}
 	return esc_url( $url );
 }
 
@@ -2118,9 +2205,12 @@ 
 
 <?php		if ( $cross_domain ): ?>
 			request = (function(){ var xhr = new XMLHttpRequest(); return ('withCredentials' in xhr); })();
-<?php		else: ?>
+<?php		else {
+	: ?>
 			request = true;
-<?php		endif; ?>
+<?php		endif;
+}
+?>
 
 			b[c] = b[c].replace( rcs, ' ' );
 			b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;

src/wp-includes/wp-diff.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * WordPress Diff bastard child of old MediaWiki Diff Formatter.
- *
- * Basically all that remains is the table structure and some method names.
- *
- * @package WordPress
- * @subpackage Diff
- */
+	 * WordPress Diff bastard child of old MediaWiki Diff Formatter.
+	 *
+	 * Basically all that remains is the table structure and some method names.
+	 *
+	 * @package WordPress
+	 * @subpackage Diff
+	 */
 
 if ( !class_exists( 'Text_Diff' ) ) {
 	/** Text_Diff class */
@@ -169,7 +169,7 @@ 
 				 *
 				 * @param String $processed_line The processed diffed line.
 				 * @param String $line           The unprocessed diffed line.
-		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}

Braces +49 added lines, -35 removed lines

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

Spacing +100 added lines, -100 removed lines

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

src/wp-trackback.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +23 added lines, -23 removed lines

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

Braces +15 added lines, -9 removed lines

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

tools/i18n/extract.php

Doc Comments +10 added lines

@@ -40,11 +40,17 @@ 
 		return $translations;
 	}
 
+	/**
+	 * @param string $prefix
+	 */
 	function extract_from_file( $file_name, $prefix ) {
 		$code = file_get_contents( $file_name );
 		return $this->extract_from_code( $code, $prefix . $file_name );
 	}
 
+	/**
+	 * @param string $path
+	 */
 	function does_file_name_match( $path, $excludes, $includes ) {
 		if ( $includes ) {
 			$matched_any_include = false;
@@ -128,6 +134,10 @@ 
 		return $entry;
 	}
 
+	/**
+	 * @param string $code
+	 * @param string $file_name
+	 */
 	function extract_from_code( $code, $file_name ) {
 		$translations = new Translations;
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );

Switch Indentation +29 added lines, -29 removed lines

@@ -75,35 +75,35 @@
 		for( $i = 0; $i < count( $rule ); ++$i ) {
 			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
 			switch( $rule[$i] ) {
-			case 'string':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$complete = true;
-				break;
-			case 'singular':
-				if ( $complete ) {
-					$multiple[] = $entry;
-					$entry = new Translation_Entry;
-					$complete = false;
-				}
-				$entry->singular = $call['args'][$i];
-				$entry->is_plural = true;
-				break;
-			case 'plural':
-				$entry->plural = $call['args'][$i];
-				$entry->is_plural = true;
-				$complete = true;
-				break;
-			case 'context':
-				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
-					$single_entry->context = $entry->context;
-				}
-				break;
+				case 'string':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$complete = true;
+					break;
+				case 'singular':
+					if ( $complete ) {
+						$multiple[] = $entry;
+						$entry = new Translation_Entry;
+						$complete = false;
+					}
+					$entry->singular = $call['args'][$i];
+					$entry->is_plural = true;
+					break;
+				case 'plural':
+					$entry->plural = $call['args'][$i];
+					$entry->is_plural = true;
+					$complete = true;
+					break;
+				case 'context':
+					$entry->context = $call['args'][$i];
+					foreach( $multiple as &$single_entry ) {
+						$single_entry->context = $entry->context;
+					}
+					break;
 			}
 		}
 		if ( isset( $call['line'] ) && $call['line'] ) {

Braces +29 added lines, -12 removed lines

@@ -26,7 +26,9 @@ 
 		$translations = new Translations;
 		$file_names = (array) scandir( '.' );
 		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
+			if ( '.' == $file_name || '..' == $file_name ) {
+				continue;
+			}
 			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
 				$extracted = $this->extract_from_file( $file_name, $prefix );
 				$translations->merge_originals_with( $extracted );
@@ -54,7 +56,9 @@ 
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( !$matched_any_include ) {
+				return false;
+			}
 		}
 		if ( $excludes ) {
 			foreach( $excludes as $exclude ) {
@@ -68,12 +72,16 @@ 
 
 	function entry_from_call( $call, $file_name ) {
 		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+		if ( !$rule ) {
+			return null;
+		}
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
 		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
+			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) {
+				return false;
+			}
 			switch( $rule[$i] ) {
 			case 'string':
 				if ( $complete ) {
@@ -133,11 +141,12 @@ 
 		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
 		foreach( $function_calls as $call ) {
 			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
+			if ( is_array( $entry ) ) {
+							foreach( $entry as $single_entry )
 					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+			} elseif ( $entry) {
+							$translations->add_entry_or_merge( $entry );
+			}
 		}
 		return $translations;
 	}
@@ -155,8 +164,12 @@ 
 		$in_func = false;
 		foreach( $tokens as $token ) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
+			if ( is_array( $token ) ) {
+				list( $id, $text, $line ) = $token;
+			}
+			if ( T_WHITESPACE == $id ) {
+				continue;
+			}
 			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
 				$in_func = true;
 				$paren_level = -1;
@@ -177,7 +190,9 @@ 
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
+			if ( !$in_func ) {
+				continue;
+			}
 			if ( '(' == $token ) {
 				$paren_level++;
 				if ( 0 == $paren_level ) { // start of first argument
@@ -197,7 +212,9 @@ 
 					$in_func = false;
 					$args[] = $current_argument;
 					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					if ( $func_comment ) {
+						$call['comment'] = $func_comment;
+					}
 					$function_calls[] = $call;
 				}
 				$paren_level--;

Spacing +76 added lines, -76 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/entry.php";
 require_once "$pomo/translations.php";
 
@@ -10,55 +10,55 @@ 
 class StringExtractor {
 
 	var $rules = array(
-		'__' => array( 'string' ),
-		'_e' => array( 'string' ),
-		'_n' => array( 'singular', 'plural' ),
+		'__' => array('string'),
+		'_e' => array('string'),
+		'_n' => array('singular', 'plural'),
 	);
 	var $comment_prefix = 'translators:';
 
-	function __construct( $rules = array() ) {
+	function __construct($rules = array()) {
 		$this->rules = $rules;
 	}
 
-	function extract_from_directory( $dir, $excludes = array(), $includes = array(), $prefix = '' ) {
+	function extract_from_directory($dir, $excludes = array(), $includes = array(), $prefix = '') {
 		$old_cwd = getcwd();
-		chdir( $dir );
+		chdir($dir);
 		$translations = new Translations;
-		$file_names = (array) scandir( '.' );
-		foreach ( $file_names as $file_name ) {
-			if ( '.' == $file_name || '..' == $file_name ) continue;
-			if ( preg_match( '/\.php$/', $file_name ) && $this->does_file_name_match( $prefix . $file_name, $excludes, $includes ) ) {
-				$extracted = $this->extract_from_file( $file_name, $prefix );
-				$translations->merge_originals_with( $extracted );
+		$file_names = (array) scandir('.');
+		foreach ($file_names as $file_name) {
+			if ('.' == $file_name || '..' == $file_name) continue;
+			if (preg_match('/\.php$/', $file_name) && $this->does_file_name_match($prefix.$file_name, $excludes, $includes)) {
+				$extracted = $this->extract_from_file($file_name, $prefix);
+				$translations->merge_originals_with($extracted);
 			}
-			if ( is_dir( $file_name ) ) {
-				$extracted = $this->extract_from_directory( $file_name, $excludes, $includes, $prefix . $file_name . '/' );
-				$translations->merge_originals_with( $extracted );
+			if (is_dir($file_name)) {
+				$extracted = $this->extract_from_directory($file_name, $excludes, $includes, $prefix.$file_name.'/');
+				$translations->merge_originals_with($extracted);
 			}
 		}
-		chdir( $old_cwd );
+		chdir($old_cwd);
 		return $translations;
 	}
 
-	function extract_from_file( $file_name, $prefix ) {
-		$code = file_get_contents( $file_name );
-		return $this->extract_from_code( $code, $prefix . $file_name );
+	function extract_from_file($file_name, $prefix) {
+		$code = file_get_contents($file_name);
+		return $this->extract_from_code($code, $prefix.$file_name);
 	}
 
-	function does_file_name_match( $path, $excludes, $includes ) {
-		if ( $includes ) {
+	function does_file_name_match($path, $excludes, $includes) {
+		if ($includes) {
 			$matched_any_include = false;
-			foreach( $includes as $include ) {
-				if ( preg_match( '|^'.$include.'$|', $path ) ) {
+			foreach ($includes as $include) {
+				if (preg_match('|^'.$include.'$|', $path)) {
 					$matched_any_include = true;
 					break;
 				}
 			}
-			if ( !$matched_any_include ) return false;
+			if ( ! $matched_any_include) return false;
 		}
-		if ( $excludes ) {
-			foreach( $excludes as $exclude ) {
-				if ( preg_match( '|^'.$exclude.'$|', $path ) ) {
+		if ($excludes) {
+			foreach ($excludes as $exclude) {
+				if (preg_match('|^'.$exclude.'$|', $path)) {
 					return false;
 				}
 			}
@@ -66,17 +66,17 @@ 
 		return true;
 	}
 
-	function entry_from_call( $call, $file_name ) {
-		$rule = isset( $this->rules[$call['name']] )? $this->rules[$call['name']] : null;
-		if ( !$rule ) return null;
+	function entry_from_call($call, $file_name) {
+		$rule = isset($this->rules[$call['name']]) ? $this->rules[$call['name']] : null;
+		if ( ! $rule) return null;
 		$entry = new Translation_Entry;
 		$multiple = array();
 		$complete = false;
-		for( $i = 0; $i < count( $rule ); ++$i ) {
-			if ( $rule[$i] && ( !isset( $call['args'][$i] ) || !is_string( $call['args'][$i] ) || '' == $call['args'][$i] ) ) return false;
-			switch( $rule[$i] ) {
+		for ($i = 0; $i < count($rule); ++$i) {
+			if ($rule[$i] && ( ! isset($call['args'][$i]) || ! is_string($call['args'][$i]) || '' == $call['args'][$i])) return false;
+			switch ($rule[$i]) {
 			case 'string':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -85,7 +85,7 @@ 
 				$complete = true;
 				break;
 			case 'singular':
-				if ( $complete ) {
+				if ($complete) {
 					$multiple[] = $entry;
 					$entry = new Translation_Entry;
 					$complete = false;
@@ -100,27 +100,27 @@ 
 				break;
 			case 'context':
 				$entry->context = $call['args'][$i];
-				foreach( $multiple as &$single_entry ) {
+				foreach ($multiple as &$single_entry) {
 					$single_entry->context = $entry->context;
 				}
 				break;
 			}
 		}
-		if ( isset( $call['line'] ) && $call['line'] ) {
-			$references = array( $file_name . ':' . $call['line'] );
+		if (isset($call['line']) && $call['line']) {
+			$references = array($file_name.':'.$call['line']);
 			$entry->references = $references;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->references = $references;
 			}
 		}
-		if ( isset( $call['comment'] ) && $call['comment'] ) {
-			$comments = rtrim( $call['comment'] ) . "\n";
+		if (isset($call['comment']) && $call['comment']) {
+			$comments = rtrim($call['comment'])."\n";
 			$entry->extracted_comments = $comments;
-			foreach( $multiple as &$single_entry ) {
+			foreach ($multiple as &$single_entry) {
 				$single_entry->extracted_comments = $comments;
 			}
 		}
-		if ( $multiple && $entry ) {
+		if ($multiple && $entry) {
 			$multiple[] = $entry;
 			return $multiple;
 		}
@@ -128,16 +128,16 @@ 
 		return $entry;
 	}
 
-	function extract_from_code( $code, $file_name ) {
+	function extract_from_code($code, $file_name) {
 		$translations = new Translations;
-		$function_calls = $this->find_function_calls( array_keys( $this->rules ), $code );
-		foreach( $function_calls as $call ) {
-			$entry = $this->entry_from_call( $call, $file_name );
-			if ( is_array( $entry ) )
-				foreach( $entry as $single_entry )
-					$translations->add_entry_or_merge( $single_entry );
-			elseif ( $entry)
-				$translations->add_entry_or_merge( $entry );
+		$function_calls = $this->find_function_calls(array_keys($this->rules), $code);
+		foreach ($function_calls as $call) {
+			$entry = $this->entry_from_call($call, $file_name);
+			if (is_array($entry))
+				foreach ($entry as $single_entry)
+					$translations->add_entry_or_merge($single_entry);
+			elseif ($entry)
+				$translations->add_entry_or_merge($entry);
 		}
 		return $translations;
 	}
@@ -148,70 +148,70 @@ 
 	 *	- args - array for the function arguments. Each string literal is represented by itself, other arguments are represented by null.
 	 *  - line - line number
 	 */
-	function find_function_calls( $function_names, $code ) {
-		$tokens = token_get_all( $code );
+	function find_function_calls($function_names, $code) {
+		$tokens = token_get_all($code);
 		$function_calls = array();
 		$latest_comment = false;
 		$in_func = false;
-		foreach( $tokens as $token ) {
+		foreach ($tokens as $token) {
 			$id = $text = null;
-			if ( is_array( $token ) ) list( $id, $text, $line ) = $token;
-			if ( T_WHITESPACE == $id ) continue;
-			if ( T_STRING == $id && in_array( $text, $function_names ) && !$in_func ) {
+			if (is_array($token)) list($id, $text, $line) = $token;
+			if (T_WHITESPACE == $id) continue;
+			if (T_STRING == $id && in_array($text, $function_names) && ! $in_func) {
 				$in_func = true;
 				$paren_level = -1;
 				$args = array();
 				$func_name = $text;
 				$func_line = $line;
-				$func_comment = $latest_comment? $latest_comment : '';
+				$func_comment = $latest_comment ? $latest_comment : '';
 
 				$just_got_into_func = true;
 				$latest_comment = false;
 				continue;
 			}
-			if ( T_COMMENT == $id ) {
-				$text = preg_replace( '%^\s+\*\s%m', '', $text );
-				$text = str_replace( array( "\r\n", "\n" ), ' ', $text );;
-				$text = trim( preg_replace( '%^(/\*|//)%', '', preg_replace( '%\*/$%', '', $text ) ) );
-				if ( 0 === stripos( $text, $this->comment_prefix ) ) {
+			if (T_COMMENT == $id) {
+				$text = preg_replace('%^\s+\*\s%m', '', $text);
+				$text = str_replace(array("\r\n", "\n"), ' ', $text); ;
+				$text = trim(preg_replace('%^(/\*|//)%', '', preg_replace('%\*/$%', '', $text)));
+				if (0 === stripos($text, $this->comment_prefix)) {
 					$latest_comment = $text;
 				}
 			}
-			if ( !$in_func ) continue;
-			if ( '(' == $token ) {
+			if ( ! $in_func) continue;
+			if ('(' == $token) {
 				$paren_level++;
-				if ( 0 == $paren_level ) { // start of first argument
+				if (0 == $paren_level) { // start of first argument
 					$just_got_into_func = false;
 					$current_argument = null;
 					$current_argument_is_just_literal = true;
 				}
 				continue;
 			}
-			if ( $just_got_into_func ) {
+			if ($just_got_into_func) {
 				// there wasn't a opening paren just after the function name -- this means it is not a function
 				$in_func = false;
 				$just_got_into_func = false;
 			}
-			if ( ')' == $token ) {
-				if ( 0 == $paren_level ) {
+			if (')' == $token) {
+				if (0 == $paren_level) {
 					$in_func = false;
 					$args[] = $current_argument;
-					$call = array( 'name' => $func_name, 'args' => $args, 'line' => $func_line );
-					if ( $func_comment ) $call['comment'] = $func_comment;
+					$call = array('name' => $func_name, 'args' => $args, 'line' => $func_line);
+					if ($func_comment) $call['comment'] = $func_comment;
 					$function_calls[] = $call;
 				}
 				$paren_level--;
 				continue;
 			}
-			if ( ',' == $token && 0 == $paren_level ) {
+			if (',' == $token && 0 == $paren_level) {
 				$args[] = $current_argument;
 				$current_argument = null;
 				$current_argument_is_just_literal = true;
 				continue;
 			}
-			if ( T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal ) {
+			if (T_CONSTANT_ENCAPSED_STRING == $id && $current_argument_is_just_literal) {
 				// we can use eval safely, because we are sure $text is just a string literal
-				eval('$current_argument = '.$text.';' );
+				eval('$current_argument = '.$text.';');
 				continue;
 			}
 			$current_argument_is_just_literal = false;

tools/i18n/not-gettexted.php

Doc Comments +12 added lines

@@ -51,6 +51,9 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $dir
+	 */
 	function list_php_files($dir) {
 		$files = array();
 		$items = scandir( $dir );
@@ -67,16 +70,25 @@ 
 	}
 
 
+	/**
+	 * @param string $global_array_name
+	 */
 	function make_string_aggregator($global_array_name, $filename) {
 		$a = $global_array_name;
 		return create_function('$string, $comment_id, $line_number', 'global $'.$a.'; $'.$a.'[] = array($string, $comment_id, '.var_export($filename, true).', $line_number);');
 	}
 
+	/**
+	 * @param string $global_mo_name
+	 */
 	function make_mo_replacer($global_mo_name) {
 		$m = $global_mo_name;
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
+	/**
+	 * @param string $register_action
+	 */
 	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
 
 		$current_comment_id = '';

Indentation +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
  */
 // see: http://php.net/tokenizer
 if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+		define( 'T_ML_COMMENT', T_COMMENT );
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+		define( 'T_DOC_COMMENT', T_ML_COMMENT );
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";

Spacing +24 added lines, -24 removed lines

@@ -7,12 +7,12 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
-	    define( 'T_ML_COMMENT', T_COMMENT );
+if ( ! defined('T_ML_COMMENT'))
+	    define('T_ML_COMMENT', T_COMMENT);
 else
-	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+	    define('T_DOC_COMMENT', T_ML_COMMENT);
 
-$pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
+$pomo = dirname(dirname(dirname(__FILE__))).'/src/wp-includes/pomo';
 require_once "$pomo/po.php";
 require_once "$pomo/mo.php";
 
@@ -26,7 +26,7 @@ 
 	var $STAGE_WHITESPACE_AFTER = 4;
 	var $STAGE_END_COMMENT = 4;
 
-	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace' );
+	var $commands = array('extract' => 'command_extract', 'replace' => 'command_replace');
 
 
 	function logmsg() {
@@ -34,8 +34,8 @@ 
 		if ($this->enable_logging) error_log(implode(' ', $args));
 	}
 
-	function stderr($msg, $nl=true) {
-		fwrite(STDERR, $msg.($nl? "\n" : ""));
+	function stderr($msg, $nl = true) {
+		fwrite(STDERR, $msg.($nl ? "\n" : ""));
 	}
 
 	function cli_die($msg) {
@@ -43,19 +43,19 @@ 
 		exit(1);
 	}
 
-	function unchanged_token($token, $s='') {
-		return is_array($token)? $token[1] : $token;
+	function unchanged_token($token, $s = '') {
+		return is_array($token) ? $token[1] : $token;
 	}
 
-	function ignore_token($token, $s='') {
+	function ignore_token($token, $s = '') {
 		return '';
 	}
 
 	function list_php_files($dir) {
 		$files = array();
-		$items = scandir( $dir );
-		foreach ( (array) $items as $item ) {
-			$full_item = $dir . '/' . $item;
+		$items = scandir($dir);
+		foreach ((array) $items as $item) {
+			$full_item = $dir.'/'.$item;
 			if ('.' == $item || '..' == $item)
 				continue;
 			if ('.php' == substr($item, -4))
@@ -77,7 +77,7 @@ 
 		return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
 	}
 
-	function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
+	function walk_tokens(&$tokens, $string_action, $other_action, $register_action = null) {
 
 		$current_comment_id = '';
 		$current_string = '';
@@ -86,7 +86,7 @@ 
 		$result = '';
 		$line = 1;
 
-		foreach($tokens as $token) {
+		foreach ($tokens as $token) {
 			if (is_array($token)) {
 				list($id, $text) = $token;
 				$line += substr_count($text, "\n");
@@ -102,7 +102,7 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if ( ! is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -149,21 +149,21 @@ 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
 
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$tokens = token_get_all(file_get_contents($filename));
 			$aggregator = $this->make_string_aggregator($global_name, $filename);
 			$this->walk_tokens($tokens, array($this, 'ignore_token'), array($this, 'ignore_token'), $aggregator);
 		}
 
-		$potf = '-' == $pot_filename? STDOUT : @fopen($pot_filename, 'a');
+		$potf = '-' == $pot_filename ? STDOUT : @fopen($pot_filename, 'a');
 		if (false === $potf) {
 			$this->cli_die("Couldn't open pot file: $pot_filename");
 		}
 
-		foreach($GLOBALS[$global_name] as $item) {
+		foreach ($GLOBALS[$global_name] as $item) {
 			@list($string, $comment_id, $filename, $line_number) = $item;
-			$filename = isset($filename)? preg_replace('|^\./|', '', $filename) : '';
-			$ref_line_number = isset($line_number)? ":$line_number" : '';
+			$filename = isset($filename) ? preg_replace('|^\./|', '', $filename) : '';
+			$ref_line_number = isset($line_number) ? ":$line_number" : '';
 			$args = array(
 				'singular' => $string,
 				'extracted_comments' => "Not gettexted string $comment_id",
@@ -192,9 +192,9 @@ 
 		if (false === $res) {
 			$this->cli_die("Couldn't read MO file '$mo_filename'!");
 		}
-		foreach($filenames as $filename) {
+		foreach ($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if (strlen($source) > 150000) continue;
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');
@@ -214,7 +214,7 @@ 
 
 	function cli() {
 		global $argv, $commands;
-		if (count($argv) < 4 || !in_array($argv[1], array_keys($this->commands))) {
+		if (count($argv) < 4 || ! in_array($argv[1], array_keys($this->commands))) {
 			$this->usage();
 			exit(1);
 		}

Braces +34 added lines, -20 removed lines

@@ -7,10 +7,11 @@ 
  * @subpackage tools
  */
 // see: http://php.net/tokenizer
-if ( ! defined( 'T_ML_COMMENT' ) )
+if ( ! defined( 'T_ML_COMMENT' ) ) {
 	    define( 'T_ML_COMMENT', T_COMMENT );
-else
+} else {
 	    define( 'T_DOC_COMMENT', T_ML_COMMENT );
+}
 
 $pomo = dirname( dirname( dirname( __FILE__ ) ) ) . '/src/wp-includes/pomo';
 require_once "$pomo/po.php";
@@ -31,7 +32,9 @@ 
 
 	function logmsg() {
 		$args = func_get_args();
-		if ($this->enable_logging) error_log(implode(' ', $args));
+		if ($this->enable_logging) {
+			error_log(implode(' ', $args));
+		}
 	}
 
 	function stderr($msg, $nl=true) {
@@ -56,12 +59,15 @@ 
 		$items = scandir( $dir );
 		foreach ( (array) $items as $item ) {
 			$full_item = $dir . '/' . $item;
-			if ('.' == $item || '..' == $item)
-				continue;
-			if ('.php' == substr($item, -4))
-				$files[] = $full_item;
-			if (is_dir($full_item))
-				$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			if ('.' == $item || '..' == $item) {
+							continue;
+			}
+			if ('.php' == substr($item, -4)) {
+							$files[] = $full_item;
+			}
+			if (is_dir($full_item)) {
+							$files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
+			}
 		}
 		return $files;
 	}
@@ -102,7 +108,9 @@ 
 						$stage = $this->STAGE_END_COMMENT;
 						$this->logmsg('end comment', $current_comment_id);
 						$result .= call_user_func($other_action, $token);
-						if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						if (!is_null($register_action)) {
+							call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
+						}
 						continue;
 					}
 				} else if (T_CONSTANT_ENCAPSED_STRING == $id) {
@@ -141,10 +149,11 @@ 
 	function command_extract() {
 		$args = func_get_args();
 		$pot_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__entries_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = array();
@@ -172,17 +181,20 @@ 
 			$entry = new Translation_Entry($args);
 			fwrite($potf, "\n".PO::export_entry($entry)."\n");
 		}
-		if ('-' != $pot_filename) fclose($potf);
+		if ('-' != $pot_filename) {
+			fclose($potf);
+		}
 		return true;
 	}
 
 	function command_replace() {
 		$args = func_get_args();
 		$mo_filename = $args[0];
-		if (isset($args[1]) && is_array($args[1]))
-			$filenames = $args[1];
-		else
-			$filenames = array_slice($args, 1);
+		if (isset($args[1]) && is_array($args[1])) {
+					$filenames = $args[1];
+		} else {
+					$filenames = array_slice($args, 1);
+		}
 
 		$global_name = '__mo_'.mt_rand(1, 1000);
 		$GLOBALS[$global_name] = new MO();
@@ -194,7 +206,9 @@ 
 		}
 		foreach($filenames as $filename) {
 			$source = file_get_contents($filename);
-			if ( strlen($source) > 150000 ) continue;
+			if ( strlen($source) > 150000 ) {
+				continue;
+			}
 			$tokens = token_get_all($source);
 			$new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
 			$f = fopen($filename, 'w');