ntwb / wordpress

src/wp-includes/class.wp-styles.php

Doc Comments +1 added lines, -1 removed lines

@@ -154,7 +154,7 @@
 	/**
 	 * @param string $handle
 	 * @param bool $echo
-	 * @return bool
+	 * @return string|boolean
 	 */
 	public function print_inline_style( $handle, $echo = true ) {
 		$output = $this->get_data( $handle, 'after' );

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * BackPress Styles enqueue.
- *
- * These classes were refactored from the WordPress WP_Scripts and WordPress
- * script enqueue API.
- *
- * @package BackPress
- * @since r74
- */
+	 * BackPress Styles enqueue.
+	 *
+	 * These classes were refactored from the WordPress WP_Scripts and WordPress
+	 * script enqueue API.
+	 *
+	 * @package BackPress
+	 * @since r74
+	 */
 
 /**
  * BackPress Styles enqueue class.

Spacing +51 added lines, -51 removed lines

@@ -36,49 +36,49 @@ 
 		 *
 		 * @param WP_Styles &$this WP_Styles instance, passed by reference.
 		 */
-		do_action_ref_array( 'wp_default_styles', array(&$this) );
+		do_action_ref_array('wp_default_styles', array(&$this));
 	}
 
 	/**
 	 * @param string $handle
 	 * @return bool
 	 */
-	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
+	public function do_item($handle) {
+		if ( ! parent::do_item($handle))
 			return false;
 
 		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
+		if (null === $obj->ver)
 			$ver = '';
 		else
 			$ver = $obj->ver ? $obj->ver : $this->default_version;
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		if (isset($this->args[$handle]))
+			$ver = $ver ? $ver.'&'.$this->args[$handle] : $this->args[$handle];
 
-		if ( $this->do_concat ) {
-			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
+		if ($this->do_concat) {
+			if ($this->in_default_dir($obj->src) && ! isset($obj->extra['conditional']) && ! isset($obj->extra['alt'])) {
 				$this->concat .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 
-				$this->print_code .= $this->print_inline_style( $handle, false );
+				$this->print_code .= $this->print_inline_style($handle, false);
 
 				return true;
 			}
 		}
 
-		if ( isset($obj->args) )
-			$media = esc_attr( $obj->args );
+		if (isset($obj->args))
+			$media = esc_attr($obj->args);
 		else
 			$media = 'all';
 
-		$href = $this->_css_href( $obj->src, $ver, $handle );
-		if ( empty( $href ) ) {
+		$href = $this->_css_href($obj->src, $ver, $handle);
+		if (empty($href)) {
 			// Turns out there is nothing to print.
 			return true;
 		}
 		$rel = isset($obj->extra['alt']) && $obj->extra['alt'] ? 'alternate stylesheet' : 'stylesheet';
-		$title = isset($obj->extra['title']) ? "title='" . esc_attr( $obj->extra['title'] ) . "'" : '';
+		$title = isset($obj->extra['title']) ? "title='".esc_attr($obj->extra['title'])."'" : '';
 
 		/**
 		 * Filter the HTML link tag of an enqueued style.
@@ -90,19 +90,19 @@ 
 		 * @param string $handle The style's registered handle.
 		 * @param string $href   The stylesheet's source URL.
 		 */
-		$tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href );
-		if ( 'rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl'] ) {
-			if ( is_bool( $obj->extra['rtl'] ) || 'replace' === $obj->extra['rtl'] ) {
-				$suffix = isset( $obj->extra['suffix'] ) ? $obj->extra['suffix'] : '';
-				$rtl_href = str_replace( "{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href( $obj->src , $ver, "$handle-rtl" ));
+		$tag = apply_filters('style_loader_tag', "<link rel='$rel' id='$handle-css' $title href='$href' type='text/css' media='$media' />\n", $handle, $href);
+		if ('rtl' === $this->text_direction && isset($obj->extra['rtl']) && $obj->extra['rtl']) {
+			if (is_bool($obj->extra['rtl']) || 'replace' === $obj->extra['rtl']) {
+				$suffix = isset($obj->extra['suffix']) ? $obj->extra['suffix'] : '';
+				$rtl_href = str_replace("{$suffix}.css", "-rtl{$suffix}.css", $this->_css_href($obj->src, $ver, "$handle-rtl"));
 			} else {
-				$rtl_href = $this->_css_href( $obj->extra['rtl'], $ver, "$handle-rtl" );
+				$rtl_href = $this->_css_href($obj->extra['rtl'], $ver, "$handle-rtl");
 			}
 
 			/** This filter is documented in wp-includes/class.wp-styles.php */
-			$rtl_tag = apply_filters( 'style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle, $rtl_href );
+			$rtl_tag = apply_filters('style_loader_tag', "<link rel='$rel' id='$handle-rtl-css' $title href='$rtl_href' type='text/css' media='$media' />\n", $handle, $rtl_href);
 
-			if ( $obj->extra['rtl'] === 'replace' ) {
+			if ($obj->extra['rtl'] === 'replace') {
 				$tag = $rtl_tag;
 			} else {
 				$tag .= $rtl_tag;
@@ -110,22 +110,22 @@ 
 		}
 
 		$conditional_pre = $conditional_post = '';
-		if ( isset( $obj->extra['conditional'] ) && $obj->extra['conditional'] ) {
+		if (isset($obj->extra['conditional']) && $obj->extra['conditional']) {
 			$conditional_pre  = "<!--[if {$obj->extra['conditional']}]>\n";
 			$conditional_post = "<![endif]-->\n";
 		}
 
-		if ( $this->do_concat ) {
+		if ($this->do_concat) {
 			$this->print_html .= $conditional_pre;
 			$this->print_html .= $tag;
-			if ( $inline_style = $this->print_inline_style( $handle, false ) ) {
-				$this->print_html .= sprintf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $inline_style );
+			if ($inline_style = $this->print_inline_style($handle, false)) {
+				$this->print_html .= sprintf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $inline_style);
 			}
 			$this->print_html .= $conditional_post;
 		} else {
 			echo $conditional_pre;
 			echo $tag;
-			$this->print_inline_style( $handle );
+			$this->print_inline_style($handle);
 			echo $conditional_post;
 		}
 
@@ -136,19 +136,19 @@ 
 	 * @param string $handle
 	 * @param string $code
 	 */
-	public function add_inline_style( $handle, $code ) {
-		if ( ! $code ) {
+	public function add_inline_style($handle, $code) {
+		if ( ! $code) {
 			return false;
 		}
 
-		$after = $this->get_data( $handle, 'after' );
-		if ( ! $after ) {
+		$after = $this->get_data($handle, 'after');
+		if ( ! $after) {
 			$after = array();
 		}
 
 		$after[] = $code;
 
-		return $this->add_data( $handle, 'after', $after );
+		return $this->add_data($handle, 'after', $after);
 	}
 
 	/**
@@ -156,20 +156,20 @@ 
 	 * @param bool $echo
 	 * @return bool
 	 */
-	public function print_inline_style( $handle, $echo = true ) {
-		$output = $this->get_data( $handle, 'after' );
+	public function print_inline_style($handle, $echo = true) {
+		$output = $this->get_data($handle, 'after');
 
-		if ( empty( $output ) ) {
+		if (empty($output)) {
 			return false;
 		}
 
-		$output = implode( "\n", $output );
+		$output = implode("\n", $output);
 
-		if ( ! $echo ) {
+		if ( ! $echo) {
 			return $output;
 		}
 
-		printf( "<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr( $handle ), $output );
+		printf("<style id='%s-inline-css' type='text/css'>\n%s\n</style>\n", esc_attr($handle), $output);
 
 		return true;
 	}
@@ -180,9 +180,9 @@ 
 	 * @param mixed $group
 	 * @return bool
 	 */
-	public function all_deps( $handles, $recursion = false, $group = false ) {
-		$r = parent::all_deps( $handles, $recursion );
-		if ( !$recursion ) {
+	public function all_deps($handles, $recursion = false, $group = false) {
+		$r = parent::all_deps($handles, $recursion);
+		if ( ! $recursion) {
 			/**
 			 * Filter the array of enqueued styles before processing for output.
 			 *
@@ -190,7 +190,7 @@ 
 			 *
 			 * @param array $to_do The list of enqueued styles about to be processed.
 			 */
-			$this->to_do = apply_filters( 'print_styles_array', $this->to_do );
+			$this->to_do = apply_filters('print_styles_array', $this->to_do);
 		}
 		return $r;
 	}
@@ -201,12 +201,12 @@ 
 	 * @param string $handle
 	 * @return string
 	 */
-	public function _css_href( $src, $ver, $handle ) {
-		if ( !is_bool($src) && !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
-			$src = $this->base_url . $src;
+	public function _css_href($src, $ver, $handle) {
+		if ( ! is_bool($src) && ! preg_match('|^(https?:)?//|', $src) && ! ($this->content_url && 0 === strpos($src, $this->content_url))) {
+			$src = $this->base_url.$src;
 		}
 
-		if ( !empty($ver) )
+		if ( ! empty($ver))
 			$src = add_query_arg('ver', $ver, $src);
 
 		/**
@@ -217,8 +217,8 @@ 
 		 * @param string $src    The source URL of the enqueued style.
 		 * @param string $handle The style's registered handle.
 		 */
-		$src = apply_filters( 'style_loader_src', $src, $handle );
-		return esc_url( $src );
+		$src = apply_filters('style_loader_src', $src, $handle);
+		return esc_url($src);
 	}
 
 	/**
@@ -226,11 +226,11 @@ 
 	 * @return bool
 	 */
 	public function in_default_dir($src) {
-		if ( ! $this->default_dirs )
+		if ( ! $this->default_dirs)
 			return true;
 
-		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
+		foreach ((array) $this->default_dirs as $test) {
+			if (0 === strpos($src, $test))
 				return true;
 		}
 		return false;

Braces +25 added lines, -18 removed lines

@@ -44,17 +44,20 @@ 
 	 * @return bool
 	 */
 	public function do_item( $handle ) {
-		if ( !parent::do_item($handle) )
-			return false;
+		if ( !parent::do_item($handle) ) {
+					return false;
+		}
 
 		$obj = $this->registered[$handle];
-		if ( null === $obj->ver )
-			$ver = '';
-		else
-			$ver = $obj->ver ? $obj->ver : $this->default_version;
+		if ( null === $obj->ver ) {
+					$ver = '';
+		} else {
+					$ver = $obj->ver ? $obj->ver : $this->default_version;
+		}
 
-		if ( isset($this->args[$handle]) )
-			$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		if ( isset($this->args[$handle]) ) {
+					$ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
+		}
 
 		if ( $this->do_concat ) {
 			if ( $this->in_default_dir($obj->src) && !isset($obj->extra['conditional']) && !isset($obj->extra['alt']) ) {
@@ -67,10 +70,11 @@ 
 			}
 		}
 
-		if ( isset($obj->args) )
-			$media = esc_attr( $obj->args );
-		else
-			$media = 'all';
+		if ( isset($obj->args) ) {
+					$media = esc_attr( $obj->args );
+		} else {
+					$media = 'all';
+		}
 
 		$href = $this->_css_href( $obj->src, $ver, $handle );
 		if ( empty( $href ) ) {
@@ -206,8 +210,9 @@ 
 			$src = $this->base_url . $src;
 		}
 
-		if ( !empty($ver) )
-			$src = add_query_arg('ver', $ver, $src);
+		if ( !empty($ver) ) {
+					$src = add_query_arg('ver', $ver, $src);
+		}
 
 		/**
 		 * Filter an enqueued style's fully-qualified URL.
@@ -226,12 +231,14 @@ 
 	 * @return bool
 	 */
 	public function in_default_dir($src) {
-		if ( ! $this->default_dirs )
-			return true;
+		if ( ! $this->default_dirs ) {
+					return true;
+		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
-				return true;
+			if ( 0 === strpos($src, $test) ) {
+							return true;
+			}
 		}
 		return false;
 	}

src/wp-includes/comment-template.php

Doc Comments +2 added lines, -2 removed lines

@@ -693,7 +693,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
 function get_comments_link( $post_id = 0 ) {
@@ -730,7 +730,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
 function get_comments_number( $post_id = 0 ) {

Indentation +10 added lines, -10 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * Comment template functions
- *
- * These functions are meant to live inside of the WordPress loop.
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * Comment template functions
+	 *
+	 * These functions are meant to live inside of the WordPress loop.
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Retrieve the author of the current comment.
@@ -2231,11 +2231,11 @@ 
 	$html5    = 'html5' === $args['format'];
 	$fields   =  array(
 		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . $html_req . ' /></p>',
+					'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . $html_req . ' /></p>',
 		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+					'<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
 		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
+					'<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
 	);
 
 	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );

Spacing +381 added lines, -381 removed lines

@@ -19,11 +19,11 @@ 
  * @param int $comment_ID Optional. The ID of the comment for which to retrieve the author. Default current comment.
  * @return string The comment author
  */
-function get_comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
-	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+	if (empty($comment->comment_author)) {
+		if ($comment->user_id && $user = get_userdata($comment->user_id))
 			$author = $user->display_name;
 		else
 			$author = __('Anonymous');
@@ -41,7 +41,7 @@ 
 	 * @param int    $comment_ID The comment ID.
 	 * @param object $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author', $author, $comment_ID, $comment );
+	return apply_filters('get_comment_author', $author, $comment_ID, $comment);
 }
 
 /**
@@ -51,8 +51,8 @@ 
  *
  * @param int $comment_ID Optional. The ID of the comment for which to print the author. Default current comment.
  */
-function comment_author( $comment_ID = 0 ) {
-	$author = get_comment_author( $comment_ID );
+function comment_author($comment_ID = 0) {
+	$author = get_comment_author($comment_ID);
 
 	/**
 	 * Filter the comment author's name for display.
@@ -63,7 +63,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_author', $author, $comment_ID );
+	echo apply_filters('comment_author', $author, $comment_ID);
 }
 
 /**
@@ -74,8 +74,8 @@ 
  * @param int $comment_ID Optional. The ID of the comment for which to get the author's email. Default current comment.
  * @return string The current comment author's email
  */
-function get_comment_author_email( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_email($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filter the comment author's returned email address.
@@ -87,7 +87,7 @@ 
 	 * @param int    $comment_ID           The comment ID.
 	 * @param object $comment              The comment object.
 	 */
-	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment_ID, $comment );
+	return apply_filters('get_comment_author_email', $comment->comment_author_email, $comment_ID, $comment);
 }
 
 /**
@@ -103,8 +103,8 @@ 
  *
  * @param int $comment_ID Optional. The ID of the comment for which to print the author's email. Default current comment.
  */
-function comment_author_email( $comment_ID = 0 ) {
-	$author_email = get_comment_author_email( $comment_ID );
+function comment_author_email($comment_ID = 0) {
+	$author_email = get_comment_author_email($comment_ID);
 
 	/**
 	 * Filter the comment author's email for display.
@@ -115,7 +115,7 @@ 
 	 * @param string $author_email The comment author's email address.
 	 * @param int    $comment_ID   The comment ID.
 	 */
-	echo apply_filters( 'author_email', $author_email, $comment_ID );
+	echo apply_filters('author_email', $author_email, $comment_ID);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  * @param string $before   Optional. Text or HTML to display before the email link. Default empty.
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  */
-function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
+function comment_author_email_link($linktext = '', $before = '', $after = '') {
+	if ($link = get_comment_author_email_link($linktext, $before, $after))
 		echo $link;
 }
 
@@ -158,7 +158,7 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  * @return string
  */
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_email_link($linktext = '', $before = '', $after = '') {
 	global $comment;
 
 	/**
@@ -173,8 +173,8 @@ 
 	 * @param string $comment_author_email The comment author's email address.
 	 * @param object $comment              The comment object.
 	 */
-	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
-	if ((!empty($email)) && ($email != '@')) {
+	$email = apply_filters('comment_email', $comment->comment_author_email, $comment);
+	if (( ! empty($email)) && ($email != '@')) {
 	$display = ($linktext != '') ? $linktext : $email;
 		$return  = $before;
 		$return .= "<a href='mailto:$email'>$display</a>";
@@ -197,11 +197,11 @@ 
  *                        Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
-function get_comment_author_link( $comment_ID = 0 ) {
-	$url    = get_comment_author_url( $comment_ID );
-	$author = get_comment_author( $comment_ID );
+function get_comment_author_link($comment_ID = 0) {
+	$url    = get_comment_author_url($comment_ID);
+	$author = get_comment_author($comment_ID);
 
-	if ( empty( $url ) || 'http://' == $url )
+	if (empty($url) || 'http://' == $url)
 		$return = $author;
 	else
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
@@ -217,7 +217,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	return apply_filters( 'get_comment_author_link', $return, $author, $comment_ID );
+	return apply_filters('get_comment_author_link', $return, $author, $comment_ID);
 }
 
 /**
@@ -228,8 +228,8 @@ 
  * @param int $comment_ID ID of the comment for which to print the author's
  *                        link. Default current comment.
  */
-function comment_author_link( $comment_ID = 0 ) {
-	echo get_comment_author_link( $comment_ID );
+function comment_author_link($comment_ID = 0) {
+	echo get_comment_author_link($comment_ID);
 }
 
 /**
@@ -241,8 +241,8 @@ 
  *                        address. Default current comment.
  * @return string Comment author's IP address.
  */
-function get_comment_author_IP( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_IP($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filter the comment author's returned IP address.
@@ -254,7 +254,7 @@ 
 	 * @param int    $comment_ID        The comment ID.
 	 * @param object $comment           The comment object.
 	 */
-	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment_ID, $comment );
+	return apply_filters('get_comment_author_IP', $comment->comment_author_IP, $comment_ID, $comment);
 }
 
 /**
@@ -265,8 +265,8 @@ 
  * @param int $comment_ID ID of the comment for which to print the author's IP
  *                        address. Default current comment.
  */
-function comment_author_IP( $comment_ID = 0 ) {
-	echo get_comment_author_IP( $comment_ID );
+function comment_author_IP($comment_ID = 0) {
+	echo get_comment_author_IP($comment_ID);
 }
 
 /**
@@ -278,10 +278,10 @@ 
  *                        Default current comment.
  * @return string
  */
-function get_comment_author_url( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_url($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 	$url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
-	$url = esc_url( $url, array('http', 'https') );
+	$url = esc_url($url, array('http', 'https'));
 
 	/**
 	 * Filter the comment author's URL.
@@ -293,7 +293,7 @@ 
 	 * @param int    $comment_ID The comment ID.
 	 * @param object $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $comment_ID, $comment );
+	return apply_filters('get_comment_author_url', $url, $comment_ID, $comment);
 }
 
 /**
@@ -304,8 +304,8 @@ 
  * @param int $comment_ID ID of the comment for which to print the author's URL.
  *                        Default current comment.
  */
-function comment_author_url( $comment_ID = 0 ) {
-	$author_url = get_comment_author_url( $comment_ID );
+function comment_author_url($comment_ID = 0) {
+	$author_url = get_comment_author_url($comment_ID);
 
 	/**
 	 * Filter the comment author's URL for display.
@@ -316,7 +316,7 @@ 
 	 * @param string $author_url The comment author's URL.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_url', $author_url, $comment_ID );
+	echo apply_filters('comment_url', $author_url, $comment_ID);
 }
 
 /**
@@ -339,13 +339,13 @@ 
  *                         Default empty.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_url_link($linktext = '', $before = '', $after = '') {
 	$url = get_comment_author_url();
 	$display = ($linktext != '') ? $linktext : $url;
-	$display = str_replace( 'http://www.', '', $display );
-	$display = str_replace( 'http://', '', $display );
+	$display = str_replace('http://www.', '', $display);
+	$display = str_replace('http://', '', $display);
 
-	if ( '/' == substr($display, -1) ) {
+	if ('/' == substr($display, -1)) {
 		$display = substr($display, 0, -1);
 	}
 
@@ -358,7 +358,7 @@ 
 	 *
 	 * @param string $return The HTML-formatted comment author URL link.
 	 */
-	return apply_filters( 'get_comment_author_url_link', $return );
+	return apply_filters('get_comment_author_url_link', $return);
 }
 
 /**
@@ -373,8 +373,8 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link.
  *                         Default empty.
  */
-function comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
-	echo get_comment_author_url_link( $linktext, $before, $after );
+function comment_author_url_link($linktext = '', $before = '', $after = '') {
+	echo get_comment_author_url_link($linktext, $before, $after);
 }
 
 /**
@@ -390,10 +390,10 @@ 
  *                                 Default true.
  * @return string|void
  */
-function comment_class( $class = '', $comment_id = null, $post_id = null, $echo = true ) {
+function comment_class($class = '', $comment_id = null, $post_id = null, $echo = true) {
 	// Separates classes with a single space, collates classes for comment DIV
-	$class = 'class="' . join( ' ', get_comment_class( $class, $comment_id, $post_id ) ) . '"';
-	if ( $echo)
+	$class = 'class="'.join(' ', get_comment_class($class, $comment_id, $post_id)).'"';
+	if ($echo)
 		echo $class;
 	else
 		return $class;
@@ -413,7 +413,7 @@ 
  * @param int|WP_Post  $post_id    Post ID or WP_Post object. Default current post.
  * @return array An array of classes.
  */
-function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
+function get_comment_class($class = '', $comment_id = null, $post_id = null) {
 	global $comment_alt, $comment_depth, $comment_thread_alt;
 
 	$comment = get_comment($comment_id);
@@ -421,28 +421,28 @@ 
 	$classes = array();
 
 	// Get the comment type (comment, trackback),
-	$classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
+	$classes[] = (empty($comment->comment_type)) ? 'comment' : $comment->comment_type;
 
 	// Add classes for comment authors that are registered users.
-	if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
+	if ($comment->user_id > 0 && $user = get_userdata($comment->user_id)) {
 		$classes[] = 'byuser';
-		$classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
+		$classes[] = 'comment-author-'.sanitize_html_class($user->user_nicename, $comment->user_id);
 		// For comment authors who are the author of the post
-		if ( $post = get_post($post_id) ) {
-			if ( $comment->user_id === $post->post_author ) {
+		if ($post = get_post($post_id)) {
+			if ($comment->user_id === $post->post_author) {
 				$classes[] = 'bypostauthor';
 			}
 		}
 	}
 
-	if ( empty($comment_alt) )
+	if (empty($comment_alt))
 		$comment_alt = 0;
-	if ( empty($comment_depth) )
+	if (empty($comment_depth))
 		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
+	if (empty($comment_thread_alt))
 		$comment_thread_alt = 0;
 
-	if ( $comment_alt % 2 ) {
+	if ($comment_alt % 2) {
 		$classes[] = 'odd';
 		$classes[] = 'alt';
 	} else {
@@ -452,8 +452,8 @@ 
 	$comment_alt++;
 
 	// Alt for top-level comments
-	if ( 1 == $comment_depth ) {
-		if ( $comment_thread_alt % 2 ) {
+	if (1 == $comment_depth) {
+		if ($comment_thread_alt % 2) {
 			$classes[] = 'thread-odd';
 			$classes[] = 'thread-alt';
 		} else {
@@ -464,8 +464,8 @@ 
 
 	$classes[] = "depth-$comment_depth";
 
-	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
 			$class = preg_split('#\s+#', $class);
 		$classes = array_merge($classes, $class);
 	}
@@ -483,7 +483,7 @@ 
 	 * @param object   	  $comment    The comment
 	 * @param int|WP_Post $post_id    The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comment_class', $classes, $class, $comment_id, $comment, $post_id );
+	return apply_filters('comment_class', $classes, $class, $comment_id, $comment, $post_id);
 }
 
 /**
@@ -495,9 +495,9 @@ 
  * @param int    $comment_ID ID of the comment for which to get the date. Default current comment.
  * @return string The comment's date.
  */
-function get_comment_date( $d = '', $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
+function get_comment_date($d = '', $comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $d)
 		$date = mysql2date(get_option('date_format'), $comment->comment_date);
 	else
 		$date = mysql2date($d, $comment->comment_date);
@@ -510,7 +510,7 @@ 
 	 * @param string     $d       The format of the date.
 	 * @param object     $comment The comment object.
 	 */
-	return apply_filters( 'get_comment_date', $date, $d, $comment );
+	return apply_filters('get_comment_date', $date, $d, $comment);
 }
 
 /**
@@ -521,8 +521,8 @@ 
  * @param string $d          Optional. The format of the date. Default user's settings.
  * @param int    $comment_ID ID of the comment for which to print the date. Default current comment.
  */
-function comment_date( $d = '', $comment_ID = 0 ) {
-	echo get_comment_date( $d, $comment_ID );
+function comment_date($d = '', $comment_ID = 0) {
+	echo get_comment_date($d, $comment_ID);
 }
 
 /**
@@ -538,8 +538,8 @@ 
  *                        Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
-function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_excerpt($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 	$comment_text = strip_tags($comment->comment_content);
 	$blah = explode(' ', $comment_text);
 
@@ -552,8 +552,8 @@ 
 	}
 
 	$excerpt = '';
-	for ($i=0; $i<$k; $i++) {
-		$excerpt .= $blah[$i] . ' ';
+	for ($i = 0; $i < $k; $i++) {
+		$excerpt .= $blah[$i].' ';
 	}
 	$excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
 
@@ -567,7 +567,7 @@ 
 	 * @param int    $comment_ID The comment ID.
 	 * @param object $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_excerpt', $excerpt, $comment_ID, $comment );
+	return apply_filters('get_comment_excerpt', $excerpt, $comment_ID, $comment);
 }
 
 /**
@@ -578,7 +578,7 @@ 
  * @param int $comment_ID ID of the comment for which to print the excerpt.
  *                        Default current comment.
  */
-function comment_excerpt( $comment_ID = 0 ) {
+function comment_excerpt($comment_ID = 0) {
 	$comment_excerpt = get_comment_excerpt($comment_ID);
 
 	/**
@@ -590,7 +590,7 @@ 
 	 * @param string $comment_excerpt The comment excerpt text.
 	 * @param int    $comment_ID      The comment ID.
 	 */
-	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment_ID );
+	echo apply_filters('comment_excerpt', $comment_excerpt, $comment_ID);
 }
 
 /**
@@ -614,7 +614,7 @@ 
 	 * @param int    $comment_ID The current comment ID.
 	 * @param object $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment );
+	return apply_filters('get_comment_ID', $comment->comment_ID, $comment);
 }
 
 /**
@@ -640,40 +640,40 @@ 
  * @param array $args    Optional. An array of arguments to override the defaults.
  * @return string The permalink to the given comment.
  */
-function get_comment_link( $comment = null, $args = array() ) {
+function get_comment_link($comment = null, $args = array()) {
 	global $wp_rewrite, $in_comment_loop;
 
 	$comment = get_comment($comment);
 
 	// Backwards compat
-	if ( ! is_array( $args ) ) {
-		$args = array( 'page' => $args );
+	if ( ! is_array($args)) {
+		$args = array('page' => $args);
 	}
 
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '');
+	$args = wp_parse_args($args, $defaults);
 
-	if ( '' === $args['per_page'] && get_option('page_comments') )
+	if ('' === $args['per_page'] && get_option('page_comments'))
 		$args['per_page'] = get_option('comments_per_page');
 
-	if ( empty($args['per_page']) ) {
+	if (empty($args['per_page'])) {
 		$args['per_page'] = 0;
 		$args['page'] = 0;
 	}
 
-	if ( $args['per_page'] ) {
-		if ( '' == $args['page'] )
-			$args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
+	if ($args['per_page']) {
+		if ('' == $args['page'])
+			$args['page'] = ( ! empty($in_comment_loop)) ? get_query_var('cpage') : get_page_of_comment($comment->comment_ID, $args);
 
-		if ( $wp_rewrite->using_permalinks() )
-			$link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . $wp_rewrite->comments_pagination_base . '-' . $args['page'], 'comment' );
+		if ($wp_rewrite->using_permalinks())
+			$link = user_trailingslashit(trailingslashit(get_permalink($comment->comment_post_ID)).$wp_rewrite->comments_pagination_base.'-'.$args['page'], 'comment');
 		else
-			$link = add_query_arg( 'cpage', $args['page'], get_permalink( $comment->comment_post_ID ) );
+			$link = add_query_arg('cpage', $args['page'], get_permalink($comment->comment_post_ID));
 	} else {
-		$link = get_permalink( $comment->comment_post_ID );
+		$link = get_permalink($comment->comment_post_ID);
 	}
 
-	$link = $link . '#comment-' . $comment->comment_ID;
+	$link = $link.'#comment-'.$comment->comment_ID;
 	/**
 	 * Filter the returned single comment permalink.
 	 *
@@ -685,7 +685,7 @@ 
 	 * @param object $comment The current comment object.
 	 * @param array  $args    An array of arguments to override the defaults.
 	 */
-	return apply_filters( 'get_comment_link', $link, $comment, $args );
+	return apply_filters('get_comment_link', $link, $comment, $args);
 }
 
 /**
@@ -696,8 +696,8 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
-function get_comments_link( $post_id = 0 ) {
-	$comments_link = get_permalink( $post_id ) . '#comments';
+function get_comments_link($post_id = 0) {
+	$comments_link = get_permalink($post_id).'#comments';
 	/**
 	 * Filter the returned post comments permalink.
 	 *
@@ -706,7 +706,7 @@ 
 	 * @param string      $comments_link Post comments permalink with '#comments' appended.
 	 * @param int|WP_Post $post_id       Post ID or WP_Post object.
 	 */
-	return apply_filters( 'get_comments_link', $comments_link, $post_id );
+	return apply_filters('get_comments_link', $comments_link, $post_id);
 }
 
 /**
@@ -717,12 +717,12 @@ 
  * @param string $deprecated   Not Used.
  * @param string $deprecated_2 Not Used.
  */
-function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3' );
-	echo esc_url( get_comments_link() );
+function comments_link($deprecated = '', $deprecated_2 = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.72');
+	if ( ! empty($deprecated_2))
+		_deprecated_argument(__FUNCTION__, '1.3');
+	echo esc_url(get_comments_link());
 }
 
 /**
@@ -733,10 +733,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
-function get_comments_number( $post_id = 0 ) {
-	$post = get_post( $post_id );
+function get_comments_number($post_id = 0) {
+	$post = get_post($post_id);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$count = 0;
 	} else {
 		$count = $post->comment_count;
@@ -751,7 +751,7 @@ 
 	 * @param int $count   Number of comments a post has.
 	 * @param int $post_id Post ID.
 	 */
-	return apply_filters( 'get_comments_number', $count, $post_id );
+	return apply_filters('get_comments_number', $count, $post_id);
 }
 
 /**
@@ -764,11 +764,11 @@ 
  * @param string $more       Optional. Text for more than one comment. Default false.
  * @param string $deprecated Not used.
  */
-function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '1.3' );
+function comments_number($zero = false, $one = false, $more = false, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '1.3');
 	}
-	echo get_comments_number_text( $zero, $one, $more );
+	echo get_comments_number_text($zero, $one, $more);
 }
 
 /**
@@ -780,15 +780,15 @@ 
  * @param string $one  Optional. Text for one comment. Default false.
  * @param string $more Optional. Text for more than one comment. Default false.
  */
-function get_comments_number_text( $zero = false, $one = false, $more = false ) {
+function get_comments_number_text($zero = false, $one = false, $more = false) {
 	$number = get_comments_number();
 
-	if ( $number > 1 ) {
-		$output = str_replace( '%', number_format_i18n( $number ), ( false === $more ) ? __( '% Comments' ) : $more );
-	} elseif ( $number == 0 ) {
-		$output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
+	if ($number > 1) {
+		$output = str_replace('%', number_format_i18n($number), (false === $more) ? __('% Comments') : $more);
+	} elseif ($number == 0) {
+		$output = (false === $zero) ? __('No Comments') : $zero;
 	} else { // must be one
-		$output = ( false === $one ) ? __( '1 Comment' ) : $one;
+		$output = (false === $one) ? __('1 Comment') : $one;
 	}
 	/**
 	 * Filter the comments count for display.
@@ -801,7 +801,7 @@ 
 	 *                       is equal to 0, 1, or 1+.
 	 * @param int    $number The number of post comments.
 	 */
-	return apply_filters( 'comments_number', $output, $number );
+	return apply_filters('comments_number', $output, $number);
 }
 
 /**
@@ -815,8 +815,8 @@ 
  * @param array $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
  */
-function get_comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filter the text of a comment.
@@ -829,7 +829,7 @@ 
 	 * @param object $comment         The comment object.
 	 * @param array  $args            An array of arguments.
 	 */
-	return apply_filters( 'get_comment_text', $comment->comment_content, $comment, $args );
+	return apply_filters('get_comment_text', $comment->comment_content, $comment, $args);
 }
 
 /**
@@ -842,10 +842,10 @@ 
  * @param int   $comment_ID ID of the comment for which to print the text. Default 0.
  * @param array $args       Optional. An array of arguments. Default empty array. Default empty.
  */
-function comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
-	$comment_text = get_comment_text( $comment_ID , $args );
+	$comment_text = get_comment_text($comment_ID, $args);
 	/**
 	 * Filter the text of a comment to be displayed.
 	 *
@@ -857,7 +857,7 @@ 
 	 * @param object $comment      The comment object.
 	 * @param array  $args         An array of arguments.
 	 */
-	echo apply_filters( 'comment_text', $comment_text, $comment, $args );
+	echo apply_filters('comment_text', $comment_text, $comment, $args);
 }
 
 /**
@@ -873,10 +873,10 @@ 
  *                          Default true.
  * @return string The formatted time.
  */
-function get_comment_time( $d = '', $gmt = false, $translate = true ) {
+function get_comment_time($d = '', $gmt = false, $translate = true) {
 	global $comment;
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
+	if ('' == $d)
 		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
 	else
 		$date = mysql2date($d, $comment_date, $translate);
@@ -892,7 +892,7 @@ 
 	 * @param bool       $translate Whether the time is translated.
 	 * @param object     $comment   The comment object.
 	 */
-	return apply_filters( 'get_comment_time', $date, $d, $gmt, $translate, $comment );
+	return apply_filters('get_comment_time', $date, $d, $gmt, $translate, $comment);
 }
 
 /**
@@ -902,7 +902,7 @@ 
  *
  * @param string $d Optional. The format of the time. Default user's settings.
  */
-function comment_time( $d = '' ) {
+function comment_time($d = '') {
 	echo get_comment_time($d);
 }
 
@@ -914,9 +914,9 @@ 
  * @param int $comment_ID ID of the comment for which to get the type. Default current comment.
  * @return string The comment type.
  */
-function get_comment_type( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
+function get_comment_type($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $comment->comment_type)
 		$comment->comment_type = 'comment';
 
 	/**
@@ -929,7 +929,7 @@ 
 	 * @param int 	 $comment_ID   The comment ID.
 	 * @param object $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_type', $comment->comment_type, $comment_ID, $comment );
+	return apply_filters('get_comment_type', $comment->comment_type, $comment_ID, $comment);
 }
 
 /**
@@ -941,12 +941,12 @@ 
  * @param string $trackbacktxt Optional. String to display for trackback type. Default false.
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
-function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
+	if (false === $commenttxt) $commenttxt = _x('Comment', 'noun');
+	if (false === $trackbacktxt) $trackbacktxt = __('Trackback');
+	if (false === $pingbacktxt) $pingbacktxt = __('Pingback');
 	$type = get_comment_type();
-	switch( $type ) {
+	switch ($type) {
 		case 'trackback' :
 			echo $trackbacktxt;
 			break;
@@ -970,10 +970,10 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	if ('' != get_option('permalink_structure'))
+		$tb_url = trailingslashit(get_permalink()).user_trailingslashit('trackback', 'single_trackback');
 	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+		$tb_url = get_option('siteurl').'/wp-trackback.php?p='.get_the_ID();
 
 	/**
 	 * Filter the returned trackback URL.
@@ -982,7 +982,7 @@ 
 	 *
 	 * @param string $tb_url The trackback URL.
 	 */
-	return apply_filters( 'trackback_url', $tb_url );
+	return apply_filters('trackback_url', $tb_url);
 }
 
 /**
@@ -994,10 +994,10 @@ 
  * @return void|string Should only be used to echo the trackback URL, use get_trackback_url()
  *                     for the result instead.
  */
-function trackback_url( $deprecated_echo = true ) {
-	if ( $deprecated_echo !== true )
-		_deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
-	if ( $deprecated_echo )
+function trackback_url($deprecated_echo = true) {
+	if ($deprecated_echo !== true)
+		_deprecated_argument(__FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.'));
+	if ($deprecated_echo)
 		echo get_trackback_url();
 	else
 		return get_trackback_url();
@@ -1012,12 +1012,12 @@ 
  *
  * @param int $deprecated Not used (Was $timezone = 0).
  */
-function trackback_rdf( $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.5' );
+function trackback_rdf($deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.5');
 	}
 
-	if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && false !== stripos( $_SERVER['HTTP_USER_AGENT'], 'W3C_Validator' ) ) {
+	if (isset($_SERVER['HTTP_USER_AGENT']) && false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
 		return;
 	}
 
@@ -1043,11 +1043,11 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if the comments are open.
  */
-function comments_open( $post_id = null ) {
+function comments_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
-	$open = ( 'open' == $_post->comment_status );
+	$open = ('open' == $_post->comment_status);
 
 	/**
 	 * Filter whether the current post is open for comments.
@@ -1057,7 +1057,7 @@ 
 	 * @param bool        $open    Whether the current post is open for comments.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comments_open', $open, $post_id );
+	return apply_filters('comments_open', $open, $post_id);
 }
 
 /**
@@ -1068,11 +1068,11 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if pings are accepted
  */
-function pings_open( $post_id = null ) {
+function pings_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
-	$open = ( 'open' == $_post->ping_status );
+	$open = ('open' == $_post->ping_status);
 
 	/**
 	 * Filter whether the current post is open for pings.
@@ -1082,7 +1082,7 @@ 
 	 * @param bool        $open    Whether the current post is open for pings.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'pings_open', $open, $post_id );
+	return apply_filters('pings_open', $open, $post_id);
 }
 
 /**
@@ -1103,8 +1103,8 @@ 
 	$post = get_post();
 	$post_id = $post ? $post->ID : 0;
 
-	if ( current_user_can( 'unfiltered_html' ) ) {
-		wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
+	if (current_user_can('unfiltered_html')) {
+		wp_nonce_field('unfiltered-html-comment_'.$post_id, '_wp_unfiltered_html_comment_disabled', false);
 		echo "<script>(function(){if(window===window.parent){document.getElementById('_wp_unfiltered_html_comment_disabled').name='_wp_unfiltered_html_comment';}})();</script>\n";
 	}
 }
@@ -1143,13 +1143,13 @@ 
  * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
  *                                  Default false.
  */
-function comments_template( $file = '/comments.php', $separate_comments = false ) {
+function comments_template($file = '/comments.php', $separate_comments = false) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+	if ( ! (is_single() || is_page() || $withcomments) || empty($post))
 		return;
 
-	if ( empty($file) )
+	if (empty($file))
 		$file = '/comments.php';
 
 	$req = get_option('require_name_email');
@@ -1183,13 +1183,13 @@ 
 		'post_id' => $post->ID,
 	);
 
-	if ( $user_ID ) {
-		$comment_args['include_unapproved'] = array( $user_ID );
-	} elseif ( ! empty( $comment_author_email ) ) {
-		$comment_args['include_unapproved'] = array( $comment_author_email );
+	if ($user_ID) {
+		$comment_args['include_unapproved'] = array($user_ID);
+	} elseif ( ! empty($comment_author_email)) {
+		$comment_args['include_unapproved'] = array($comment_author_email);
 	}
 
-	$comments = get_comments( $comment_args );
+	$comments = get_comments($comment_args);
 
 	/**
 	 * Filter the comments array.
@@ -1199,25 +1199,25 @@ 
 	 * @param array $comments Array of comments supplied to the comments template.
 	 * @param int   $post_ID  Post ID.
 	 */
-	$wp_query->comments = apply_filters( 'comments_array', $comments, $post->ID );
+	$wp_query->comments = apply_filters('comments_array', $comments, $post->ID);
 	$comments = &$wp_query->comments;
 	$wp_query->comment_count = count($wp_query->comments);
 
-	if ( $separate_comments ) {
+	if ($separate_comments) {
 		$wp_query->comments_by_type = separate_comments($comments);
 		$comments_by_type = &$wp_query->comments_by_type;
 	}
 
 	$overridden_cpage = false;
-	if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+	if ('' == get_query_var('cpage') && get_option('page_comments')) {
+		set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
+	if ( ! defined('COMMENTS_TEMPLATE'))
 		define('COMMENTS_TEMPLATE', true);
 
-	$theme_template = STYLESHEETPATH . $file;
+	$theme_template = STYLESHEETPATH.$file;
 	/**
 	 * Filter the path to the theme template file used for the comments template.
 	 *
@@ -1225,13 +1225,13 @@ 
 	 *
 	 * @param string $theme_template The path to the theme template file.
 	 */
-	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
+	$include = apply_filters('comments_template', $theme_template);
+	if (file_exists($include))
+		require($include);
+	elseif (file_exists(TEMPLATEPATH.$file))
+		require(TEMPLATEPATH.$file);
 	else // Backward compat code will be removed in a future release
-		require( ABSPATH . WPINC . '/theme-compat/comments.php');
+		require(ABSPATH.WPINC.'/theme-compat/comments.php');
 }
 
 /**
@@ -1252,11 +1252,11 @@ 
  * @param int $height Optional. The height of the popup window. Default 400.
  * @param string $file Optional. Sets the location of the popup window.
  */
-function comments_popup_script( $width = 400, $height = 400, $file = '' ) {
+function comments_popup_script($width = 400, $height = 400, $file = '') {
 	global $wpcommentspopupfile, $wpcommentsjavascript;
 
 	if (empty ($file)) {
-		$wpcommentspopupfile = '';  // Use the index.
+		$wpcommentspopupfile = ''; // Use the index.
 	} else {
 		$wpcommentspopupfile = $file;
 	}
@@ -1286,61 +1286,61 @@ 
  * @param string $none      Optional. String to display when comments have been turned off.
  *                          Default false.
  */
-function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
+function comments_popup_link($zero = false, $one = false, $more = false, $css_class = '', $none = false) {
 	global $wpcommentspopupfile, $wpcommentsjavascript;
 
 	$id = get_the_ID();
 	$title = get_the_title();
-	$number = get_comments_number( $id );
+	$number = get_comments_number($id);
 
-	if ( false === $zero ) {
+	if (false === $zero) {
 		/* translators: %s: post title */
-		$zero = sprintf( __( 'No Comments<span class="screen-reader-text"> on %s</span>' ), $title );
+		$zero = sprintf(__('No Comments<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $one ) {
+	if (false === $one) {
 		/* translators: %s: post title */
-		$one = sprintf( __( '1 Comment<span class="screen-reader-text"> on %s</span>' ), $title );
+		$one = sprintf(__('1 Comment<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $more ) {
+	if (false === $more) {
 		/* translators: 1: Number of comments 2: post title */
-		$more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
-		$more = sprintf( $more, number_format_i18n( $number ), $title );
+		$more = _n('%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number);
+		$more = sprintf($more, number_format_i18n($number), $title);
 	}
 
-	if ( false === $none ) {
+	if (false === $none) {
 		/* translators: %s: post title */
-		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
+		$none = sprintf(__('Comments Off<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( 0 == $number && !comments_open() && !pings_open() ) {
-		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+	if (0 == $number && ! comments_open() && ! pings_open()) {
+		echo '<span'.(( ! empty($css_class)) ? ' class="'.esc_attr($css_class).'"' : '').'>'.$none.'</span>';
 		return;
 	}
 
-	if ( post_password_required() ) {
-		_e( 'Enter your password to view comments.' );
+	if (post_password_required()) {
+		_e('Enter your password to view comments.');
 		return;
 	}
 
 	echo '<a href="';
-	if ( $wpcommentsjavascript ) {
-		if ( empty( $wpcommentspopupfile ) )
+	if ($wpcommentsjavascript) {
+		if (empty($wpcommentspopupfile))
 			$home = home_url();
 		else
 			$home = get_option('siteurl');
-		echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
+		echo $home.'/'.$wpcommentspopupfile.'?comments_popup='.$id;
 		echo '" onclick="wpopen(this.href); return false"';
 	} else { // if comments_popup_script() is not in the template, display simple comment link
-		if ( 0 == $number )
-			echo get_permalink() . '#respond';
+		if (0 == $number)
+			echo get_permalink().'#respond';
 		else
 			comments_link();
 		echo '"';
 	}
 
-	if ( !empty( $css_class ) ) {
+	if ( ! empty($css_class)) {
 		echo ' class="'.$css_class.'" ';
 	}
 
@@ -1352,10 +1352,10 @@ 
 	 *
 	 * @param string $attributes The comments popup link attributes. Default empty.
 	 */
-	echo apply_filters( 'comments_popup_link_attributes', $attributes );
+	echo apply_filters('comments_popup_link_attributes', $attributes);
 
 	echo '>';
-	comments_number( $zero, $one, $more );
+	comments_number($zero, $one, $more);
 	echo '</a>';
 }
 
@@ -1385,33 +1385,33 @@ 
  *                             Default current post.
  * @return void|false|string Link to show comment form, if successful. False, if comments are closed.
  */
-function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
+function get_comment_reply_link($args = array(), $comment = null, $post = null) {
 	$defaults = array(
 		'add_below'     => 'comment',
 		'respond_id'    => 'respond',
-		'reply_text'    => __( 'Reply' ),
-		'reply_to_text' => __( 'Reply to %s' ),
-		'login_text'    => __( 'Log in to Reply' ),
+		'reply_text'    => __('Reply'),
+		'reply_to_text' => __('Reply to %s'),
+		'login_text'    => __('Log in to Reply'),
 		'depth'         => 0,
 		'before'        => '',
 		'after'         => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) {
+	if (0 == $args['depth'] || $args['max_depth'] <= $args['depth']) {
 		return;
 	}
 
-	$comment = get_comment( $comment );
+	$comment = get_comment($comment);
 
-	if ( empty( $post ) ) {
+	if (empty($post)) {
 		$post = $comment->comment_post_ID;
 	}
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
@@ -1425,22 +1425,22 @@ 
 	 * @param object  $comment The object of the comment being replied to.
 	 * @param WP_Post $post    The {@see WP_Post} object.
 	 */
-	$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
+	$args = apply_filters('comment_reply_link_args', $args, $comment, $post);
 
-	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			esc_url( wp_login_url( get_permalink() ) ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			esc_url(wp_login_url(get_permalink())),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
 			$args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+			esc_url(add_query_arg('replytocom', $comment->comment_ID, get_permalink($post->ID)))."#".$args['respond_id'],
 			$onclick,
-			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
+			esc_attr(sprintf($args['reply_to_text'], $comment->comment_author)),
 			$args['reply_text']
 		);
 	}
@@ -1454,7 +1454,7 @@ 
 	 * @param object  $comment The object of the comment being replied.
 	 * @param WP_Post $post    The WP_Post object.
 	 */
-	return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post );
+	return apply_filters('comment_reply_link', $args['before'].$link.$args['after'], $args, $comment, $post);
 }
 
 /**
@@ -1511,27 +1511,27 @@ 
 
 	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
-	if ( get_option('comment_registration') && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			wp_login_url( get_permalink() ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			wp_login_url(get_permalink()),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
 			$args['add_below'], $post->ID, $args['respond_id']
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
-			get_permalink( $post->ID ) . '#' . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+			get_permalink($post->ID).'#'.$args['respond_id'],
 			$onclick,
 			$args['reply_text']
 		);
 	}
-	$formatted_link = $args['before'] . $link . $args['after'];
+	$formatted_link = $args['before'].$link.$args['after'];
 	/**
 	 * Filter the formatted post comments link HTML.
 	 *
@@ -1540,7 +1540,7 @@ 
 	 * @param string      $formatted The HTML-formatted post comments link.
 	 * @param int|WP_Post $post      The post ID or WP_Post object.
 	 */
-	return apply_filters( 'post_comments_link', $formatted_link, $post );
+	return apply_filters('post_comments_link', $formatted_link, $post);
 }
 
 /**
@@ -1567,14 +1567,14 @@ 
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  * @return string
  */
-function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
+function get_cancel_comment_reply_link($text = '') {
+	if (empty($text))
 		$text = __('Click here to cancel reply.');
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+	$link = esc_html(remove_query_arg('replytocom')).'#respond';
 
-	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
+	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="'.$link.'"'.$style.'>'.$text.'</a>';
 	/**
 	 * Filter the cancel comment reply link HTML.
 	 *
@@ -1584,7 +1584,7 @@ 
 	 * @param string $link           Cancel comment reply link URL.
 	 * @param string $text           Cancel comment reply link text.
 	 */
-	return apply_filters( 'cancel_comment_reply_link', $formatted_link, $link, $text );
+	return apply_filters('cancel_comment_reply_link', $formatted_link, $link, $text);
 }
 
 /**
@@ -1594,7 +1594,7 @@ 
  *
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
-function cancel_comment_reply_link( $text = '' ) {
+function cancel_comment_reply_link($text = '') {
 	echo get_cancel_comment_reply_link($text);
 }
 
@@ -1606,8 +1606,8 @@ 
  * @param int $id Optional. Post ID. Default current post ID.
  * @return string Hidden input HTML for replying to comments
  */
-function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
+function get_comment_id_fields($id = 0) {
+	if (empty($id))
 		$id = get_the_ID();
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
@@ -1623,7 +1623,7 @@ 
 	 * @param int    $id        The post ID.
 	 * @param int    $replytoid The id of the comment being replied to.
 	 */
-	return apply_filters( 'comment_id_fields', $result, $id, $replytoid );
+	return apply_filters('comment_id_fields', $result, $id, $replytoid);
 }
 
 /**
@@ -1633,8 +1633,8 @@ 
  *
  * @param int $id Optional. Post ID. Default current post ID.
  */
-function comment_id_fields( $id = 0 ) {
-	echo get_comment_id_fields( $id );
+function comment_id_fields($id = 0) {
+	echo get_comment_id_fields($id);
 }
 
 /**
@@ -1654,20 +1654,20 @@ 
  * @param string $linktoparent Optional. Boolean to control making the author's name a link
  *                             to their comment. Default true.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
+function comment_form_title($noreplytext = false, $replytext = false, $linktoparent = true) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if (false === $noreplytext) $noreplytext = __('Leave a Reply');
+	if (false === $replytext) $replytext = __('Leave a Reply to %s');
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
+	if (0 == $replytoid)
 		echo $noreplytext;
 	else {
 		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
-		printf( $replytext, $author );
+		$author = ($linktoparent) ? '<a href="#comment-'.get_comment_ID().'">'.get_comment_author().'</a>' : get_comment_author();
+		printf($replytext, $author);
 	}
 }
 
@@ -1696,7 +1696,7 @@ 
 	 * @since 2.7.0
 	 * @var array
 	 */
-	public $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
+	public $db_fields = array('parent' => 'comment_parent', 'id' => 'comment_ID');
 
 	/**
 	 * Start the list before the elements are added.
@@ -1711,18 +1711,18 @@ 
 	 * @param int $depth Depth of comment.
 	 * @param array $args Uses 'style' argument for type of HTML list.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
 		$GLOBALS['comment_depth'] = $depth + 1;
 
-		switch ( $args['style'] ) {
+		switch ($args['style']) {
 			case 'div':
 				break;
 			case 'ol':
-				$output .= '<ol class="children">' . "\n";
+				$output .= '<ol class="children">'."\n";
 				break;
 			case 'ul':
 			default:
-				$output .= '<ul class="children">' . "\n";
+				$output .= '<ul class="children">'."\n";
 				break;
 		}
 	}
@@ -1740,10 +1740,10 @@ 
 	 * @param int    $depth  Depth of comment.
 	 * @param array  $args   Will only append content if style argument value is 'ol' or 'ul'.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
 		$GLOBALS['comment_depth'] = $depth + 1;
 
-		switch ( $args['style'] ) {
+		switch ($args['style']) {
 			case 'div':
 				break;
 			case 'ol':
@@ -1787,22 +1787,22 @@ 
 	 * @param array  $args              An array of arguments.
 	 * @param string $output            Passed by reference. Used to append additional content.
 	 */
-	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-		if ( !$element )
+	public function display_element($element, &$children_elements, $max_depth, $depth, $args, &$output) {
+		if ( ! $element)
 			return;
 
 		$id_field = $this->db_fields['id'];
 		$id = $element->$id_field;
 
-		parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
+		parent::display_element($element, $children_elements, $max_depth, $depth, $args, $output);
 
 		// If we're at the max depth, and the current element still has children, loop over those and display them at this level
 		// This is to prevent them being orphaned to the end of the list.
-		if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
-			foreach ( $children_elements[ $id ] as $child )
-				$this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
+		if ($max_depth <= $depth + 1 && isset($children_elements[$id])) {
+			foreach ($children_elements[$id] as $child)
+				$this->display_element($child, $children_elements, $max_depth, $depth, $args, $output);
 
-			unset( $children_elements[ $id ] );
+			unset($children_elements[$id]);
 		}
 
 	}
@@ -1823,29 +1823,29 @@ 
 	 * @param int    $depth   Depth of comment in reference to parents.
 	 * @param array  $args    An array of arguments.
 	 */
-	public function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $comment, $depth = 0, $args = array(), $id = 0) {
 		$depth++;
 		$GLOBALS['comment_depth'] = $depth;
 		$GLOBALS['comment'] = $comment;
 
-		if ( !empty( $args['callback'] ) ) {
+		if ( ! empty($args['callback'])) {
 			ob_start();
-			call_user_func( $args['callback'], $comment, $args, $depth );
+			call_user_func($args['callback'], $comment, $args, $depth);
 			$output .= ob_get_clean();
 			return;
 		}
 
-		if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
+		if (('pingback' == $comment->comment_type || 'trackback' == $comment->comment_type) && $args['short_ping']) {
 			ob_start();
-			$this->ping( $comment, $depth, $args );
+			$this->ping($comment, $depth, $args);
 			$output .= ob_get_clean();
-		} elseif ( 'html5' === $args['format'] ) {
+		} elseif ('html5' === $args['format']) {
 			ob_start();
-			$this->html5_comment( $comment, $depth, $args );
+			$this->html5_comment($comment, $depth, $args);
 			$output .= ob_get_clean();
 		} else {
 			ob_start();
-			$this->comment( $comment, $depth, $args );
+			$this->comment($comment, $depth, $args);
 			$output .= ob_get_clean();
 		}
 	}
@@ -1863,14 +1863,14 @@ 
 	 * @param int    $depth   Depth of comment.
 	 * @param array  $args    An array of arguments.
 	 */
-	public function end_el( &$output, $comment, $depth = 0, $args = array() ) {
-		if ( !empty( $args['end-callback'] ) ) {
+	public function end_el(&$output, $comment, $depth = 0, $args = array()) {
+		if ( ! empty($args['end-callback'])) {
 			ob_start();
-			call_user_func( $args['end-callback'], $comment, $args, $depth );
+			call_user_func($args['end-callback'], $comment, $args, $depth);
 			$output .= ob_get_clean();
 			return;
 		}
-		if ( 'div' == $args['style'] )
+		if ('div' == $args['style'])
 			$output .= "</div><!-- #comment-## -->\n";
 		else
 			$output .= "</li><!-- #comment-## -->\n";
@@ -1888,12 +1888,12 @@ 
 	 * @param int    $depth   Depth of comment.
 	 * @param array  $args    An array of arguments.
 	 */
-	protected function ping( $comment, $depth, $args ) {
-		$tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
+	protected function ping($comment, $depth, $args) {
+		$tag = ('div' == $args['style']) ? 'div' : 'li';
 ?>
 		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
 			<div class="comment-body">
-				<?php _e( 'Pingback:' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
+				<?php _e('Pingback:'); ?> <?php comment_author_link(); ?> <?php edit_comment_link(__('Edit'), '<span class="edit-link">', '</span>'); ?>
 			</div>
 <?php
 	}
@@ -1910,8 +1910,8 @@ 
 	 * @param int    $depth   Depth of comment.
 	 * @param array  $args    An array of arguments.
 	 */
-	protected function comment( $comment, $depth, $args ) {
-		if ( 'div' == $args['style'] ) {
+	protected function comment($comment, $depth, $args) {
+		if ('div' == $args['style']) {
 			$tag = 'div';
 			$add_below = 'comment';
 		} else {
@@ -1919,39 +1919,39 @@ 
 			$add_below = 'div-comment';
 		}
 ?>
-		<<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '' ); ?> id="comment-<?php comment_ID(); ?>">
-		<?php if ( 'div' != $args['style'] ) : ?>
+		<<?php echo $tag; ?> <?php comment_class($this->has_children ? 'parent' : ''); ?> id="comment-<?php comment_ID(); ?>">
+		<?php if ('div' != $args['style']) : ?>
 		<div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 		<?php endif; ?>
 		<div class="comment-author vcard">
-			<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-			<?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
+			<?php if (0 != $args['avatar_size']) echo get_avatar($comment, $args['avatar_size']); ?>
+			<?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()); ?>
 		</div>
-		<?php if ( '0' == $comment->comment_approved ) : ?>
-		<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
+		<?php if ('0' == $comment->comment_approved) : ?>
+		<em class="comment-awaiting-moderation"><?php _e('Your comment is awaiting moderation.') ?></em>
 		<br />
 		<?php endif; ?>
 
-		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
+		<div class="comment-meta commentmetadata"><a href="<?php echo esc_url(get_comment_link($comment->comment_ID, $args)); ?>">
 			<?php
 				/* translators: 1: date, 2: time */
-				printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+				printf(__('%1$s at %2$s'), get_comment_date(), get_comment_time()); ?></a><?php edit_comment_link(__('(Edit)'), '&nbsp;&nbsp;', '');
 			?>
 		</div>
 
-		<?php comment_text( get_comment_id(), array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+		<?php comment_text(get_comment_id(), array_merge($args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))); ?>
 
 		<?php
-		comment_reply_link( array_merge( $args, array(
+		comment_reply_link(array_merge($args, array(
 			'add_below' => $add_below,
 			'depth'     => $depth,
 			'max_depth' => $args['max_depth'],
 			'before'    => '<div class="reply">',
 			'after'     => '</div>'
-		) ) );
+		)));
 		?>
 
-		<?php if ( 'div' != $args['style'] ) : ?>
+		<?php if ('div' != $args['style']) : ?>
 		</div>
 		<?php endif; ?>
 <?php
@@ -1969,28 +1969,28 @@ 
 	 * @param int    $depth   Depth of comment.
 	 * @param array  $args    An array of arguments.
 	 */
-	protected function html5_comment( $comment, $depth, $args ) {
-		$tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
+	protected function html5_comment($comment, $depth, $args) {
+		$tag = ('div' === $args['style']) ? 'div' : 'li';
 ?>
-		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( $this->has_children ? 'parent' : '' ); ?>>
+		<<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class($this->has_children ? 'parent' : ''); ?>>
 			<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 				<footer class="comment-meta">
 					<div class="comment-author vcard">
-						<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-						<?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link() ) ); ?>
+						<?php if (0 != $args['avatar_size']) echo get_avatar($comment, $args['avatar_size']); ?>
+						<?php printf(__('%s <span class="says">says:</span>'), sprintf('<b class="fn">%s</b>', get_comment_author_link())); ?>
 					</div><!-- .comment-author -->
 
 					<div class="comment-metadata">
-						<a href="<?php echo esc_url( get_comment_link( $comment->comment_ID, $args ) ); ?>">
-							<time datetime="<?php comment_time( 'c' ); ?>">
-								<?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
+						<a href="<?php echo esc_url(get_comment_link($comment->comment_ID, $args)); ?>">
+							<time datetime="<?php comment_time('c'); ?>">
+								<?php printf(_x('%1$s at %2$s', '1: date, 2: time'), get_comment_date(), get_comment_time()); ?>
 							</time>
 						</a>
-						<?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
+						<?php edit_comment_link(__('Edit'), '<span class="edit-link">', '</span>'); ?>
 					</div><!-- .comment-metadata -->
 
-					<?php if ( '0' == $comment->comment_approved ) : ?>
-					<p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
+					<?php if ('0' == $comment->comment_approved) : ?>
+					<p class="comment-awaiting-moderation"><?php _e('Your comment is awaiting moderation.'); ?></p>
 					<?php endif; ?>
 				</footer><!-- .comment-meta -->
 
@@ -1999,13 +1999,13 @@ 
 				</div><!-- .comment-content -->
 
 				<?php
-				comment_reply_link( array_merge( $args, array(
+				comment_reply_link(array_merge($args, array(
 					'add_below' => 'div-comment',
 					'depth'     => $depth,
 					'max_depth' => $args['max_depth'],
 					'before'    => '<div class="reply">',
 					'after'     => '</div>'
-				) ) );
+				)));
 				?>
 			</article><!-- .comment-body -->
 <?php
@@ -2050,7 +2050,7 @@ 
  * }
  * @param array $comments Optional. Array of comment objects.
  */
-function wp_list_comments( $args = array(), $comments = null ) {
+function wp_list_comments($args = array(), $comments = null) {
 	global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
 
 	$in_comment_loop = true;
@@ -2070,12 +2070,12 @@ 
 		'avatar_size'       => 32,
 		'reverse_top_level' => null,
 		'reverse_children'  => '',
-		'format'            => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
+		'format'            => current_theme_supports('html5', 'comment-list') ? 'html5' : 'xhtml',
 		'short_ping'        => false,
 		'echo'              => true,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filter the arguments used in retrieving the comment list.
@@ -2086,28 +2086,28 @@ 
 	 *
 	 * @param array $r An array of arguments for displaying comments.
 	 */
-	$r = apply_filters( 'wp_list_comments_args', $r );
+	$r = apply_filters('wp_list_comments_args', $r);
 
 	// Figure out what comments we'll be looping through ($_comments)
-	if ( null !== $comments ) {
+	if (null !== $comments) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
+		if (empty($comments))
 			return;
-		if ( 'all' != $r['type'] ) {
+		if ('all' != $r['type']) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
+			if (empty($comments_by_type[$r['type']]))
 				return;
 			$_comments = $comments_by_type[$r['type']];
 		} else {
 			$_comments = $comments;
 		}
 	} else {
-		if ( empty($wp_query->comments) )
+		if (empty($wp_query->comments))
 			return;
-		if ( 'all' != $r['type'] ) {
-			if ( empty($wp_query->comments_by_type) )
+		if ('all' != $r['type']) {
+			if (empty($wp_query->comments_by_type))
 				$wp_query->comments_by_type = separate_comments($wp_query->comments);
-			if ( empty($wp_query->comments_by_type[$r['type']]) )
+			if (empty($wp_query->comments_by_type[$r['type']]))
 				return;
 			$_comments = $wp_query->comments_by_type[$r['type']];
 		} else {
@@ -2115,50 +2115,50 @@ 
 		}
 	}
 
-	if ( '' === $r['per_page'] && get_option('page_comments') )
+	if ('' === $r['per_page'] && get_option('page_comments'))
 		$r['per_page'] = get_query_var('comments_per_page');
 
-	if ( empty($r['per_page']) ) {
+	if (empty($r['per_page'])) {
 		$r['per_page'] = 0;
 		$r['page'] = 0;
 	}
 
-	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
+	if ('' === $r['max_depth']) {
+		if (get_option('thread_comments'))
 			$r['max_depth'] = get_option('thread_comments_depth');
 		else
 			$r['max_depth'] = -1;
 	}
 
-	if ( '' === $r['page'] ) {
-		if ( empty($overridden_cpage) ) {
+	if ('' === $r['page']) {
+		if (empty($overridden_cpage)) {
 			$r['page'] = get_query_var('cpage');
 		} else {
 			$threaded = ( -1 != $r['max_depth'] );
-			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
-			set_query_var( 'cpage', $r['page'] );
+			$r['page'] = ('newest' == get_option('default_comments_page')) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+			set_query_var('cpage', $r['page']);
 		}
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
+	if (0 == $r['page'] && 0 != $r['per_page'])
 		$r['page'] = 1;
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if (null === $r['reverse_top_level'])
+		$r['reverse_top_level'] = ('desc' == get_option('comment_order'));
 
-	if ( empty( $r['walker'] ) ) {
+	if (empty($r['walker'])) {
 		$walker = new Walker_Comment;
 	} else {
 		$walker = $r['walker'];
 	}
 
-	$output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
+	$output = $walker->paged_walk($_comments, $r['max_depth'], $r['page'], $r['per_page'], $r);
 	$wp_query->max_num_comment_pages = $walker->max_pages;
 
 	$in_comment_loop = false;
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -2213,32 +2213,32 @@ 
  * }
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
-function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
+function comment_form($args = array(), $post_id = null) {
+	if (null === $post_id)
 		$post_id = get_the_ID();
 
 	$commenter = wp_get_current_commenter();
 	$user = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
-	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	$args = wp_parse_args($args);
+	if ( ! isset($args['format']))
+		$args['format'] = current_theme_supports('html5', 'comment-form') ? 'html5' : 'xhtml';
 
-	$req      = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
-	$html_req = ( $req ? " required='required'" : '' );
+	$req      = get_option('require_name_email');
+	$aria_req = ($req ? " aria-required='true'" : '');
+	$html_req = ($req ? " required='required'" : '');
 	$html5    = 'html5' === $args['format'];
-	$fields   =  array(
-		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . $html_req . ' /></p>',
-		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
-		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
+	$fields   = array(
+		'author' => '<p class="comment-form-author">'.'<label for="author">'.__('Name').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="author" name="author" type="text" value="'.esc_attr($commenter['comment_author']).'" size="30"'.$aria_req.$html_req.' /></p>',
+		'email'  => '<p class="comment-form-email"><label for="email">'.__('Email').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="email" name="email" '.($html5 ? 'type="email"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_email']).'" size="30" aria-describedby="email-notes"'.$aria_req.$html_req.' /></p>',
+		'url'    => '<p class="comment-form-url"><label for="url">'.__('Website').'</label> '.
+		            '<input id="url" name="url" '.($html5 ? 'type="url"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_url']).'" size="30" /></p>',
 	);
 
-	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	$required_text = sprintf(' '.__('Required fields are marked %s'), '<span class="required">*</span>');
 
 	/**
 	 * Filter the default comment form fields.
@@ -2247,24 +2247,24 @@ 
 	 *
 	 * @param array $fields The default comment fields.
 	 */
-	$fields = apply_filters( 'comment_form_default_fields', $fields );
+	$fields = apply_filters('comment_form_default_fields', $fields);
 	$defaults = array(
 		'fields'               => $fields,
-		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8"  aria-required="true" required="required"></textarea></p>',
+		'comment_field'        => '<p class="comment-form-comment"><label for="comment">'._x('Comment', 'noun').'</label> <textarea id="comment" name="comment" cols="45" rows="8"  aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'must_log_in'          => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+		'must_log_in'          => '<p class="must-log-in">'.sprintf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url(apply_filters('the_permalink', get_permalink($post_id)))).'</p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), get_edit_user_link(), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
-		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+		'logged_in_as'         => '<p class="logged-in-as">'.sprintf(__('Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>'), get_edit_user_link(), $user_identity, wp_logout_url(apply_filters('the_permalink', get_permalink($post_id)))).'</p>',
+		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">'.__('Your email address will not be published.').'</span>'.($req ? $required_text : '').'</p>',
 		'comment_notes_after'  => '',
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
 		'class_submit'         => 'submit',
 		'name_submit'          => 'submit',
-		'title_reply'          => __( 'Leave a Reply' ),
-		'title_reply_to'       => __( 'Leave a Reply to %s' ),
-		'cancel_reply_link'    => __( 'Cancel reply' ),
-		'label_submit'         => __( 'Post Comment' ),
+		'title_reply'          => __('Leave a Reply'),
+		'title_reply_to'       => __('Leave a Reply to %s'),
+		'cancel_reply_link'    => __('Cancel reply'),
+		'label_submit'         => __('Post Comment'),
 		'submit_button'        => '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />',
 		'submit_field'         => '<p class="form-submit">%1$s %2$s</p>',
 		'format'               => 'xhtml',
@@ -2279,23 +2279,23 @@ 
 	 *
 	 * @param array $defaults The default comment form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('comment_form_defaults', $defaults));
 
 	// Ensure that the filtered args contain all required default values.
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
-		if ( comments_open( $post_id ) ) : ?>
+		if (comments_open($post_id)) : ?>
 			<?php
 			/**
 			 * Fires before the comment form.
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'comment_form_before' );
+			do_action('comment_form_before');
 			?>
 			<div id="respond" class="comment-respond">
-				<h3 id="reply-title" class="comment-reply-title"><?php comment_form_title( $args['title_reply'], $args['title_reply_to'] ); ?> <small><?php cancel_comment_reply_link( $args['cancel_reply_link'] ); ?></small></h3>
-				<?php if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) : ?>
+				<h3 id="reply-title" class="comment-reply-title"><?php comment_form_title($args['title_reply'], $args['title_reply_to']); ?> <small><?php cancel_comment_reply_link($args['cancel_reply_link']); ?></small></h3>
+				<?php if (get_option('comment_registration') && ! is_user_logged_in()) : ?>
 					<?php echo $args['must_log_in']; ?>
 					<?php
 					/**
@@ -2303,19 +2303,19 @@ 
 					 *
 					 * @since 3.0.0
 					 */
-					do_action( 'comment_form_must_log_in_after' );
+					do_action('comment_form_must_log_in_after');
 					?>
 				<?php else : ?>
-					<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
+					<form action="<?php echo site_url('/wp-comments-post.php'); ?>" method="post" id="<?php echo esc_attr($args['id_form']); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
 						<?php
 						/**
 						 * Fires at the top of the comment form, inside the form tag.
 						 *
 						 * @since 3.0.0
 						 */
-						do_action( 'comment_form_top' );
+						do_action('comment_form_top');
 						?>
-						<?php if ( is_user_logged_in() ) : ?>
+						<?php if (is_user_logged_in()) : ?>
 							<?php
 							/**
 							 * Filter the 'logged in' message for the comment form for display.
@@ -2328,7 +2328,7 @@ 
 							 * @param string $user_identity  If the commenter is a registered user,
 							 *                               the display name, blank otherwise.
 							 */
-							echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+							echo apply_filters('comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity);
 							?>
 							<?php
 							/**
@@ -2341,7 +2341,7 @@ 
 							 * @param string $user_identity If the commenter is a registered user,
 							 *                              the display name, blank otherwise.
 							 */
-							do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+							do_action('comment_form_logged_in_after', $commenter, $user_identity);
 							?>
 						<?php else : ?>
 							<?php echo $args['comment_notes_before']; ?>
@@ -2351,8 +2351,8 @@ 
 							 *
 							 * @since 3.0.0
 							 */
-							do_action( 'comment_form_before_fields' );
-							foreach ( (array) $args['fields'] as $name => $field ) {
+							do_action('comment_form_before_fields');
+							foreach ((array) $args['fields'] as $name => $field) {
 								/**
 								 * Filter a comment form field for display.
 								 *
@@ -2363,14 +2363,14 @@ 
 								 *
 								 * @param string $field The HTML-formatted output of the comment form field.
 								 */
-								echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+								echo apply_filters("comment_form_field_{$name}", $field)."\n";
 							}
 							/**
 							 * Fires after the comment fields in the comment form.
 							 *
 							 * @since 3.0.0
 							 */
-							do_action( 'comment_form_after_fields' );
+							do_action('comment_form_after_fields');
 							?>
 						<?php endif; ?>
 						<?php
@@ -2381,17 +2381,17 @@ 
 						 *
 						 * @param string $args_comment_field The content of the comment textarea field.
 						 */
-						echo apply_filters( 'comment_form_field_comment', $args['comment_field'] );
+						echo apply_filters('comment_form_field_comment', $args['comment_field']);
 						?>
 						<?php echo $args['comment_notes_after']; ?>
 
 						<?php
 						$submit_button = sprintf(
 							$args['submit_button'],
-							esc_attr( $args['name_submit'] ),
-							esc_attr( $args['id_submit'] ),
-							esc_attr( $args['class_submit'] ),
-							esc_attr( $args['label_submit'] )
+							esc_attr($args['name_submit']),
+							esc_attr($args['id_submit']),
+							esc_attr($args['class_submit']),
+							esc_attr($args['label_submit'])
 						);
 
 						/**
@@ -2402,12 +2402,12 @@ 
 						 * @param string $submit_button HTML markup for the submit button.
 						 * @param array  $args          Arguments passed to `comment_form()`.
 						 */
-						$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
+						$submit_button = apply_filters('comment_form_submit_button', $submit_button, $args);
 
 						$submit_field = sprintf(
 							$args['submit_field'],
 							$submit_button,
-							get_comment_id_fields( $post_id )
+							get_comment_id_fields($post_id)
 						);
 
 						/**
@@ -2421,7 +2421,7 @@ 
 						 * @param string $submit_field HTML markup for the submit field.
 						 * @param array  $args         Arguments passed to comment_form().
 						 */
-						echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+						echo apply_filters('comment_form_submit_field', $submit_field, $args);
 
 						/**
 						 * Fires at the bottom of the comment form, inside the closing </form> tag.
@@ -2430,7 +2430,7 @@ 
 						 *
 						 * @param int $post_id The post ID.
 						 */
-						do_action( 'comment_form', $post_id );
+						do_action('comment_form', $post_id);
 						?>
 					</form>
 				<?php endif; ?>
@@ -2441,13 +2441,13 @@ 
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'comment_form_after' );
+			do_action('comment_form_after');
 		else :
 			/**
 			 * Fires after the comment form if comments are closed.
 			 *
 			 * @since 3.0.0
 			 */
-			do_action( 'comment_form_comments_closed' );
+			do_action('comment_form_comments_closed');
 		endif;
 }

Braces +194 added lines, -128 removed lines

@@ -23,10 +23,11 @@ 
 	$comment = get_comment( $comment_ID );
 
 	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
-			$author = $user->display_name;
-		else
-			$author = __('Anonymous');
+		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) ) {
+					$author = $user->display_name;
+		} else {
+					$author = __('Anonymous');
+		}
 	} else {
 		$author = $comment->comment_author;
 	}
@@ -135,9 +136,10 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  */
 function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
-		echo $link;
-}
+	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) ) {
+			echo $link;
+	}
+	}
 
 /**
  * Return the html email link to the author of the current comment.
@@ -201,10 +203,11 @@ 
 	$url    = get_comment_author_url( $comment_ID );
 	$author = get_comment_author( $comment_ID );
 
-	if ( empty( $url ) || 'http://' == $url )
-		$return = $author;
-	else
-		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	if ( empty( $url ) || 'http://' == $url ) {
+			$return = $author;
+	} else {
+			$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	}
 
 	/**
 	 * Filter the comment author's link for display.
@@ -393,11 +396,12 @@ 
 function comment_class( $class = '', $comment_id = null, $post_id = null, $echo = true ) {
 	// Separates classes with a single space, collates classes for comment DIV
 	$class = 'class="' . join( ' ', get_comment_class( $class, $comment_id, $post_id ) ) . '"';
-	if ( $echo)
-		echo $class;
-	else
-		return $class;
-}
+	if ( $echo) {
+			echo $class;
+	} else {
+			return $class;
+	}
+	}
 
 /**
  * Returns the classes for the comment div as an array.
@@ -435,12 +439,15 @@ 
 		}
 	}
 
-	if ( empty($comment_alt) )
-		$comment_alt = 0;
-	if ( empty($comment_depth) )
-		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
-		$comment_thread_alt = 0;
+	if ( empty($comment_alt) ) {
+			$comment_alt = 0;
+	}
+	if ( empty($comment_depth) ) {
+			$comment_depth = 1;
+	}
+	if ( empty($comment_thread_alt) ) {
+			$comment_thread_alt = 0;
+	}
 
 	if ( $comment_alt % 2 ) {
 		$classes[] = 'odd';
@@ -465,8 +472,9 @@ 
 	$classes[] = "depth-$comment_depth";
 
 	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split('#\s+#', $class);
+		if ( !is_array( $class ) ) {
+					$class = preg_split('#\s+#', $class);
+		}
 		$classes = array_merge($classes, $class);
 	}
 
@@ -497,10 +505,11 @@ 
  */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
-		$date = mysql2date(get_option('date_format'), $comment->comment_date);
-	else
-		$date = mysql2date($d, $comment->comment_date);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('date_format'), $comment->comment_date);
+	} else {
+			$date = mysql2date($d, $comment->comment_date);
+	}
 	/**
 	 * Filter the returned comment date.
 	 *
@@ -653,8 +662,9 @@ 
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( '' === $args['per_page'] && get_option('page_comments') )
-		$args['per_page'] = get_option('comments_per_page');
+	if ( '' === $args['per_page'] && get_option('page_comments') ) {
+			$args['per_page'] = get_option('comments_per_page');
+	}
 
 	if ( empty($args['per_page']) ) {
 		$args['per_page'] = 0;
@@ -662,13 +672,15 @@ 
 	}
 
 	if ( $args['per_page'] ) {
-		if ( '' == $args['page'] )
-			$args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
+		if ( '' == $args['page'] ) {
+					$args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
+		}
 
-		if ( $wp_rewrite->using_permalinks() )
-			$link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . $wp_rewrite->comments_pagination_base . '-' . $args['page'], 'comment' );
-		else
-			$link = add_query_arg( 'cpage', $args['page'], get_permalink( $comment->comment_post_ID ) );
+		if ( $wp_rewrite->using_permalinks() ) {
+					$link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . $wp_rewrite->comments_pagination_base . '-' . $args['page'], 'comment' );
+		} else {
+					$link = add_query_arg( 'cpage', $args['page'], get_permalink( $comment->comment_post_ID ) );
+		}
 	} else {
 		$link = get_permalink( $comment->comment_post_ID );
 	}
@@ -718,10 +730,12 @@ 
  * @param string $deprecated_2 Not Used.
  */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.72' );
+	}
+	if ( !empty( $deprecated_2 ) ) {
+			_deprecated_argument( __FUNCTION__, '1.3' );
+	}
 	echo esc_url( get_comments_link() );
 }
 
@@ -876,10 +890,11 @@ 
 function get_comment_time( $d = '', $gmt = false, $translate = true ) {
 	global $comment;
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
-		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
-	else
-		$date = mysql2date($d, $comment_date, $translate);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('time_format'), $comment_date, $translate);
+	} else {
+			$date = mysql2date($d, $comment_date, $translate);
+	}
 
 	/**
 	 * Filter the returned comment time.
@@ -916,8 +931,9 @@ 
  */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
-		$comment->comment_type = 'comment';
+	if ( '' == $comment->comment_type ) {
+			$comment->comment_type = 'comment';
+	}
 
 	/**
 	 * Filter the returned comment type.
@@ -942,9 +958,15 @@ 
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
 function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $commenttxt ) {
+		$commenttxt = _x( 'Comment', 'noun' );
+	}
+	if ( false === $trackbacktxt ) {
+		$trackbacktxt = __( 'Trackback' );
+	}
+	if ( false === $pingbacktxt ) {
+		$pingbacktxt = __( 'Pingback' );
+	}
 	$type = get_comment_type();
 	switch( $type ) {
 		case 'trackback' :
@@ -970,10 +992,11 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
-	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	if ( '' != get_option('permalink_structure') ) {
+			$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	} else {
+			$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	}
 
 	/**
 	 * Filter the returned trackback URL.
@@ -995,13 +1018,15 @@ 
  *                     for the result instead.
  */
 function trackback_url( $deprecated_echo = true ) {
-	if ( $deprecated_echo !== true )
-		_deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
-	if ( $deprecated_echo )
-		echo get_trackback_url();
-	else
-		return get_trackback_url();
-}
+	if ( $deprecated_echo !== true ) {
+			_deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
+	}
+	if ( $deprecated_echo ) {
+			echo get_trackback_url();
+	} else {
+			return get_trackback_url();
+	}
+	}
 
 /**
  * Generate and display the RDF for the trackback information of current post.
@@ -1146,11 +1171,13 @@ 
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
-		return;
+	if ( !(is_single() || is_page() || $withcomments) || empty($post) ) {
+			return;
+	}
 
-	if ( empty($file) )
-		$file = '/comments.php';
+	if ( empty($file) ) {
+			$file = '/comments.php';
+	}
 
 	$req = get_option('require_name_email');
 
@@ -1214,8 +1241,9 @@ 
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
-		define('COMMENTS_TEMPLATE', true);
+	if ( !defined('COMMENTS_TEMPLATE') ) {
+			define('COMMENTS_TEMPLATE', true);
+	}
 
 	$theme_template = STYLESHEETPATH . $file;
 	/**
@@ -1226,13 +1254,15 @@ 
 	 * @param string $theme_template The path to the theme template file.
 	 */
 	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
-	else // Backward compat code will be removed in a future release
+	if ( file_exists( $include ) ) {
+			require( $include );
+	} elseif ( file_exists( TEMPLATEPATH . $file ) ) {
+			require( TEMPLATEPATH . $file );
+	} else {
+		// Backward compat code will be removed in a future release
 		require( ABSPATH . WPINC . '/theme-compat/comments.php');
-}
+	}
+	}
 
 /**
  * Display the JS popup script to show a comment.
@@ -1326,17 +1356,19 @@ 
 
 	echo '<a href="';
 	if ( $wpcommentsjavascript ) {
-		if ( empty( $wpcommentspopupfile ) )
-			$home = home_url();
-		else
-			$home = get_option('siteurl');
+		if ( empty( $wpcommentspopupfile ) ) {
+					$home = home_url();
+		} else {
+					$home = get_option('siteurl');
+		}
 		echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
 		echo '" onclick="wpopen(this.href); return false"';
 	} else { // if comments_popup_script() is not in the template, display simple comment link
-		if ( 0 == $number )
-			echo get_permalink() . '#respond';
-		else
-			comments_link();
+		if ( 0 == $number ) {
+					echo get_permalink() . '#respond';
+		} else {
+					comments_link();
+		}
 		echo '"';
 	}
 
@@ -1568,8 +1600,9 @@ 
  * @return string
  */
 function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
-		$text = __('Click here to cancel reply.');
+	if ( empty($text) ) {
+			$text = __('Click here to cancel reply.');
+	}
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
 	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
@@ -1607,8 +1640,9 @@ 
  * @return string Hidden input HTML for replying to comments
  */
 function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
-		$id = get_the_ID();
+	if ( empty( $id ) ) {
+			$id = get_the_ID();
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 	$result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
@@ -1657,14 +1691,18 @@ 
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if ( false === $noreplytext ) {
+		$noreplytext = __( 'Leave a Reply' );
+	}
+	if ( false === $replytext ) {
+		$replytext = __( 'Leave a Reply to %s' );
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
-		echo $noreplytext;
-	else {
+	if ( 0 == $replytoid ) {
+			echo $noreplytext;
+	} else {
 		$comment = get_comment($replytoid);
 		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
 		printf( $replytext, $author );
@@ -1788,8 +1826,9 @@ 
 	 * @param string $output            Passed by reference. Used to append additional content.
 	 */
 	public function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-		if ( !$element )
-			return;
+		if ( !$element ) {
+					return;
+		}
 
 		$id_field = $this->db_fields['id'];
 		$id = $element->$id_field;
@@ -1799,8 +1838,9 @@ 
 		// If we're at the max depth, and the current element still has children, loop over those and display them at this level
 		// This is to prevent them being orphaned to the end of the list.
 		if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
-			foreach ( $children_elements[ $id ] as $child )
-				$this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
+			foreach ( $children_elements[ $id ] as $child ) {
+							$this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
+			}
 
 			unset( $children_elements[ $id ] );
 		}
@@ -1870,10 +1910,11 @@ 
 			$output .= ob_get_clean();
 			return;
 		}
-		if ( 'div' == $args['style'] )
-			$output .= "</div><!-- #comment-## -->\n";
-		else
-			$output .= "</li><!-- #comment-## -->\n";
+		if ( 'div' == $args['style'] ) {
+					$output .= "</div><!-- #comment-## -->\n";
+		} else {
+					$output .= "</li><!-- #comment-## -->\n";
+		}
 	}
 
 	/**
@@ -1924,7 +1965,10 @@ 
 		<div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 		<?php endif; ?>
 		<div class="comment-author vcard">
-			<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
+			<?php if ( 0 != $args['avatar_size'] ) {
+	echo get_avatar( $comment, $args['avatar_size'] );
+}
+?>
 			<?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
 		</div>
 		<?php if ( '0' == $comment->comment_approved ) : ?>
@@ -1976,7 +2020,10 @@ 
 			<article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
 				<footer class="comment-meta">
 					<div class="comment-author vcard">
-						<?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
+						<?php if ( 0 != $args['avatar_size'] ) {
+	echo get_avatar( $comment, $args['avatar_size'] );
+}
+?>
 						<?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link() ) ); ?>
 					</div><!-- .comment-author -->
 
@@ -2091,32 +2138,38 @@ 
 	// Figure out what comments we'll be looping through ($_comments)
 	if ( null !== $comments ) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
-			return;
+		if ( empty($comments) ) {
+					return;
+		}
 		if ( 'all' != $r['type'] ) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
-				return;
+			if ( empty($comments_by_type[$r['type']]) ) {
+							return;
+			}
 			$_comments = $comments_by_type[$r['type']];
 		} else {
 			$_comments = $comments;
 		}
 	} else {
-		if ( empty($wp_query->comments) )
-			return;
+		if ( empty($wp_query->comments) ) {
+					return;
+		}
 		if ( 'all' != $r['type'] ) {
-			if ( empty($wp_query->comments_by_type) )
-				$wp_query->comments_by_type = separate_comments($wp_query->comments);
-			if ( empty($wp_query->comments_by_type[$r['type']]) )
-				return;
+			if ( empty($wp_query->comments_by_type) ) {
+							$wp_query->comments_by_type = separate_comments($wp_query->comments);
+			}
+			if ( empty($wp_query->comments_by_type[$r['type']]) ) {
+							return;
+			}
 			$_comments = $wp_query->comments_by_type[$r['type']];
 		} else {
 			$_comments = $wp_query->comments;
 		}
 	}
 
-	if ( '' === $r['per_page'] && get_option('page_comments') )
-		$r['per_page'] = get_query_var('comments_per_page');
+	if ( '' === $r['per_page'] && get_option('page_comments') ) {
+			$r['per_page'] = get_query_var('comments_per_page');
+	}
 
 	if ( empty($r['per_page']) ) {
 		$r['per_page'] = 0;
@@ -2124,10 +2177,11 @@ 
 	}
 
 	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
-			$r['max_depth'] = get_option('thread_comments_depth');
-		else
-			$r['max_depth'] = -1;
+		if ( get_option('thread_comments') ) {
+					$r['max_depth'] = get_option('thread_comments_depth');
+		} else {
+					$r['max_depth'] = -1;
+		}
 	}
 
 	if ( '' === $r['page'] ) {
@@ -2141,11 +2195,13 @@ 
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
-		$r['page'] = 1;
+	if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
+			$r['page'] = 1;
+	}
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if ( null === $r['reverse_top_level'] ) {
+			$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	}
 
 	if ( empty( $r['walker'] ) ) {
 		$walker = new Walker_Comment;
@@ -2214,16 +2270,18 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
 function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
-		$post_id = get_the_ID();
+	if ( null === $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	$commenter = wp_get_current_commenter();
 	$user = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
 	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	if ( ! isset( $args['format'] ) ) {
+			$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	}
 
 	$req      = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
@@ -2305,8 +2363,11 @@ 
 					 */
 					do_action( 'comment_form_must_log_in_after' );
 					?>
-				<?php else : ?>
-					<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
+				<?php else {
+	: ?>
+					<form action="<?php echo site_url( '/wp-comments-post.php' );
+}
+?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
 						<?php
 						/**
 						 * Fires at the top of the comment form, inside the form tag.
@@ -2343,8 +2404,11 @@ 
 							 */
 							do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
 							?>
-						<?php else : ?>
-							<?php echo $args['comment_notes_before']; ?>
+						<?php else {
+	: ?>
+							<?php echo $args['comment_notes_before'];
+}
+?>
 							<?php
 							/**
 							 * Fires before the comment fields in the comment form.
@@ -2442,12 +2506,14 @@ 
 			 * @since 3.0.0
 			 */
 			do_action( 'comment_form_after' );
-		else :
+		else {
+			:
 			/**
 			 * Fires after the comment form if comments are closed.
 			 *
 			 * @since 3.0.0
 			 */
 			do_action( 'comment_form_comments_closed' );
+		}
 		endif;
 }

src/wp-includes/comment.php

Doc Comments +2 added lines, -2 removed lines

@@ -912,7 +912,7 @@ 
 	 * @global wpdb $wpdb
 	 *
 	 * @param string $string
-	 * @param array $cols
+	 * @param string[] $cols
 	 * @return string
 	 */
 	protected function get_search_sql( $string, $cols ) {
@@ -3111,7 +3111,7 @@ 
  *
  * @param WP_Post  $posts Post data object.
  * @param WP_Query $query Query object.
- * @return array
+ * @return WP_Post
  */
 function _close_comments_for_old_posts( $posts, $query ) {
 	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )

Spacing +557 added lines, -558 removed lines

@@ -40,15 +40,15 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
+	if (1 == get_option('comment_moderation'))
 		return false;
 
 	/** This filter is documented in wp-includes/comment-template.php */
-	$comment = apply_filters( 'comment_text', $comment );
+	$comment = apply_filters('comment_text', $comment);
 
 	// Check for the number of external links if a max allowed number is set.
-	if ( $max_links = get_option( 'comment_max_links' ) ) {
-		$num_links = preg_match_all( '/<a [^>]*href/i', $comment, $out );
+	if ($max_links = get_option('comment_max_links')) {
+		$num_links = preg_match_all('/<a [^>]*href/i', $comment, $out);
 
 		/**
 		 * Filter the maximum number of links allowed in a comment.
@@ -58,27 +58,27 @@ 
 		 * @param int    $num_links The number of links allowed.
 		 * @param string $url       Comment author's URL. Included in allowed links total.
 		 */
-		$num_links = apply_filters( 'comment_max_links_url', $num_links, $url );
+		$num_links = apply_filters('comment_max_links_url', $num_links, $url);
 
 		/*
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
+		if ($num_links >= $max_links)
 			return false;
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
 
 	// If moderation 'keys' (keywords) are set, process them.
-	if ( !empty($mod_keys) ) {
-		$words = explode("\n", $mod_keys );
+	if ( ! empty($mod_keys)) {
+		$words = explode("\n", $mod_keys);
 
-		foreach ( (array) $words as $word) {
+		foreach ((array) $words as $word) {
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
+			if (empty($word))
 				continue;
 
 			/*
@@ -92,12 +92,12 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if (preg_match($pattern, $author)) return false;
+			if (preg_match($pattern, $email)) return false;
+			if (preg_match($pattern, $url)) return false;
+			if (preg_match($pattern, $comment)) return false;
+			if (preg_match($pattern, $user_ip)) return false;
+			if (preg_match($pattern, $user_agent)) return false;
 		}
 	}
 
@@ -108,12 +108,12 @@ 
 	 * as well as whether there are any moderation keywords (if set) present in the author
 	 * email address. If both checks pass, return true. Otherwise, return false.
 	 */
-	if ( 1 == get_option('comment_whitelist')) {
-		if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
+	if (1 == get_option('comment_whitelist')) {
+		if ('trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '') {
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
-			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+			if ((1 == $ok_to_comment) &&
+				(empty($mod_keys) || false === strpos($email, $mod_keys)))
 					return true;
 			else
 				return false;
@@ -136,8 +136,8 @@ 
  * @return int|array $comments The approved comments, or number of comments if `$count`
  *                             argument is true.
  */
-function get_approved_comments( $post_id, $args = array() ) {
-	if ( ! $post_id ) {
+function get_approved_comments($post_id, $args = array()) {
+	if ( ! $post_id) {
 		return array();
 	}
 
@@ -146,10 +146,10 @@ 
 		'post_id' => $post_id,
 		'order'   => 'ASC',
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$query = new WP_Comment_Query;
-	return $query->query( $r );
+	return $query->query($r);
 }
 
 /**
@@ -171,20 +171,20 @@ 
 function get_comment(&$comment, $output = OBJECT) {
 	global $wpdb;
 
-	if ( empty($comment) ) {
-		if ( isset($GLOBALS['comment']) )
+	if (empty($comment)) {
+		if (isset($GLOBALS['comment']))
 			$_comment = & $GLOBALS['comment'];
 		else
 			$_comment = null;
-	} elseif ( is_object($comment) ) {
+	} elseif (is_object($comment)) {
 		wp_cache_add($comment->comment_ID, $comment, 'comment');
 		$_comment = $comment;
 	} else {
-		if ( isset($GLOBALS['comment']) && ($GLOBALS['comment']->comment_ID == $comment) ) {
+		if (isset($GLOBALS['comment']) && ($GLOBALS['comment']->comment_ID == $comment)) {
 			$_comment = & $GLOBALS['comment'];
-		} elseif ( ! $_comment = wp_cache_get($comment, 'comment') ) {
+		} elseif ( ! $_comment = wp_cache_get($comment, 'comment')) {
 			$_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment));
-			if ( ! $_comment )
+			if ( ! $_comment)
 				return null;
 			wp_cache_add($_comment->comment_ID, $_comment, 'comment');
 		}
@@ -197,14 +197,14 @@ 
 	 *
 	 * @param mixed $_comment Comment data.
 	 */
-	$_comment = apply_filters( 'get_comment', $_comment );
+	$_comment = apply_filters('get_comment', $_comment);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_comment;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$__comment = get_object_vars($_comment);
 		return $__comment;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$__comment = array_values(get_object_vars($_comment));
 		return $__comment;
 	} else {
@@ -223,9 +223,9 @@ 
  *                           for information on accepted arguments. Default empty.
  * @return int|array List of comments or number of found comments if `$count` argument is true.
  */
-function get_comments( $args = '' ) {
+function get_comments($args = '') {
 	$query = new WP_Comment_Query;
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -300,9 +300,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -379,7 +379,7 @@ 
 	 *     @type int          $user_id             Include comments for a specific user ID. Default empty.
 	 * }
 	 */
-	public function __construct( $query = '' ) {
+	public function __construct($query = '') {
 		$this->query_var_defaults = array(
 			'author_email' => '',
 			'author__in' => '',
@@ -419,8 +419,8 @@ 
 			'date_query' => null, // See WP_Date_Query
 		);
 
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -433,13 +433,13 @@ 
 	 *
 	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
 	 */
-	public function parse_query( $query = '' ) {
-		if ( empty( $query ) ) {
+	public function parse_query($query = '') {
+		if (empty($query)) {
 			$query = $this->query_vars;
 		}
 
-		$this->query_vars = wp_parse_args( $query, $this->query_var_defaults );
-		do_action_ref_array( 'parse_comment_query', array( &$this ) );
+		$this->query_vars = wp_parse_args($query, $this->query_var_defaults);
+		do_action_ref_array('parse_comment_query', array(&$this));
 	}
 
 	/**
@@ -456,8 +456,8 @@ 
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of comments, or number of comments when 'count' is passed as a query var.
 	 */
-	public function query( $query ) {
-		$this->query_vars = wp_parse_args( $query );
+	public function query($query) {
+		$this->query_vars = wp_parse_args($query);
 		return $this->get_comments();
 	}
 
@@ -480,7 +480,7 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $this->query_vars );
+		$this->meta_query->parse_query_vars($this->query_vars);
 
 		/**
 		 * Fires before comments are retrieved.
@@ -489,24 +489,24 @@ 
 		 *
 		 * @param WP_Comment_Query &$this Current instance of WP_Comment_Query, passed by reference.
 		 */
-		do_action_ref_array( 'pre_get_comments', array( &$this ) );
+		do_action_ref_array('pre_get_comments', array(&$this));
 
 		// Reparse query vars, in case they were modified in a 'pre_get_comments' callback.
-		$this->meta_query->parse_query_vars( $this->query_vars );
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+		$this->meta_query->parse_query_vars($this->query_vars);
+		if ( ! empty($this->meta_query->queries)) {
+			$meta_query_clauses = $this->meta_query->get_sql('comment', $wpdb->comments, 'comment_ID', $this);
 		}
 
 		// $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get( 'last_changed', 'comment' );
-		if ( ! $last_changed ) {
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get('last_changed', 'comment');
+		if ( ! $last_changed) {
 			$last_changed = microtime();
-			wp_cache_set( 'last_changed', $last_changed, 'comment' );
+			wp_cache_set('last_changed', $last_changed, 'comment');
 		}
 		$cache_key = "get_comments:$key:$last_changed";
 
-		if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
+		if ($cache = wp_cache_get($cache_key, 'comment')) {
 			$this->comments = $cache;
 			return $this->comments;
 		}
@@ -519,14 +519,14 @@ 
 		// 'status' accepts an array or a comma-separated string.
 		$status_clauses = array();
 		$statuses = $this->query_vars['status'];
-		if ( ! is_array( $statuses ) ) {
-			$statuses = preg_split( '/[\s,]+/', $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = preg_split('/[\s,]+/', $statuses);
 		}
 
 		// 'any' overrides other statuses.
-		if ( ! in_array( 'any', $statuses ) ) {
-			foreach ( $statuses as $status ) {
-				switch ( $status ) {
+		if ( ! in_array('any', $statuses)) {
+			foreach ($statuses as $status) {
+				switch ($status) {
 					case 'hold' :
 						$status_clauses[] = "comment_approved = '0'";
 						break;
@@ -541,65 +541,64 @@ 
 						break;
 
 					default :
-						$status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+						$status_clauses[] = $wpdb->prepare("comment_approved = %s", $status);
 						break;
 				}
 			}
 
-			if ( ! empty( $status_clauses ) ) {
-				$approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
+			if ( ! empty($status_clauses)) {
+				$approved_clauses[] = '( '.implode(' OR ', $status_clauses).' )';
 			}
 		}
 
 		// User IDs or emails whose unapproved comments are included, regardless of $status.
-		if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
+		if ( ! empty($this->query_vars['include_unapproved'])) {
 			$include_unapproved = $this->query_vars['include_unapproved'];
 
 			// Accepts arrays or comma-separated strings.
-			if ( ! is_array( $include_unapproved ) ) {
-				$include_unapproved = preg_split( '/[\s,]+/', $include_unapproved );
+			if ( ! is_array($include_unapproved)) {
+				$include_unapproved = preg_split('/[\s,]+/', $include_unapproved);
 			}
 
 			$unapproved_ids = $unapproved_emails = array();
-			foreach ( $include_unapproved as $unapproved_identifier ) {
+			foreach ($include_unapproved as $unapproved_identifier) {
 				// Numeric values are assumed to be user ids.
-				if ( is_numeric( $unapproved_identifier ) ) {
-					$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
+				if (is_numeric($unapproved_identifier)) {
+					$approved_clauses[] = $wpdb->prepare("( user_id = %d AND comment_approved = '0' )", $unapproved_identifier);
 
 				// Otherwise we match against email addresses.
 				} else {
-					$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+					$approved_clauses[] = $wpdb->prepare("( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier);
 				}
 			}
 		}
 
 		// Collapse comment_approved clauses into a single OR-separated clause.
-		if ( ! empty( $approved_clauses ) ) {
-			if ( 1 === count( $approved_clauses ) ) {
+		if ( ! empty($approved_clauses)) {
+			if (1 === count($approved_clauses)) {
 				$where[] = $approved_clauses[0];
 			} else {
-				$where[] = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+				$where[] = '( '.implode(' OR ', $approved_clauses).' )';
 			}
 		}
 
-		$order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
+		$order = ('ASC' == strtoupper($this->query_vars['order'])) ? 'ASC' : 'DESC';
 
 		// Disable ORDER BY with 'none', an empty array, or boolean false.
-		if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
+		if (in_array($this->query_vars['orderby'], array('none', array(), false), true)) {
 			$orderby = '';
-		} elseif ( ! empty( $this->query_vars['orderby'] ) ) {
-			$ordersby = is_array( $this->query_vars['orderby'] ) ?
-				$this->query_vars['orderby'] :
-				preg_split( '/[,\s]/', $this->query_vars['orderby'] );
+		} elseif ( ! empty($this->query_vars['orderby'])) {
+			$ordersby = is_array($this->query_vars['orderby']) ?
+				$this->query_vars['orderby'] : preg_split('/[,\s]/', $this->query_vars['orderby']);
 
 			$orderby_array = array();
 			$found_orderby_comment_ID = false;
-			foreach ( $ordersby as $_key => $_value ) {
-				if ( ! $_value ) {
+			foreach ($ordersby as $_key => $_value) {
+				if ( ! $_value) {
 					continue;
 				}
 
-				if ( is_int( $_key ) ) {
+				if (is_int($_key)) {
 					$_orderby = $_value;
 					$_order = $order;
 				} else {
@@ -607,40 +606,40 @@ 
 					$_order = $_value;
 				}
 
-				if ( ! $found_orderby_comment_ID && 'comment_ID' === $_orderby ) {
+				if ( ! $found_orderby_comment_ID && 'comment_ID' === $_orderby) {
 					$found_orderby_comment_ID = true;
 				}
 
-				$parsed = $this->parse_orderby( $_orderby );
+				$parsed = $this->parse_orderby($_orderby);
 
-				if ( ! $parsed ) {
+				if ( ! $parsed) {
 					continue;
 				}
 
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+				$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 			}
 
 			// If no valid clauses were found, order by comment_date_gmt.
-			if ( empty( $orderby_array ) ) {
+			if (empty($orderby_array)) {
 				$orderby_array[] = "$wpdb->comments.comment_date_gmt $order";
 			}
 
 			// To ensure determinate sorting, always include a comment_ID clause.
-			if ( ! $found_orderby_comment_ID ) {
+			if ( ! $found_orderby_comment_ID) {
 				$comment_ID_order = '';
 
 				// Inherit order from comment_date or comment_date_gmt, if available.
-				foreach ( $orderby_array as $orderby_clause ) {
-					if ( preg_match( '/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match ) ) {
+				foreach ($orderby_array as $orderby_clause) {
+					if (preg_match('/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match)) {
 						$comment_ID_order = $match[1];
 						break;
 					}
 				}
 
 				// If no date-related order is available, use the date from the first available clause.
-				if ( ! $comment_ID_order ) {
-					foreach ( $orderby_array as $orderby_clause ) {
-						if ( false !== strpos( 'ASC', $orderby_clause ) ) {
+				if ( ! $comment_ID_order) {
+					foreach ($orderby_array as $orderby_clause) {
+						if (false !== strpos('ASC', $orderby_clause)) {
 							$comment_ID_order = 'ASC';
 						} else {
 							$comment_ID_order = 'DESC';
@@ -651,35 +650,35 @@ 
 				}
 
 				// Default to DESC.
-				if ( ! $comment_ID_order ) {
+				if ( ! $comment_ID_order) {
 					$comment_ID_order = 'DESC';
 				}
 
 				$orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
 			}
 
-			$orderby = implode( ', ', $orderby_array );
+			$orderby = implode(', ', $orderby_array);
 		} else {
 			$orderby = "$wpdb->comments.comment_date_gmt $order";
 		}
 
-		$number = absint( $this->query_vars['number'] );
-		$offset = absint( $this->query_vars['offset'] );
+		$number = absint($this->query_vars['number']);
+		$offset = absint($this->query_vars['offset']);
 
-		if ( ! empty( $number ) ) {
-			if ( $offset ) {
-				$limits = 'LIMIT ' . $offset . ',' . $number;
+		if ( ! empty($number)) {
+			if ($offset) {
+				$limits = 'LIMIT '.$offset.','.$number;
 			} else {
-				$limits = 'LIMIT ' . $number;
+				$limits = 'LIMIT '.$number;
 			}
 		} else {
 			$limits = '';
 		}
 
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			$fields = 'COUNT(*)';
 		} else {
-			switch ( strtolower( $this->query_vars['fields'] ) ) {
+			switch (strtolower($this->query_vars['fields'])) {
 				case 'ids':
 					$fields = "$wpdb->comments.comment_ID";
 					break;
@@ -691,51 +690,51 @@ 
 
 		$join = '';
 
-		$post_id = absint( $this->query_vars['post_id'] );
-		if ( ! empty( $post_id ) ) {
-			$where[] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
+		$post_id = absint($this->query_vars['post_id']);
+		if ( ! empty($post_id)) {
+			$where[] = $wpdb->prepare('comment_post_ID = %d', $post_id);
 		}
 
 		// Parse comment IDs for an IN clause.
-		if ( ! empty( $this->query_vars['comment__in'] ) ) {
-			$where[] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__in'])) {
+			$where[] = "$wpdb->comments.comment_ID IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__in'])).' )';
 		}
 
 		// Parse comment IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-			$where[] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__not_in'])) {
+			$where[] = "$wpdb->comments.comment_ID NOT IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__not_in'])).' )';
 		}
 
 		// Parse comment post IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post__in'] ) ) {
-			$where[] = 'comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__in'])) {
+			$where[] = 'comment_post_ID IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__in'])).' )';
 		}
 
 		// Parse comment post IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post__not_in'] ) ) {
-			$where[] = 'comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__not_in'])) {
+			$where[] = 'comment_post_ID NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__not_in'])).' )';
 		}
 
-		if ( '' !== $this->query_vars['author_email'] ) {
-			$where[] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
+		if ('' !== $this->query_vars['author_email']) {
+			$where[] = $wpdb->prepare('comment_author_email = %s', $this->query_vars['author_email']);
 		}
 
-		if ( '' !== $this->query_vars['karma'] ) {
-			$where[] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
+		if ('' !== $this->query_vars['karma']) {
+			$where[] = $wpdb->prepare('comment_karma = %d', $this->query_vars['karma']);
 		}
 
 		// Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
 		$raw_types = array(
-			'IN' => array_merge( (array) $this->query_vars['type'], (array) $this->query_vars['type__in'] ),
+			'IN' => array_merge((array) $this->query_vars['type'], (array) $this->query_vars['type__in']),
 			'NOT IN' => (array) $this->query_vars['type__not_in'],
 		);
 
 		$comment_types = array();
-		foreach ( $raw_types as $operator => $_raw_types ) {
-			$_raw_types = array_unique( $_raw_types );
+		foreach ($raw_types as $operator => $_raw_types) {
+			$_raw_types = array_unique($_raw_types);
 
-			foreach ( $_raw_types as $type ) {
-				switch ( $type ) {
+			foreach ($_raw_types as $type) {
+				switch ($type) {
 					// An empty translates to 'all', for backward compatibility
 					case '':
 					case 'all' :
@@ -743,106 +742,106 @@ 
 
 					case 'comment':
 					case 'comments':
-						$comment_types[ $operator ][] = "''";
+						$comment_types[$operator][] = "''";
 						break;
 
 					case 'pings':
-						$comment_types[ $operator ][] = "'pingback'";
-						$comment_types[ $operator ][] = "'trackback'";
+						$comment_types[$operator][] = "'pingback'";
+						$comment_types[$operator][] = "'trackback'";
 						break;
 
 					default:
-						$comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
+						$comment_types[$operator][] = $wpdb->prepare('%s', $type);
 						break;
 				}
 			}
 
-			if ( ! empty( $comment_types[ $operator ] ) ) {
-				$types_sql = implode( ', ', $comment_types[ $operator ] );
+			if ( ! empty($comment_types[$operator])) {
+				$types_sql = implode(', ', $comment_types[$operator]);
 				$where[] = "comment_type $operator ($types_sql)";
 			}
 		}
 
-		if ( '' !== $this->query_vars['parent'] ) {
-			$where[] = $wpdb->prepare( 'comment_parent = %d', $this->query_vars['parent'] );
+		if ('' !== $this->query_vars['parent']) {
+			$where[] = $wpdb->prepare('comment_parent = %d', $this->query_vars['parent']);
 		}
 
-		if ( is_array( $this->query_vars['user_id'] ) ) {
-			$where[] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
-		} elseif ( '' !== $this->query_vars['user_id'] ) {
-			$where[] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
+		if (is_array($this->query_vars['user_id'])) {
+			$where[] = 'user_id IN ('.implode(',', array_map('absint', $this->query_vars['user_id'])).')';
+		} elseif ('' !== $this->query_vars['user_id']) {
+			$where[] = $wpdb->prepare('user_id = %d', $this->query_vars['user_id']);
 		}
 
-		if ( '' !== $this->query_vars['search'] ) {
+		if ('' !== $this->query_vars['search']) {
 			$search_sql = $this->get_search_sql(
 				$this->query_vars['search'],
-				array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )
+				array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content')
 			);
 
 			// Strip leading 'AND'.
-			$where[] = preg_replace( '/^\s*AND\s*/', '', $search_sql );
+			$where[] = preg_replace('/^\s*AND\s*/', '', $search_sql);
 		}
 
 		// If any post-related query vars are passed, join the posts table.
 		$join_posts_table = false;
-		$plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent', 'post_status', 'post_type' ) );
-		$post_fields = array_filter( $plucked );
+		$plucked = wp_array_slice_assoc($this->query_vars, array('post_author', 'post_name', 'post_parent', 'post_status', 'post_type'));
+		$post_fields = array_filter($plucked);
 
-		if ( ! empty( $post_fields ) ) {
+		if ( ! empty($post_fields)) {
 			$join_posts_table = true;
-			foreach ( $post_fields as $field_name => $field_value ) {
+			foreach ($post_fields as $field_name => $field_value) {
 				// $field_value may be an array.
-				$esses = array_fill( 0, count( (array) $field_value ), '%s' );
-				$where[] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+				$esses = array_fill(0, count((array) $field_value), '%s');
+				$where[] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).')', $field_value);
 			}
 		}
 
 		// Comment author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['author__in'] ) ) {
-			$where[] = 'user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__in'])) {
+			$where[] = 'user_id IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__in'])).' )';
 		}
 
 		// Comment author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['author__not_in'] ) ) {
-			$where[] = 'user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__not_in'])) {
+			$where[] = 'user_id NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__not_in'])).' )';
 		}
 
 		// Post author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post_author__in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__in'])) {
 			$join_posts_table = true;
-			$where[] = 'post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
+			$where[] = 'post_author IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__in'])).' )';
 		}
 
 		// Post author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__not_in'])) {
 			$join_posts_table = true;
-			$where[] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
+			$where[] = 'post_author NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__not_in'])).' )';
 		}
 
-		if ( $join_posts_table ) {
+		if ($join_posts_table) {
 			$join = "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
 		}
 
-		if ( ! empty( $meta_query_clauses ) ) {
+		if ( ! empty($meta_query_clauses)) {
 			$join .= $meta_query_clauses['join'];
 
 			// Strip leading 'AND'.
-			$where[] = preg_replace( '/^\s*AND\s*/', '', $meta_query_clauses['where'] );
+			$where[] = preg_replace('/^\s*AND\s*/', '', $meta_query_clauses['where']);
 
-			if ( ! $this->query_vars['count'] ) {
+			if ( ! $this->query_vars['count']) {
 				$groupby = "{$wpdb->comments}.comment_ID";
 			}
 		}
 
 		$date_query = $this->query_vars['date_query'];
-		if ( ! empty( $date_query ) && is_array( $date_query ) ) {
-			$date_query_object = new WP_Date_Query( $date_query, 'comment_date' );
-			$where[] = preg_replace( '/^\s*AND\s*/', '', $date_query_object->get_sql() );
+		if ( ! empty($date_query) && is_array($date_query)) {
+			$date_query_object = new WP_Date_Query($date_query, 'comment_date');
+			$where[] = preg_replace('/^\s*AND\s*/', '', $date_query_object->get_sql());
 		}
 
-		$where = implode( ' AND ', $where );
+		$where = implode(' AND ', $where);
 
-		$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+		$pieces = array('fields', 'join', 'where', 'orderby', 'limits', 'groupby');
 		/**
 		 * Filter the comment query clauses.
 		 *
@@ -851,39 +850,39 @@ 
 		 * @param array            $pieces A compacted array of comment query clauses.
 		 * @param WP_Comment_Query &$this  Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
+		$clauses = apply_filters_ref_array('comments_clauses', array(compact($pieces), &$this));
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
-		$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
+		$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+		$join = isset($clauses['join']) ? $clauses['join'] : '';
+		$where = isset($clauses['where']) ? $clauses['where'] : '';
+		$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+		$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
+		$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
 
-		if ( $where ) {
-			$where = 'WHERE ' . $where;
+		if ($where) {
+			$where = 'WHERE '.$where;
 		}
 
-		if ( $groupby ) {
-			$groupby = 'GROUP BY ' . $groupby;
+		if ($groupby) {
+			$groupby = 'GROUP BY '.$groupby;
 		}
 
-		if ( $orderby ) {
+		if ($orderby) {
 			$orderby = "ORDER BY $orderby";
 		}
 
 		$this->request = "SELECT $fields FROM $wpdb->comments $join $where $groupby $orderby $limits";
 
-		if ( $this->query_vars['count'] ) {
-			return $wpdb->get_var( $this->request );
+		if ($this->query_vars['count']) {
+			return $wpdb->get_var($this->request);
 		}
 
-		if ( 'ids' == $this->query_vars['fields'] ) {
-			$this->comments = $wpdb->get_col( $this->request );
-			return array_map( 'intval', $this->comments );
+		if ('ids' == $this->query_vars['fields']) {
+			$this->comments = $wpdb->get_col($this->request);
+			return array_map('intval', $this->comments);
 		}
 
-		$results = $wpdb->get_results( $this->request );
+		$results = $wpdb->get_results($this->request);
 		/**
 		 * Filter the comment query results.
 		 *
@@ -892,11 +891,11 @@ 
 		 * @param array            $results  An array of comments.
 		 * @param WP_Comment_Query &$this    Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$comments = apply_filters_ref_array( 'the_comments', array( $results, &$this ) );
+		$comments = apply_filters_ref_array('the_comments', array($results, &$this));
 
-		wp_cache_add( $cache_key, $comments, 'comment' );
-		if ( '*' === $fields ) {
-			update_comment_cache( $comments );
+		wp_cache_add($cache_key, $comments, 'comment');
+		if ('*' === $fields) {
+			update_comment_cache($comments);
 		}
 
 		$this->comments = $comments;
@@ -915,17 +914,17 @@ 
 	 * @param array $cols
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols ) {
+	protected function get_search_sql($string, $cols) {
 		global $wpdb;
 
-		$like = '%' . $wpdb->esc_like( $string ) . '%';
+		$like = '%'.$wpdb->esc_like($string).'%';
 
 		$searches = array();
-		foreach ( $cols as $col ) {
-			$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+		foreach ($cols as $col) {
+			$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -939,7 +938,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$allowed_keys = array(
@@ -960,27 +959,27 @@ 
 			'user_id',
 		);
 
-		if ( ! empty( $this->query_vars['meta_key'] ) ) {
+		if ( ! empty($this->query_vars['meta_key'])) {
 			$allowed_keys[] = $this->query_vars['meta_key'];
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
 		}
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
-		if ( $meta_query_clauses ) {
-			$allowed_keys = array_merge( $allowed_keys, array_keys( $meta_query_clauses ) );
+		if ($meta_query_clauses) {
+			$allowed_keys = array_merge($allowed_keys, array_keys($meta_query_clauses));
 		}
 
 		$parsed = false;
-		if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
+		if ($orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value') {
 			$parsed = "$wpdb->commentmeta.meta_value";
-		} elseif ( $orderby == 'meta_value_num' ) {
+		} elseif ($orderby == 'meta_value_num') {
 			$parsed = "$wpdb->commentmeta.meta_value+0";
-		} elseif ( in_array( $orderby, $allowed_keys ) ) {
+		} elseif (in_array($orderby, $allowed_keys)) {
 
-			if ( isset( $meta_query_clauses[ $orderby ] ) ) {
-				$meta_clause = $meta_query_clauses[ $orderby ];
-				$parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+			if (isset($meta_query_clauses[$orderby])) {
+				$meta_clause = $meta_query_clauses[$orderby];
+				$parsed = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 			} else {
 				$parsed = "$wpdb->comments.$orderby";
 			}
@@ -998,12 +997,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';
@@ -1042,8 +1041,8 @@ 
  * @param string $comment_type Optional. Comment type. Default 'comment'.
  * @return string Expected return value is 'open' or 'closed'.
  */
-function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
-	switch ( $comment_type ) {
+function get_default_comment_status($post_type = 'post', $comment_type = 'comment') {
+	switch ($comment_type) {
 		case 'pingback' :
 		case 'trackback' :
 			$supports = 'trackbacks';
@@ -1055,10 +1054,10 @@ 
 	}
 
 	// Set the status.
-	if ( 'page' === $post_type ) {
+	if ('page' === $post_type) {
 		$status = 'closed';
-	} elseif ( post_type_supports( $post_type, $supports ) ) {
-		$status = get_option( "default_{$option}_status" );
+	} elseif (post_type_supports($post_type, $supports)) {
+		$status = get_option("default_{$option}_status");
 	} else {
 		$status = 'closed';
 	}
@@ -1073,7 +1072,7 @@ 
 	 * @param string $post_type    Post type. Default is `post`.
 	 * @param string $comment_type Type of comment. Default is `comment`.
 	 */
-	return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
+	return apply_filters('get_default_comment_status', $status, $post_type, $comment_type);
 }
 
 /**
@@ -1092,12 +1091,12 @@ 
 	global $wpdb;
 	static $cache_lastcommentmodified = array();
 
-	if ( isset($cache_lastcommentmodified[$timezone]) )
+	if (isset($cache_lastcommentmodified[$timezone]))
 		return $cache_lastcommentmodified[$timezone];
 
 	$add_seconds_server = date('Z');
 
-	switch ( strtolower($timezone)) {
+	switch (strtolower($timezone)) {
 		case 'gmt':
 			$lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
@@ -1128,13 +1127,13 @@ 
  * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
  * @return array The amount of spam, approved, awaiting moderation, and total comments.
  */
-function get_comment_count( $post_id = 0 ) {
+function get_comment_count($post_id = 0) {
 	global $wpdb;
 
 	$post_id = (int) $post_id;
 
 	$where = '';
-	if ( $post_id > 0 ) {
+	if ($post_id > 0) {
 		$where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
 	}
 
@@ -1152,8 +1151,8 @@ 
 		"total_comments"        => 0
 	);
 
-	foreach ( $totals as $row ) {
-		switch ( $row['comment_approved'] ) {
+	foreach ($totals as $row) {
+		switch ($row['comment_approved']) {
 			case 'spam':
 				$comment_count['spam'] = $row['total'];
 				$comment_count["total_comments"] += $row['total'];
@@ -1260,7 +1259,7 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
+	if ($user->exists())
 		return;
 
 	/**
@@ -1270,11 +1269,11 @@ 
 	 *
 	 * @param int $seconds Comment cookie lifetime. Default 30000000.
 	 */
-	$comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
-	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
-	setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
+	$comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+	$secure = ('https' === parse_url(home_url(), PHP_URL_SCHEME));
+	setcookie('comment_author_'.COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_email_'.COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_url_'.COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
 }
 
 /**
@@ -1286,7 +1285,7 @@ 
  * @since 2.0.4
  */
 function sanitize_comment_cookies() {
-	if ( isset( $_COOKIE['comment_author_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's name cookie before it is set.
 		 *
@@ -1297,13 +1296,13 @@ 
 		 *
 		 * @param string $author_cookie The comment author name cookie.
 		 */
-		$comment_author = apply_filters( 'pre_comment_author_name', $_COOKIE['comment_author_' . COOKIEHASH] );
+		$comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
 		$comment_author = wp_unslash($comment_author);
 		$comment_author = esc_attr($comment_author);
-		$_COOKIE['comment_author_' . COOKIEHASH] = $comment_author;
+		$_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
 	}
 
-	if ( isset( $_COOKIE['comment_author_email_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's email cookie before it is set.
 		 *
@@ -1314,13 +1313,13 @@ 
 		 *
 		 * @param string $author_email_cookie The comment author email cookie.
 		 */
-		$comment_author_email = apply_filters( 'pre_comment_author_email', $_COOKIE['comment_author_email_' . COOKIEHASH] );
+		$comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
 		$comment_author_email = wp_unslash($comment_author_email);
 		$comment_author_email = esc_attr($comment_author_email);
 		$_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
 	}
 
-	if ( isset( $_COOKIE['comment_author_url_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's URL cookie before it is set.
 		 *
@@ -1331,7 +1330,7 @@ 
 		 *
 		 * @param string $author_url_cookie The comment author URL cookie.
 		 */
-		$comment_author_url = apply_filters( 'pre_comment_author_url', $_COOKIE['comment_author_url_' . COOKIEHASH] );
+		$comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]);
 		$comment_author_url = wp_unslash($comment_author_url);
 		$_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
 	}
@@ -1347,28 +1346,28 @@ 
  * @param array $commentdata Contains information on the comment
  * @return int|string Signifies the approval status (0|1|'spam')
  */
-function wp_allow_comment( $commentdata ) {
+function wp_allow_comment($commentdata) {
 	global $wpdb;
 
 	// Simple duplicate check
 	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
 	$dupe = $wpdb->prepare(
 		"SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",
-		wp_unslash( $commentdata['comment_post_ID'] ),
-		wp_unslash( $commentdata['comment_parent'] ),
-		wp_unslash( $commentdata['comment_author'] )
+		wp_unslash($commentdata['comment_post_ID']),
+		wp_unslash($commentdata['comment_parent']),
+		wp_unslash($commentdata['comment_author'])
 	);
-	if ( $commentdata['comment_author_email'] ) {
+	if ($commentdata['comment_author_email']) {
 		$dupe .= $wpdb->prepare(
 			"OR comment_author_email = %s ",
-			wp_unslash( $commentdata['comment_author_email'] )
+			wp_unslash($commentdata['comment_author_email'])
 		);
 	}
 	$dupe .= $wpdb->prepare(
 		") AND comment_content = %s LIMIT 1",
-		wp_unslash( $commentdata['comment_content'] )
+		wp_unslash($commentdata['comment_content'])
 	);
-	if ( $wpdb->get_var( $dupe ) ) {
+	if ($wpdb->get_var($dupe)) {
 		/**
 		 * Fires immediately after a duplicate comment is detected.
 		 *
@@ -1376,11 +1375,11 @@ 
 		 *
 		 * @param array $commentdata Comment data.
 		 */
-		do_action( 'comment_duplicate_trigger', $commentdata );
-		if ( defined( 'DOING_AJAX' ) ) {
-			die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
+		do_action('comment_duplicate_trigger', $commentdata);
+		if (defined('DOING_AJAX')) {
+			die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'));
 		}
-		wp_die( __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
+		wp_die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'), 409);
 	}
 
 	/**
@@ -1401,20 +1400,20 @@ 
 		$commentdata['comment_date_gmt']
 	);
 
-	if ( ! empty( $commentdata['user_id'] ) ) {
-		$user = get_userdata( $commentdata['user_id'] );
-		$post_author = $wpdb->get_var( $wpdb->prepare(
+	if ( ! empty($commentdata['user_id'])) {
+		$user = get_userdata($commentdata['user_id']);
+		$post_author = $wpdb->get_var($wpdb->prepare(
 			"SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1",
 			$commentdata['comment_post_ID']
-		) );
+		));
 	}
 
-	if ( isset( $user ) && ( $commentdata['user_id'] == $post_author || $user->has_cap( 'moderate_comments' ) ) ) {
+	if (isset($user) && ($commentdata['user_id'] == $post_author || $user->has_cap('moderate_comments'))) {
 		// The author and the admins get respect.
 		$approved = 1;
 	} else {
 		// Everyone else's comments will be checked.
-		if ( check_comment(
+		if (check_comment(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
@@ -1422,20 +1421,20 @@ 
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent'],
 			$commentdata['comment_type']
-		) ) {
+		)) {
 			$approved = 1;
 		} else {
 			$approved = 0;
 		}
 
-		if ( wp_blacklist_check(
+		if (wp_blacklist_check(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
 			$commentdata['comment_content'],
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent']
-		) ) {
+		)) {
 			$approved = 'spam';
 		}
 	}
@@ -1448,7 +1447,7 @@ 
 	 * @param bool|string $approved    The approval status. Accepts 1, 0, or 'spam'.
 	 * @param array       $commentdata Comment data.
 	 */
-	$approved = apply_filters( 'pre_comment_approved', $approved, $commentdata );
+	$approved = apply_filters('pre_comment_approved', $approved, $commentdata);
 	return $approved;
 }
 
@@ -1466,12 +1465,12 @@ 
  * @param string $email Comment author email address.
  * @param string $date MySQL time string.
  */
-function check_comment_flood_db( $ip, $email, $date ) {
+function check_comment_flood_db($ip, $email, $date) {
 	global $wpdb;
-	if ( current_user_can( 'manage_options' ) )
+	if (current_user_can('manage_options'))
 		return; // don't throttle admins
-	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
-	if ( $lasttime = $wpdb->get_var( $wpdb->prepare( "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( `comment_author_IP` = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $ip, $email ) ) ) {
+	$hour_ago = gmdate('Y-m-d H:i:s', time() - HOUR_IN_SECONDS);
+	if ($lasttime = $wpdb->get_var($wpdb->prepare("SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( `comment_author_IP` = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $ip, $email))) {
 		$time_lastcomment = mysql2date('U', $lasttime, false);
 		$time_newcomment  = mysql2date('U', $date, false);
 		/**
@@ -1483,8 +1482,8 @@ 
 		 * @param int  $time_lastcomment Timestamp of when the last comment was posted.
 		 * @param int  $time_newcomment  Timestamp of when the new comment was posted.
 		 */
-		$flood_die = apply_filters( 'comment_flood_filter', false, $time_lastcomment, $time_newcomment );
-		if ( $flood_die ) {
+		$flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
+		if ($flood_die) {
 			/**
 			 * Fires before the comment flood message is triggered.
 			 *
@@ -1493,12 +1492,12 @@ 
 			 * @param int $time_lastcomment Timestamp of when the last comment was posted.
 			 * @param int $time_newcomment  Timestamp of when the new comment was posted.
 			 */
-			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
+			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
 
-			if ( defined('DOING_AJAX') )
-				die( __('You are posting comments too quickly. Slow down.') );
+			if (defined('DOING_AJAX'))
+				die(__('You are posting comments too quickly. Slow down.'));
 
-			wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
+			wp_die(__('You are posting comments too quickly. Slow down.'), 429);
 		}
 	}
 }
@@ -1514,12 +1513,12 @@ 
 function separate_comments(&$comments) {
 	$comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
 	$count = count($comments);
-	for ( $i = 0; $i < $count; $i++ ) {
+	for ($i = 0; $i < $count; $i++) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
+		if (empty($type))
 			$type = 'comment';
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
+		if ('trackback' == $type || 'pingback' == $type)
 			$comments_by_type['pings'][] = &$comments[$i];
 	}
 
@@ -1540,36 +1539,36 @@ 
  * @param bool  $threaded Optional control over flat or threaded comments.
  * @return int Number of comment pages.
  */
-function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
+function get_comment_pages_count($comments = null, $per_page = null, $threaded = null) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+	if (null === $comments && null === $per_page && null === $threaded && ! empty($wp_query->max_num_comment_pages))
 		return $wp_query->max_num_comment_pages;
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
+	if (( ! $comments || ! is_array($comments)) && ! empty($wp_query->comments))
 		$comments = $wp_query->comments;
 
-	if ( empty($comments) )
+	if (empty($comments))
 		return 0;
 
-	if ( ! get_option( 'page_comments' ) )
+	if ( ! get_option('page_comments'))
 		return 1;
 
-	if ( !isset($per_page) )
+	if ( ! isset($per_page))
 		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		return 1;
 
-	if ( !isset($threaded) )
+	if ( ! isset($threaded))
 		$threaded = get_option('thread_comments');
 
-	if ( $threaded ) {
+	if ($threaded) {
 		$walker = new Walker_Comment;
-		$count = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
+		$count = ceil($walker->get_number_of_root_elements($comments) / $per_page);
 	} else {
-		$count = ceil( count( $comments ) / $per_page );
+		$count = ceil(count($comments) / $per_page);
 	}
 
 	return $count;
@@ -1586,34 +1585,34 @@ 
  * @param array $args Optional args.
  * @return int|null Comment page number or null on error.
  */
-function get_page_of_comment( $comment_ID, $args = array() ) {
+function get_page_of_comment($comment_ID, $args = array()) {
 	global $wpdb;
 
-	if ( !$comment = get_comment( $comment_ID ) )
+	if ( ! $comment = get_comment($comment_ID))
 		return;
 
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '');
+	$args = wp_parse_args($args, $defaults);
 
-	if ( '' === $args['per_page'] && get_option('page_comments') )
+	if ('' === $args['per_page'] && get_option('page_comments'))
 		$args['per_page'] = get_query_var('comments_per_page');
-	if ( empty($args['per_page']) ) {
+	if (empty($args['per_page'])) {
 		$args['per_page'] = 0;
 		$args['page'] = 0;
 	}
-	if ( $args['per_page'] < 1 )
+	if ($args['per_page'] < 1)
 		return 1;
 
-	if ( '' === $args['max_depth'] ) {
-		if ( get_option('thread_comments') )
+	if ('' === $args['max_depth']) {
+		if (get_option('thread_comments'))
 			$args['max_depth'] = get_option('thread_comments_depth');
 		else
 			$args['max_depth'] = -1;
 	}
 
 	// Find this comment's top level parent if threading is enabled
-	if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-		return get_page_of_comment( $comment->comment_parent, $args );
+	if ($args['max_depth'] > 1 && 0 != $comment->comment_parent)
+		return get_page_of_comment($comment->comment_parent, $args);
 
 	$allowedtypes = array(
 		'comment' => '',
@@ -1621,17 +1620,17 @@ 
 		'trackback' => 'trackback',
 	);
 
-	$comtypewhere = ( 'all' != $args['type'] && isset($allowedtypes[$args['type']]) ) ? " AND comment_type = '" . $allowedtypes[$args['type']] . "'" : '';
+	$comtypewhere = ('all' != $args['type'] && isset($allowedtypes[$args['type']])) ? " AND comment_type = '".$allowedtypes[$args['type']]."'" : '';
 
 	// Count comments older than this one
-	$oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_approved = '1' AND comment_date_gmt < '%s'" . $comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt ) );
+	$oldercoms = $wpdb->get_var($wpdb->prepare("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_approved = '1' AND comment_date_gmt < '%s'".$comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt));
 
 	// No older comments? Then it's page #1.
-	if ( 0 == $oldercoms )
+	if (0 == $oldercoms)
 		return 1;
 
 	// Divide comments older than this one by comments per page to get this comment's page number
-	return ceil( ( $oldercoms + 1 ) / $args['per_page'] );
+	return ceil(($oldercoms + 1) / $args['per_page']);
 }
 
 /**
@@ -1660,18 +1659,18 @@ 
 	 * @param string $user_ip    Comment author's IP address.
 	 * @param string $user_agent Comment author's browser user agent.
 	 */
-	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
+	do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
 
-	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
+	$mod_keys = trim(get_option('blacklist_keys'));
+	if ('' == $mod_keys)
 		return false; // If moderation keys are empty
-	$words = explode("\n", $mod_keys );
+	$words = explode("\n", $mod_keys);
 
-	foreach ( (array) $words as $word ) {
+	foreach ((array) $words as $word) {
 		$word = trim($word);
 
 		// Skip empty lines
-		if ( empty($word) ) { continue; }
+		if (empty($word)) { continue; }
 
 		// Do some escaping magic so that '#' chars in the
 		// spam words don't break things:
@@ -1709,7 +1708,7 @@ 
  * @param int $post_id Optional. Post ID.
  * @return object|array Comment stats.
  */
-function wp_count_comments( $post_id = 0 ) {
+function wp_count_comments($post_id = 0) {
 	global $wpdb;
 
 	$post_id = (int) $post_id;
@@ -1722,34 +1721,34 @@ 
 	 * @param array $count   An empty array.
 	 * @param int   $post_id The post ID.
 	 */
-	$stats = apply_filters( 'wp_count_comments', array(), $post_id );
-	if ( !empty($stats) )
+	$stats = apply_filters('wp_count_comments', array(), $post_id);
+	if ( ! empty($stats))
 		return $stats;
 
 	$count = wp_cache_get("comments-{$post_id}", 'counts');
 
-	if ( false !== $count )
+	if (false !== $count)
 		return $count;
 
 	$where = '';
-	if ( $post_id > 0 )
-		$where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id );
+	if ($post_id > 0)
+		$where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
 
-	$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
+	$count = $wpdb->get_results("SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A);
 
 	$total = 0;
 	$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
-	foreach ( (array) $count as $row ) {
+	foreach ((array) $count as $row) {
 		// Don't count post-trashed toward totals
-		if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
+		if ('post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'])
 			$total += $row['num_comments'];
-		if ( isset( $approved[$row['comment_approved']] ) )
+		if (isset($approved[$row['comment_approved']]))
 			$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
 	}
 
 	$stats['total_comments'] = $total;
-	foreach ( $approved as $key ) {
-		if ( empty($stats[$key]) )
+	foreach ($approved as $key) {
+		if (empty($stats[$key]))
 			$stats[$key] = 0;
 	}
 
@@ -1778,10 +1777,10 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status($comment_id), array( 'trash', 'spam' ) ) )
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array(wp_get_comment_status($comment_id), array('trash', 'spam')))
 		return wp_trash_comment($comment_id);
 
 	/**
@@ -1791,21 +1790,21 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'delete_comment', $comment_id );
+	do_action('delete_comment', $comment_id);
 
 	// Move children up a level.
-	$children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment_id) );
-	if ( !empty($children) ) {
+	$children = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment_id));
+	if ( ! empty($children)) {
 		$wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment_id));
 		clean_comment_cache($children);
 	}
 
 	// Delete metadata
-	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment_id ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	$meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment_id));
+	foreach ($meta_ids as $mid)
+		delete_metadata_by_mid('comment', $mid);
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment_id ) ) )
+	if ( ! $wpdb->delete($wpdb->comments, array('comment_ID' => $comment_id)))
 		return false;
 
 	/**
@@ -1815,16 +1814,16 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'deleted_comment', $comment_id );
+	do_action('deleted_comment', $comment_id);
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
+	if ($post_id && $comment->comment_approved == 1)
 		wp_update_comment_count($post_id);
 
 	clean_comment_cache($comment_id);
 
 	/** This action is documented in wp-includes/comment.php */
-	do_action( 'wp_set_comment_status', $comment_id, 'delete' );
+	do_action('wp_set_comment_status', $comment_id, 'delete');
 
 	wp_transition_comment_status('delete', $comment->comment_approved, $comment);
 	return true;
@@ -1841,10 +1840,10 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_comment($comment_id, true);
 
-	if ( !$comment = get_comment($comment_id) )
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
 	/**
@@ -1854,13 +1853,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'trash_comment', $comment_id );
+	do_action('trash_comment', $comment_id);
 
-	if ( wp_set_comment_status($comment_id, 'trash') ) {
-		delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
-		add_comment_meta( $comment_id, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment_id, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment_id, 'trash')) {
+		delete_comment_meta($comment_id, '_wp_trash_meta_status');
+		delete_comment_meta($comment_id, '_wp_trash_meta_time');
+		add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment_id, '_wp_trash_meta_time', time());
 
 		/**
 		 * Fires immediately after a comment is sent to Trash.
@@ -1869,7 +1868,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'trashed_comment', $comment_id );
+		do_action('trashed_comment', $comment_id);
 		return true;
 	}
 
@@ -1885,7 +1884,7 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_untrash_comment($comment_id) {
-	if ( ! (int)$comment_id )
+	if ( ! (int) $comment_id)
 		return false;
 
 	/**
@@ -1895,13 +1894,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'untrash_comment', $comment_id );
+	do_action('untrash_comment', $comment_id);
 
 	$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
-	if ( empty($status) )
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status($comment_id, $status) ) {
+	if (wp_set_comment_status($comment_id, $status)) {
 		delete_comment_meta($comment_id, '_wp_trash_meta_time');
 		delete_comment_meta($comment_id, '_wp_trash_meta_status');
 		/**
@@ -1911,7 +1910,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'untrashed_comment', $comment_id );
+		do_action('untrashed_comment', $comment_id);
 		return true;
 	}
 
@@ -1927,7 +1926,7 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_spam_comment($comment_id) {
-	if ( !$comment = get_comment($comment_id) )
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
 	/**
@@ -1937,13 +1936,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'spam_comment', $comment_id );
+	do_action('spam_comment', $comment_id);
 
-	if ( wp_set_comment_status($comment_id, 'spam') ) {
-		delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
-		add_comment_meta( $comment_id, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment_id, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment_id, 'spam')) {
+		delete_comment_meta($comment_id, '_wp_trash_meta_status');
+		delete_comment_meta($comment_id, '_wp_trash_meta_time');
+		add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment_id, '_wp_trash_meta_time', time());
 		/**
 		 * Fires immediately after a comment is marked as Spam.
 		 *
@@ -1951,7 +1950,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'spammed_comment', $comment_id );
+		do_action('spammed_comment', $comment_id);
 		return true;
 	}
 
@@ -1967,7 +1966,7 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_unspam_comment($comment_id) {
-	if ( ! (int)$comment_id )
+	if ( ! (int) $comment_id)
 		return false;
 
 	/**
@@ -1977,15 +1976,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'unspam_comment', $comment_id );
+	do_action('unspam_comment', $comment_id);
 
 	$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
-	if ( empty($status) )
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status($comment_id, $status) ) {
-		delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
+	if (wp_set_comment_status($comment_id, $status)) {
+		delete_comment_meta($comment_id, '_wp_trash_meta_status');
+		delete_comment_meta($comment_id, '_wp_trash_meta_time');
 		/**
 		 * Fires immediately after a comment is unmarked as Spam.
 		 *
@@ -1993,7 +1992,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'unspammed_comment', $comment_id );
+		do_action('unspammed_comment', $comment_id);
 		return true;
 	}
 
@@ -2010,20 +2009,20 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
+	if ( ! $comment)
 		return false;
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
+	if ($approved == null)
 		return false;
-	elseif ( $approved == '1' )
+	elseif ($approved == '1')
 		return 'approved';
-	elseif ( $approved == '0' )
+	elseif ($approved == '0')
 		return 'unapproved';
-	elseif ( $approved == 'spam' )
+	elseif ($approved == 'spam')
 		return 'spam';
-	elseif ( $approved == 'trash' )
+	elseif ($approved == 'trash')
 		return 'trash';
 	else
 		return false;
@@ -2061,11 +2060,11 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if (isset($comment_statuses[$new_status])) $new_status = $comment_statuses[$new_status];
+	if (isset($comment_statuses[$old_status])) $old_status = $comment_statuses[$old_status];
 
 	// Call the hooks
-	if ( $new_status != $old_status ) {
+	if ($new_status != $old_status) {
 		/**
 		 * Fires when the comment status is in transition.
 		 *
@@ -2075,7 +2074,7 @@ 
 		 * @param int|string $old_status The old comment status.
 		 * @param object     $comment    The comment data.
 		 */
-		do_action( 'transition_comment_status', $new_status, $old_status, $comment );
+		do_action('transition_comment_status', $new_status, $old_status, $comment);
 		/**
 		 * Fires when the comment status is in transition from one specific status to another.
 		 *
@@ -2086,7 +2085,7 @@ 
 		 *
 		 * @param object $comment Comment object.
 		 */
-		do_action( "comment_{$old_status}_to_{$new_status}", $comment );
+		do_action("comment_{$old_status}_to_{$new_status}", $comment);
 	}
 	/**
 	 * Fires when the status of a specific comment type is in transition.
@@ -2102,7 +2101,7 @@ 
 	 * @param int $comment_ID The comment ID.
 	 * @param obj $comment    Comment object.
 	 */
-	do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment );
+	do_action("comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment);
 }
 
 /**
@@ -2121,15 +2120,15 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH]))
 		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH]))
 		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH]))
 		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
 
 	/**
@@ -2141,7 +2140,7 @@ 
 	 * @param string $comment_author_email Comment author's email.
 	 * @param string $comment_author_url   Comment author's URL.
 	 */
-	return apply_filters( 'wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url') );
+	return apply_filters('wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url'));
 }
 
 /**
@@ -2176,39 +2175,39 @@ 
  * }
  * @return int|false The new comment's ID on success, false on failure.
  */
-function wp_insert_comment( $commentdata ) {
+function wp_insert_comment($commentdata) {
 	global $wpdb;
-	$data = wp_unslash( $commentdata );
+	$data = wp_unslash($commentdata);
 
-	$comment_author       = ! isset( $data['comment_author'] )       ? '' : $data['comment_author'];
-	$comment_author_email = ! isset( $data['comment_author_email'] ) ? '' : $data['comment_author_email'];
-	$comment_author_url   = ! isset( $data['comment_author_url'] )   ? '' : $data['comment_author_url'];
-	$comment_author_IP    = ! isset( $data['comment_author_IP'] )    ? '' : $data['comment_author_IP'];
+	$comment_author       = ! isset($data['comment_author']) ? '' : $data['comment_author'];
+	$comment_author_email = ! isset($data['comment_author_email']) ? '' : $data['comment_author_email'];
+	$comment_author_url   = ! isset($data['comment_author_url']) ? '' : $data['comment_author_url'];
+	$comment_author_IP    = ! isset($data['comment_author_IP']) ? '' : $data['comment_author_IP'];
 
-	$comment_date     = ! isset( $data['comment_date'] )     ? current_time( 'mysql' )            : $data['comment_date'];
-	$comment_date_gmt = ! isset( $data['comment_date_gmt'] ) ? get_gmt_from_date( $comment_date ) : $data['comment_date_gmt'];
+	$comment_date     = ! isset($data['comment_date']) ? current_time('mysql') : $data['comment_date'];
+	$comment_date_gmt = ! isset($data['comment_date_gmt']) ? get_gmt_from_date($comment_date) : $data['comment_date_gmt'];
 
-	$comment_post_ID  = ! isset( $data['comment_post_ID'] )  ? '' : $data['comment_post_ID'];
-	$comment_content  = ! isset( $data['comment_content'] )  ? '' : $data['comment_content'];
-	$comment_karma    = ! isset( $data['comment_karma'] )    ? 0  : $data['comment_karma'];
-	$comment_approved = ! isset( $data['comment_approved'] ) ? 1  : $data['comment_approved'];
-	$comment_agent    = ! isset( $data['comment_agent'] )    ? '' : $data['comment_agent'];
-	$comment_type     = ! isset( $data['comment_type'] )     ? '' : $data['comment_type'];
-	$comment_parent   = ! isset( $data['comment_parent'] )   ? 0  : $data['comment_parent'];
+	$comment_post_ID  = ! isset($data['comment_post_ID']) ? '' : $data['comment_post_ID'];
+	$comment_content  = ! isset($data['comment_content']) ? '' : $data['comment_content'];
+	$comment_karma    = ! isset($data['comment_karma']) ? 0 : $data['comment_karma'];
+	$comment_approved = ! isset($data['comment_approved']) ? 1 : $data['comment_approved'];
+	$comment_agent    = ! isset($data['comment_agent']) ? '' : $data['comment_agent'];
+	$comment_type     = ! isset($data['comment_type']) ? '' : $data['comment_type'];
+	$comment_parent   = ! isset($data['comment_parent']) ? 0 : $data['comment_parent'];
 
-	$user_id  = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
+	$user_id = ! isset($data['user_id']) ? 0 : $data['user_id'];
 
-	$compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
-	if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
+	$compacted = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id');
+	if ( ! $wpdb->insert($wpdb->comments, $compacted)) {
 		return false;
 	}
 
 	$id = (int) $wpdb->insert_id;
 
-	if ( $comment_approved == 1 ) {
-		wp_update_comment_count( $comment_post_ID );
+	if ($comment_approved == 1) {
+		wp_update_comment_count($comment_post_ID);
 	}
-	$comment = get_comment( $id );
+	$comment = get_comment($id);
 
 	/**
 	 * Fires immediately after a comment is inserted into the database.
@@ -2218,9 +2217,9 @@ 
 	 * @param int $id      The comment ID.
 	 * @param obj $comment Comment object.
 	 */
-	do_action( 'wp_insert_comment', $id, $comment );
+	do_action('wp_insert_comment', $id, $comment);
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 
 	return $id;
 }
@@ -2238,7 +2237,7 @@ 
  * @return array Parsed comment information.
  */
 function wp_filter_comment($commentdata) {
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		/**
 		 * Filter the comment author's user id before it is set.
 		 *
@@ -2249,10 +2248,10 @@ 
 		 *
 		 * @param int $user_ID The comment author's user ID.
 		 */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+	} elseif (isset($commentdata['user_id'])) {
 		/** This filter is documented in wp-includes/comment.php */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_id']);
 	}
 
 	/**
@@ -2262,9 +2261,9 @@ 
 	 *
 	 * @param int $comment_agent The comment author's browser user agent.
 	 */
-	$commentdata['comment_agent'] = apply_filters( 'pre_comment_user_agent', ( isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '' ) );
+	$commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', (isset($commentdata['comment_agent']) ? $commentdata['comment_agent'] : ''));
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author'] = apply_filters( 'pre_comment_author_name', $commentdata['comment_author'] );
+	$commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
 	/**
 	 * Filter the comment content before it is set.
 	 *
@@ -2272,7 +2271,7 @@ 
 	 *
 	 * @param int $comment_content The comment content.
 	 */
-	$commentdata['comment_content'] = apply_filters( 'pre_comment_content', $commentdata['comment_content'] );
+	$commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
 	/**
 	 * Filter the comment author's IP before it is set.
 	 *
@@ -2280,11 +2279,11 @@ 
 	 *
 	 * @param int $comment_author_ip The comment author's IP.
 	 */
-	$commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
+	$commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
+	$commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
 	$commentdata['filtered'] = true;
 	return $commentdata;
 }
@@ -2300,9 +2299,9 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ($block) // a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
+	if (($time_newcomment - $time_lastcomment) < 15)
 		return true;
 	return false;
 }
@@ -2330,14 +2329,14 @@ 
  *                           for information on accepted arguments.
  * @return int|false The ID of the comment on success, false on failure.
  */
-function wp_new_comment( $commentdata ) {
+function wp_new_comment($commentdata) {
 	global $wpdb;
 
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
 	}
 
-	$prefiltered_user_id = ( isset( $commentdata['user_id'] ) ) ? (int) $commentdata['user_id'] : 0;
+	$prefiltered_user_id = (isset($commentdata['user_id'])) ? (int) $commentdata['user_id'] : 0;
 
 	/**
 	 * Filter a comment's data before it is sanitized and inserted into the database.
@@ -2346,35 +2345,35 @@ 
 	 *
 	 * @param array $commentdata Comment data.
 	 */
-	$commentdata = apply_filters( 'preprocess_comment', $commentdata );
+	$commentdata = apply_filters('preprocess_comment', $commentdata);
 
 	$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-	if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
+	if (isset($commentdata['user_ID']) && $prefiltered_user_id !== (int) $commentdata['user_ID']) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+	} elseif (isset($commentdata['user_id'])) {
 		$commentdata['user_id'] = (int) $commentdata['user_id'];
 	}
 
 	$commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;
-	$parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';
-	$commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
+	$parent_status = (0 < $commentdata['comment_parent']) ? wp_get_comment_status($commentdata['comment_parent']) : '';
+	$commentdata['comment_parent'] = ('approved' == $parent_status || 'unapproved' == $parent_status) ? $commentdata['comment_parent'] : 0;
 
-	if ( ! isset( $commentdata['comment_author_IP'] ) ) {
+	if ( ! isset($commentdata['comment_author_IP'])) {
 		$commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
 	}
-	$commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = preg_replace('/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP']);
 
-	if ( ! isset( $commentdata['comment_agent'] ) ) {
-		$commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT']: '';
+	if ( ! isset($commentdata['comment_agent'])) {
+		$commentdata['comment_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
 	}
-	$commentdata['comment_agent'] = substr( $commentdata['comment_agent'], 0, 254 );
+	$commentdata['comment_agent'] = substr($commentdata['comment_agent'], 0, 254);
 
-	if ( empty( $commentdata['comment_date'] ) ) {
+	if (empty($commentdata['comment_date'])) {
 		$commentdata['comment_date'] = current_time('mysql');
 	}
 
-	if ( empty( $commentdata['comment_date_gmt'] ) ) {
-		$commentdata['comment_date_gmt'] = current_time( 'mysql', 1 );
+	if (empty($commentdata['comment_date_gmt'])) {
+		$commentdata['comment_date_gmt'] = current_time('mysql', 1);
 	}
 
 	$commentdata = wp_filter_comment($commentdata);
@@ -2382,21 +2381,21 @@ 
 	$commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
 	$comment_ID = wp_insert_comment($commentdata);
-	if ( ! $comment_ID ) {
-		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
+	if ( ! $comment_ID) {
+		$fields = array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_content');
 
-		foreach( $fields as $field ) {
-			if ( isset( $commentdata[ $field ] ) ) {
-				$commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($commentdata[$field])) {
+				$commentdata[$field] = $wpdb->strip_invalid_text_for_column($wpdb->comments, $field, $commentdata[$field]);
 			}
 		}
 
-		$commentdata = wp_filter_comment( $commentdata );
+		$commentdata = wp_filter_comment($commentdata);
 
-		$commentdata['comment_approved'] = wp_allow_comment( $commentdata );
+		$commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
-		$comment_ID = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		$comment_ID = wp_insert_comment($commentdata);
+		if ( ! $comment_ID) {
 			return false;
 		}
 	}
@@ -2409,17 +2408,17 @@ 
 	 * @param int $comment_ID       The comment ID.
 	 * @param int $comment_approved 1 (true) if the comment is approved, 0 (false) if not.
 	 */
-	do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'] );
+	do_action('comment_post', $comment_ID, $commentdata['comment_approved']);
 
-	if ( 'spam' !== $commentdata['comment_approved'] ) { // If it's spam save it silently for later crunching
-		if ( '0' == $commentdata['comment_approved'] ) {
-			wp_notify_moderator( $comment_ID );
+	if ('spam' !== $commentdata['comment_approved']) { // If it's spam save it silently for later crunching
+		if ('0' == $commentdata['comment_approved']) {
+			wp_notify_moderator($comment_ID);
 		}
 
 		// wp_notify_postauthor() checks if notifying the author of their own comment.
 		// By default, it won't, but filters can override this.
-		if ( get_option( 'comments_notify' ) && $commentdata['comment_approved'] ) {
-			wp_notify_postauthor( $comment_ID );
+		if (get_option('comments_notify') && $commentdata['comment_approved']) {
+			wp_notify_postauthor($comment_ID);
 		}
 	}
 
@@ -2444,7 +2443,7 @@ 
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
 	global $wpdb;
 
-	switch ( $comment_status ) {
+	switch ($comment_status) {
 		case 'hold':
 		case '0':
 			$status = '0';
@@ -2452,8 +2451,8 @@ 
 		case 'approve':
 		case '1':
 			$status = '1';
-			if ( get_option('comments_notify') ) {
-				wp_notify_postauthor( $comment_id );
+			if (get_option('comments_notify')) {
+				wp_notify_postauthor($comment_id);
 			}
 			break;
 		case 'spam':
@@ -2468,8 +2467,8 @@ 
 
 	$comment_old = clone get_comment($comment_id);
 
-	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
-		if ( $wp_error )
+	if ( ! $wpdb->update($wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id))) {
+		if ($wp_error)
 			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
 		else
 			return false;
@@ -2489,7 +2488,7 @@ 
 	 * @param string|bool $comment_status Current comment status. Possible values include
 	 *                                    'hold', 'approve', 'spam', 'trash', or false.
 	 */
-	do_action( 'wp_set_comment_status', $comment_id, $comment_status );
+	do_action('wp_set_comment_status', $comment_id, $comment_status);
 
 	wp_transition_comment_status($comment_status, $comment_old->comment_approved, $comment);
 
@@ -2515,12 +2514,12 @@ 
 
 	// First, get all of the original fields
 	$comment = get_comment($commentarr['comment_ID'], ARRAY_A);
-	if ( empty( $comment ) ) {
+	if (empty($comment)) {
 		return 0;
 	}
 
 	// Make sure that the comment post ID is valid (if specified).
-	if ( isset( $commentarr['comment_post_ID'] ) && ! get_post( $commentarr['comment_post_ID'] ) ) {
+	if (isset($commentarr['comment_post_ID']) && ! get_post($commentarr['comment_post_ID'])) {
 		return 0;
 	}
 
@@ -2532,10 +2531,10 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$commentarr = array_merge($comment, $commentarr);
 
-	$commentarr = wp_filter_comment( $commentarr );
+	$commentarr = wp_filter_comment($commentarr);
 
 	// Now extract the merged array.
-	$data = wp_unslash( $commentarr );
+	$data = wp_unslash($commentarr);
 
 	/**
 	 * Filter the comment content before it is updated in the database.
@@ -2544,26 +2543,26 @@ 
 	 *
 	 * @param string $comment_content The comment data.
 	 */
-	$data['comment_content'] = apply_filters( 'comment_save_pre', $data['comment_content'] );
+	$data['comment_content'] = apply_filters('comment_save_pre', $data['comment_content']);
 
-	$data['comment_date_gmt'] = get_gmt_from_date( $data['comment_date'] );
+	$data['comment_date_gmt'] = get_gmt_from_date($data['comment_date']);
 
-	if ( ! isset( $data['comment_approved'] ) ) {
+	if ( ! isset($data['comment_approved'])) {
 		$data['comment_approved'] = 1;
-	} elseif ( 'hold' == $data['comment_approved'] ) {
+	} elseif ('hold' == $data['comment_approved']) {
 		$data['comment_approved'] = 0;
-	} elseif ( 'approve' == $data['comment_approved'] ) {
+	} elseif ('approve' == $data['comment_approved']) {
 		$data['comment_approved'] = 1;
 	}
 
 	$comment_ID = $data['comment_ID'];
 	$comment_post_ID = $data['comment_post_ID'];
-	$keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id' );
-	$data = wp_array_slice_assoc( $data, $keys );
-	$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
+	$keys = array('comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id');
+	$data = wp_array_slice_assoc($data, $keys);
+	$rval = $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
 
-	clean_comment_cache( $comment_ID );
-	wp_update_comment_count( $comment_post_ID );
+	clean_comment_cache($comment_ID);
+	wp_update_comment_count($comment_post_ID);
 	/**
 	 * Fires immediately after a comment is updated in the database.
 	 *
@@ -2573,7 +2572,7 @@ 
 	 *
 	 * @param int $comment_ID The comment ID.
 	 */
-	do_action( 'edit_comment', $comment_ID );
+	do_action('edit_comment', $comment_ID);
 	$comment = get_comment($comment_ID);
 	wp_transition_comment_status($comment->comment_approved, $old_status, $comment);
 	return $rval;
@@ -2593,14 +2592,14 @@ 
  * @param bool $defer
  * @return bool
  */
-function wp_defer_comment_counting($defer=null) {
+function wp_defer_comment_counting($defer = null) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if (is_bool($defer)) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( ! $defer)
+			wp_update_comment_count(null, true);
 	}
 
 	return $_defer;
@@ -2626,22 +2625,22 @@ 
  * @param bool $do_deferred Whether to process previously deferred post comment counts
  * @return bool|void True on success, false on failure
  */
-function wp_update_comment_count($post_id, $do_deferred=false) {
+function wp_update_comment_count($post_id, $do_deferred = false) {
 	static $_deferred = array();
 
-	if ( $do_deferred ) {
+	if ($do_deferred) {
 		$_deferred = array_unique($_deferred);
-		foreach ( $_deferred as $i => $_post_id ) {
+		foreach ($_deferred as $i => $_post_id) {
 			wp_update_comment_count_now($_post_id);
-			unset( $_deferred[$i] ); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
+			unset($_deferred[$i]); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
 		}
 	}
 
-	if ( wp_defer_comment_counting() ) {
+	if (wp_defer_comment_counting()) {
 		$_deferred[] = $post_id;
 		return true;
 	}
-	elseif ( $post_id ) {
+	elseif ($post_id) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2660,16 +2659,16 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
-	if ( !$post = get_post($post_id) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	$old = (int) $post->comment_count;
-	$new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
-	$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
+	$new = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id));
+	$wpdb->update($wpdb->posts, array('comment_count' => $new), array('ID' => $post_id));
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	/**
 	 * Fires immediately after a post's comment count is updated in the database.
@@ -2680,9 +2679,9 @@ 
 	 * @param int $new     The new comment count.
 	 * @param int $old     The old comment count.
 	 */
-	do_action( 'wp_update_comment_count', $post_id, $new, $old );
+	do_action('wp_update_comment_count', $post_id, $new, $old);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post_id, $post );
+	do_action('edit_post', $post_id, $post);
 
 	return true;
 }
@@ -2704,9 +2703,9 @@ 
  * @param int $deprecated Not Used.
  * @return false|string False on failure, string containing URI on success.
  */
-function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+function discover_pingback_server_uri($url, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7');
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2714,47 +2713,47 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not an URL. This should never happen.
+	if ( ! isset($parsed_url['host'])) // Not an URL. This should never happen.
 		return false;
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+	if (0 === strpos($url, $uploads_dir['baseurl']))
 		return false;
 
-	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_head($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if (wp_remote_retrieve_header($response, 'x-pingback'))
+		return wp_remote_retrieve_header($response, 'x-pingback');
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
+	if (preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header($response, 'content-type')))
 		return false;
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
-	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_get($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$contents = wp_remote_retrieve_body( $response );
+	$contents = wp_remote_retrieve_body($response);
 
 	$pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
 	$pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
-	if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {
+	if ($pingback_link_offset_dquote || $pingback_link_offset_squote) {
 		$quote = ($pingback_link_offset_dquote) ? '"' : '\'';
-		$pingback_link_offset = ($quote=='"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
+		$pingback_link_offset = ($quote == '"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
 		$pingback_href_pos = @strpos($contents, 'href=', $pingback_link_offset);
-		$pingback_href_start = $pingback_href_pos+6;
+		$pingback_href_start = $pingback_href_pos + 6;
 		$pingback_href_end = @strpos($contents, $quote, $pingback_href_start);
 		$pingback_server_url_len = $pingback_href_end - $pingback_href_start;
 		$pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
 
 		// We may find rel="pingback" but an incomplete pingback URL
-		if ( $pingback_server_url_len > 0 ) { // We got it!
+		if ($pingback_server_url_len > 0) { // We got it!
 			return $pingback_server_url;
 		}
 	}
@@ -2774,20 +2773,20 @@ 
 
 	// Do pingbacks
 	while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $ping->meta_id );
-		pingback( $ping->post_content, $ping->ID );
+		delete_metadata_by_mid('post', $ping->meta_id);
+		pingback($ping->post_content, $ping->ID);
 	}
 
 	// Do Enclosures
 	while ($enclosure = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $enclosure->meta_id );
-		do_enclose( $enclosure->post_content, $enclosure->ID );
+		delete_metadata_by_mid('post', $enclosure->meta_id);
+		do_enclose($enclosure->post_content, $enclosure->ID);
 	}
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if (is_array($trackbacks))
+		foreach ($trackbacks as $trackback)
 			do_trackbacks($trackback);
 
 	//Do Update Services/Generic Pings
@@ -2806,37 +2805,37 @@ 
 function do_trackbacks($post_id) {
 	global $wpdb;
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$to_ping = get_to_ping($post_id);
 	$pinged  = get_pung($post_id);
-	if ( empty($to_ping) ) {
-		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );
+	if (empty($to_ping)) {
+		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id));
 		return;
 	}
 
-	if ( empty($post->post_excerpt) ) {
+	if (empty($post->post_excerpt)) {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_content', $post->post_content, $post->ID );
+		$excerpt = apply_filters('the_content', $post->post_content, $post->ID);
 	} else {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_excerpt', $post->post_excerpt );
+		$excerpt = apply_filters('the_excerpt', $post->post_excerpt);
 	}
 
 	$excerpt = str_replace(']]>', ']]&gt;', $excerpt);
 	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	/** This filter is documented in wp-includes/post-template.php */
-	$post_title = apply_filters( 'the_title', $post->post_title, $post->ID );
+	$post_title = apply_filters('the_title', $post->post_title, $post->ID);
 	$post_title = strip_tags($post_title);
 
-	if ( $to_ping ) {
-		foreach ( (array) $to_ping as $tb_ping ) {
+	if ($to_ping) {
+		foreach ((array) $to_ping as $tb_ping) {
 			$tb_ping = trim($tb_ping);
-			if ( !in_array($tb_ping, $pinged) ) {
+			if ( ! in_array($tb_ping, $pinged)) {
 				trackback($tb_ping, $post_title, $excerpt, $post_id);
 				$pinged[] = $tb_ping;
 			} else {
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id));
 			}
 		}
 	}
@@ -2850,13 +2849,13 @@ 
  * @param int $post_id Post ID.
  * @return int Same as Post ID from parameter
  */
-function generic_ping( $post_id = 0 ) {
+function generic_ping($post_id = 0) {
 	$services = get_option('ping_sites');
 
 	$services = explode("\n", $services);
-	foreach ( (array) $services as $service ) {
+	foreach ((array) $services as $service) {
 		$service = trim($service);
-		if ( '' != $service )
+		if ('' != $service)
 			weblog_ping($service);
 	}
 
@@ -2875,8 +2874,8 @@ 
  */
 function pingback($content, $post_ID) {
 	global $wp_version;
-	include_once(ABSPATH . WPINC . '/class-IXR.php');
-	include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// original code by Mort (http://mort.mine.nu:8080)
 	$post_links = array();
@@ -2885,7 +2884,7 @@ 
 
 	// Step 1
 	// Parsing the post, external links (if any) are stored in the $post_links array
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
 	// Step 2.
 	// Walking thru the links array
@@ -2896,19 +2895,19 @@ 
 	// http://dummy-weblog.org/post.php
 	// We don't wanna ping first and second types, even if they have a valid <link/>
 
-	foreach ( (array) $post_links_temp as $link_test ) :
-		if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
-				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
-			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
+	foreach ((array) $post_links_temp as $link_test) :
+		if ( ! in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
+				&& ! is_local_attachment($link_test)) : // Also, let's never ping local attachments.
+			if ($test = @parse_url($link_test)) {
+				if (isset($test['query']))
 					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
+				elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 					$post_links[] = $link_test;
 			}
 		endif;
 	endforeach;
 
-	$post_links = array_unique( $post_links );
+	$post_links = array_unique($post_links);
 	/**
 	 * Fires just before pinging back links found in a post.
 	 *
@@ -2918,13 +2917,13 @@ 
 	 * @param array &$pung       Whether a link has already been pinged, passed by reference.
 	 * @param int   $post_ID     The post ID.
 	 */
-	do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post_ID ) );
+	do_action_ref_array('pre_ping', array(&$post_links, &$pung, $post_ID));
 
-	foreach ( (array) $post_links as $pagelinkedto ) {
-		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
+	foreach ((array) $post_links as $pagelinkedto) {
+		$pingback_server_url = discover_pingback_server_uri($pagelinkedto);
 
-		if ( $pingback_server_url ) {
-			@ set_time_limit( 60 );
+		if ($pingback_server_url) {
+			@ set_time_limit(60);
 			// Now, the RPC call
 			$pagelinkedfrom = get_permalink($post_ID);
 
@@ -2943,12 +2942,12 @@ 
 			 * @param string $pagelinkedto        URL of page linked to.
 			 * @param string $pagelinkedfrom      URL of page linked from.
 			 */
-			$client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
+			$client->useragent = apply_filters('pingback_useragent', $client->useragent.' -- WordPress/'.$wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
-				add_ping( $post_ID, $pagelinkedto );
+			if ($client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || (isset($client->error->code) && 48 == $client->error->code)) // Already registered
+				add_ping($post_ID, $pagelinkedto);
 		}
 	}
 }
@@ -2962,7 +2961,7 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
+	if ('0' != get_option('blog_public'))
 		return $sites;
 	else
 		return '';
@@ -2986,7 +2985,7 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
+	if (empty($trackback_url))
 		return;
 
 	$options = array();
@@ -2998,13 +2997,13 @@ 
 		'excerpt' => $excerpt
 	);
 
-	$response = wp_safe_remote_post( $trackback_url, $options );
+	$response = wp_safe_remote_post($trackback_url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return;
 
-	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
-	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
+	$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID));
+	return $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID));
 }
 
 /**
@@ -3019,18 +3018,18 @@ 
  */
 function weblog_ping($server = '', $path = '') {
 	global $wp_version;
-	include_once(ABSPATH . WPINC . '/class-IXR.php');
-	include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// using a timeout of 3 seconds should be enough to cover slow servers
-	$client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
+	$client = new WP_HTTP_IXR_Client($server, (( ! strlen(trim($path)) || ('/' == $path)) ? false : $path));
 	$client->timeout = 3;
 	$client->useragent .= ' -- WordPress/'.$wp_version;
 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
-	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	$home = trailingslashit(home_url());
+	if ( ! $client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url'))) // then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }
 
@@ -3043,8 +3042,8 @@ 
  * @param string $source_uri
  * @return string
  */
-function pingback_ping_source_uri( $source_uri ) {
-	return (string) wp_http_validate_url( $source_uri );
+function pingback_ping_source_uri($source_uri) {
+	return (string) wp_http_validate_url($source_uri);
 }
 
 /**
@@ -3059,10 +3058,10 @@ 
  * @param IXR_Error $ixr_error
  * @return IXR_Error
  */
-function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
+function xmlrpc_pingback_error($ixr_error) {
+	if ($ixr_error->code === 48)
 		return $ixr_error;
-	return new IXR_Error( 0, '' );
+	return new IXR_Error(0, '');
 }
 
 //
@@ -3077,10 +3076,10 @@ 
  * @param int|array $ids Comment ID or array of comment IDs to remove from cache
  */
 function clean_comment_cache($ids) {
-	foreach ( (array) $ids as $id )
+	foreach ((array) $ids as $id)
 		wp_cache_delete($id, 'comment');
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 }
 
 /**
@@ -3095,7 +3094,7 @@ 
  * @param array $comments Array of comment row objects
  */
 function update_comment_cache($comments) {
-	foreach ( (array) $comments as $comment )
+	foreach ((array) $comments as $comment)
 		wp_cache_add($comment->comment_ID, $comment, 'comment');
 }
 
@@ -3113,8 +3112,8 @@ 
  * @param WP_Query $query Query object.
  * @return array
  */
-function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
+function _close_comments_for_old_posts($posts, $query) {
+	if (empty($posts) || ! $query->is_singular() || ! get_option('close_comments_for_old_posts'))
 		return $posts;
 
 	/**
@@ -3124,15 +3123,15 @@ 
 	 *
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($posts[0]->post_type, $post_types))
 		return $posts;
 
-	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
+	$days_old = (int) get_option('close_comments_days_old');
+	if ( ! $days_old)
 		return $posts;
 
-	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+	if (time() - strtotime($posts[0]->post_date_gmt) > ($days_old * DAY_IN_SECONDS)) {
 		$posts[0]->comment_status = 'closed';
 		$posts[0]->ping_status = 'closed';
 	}
@@ -3150,25 +3149,25 @@ 
  * @param int $post_id Post ID
  * @return bool $open
  */
-function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
+function _close_comments_for_old_post($open, $post_id) {
+	if ( ! $open)
 		return $open;
 
-	if ( !get_option('close_comments_for_old_posts') )
+	if ( ! get_option('close_comments_for_old_posts'))
 		return $open;
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
+	if ( ! $days_old)
 		return $open;
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($post->post_type, $post_types))
 		return $open;
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
+	if (time() - strtotime($post->post_date_gmt) > ($days_old * DAY_IN_SECONDS))
 		return false;
 
 	return $open;

Braces +302 added lines, -198 removed lines

@@ -40,8 +40,9 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
-		return false;
+	if ( 1 == get_option('comment_moderation') ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/comment-template.php */
 	$comment = apply_filters( 'comment_text', $comment );
@@ -64,8 +65,9 @@ 
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
-			return false;
+		if ( $num_links >= $max_links ) {
+					return false;
+		}
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
@@ -78,8 +80,9 @@ 
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
-				continue;
+			if ( empty($word) ) {
+							continue;
+			}
 
 			/*
 			 * Do some escaping magic so that '#' (number of) characters in the spam
@@ -92,12 +95,24 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if ( preg_match($pattern, $author) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $email) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $url) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $comment) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_ip) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_agent) ) {
+				return false;
+			}
 		}
 	}
 
@@ -113,10 +128,11 @@ 
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
-					return true;
-			else
-				return false;
+				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) ) {
+								return true;
+			} else {
+							return false;
+			}
 		} else {
 			return false;
 		}
@@ -172,10 +188,11 @@ 
 	global $wpdb;
 
 	if ( empty($comment) ) {
-		if ( isset($GLOBALS['comment']) )
-			$_comment = & $GLOBALS['comment'];
-		else
-			$_comment = null;
+		if ( isset($GLOBALS['comment']) ) {
+					$_comment = & $GLOBALS['comment'];
+		} else {
+					$_comment = null;
+		}
 	} elseif ( is_object($comment) ) {
 		wp_cache_add($comment->comment_ID, $comment, 'comment');
 		$_comment = $comment;
@@ -184,8 +201,9 @@ 
 			$_comment = & $GLOBALS['comment'];
 		} elseif ( ! $_comment = wp_cache_get($comment, 'comment') ) {
 			$_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment));
-			if ( ! $_comment )
-				return null;
+			if ( ! $_comment ) {
+							return null;
+			}
 			wp_cache_add($_comment->comment_ID, $_comment, 'comment');
 		}
 	}
@@ -1092,8 +1110,9 @@ 
 	global $wpdb;
 	static $cache_lastcommentmodified = array();
 
-	if ( isset($cache_lastcommentmodified[$timezone]) )
-		return $cache_lastcommentmodified[$timezone];
+	if ( isset($cache_lastcommentmodified[$timezone]) ) {
+			return $cache_lastcommentmodified[$timezone];
+	}
 
 	$add_seconds_server = date('Z');
 
@@ -1260,8 +1279,9 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
-		return;
+	if ( $user->exists() ) {
+			return;
+	}
 
 	/**
 	 * Filter the lifetime of the comment cookie in seconds.
@@ -1468,8 +1488,10 @@ 
  */
 function check_comment_flood_db( $ip, $email, $date ) {
 	global $wpdb;
-	if ( current_user_can( 'manage_options' ) )
-		return; // don't throttle admins
+	if ( current_user_can( 'manage_options' ) ) {
+			return;
+	}
+	// don't throttle admins
 	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
 	if ( $lasttime = $wpdb->get_var( $wpdb->prepare( "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( `comment_author_IP` = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $ip, $email ) ) ) {
 		$time_lastcomment = mysql2date('U', $lasttime, false);
@@ -1495,8 +1517,9 @@ 
 			 */
 			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
 
-			if ( defined('DOING_AJAX') )
-				die( __('You are posting comments too quickly. Slow down.') );
+			if ( defined('DOING_AJAX') ) {
+							die( __('You are posting comments too quickly. Slow down.') );
+			}
 
 			wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
 		}
@@ -1516,11 +1539,13 @@ 
 	$count = count($comments);
 	for ( $i = 0; $i < $count; $i++ ) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
-			$type = 'comment';
+		if ( empty($type) ) {
+					$type = 'comment';
+		}
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
-			$comments_by_type['pings'][] = &$comments[$i];
+		if ( 'trackback' == $type || 'pingback' == $type ) {
+					$comments_by_type['pings'][] = &$comments[$i];
+		}
 	}
 
 	return $comments_by_type;
@@ -1543,27 +1568,35 @@ 
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
-		return $wp_query->max_num_comment_pages;
+	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) ) {
+			return $wp_query->max_num_comment_pages;
+	}
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
-		$comments = $wp_query->comments;
+	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  ) {
+			$comments = $wp_query->comments;
+	}
 
-	if ( empty($comments) )
-		return 0;
+	if ( empty($comments) ) {
+			return 0;
+	}
 
-	if ( ! get_option( 'page_comments' ) )
-		return 1;
+	if ( ! get_option( 'page_comments' ) ) {
+			return 1;
+	}
 
-	if ( !isset($per_page) )
-		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
-		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
-		return 1;
+	if ( !isset($per_page) ) {
+			$per_page = (int) get_query_var('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			$per_page = (int) get_option('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			return 1;
+	}
 
-	if ( !isset($threaded) )
-		$threaded = get_option('thread_comments');
+	if ( !isset($threaded) ) {
+			$threaded = get_option('thread_comments');
+	}
 
 	if ( $threaded ) {
 		$walker = new Walker_Comment;
@@ -1589,31 +1622,36 @@ 
 function get_page_of_comment( $comment_ID, $args = array() ) {
 	global $wpdb;
 
-	if ( !$comment = get_comment( $comment_ID ) )
-		return;
+	if ( !$comment = get_comment( $comment_ID ) ) {
+			return;
+	}
 
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( '' === $args['per_page'] && get_option('page_comments') )
-		$args['per_page'] = get_query_var('comments_per_page');
+	if ( '' === $args['per_page'] && get_option('page_comments') ) {
+			$args['per_page'] = get_query_var('comments_per_page');
+	}
 	if ( empty($args['per_page']) ) {
 		$args['per_page'] = 0;
 		$args['page'] = 0;
 	}
-	if ( $args['per_page'] < 1 )
-		return 1;
+	if ( $args['per_page'] < 1 ) {
+			return 1;
+	}
 
 	if ( '' === $args['max_depth'] ) {
-		if ( get_option('thread_comments') )
-			$args['max_depth'] = get_option('thread_comments_depth');
-		else
-			$args['max_depth'] = -1;
+		if ( get_option('thread_comments') ) {
+					$args['max_depth'] = get_option('thread_comments_depth');
+		} else {
+					$args['max_depth'] = -1;
+		}
 	}
 
 	// Find this comment's top level parent if threading is enabled
-	if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-		return get_page_of_comment( $comment->comment_parent, $args );
+	if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) {
+			return get_page_of_comment( $comment->comment_parent, $args );
+	}
 
 	$allowedtypes = array(
 		'comment' => '',
@@ -1627,8 +1665,9 @@ 
 	$oldercoms = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = 0 AND comment_approved = '1' AND comment_date_gmt < '%s'" . $comtypewhere, $comment->comment_post_ID, $comment->comment_date_gmt ) );
 
 	// No older comments? Then it's page #1.
-	if ( 0 == $oldercoms )
-		return 1;
+	if ( 0 == $oldercoms ) {
+			return 1;
+	}
 
 	// Divide comments older than this one by comments per page to get this comment's page number
 	return ceil( ( $oldercoms + 1 ) / $args['per_page'] );
@@ -1663,8 +1702,10 @@ 
 	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
 
 	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
-		return false; // If moderation keys are empty
+	if ( '' == $mod_keys ) {
+			return false;
+	}
+	// If moderation keys are empty
 	$words = explode("\n", $mod_keys );
 
 	foreach ( (array) $words as $word ) {
@@ -1685,8 +1726,9 @@ 
 			|| preg_match($pattern, $comment)
 			|| preg_match($pattern, $user_ip)
 			|| preg_match($pattern, $user_agent)
-		 )
-			return true;
+		 ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -1723,17 +1765,20 @@ 
 	 * @param int   $post_id The post ID.
 	 */
 	$stats = apply_filters( 'wp_count_comments', array(), $post_id );
-	if ( !empty($stats) )
-		return $stats;
+	if ( !empty($stats) ) {
+			return $stats;
+	}
 
 	$count = wp_cache_get("comments-{$post_id}", 'counts');
 
-	if ( false !== $count )
-		return $count;
+	if ( false !== $count ) {
+			return $count;
+	}
 
 	$where = '';
-	if ( $post_id > 0 )
-		$where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id );
+	if ( $post_id > 0 ) {
+			$where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id );
+	}
 
 	$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
 
@@ -1741,16 +1786,19 @@ 
 	$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
 	foreach ( (array) $count as $row ) {
 		// Don't count post-trashed toward totals
-		if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
-			$total += $row['num_comments'];
-		if ( isset( $approved[$row['comment_approved']] ) )
-			$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
+		if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] ) {
+					$total += $row['num_comments'];
+		}
+		if ( isset( $approved[$row['comment_approved']] ) ) {
+					$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
+		}
 	}
 
 	$stats['total_comments'] = $total;
 	foreach ( $approved as $key ) {
-		if ( empty($stats[$key]) )
-			$stats[$key] = 0;
+		if ( empty($stats[$key]) ) {
+					$stats[$key] = 0;
+		}
 	}
 
 	$stats = (object) $stats;
@@ -1778,11 +1826,13 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
-		return false;
+	if (!$comment = get_comment($comment_id)) {
+			return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status($comment_id), array( 'trash', 'spam' ) ) )
-		return wp_trash_comment($comment_id);
+	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status($comment_id), array( 'trash', 'spam' ) ) ) {
+			return wp_trash_comment($comment_id);
+	}
 
 	/**
 	 * Fires immediately before a comment is deleted from the database.
@@ -1802,11 +1852,13 @@ 
 
 	// Delete metadata
 	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment_id ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	foreach ( $meta_ids as $mid ) {
+			delete_metadata_by_mid( 'comment', $mid );
+	}
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment_id ) ) )
-		return false;
+	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment_id ) ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately after a comment is deleted from the database.
@@ -1818,8 +1870,9 @@ 
 	do_action( 'deleted_comment', $comment_id );
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
-		wp_update_comment_count($post_id);
+	if ( $post_id && $comment->comment_approved == 1 ) {
+			wp_update_comment_count($post_id);
+	}
 
 	clean_comment_cache($comment_id);
 
@@ -1841,11 +1894,13 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_comment($comment_id, true);
+	if ( !EMPTY_TRASH_DAYS ) {
+			return wp_delete_comment($comment_id, true);
+	}
 
-	if ( !$comment = get_comment($comment_id) )
-		return false;
+	if ( !$comment = get_comment($comment_id) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is sent to the Trash.
@@ -1885,8 +1940,9 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_untrash_comment($comment_id) {
-	if ( ! (int)$comment_id )
-		return false;
+	if ( ! (int)$comment_id ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is restored from the Trash.
@@ -1898,8 +1954,9 @@ 
 	do_action( 'untrash_comment', $comment_id );
 
 	$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status($comment_id, $status) ) {
 		delete_comment_meta($comment_id, '_wp_trash_meta_time');
@@ -1927,8 +1984,9 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_spam_comment($comment_id) {
-	if ( !$comment = get_comment($comment_id) )
-		return false;
+	if ( !$comment = get_comment($comment_id) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is marked as Spam.
@@ -1967,8 +2025,9 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_unspam_comment($comment_id) {
-	if ( ! (int)$comment_id )
-		return false;
+	if ( ! (int)$comment_id ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is unmarked as Spam.
@@ -1980,8 +2039,9 @@ 
 	do_action( 'unspam_comment', $comment_id );
 
 	$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status($comment_id, $status) ) {
 		delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
@@ -2010,24 +2070,26 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
-		return false;
+	if ( !$comment ) {
+			return false;
+	}
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
-		return false;
-	elseif ( $approved == '1' )
-		return 'approved';
-	elseif ( $approved == '0' )
-		return 'unapproved';
-	elseif ( $approved == 'spam' )
-		return 'spam';
-	elseif ( $approved == 'trash' )
-		return 'trash';
-	else
-		return false;
-}
+	if ( $approved == null ) {
+			return false;
+	} elseif ( $approved == '1' ) {
+			return 'approved';
+	} elseif ( $approved == '0' ) {
+			return 'unapproved';
+	} elseif ( $approved == 'spam' ) {
+			return 'spam';
+	} elseif ( $approved == 'trash' ) {
+			return 'trash';
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Call hooks for when a comment status transition occurs.
@@ -2061,8 +2123,12 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if ( isset($comment_statuses[$new_status]) ) {
+		$new_status = $comment_statuses[$new_status];
+	}
+	if ( isset($comment_statuses[$old_status]) ) {
+		$old_status = $comment_statuses[$old_status];
+	}
 
 	// Call the hooks
 	if ( $new_status != $old_status ) {
@@ -2121,16 +2187,19 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
+			$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	}
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
+			$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	}
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+			$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	}
 
 	/**
 	 * Filter the current commenter's name, email, and URL.
@@ -2300,10 +2369,13 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ( $block ) {
+		// a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
-		return true;
+	}
+	if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+			return true;
+	}
 	return false;
 }
 
@@ -2469,10 +2541,11 @@ 
 	$comment_old = clone get_comment($comment_id);
 
 	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
-		if ( $wp_error )
-			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
-		else
-			return false;
+		if ( $wp_error ) {
+					return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
+		} else {
+					return false;
+		}
 	}
 
 	clean_comment_cache($comment_id);
@@ -2599,8 +2672,9 @@ 
 	if ( is_bool($defer) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( !$defer ) {
+					wp_update_comment_count( null, true );
+		}
 	}
 
 	return $_defer;
@@ -2640,8 +2714,7 @@ 
 	if ( wp_defer_comment_counting() ) {
 		$_deferred[] = $post_id;
 		return true;
-	}
-	elseif ( $post_id ) {
+	} elseif ( $post_id ) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2660,10 +2733,12 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
-	if ( !$post = get_post($post_id) )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
+	if ( !$post = get_post($post_id) ) {
+			return false;
+	}
 
 	$old = (int) $post->comment_count;
 	$new = (int) $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id) );
@@ -2705,8 +2780,9 @@ 
  * @return false|string False on failure, string containing URI on success.
  */
 function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7' );
+	}
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2714,31 +2790,38 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not an URL. This should never happen.
+	if ( ! isset( $parsed_url['host'] ) ) {
+		// Not an URL. This should never happen.
 		return false;
+	}
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
-		return false;
+	if ( 0 === strpos($url, $uploads_dir['baseurl']) ) {
+			return false;
+	}
 
 	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
+			return wp_remote_retrieve_header( $response, 'x-pingback' );
+	}
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
-		return false;
+	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) ) {
+			return false;
+	}
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
 	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$contents = wp_remote_retrieve_body( $response );
 
@@ -2786,9 +2869,10 @@ 
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if ( is_array($trackbacks) ) {
+			foreach ( $trackbacks as $trackback )
 			do_trackbacks($trackback);
+	}
 
 	//Do Update Services/Generic Pings
 	generic_ping();
@@ -2856,8 +2940,9 @@ 
 	$services = explode("\n", $services);
 	foreach ( (array) $services as $service ) {
 		$service = trim($service);
-		if ( '' != $service )
-			weblog_ping($service);
+		if ( '' != $service ) {
+					weblog_ping($service);
+		}
 	}
 
 	return $post_id;
@@ -2900,10 +2985,11 @@ 
 		if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
 				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
 			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
-					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
-					$post_links[] = $link_test;
+				if ( isset($test['query']) ) {
+									$post_links[] = $link_test;
+				} elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
+									$post_links[] = $link_test;
+				}
 			}
 		endif;
 	endforeach;
@@ -2947,8 +3033,10 @@ 
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
+			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) {
+				// Already registered
 				add_ping( $post_ID, $pagelinkedto );
+			}
 		}
 	}
 }
@@ -2962,11 +3050,12 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
-		return $sites;
-	else
-		return '';
-}
+	if ( '0' != get_option('blog_public') ) {
+			return $sites;
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Send a Trackback.
@@ -2986,8 +3075,9 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
-		return;
+	if ( empty($trackback_url) ) {
+			return;
+	}
 
 	$options = array();
 	$options['timeout'] = 4;
@@ -3000,8 +3090,9 @@ 
 
 	$response = wp_safe_remote_post( $trackback_url, $options );
 
-	if ( is_wp_error( $response ) )
-		return;
+	if ( is_wp_error( $response ) ) {
+			return;
+	}
 
 	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
 	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
@@ -3030,9 +3121,11 @@ 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
 	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) {
+		// then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
-}
+	}
+	}
 
 /**
  * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI
@@ -3060,8 +3153,9 @@ 
  * @return IXR_Error
  */
 function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
-		return $ixr_error;
+	if ( $ixr_error->code === 48 ) {
+			return $ixr_error;
+	}
 	return new IXR_Error( 0, '' );
 }
 
@@ -3077,8 +3171,9 @@ 
  * @param int|array $ids Comment ID or array of comment IDs to remove from cache
  */
 function clean_comment_cache($ids) {
-	foreach ( (array) $ids as $id )
-		wp_cache_delete($id, 'comment');
+	foreach ( (array) $ids as $id ) {
+			wp_cache_delete($id, 'comment');
+	}
 
 	wp_cache_set( 'last_changed', microtime(), 'comment' );
 }
@@ -3095,9 +3190,10 @@ 
  * @param array $comments Array of comment row objects
  */
 function update_comment_cache($comments) {
-	foreach ( (array) $comments as $comment )
-		wp_cache_add($comment->comment_ID, $comment, 'comment');
-}
+	foreach ( (array) $comments as $comment ) {
+			wp_cache_add($comment->comment_ID, $comment, 'comment');
+	}
+	}
 
 //
 // Internal
@@ -3114,8 +3210,9 @@ 
  * @return array
  */
 function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
-		return $posts;
+	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) ) {
+			return $posts;
+	}
 
 	/**
 	 * Filter the list of post types to automatically close comments for.
@@ -3125,12 +3222,14 @@ 
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
-		return $posts;
+	if ( ! in_array( $posts[0]->post_type, $post_types ) ) {
+			return $posts;
+	}
 
 	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
-		return $posts;
+	if ( ! $days_old ) {
+			return $posts;
+	}
 
 	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
 		$posts[0]->comment_status = 'closed';
@@ -3151,25 +3250,30 @@ 
  * @return bool $open
  */
 function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
-		return $open;
+	if ( ! $open ) {
+			return $open;
+	}
 
-	if ( !get_option('close_comments_for_old_posts') )
-		return $open;
+	if ( !get_option('close_comments_for_old_posts') ) {
+			return $open;
+	}
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
-		return $open;
+	if ( !$days_old ) {
+			return $open;
+	}
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
-		return $open;
+	if ( ! in_array( $post->post_type, $post_types ) ) {
+			return $open;
+	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
-		return false;
+	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+			return false;
+	}
 
 	return $open;
 }

src/wp-includes/compat.php

Doc Comments +18 added lines

@@ -8,6 +8,10 @@ 
 
 // If gettext isn't available
 if ( !function_exists('_') ) {
+
+	/**
+	 * @param string $string
+	 */
 	function _($string) {
 		return $string;
 	}
@@ -42,6 +46,10 @@ 
 }
 
 if ( ! function_exists( 'mb_substr' ) ) :
+
+	/**
+	 * @param string $encoding
+	 */
 	function mb_substr( $str, $start, $length = null, $encoding = null ) {
 		return _mb_substr( $str, $start, $length, $encoding );
 	}
@@ -97,6 +105,10 @@ 
 }
 
 if ( ! function_exists( 'mb_strlen' ) ) :
+
+	/**
+	 * @param string $encoding
+	 */
 	function mb_strlen( $str, $encoding = null ) {
 		return _mb_strlen( $str, $encoding );
 	}
@@ -153,6 +165,12 @@ 
 }
 
 if ( !function_exists('hash_hmac') ):
+/**
+ * @param string $algo
+ * @param string $data
+ *
+ * @return string
+ */
 function hash_hmac($algo, $data, $key, $raw_output = false) {
 	return _hash_hmac($algo, $data, $key, $raw_output);
 }

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress implementation for PHP functions either missing from older PHP versions or not included by default.
- *
- * @package PHP
- * @access private
- */
+	 * WordPress implementation for PHP functions either missing from older PHP versions or not included by default.
+	 *
+	 * @package PHP
+	 * @access private
+	 */
 
 // If gettext isn't available
 if ( !function_exists('_') ) {

Spacing +63 added lines, -63 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // If gettext isn't available
-if ( !function_exists('_') ) {
+if ( ! function_exists('_')) {
 	function _($string) {
 		return $string;
 	}
@@ -27,23 +27,23 @@ 
  *             false  : Used for testing - return false for future calls to this function
  *             'reset': Used for testing - restore default behavior of this function
  */
-function _wp_can_use_pcre_u( $set = null ) {
+function _wp_can_use_pcre_u($set = null) {
 	static $utf8_pcre = 'reset';
 
-	if ( null !== $set ) {
+	if (null !== $set) {
 		$utf8_pcre = $set;
 	}
 
-	if ( 'reset' === $utf8_pcre ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ('reset' === $utf8_pcre) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 
 	return $utf8_pcre;
 }
 
-if ( ! function_exists( 'mb_substr' ) ) :
-	function mb_substr( $str, $start, $length = null, $encoding = null ) {
-		return _mb_substr( $str, $start, $length, $encoding );
+if ( ! function_exists('mb_substr')) :
+	function mb_substr($str, $start, $length = null, $encoding = null) {
+		return _mb_substr($str, $start, $length, $encoding);
 	}
 endif;
 
@@ -52,22 +52,22 @@ 
  * For $encoding === UTF-8, the $str input is expected to be a valid UTF-8 byte sequence.
  * The behavior of this function for invalid inputs is undefined.
  */
-function _mb_substr( $str, $start, $length = null, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_substr($str, $start, $length = null, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	// The solution below works only for UTF-8,
 	// so in case of a different charset just use built-in substr()
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return is_null($length) ? substr($str, $start) : substr($str, $start, $length);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array
-		preg_match_all( '/./us', $str, $match );
-		$chars = is_null( $length ) ? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
-		return implode( '', $chars );
+		preg_match_all('/./us', $str, $match);
+		$chars = is_null($length) ? array_slice($match[0], $start) : array_slice($match[0], $start, $length);
+		return implode('', $chars);
 	}
 
 	$regex = '/(
@@ -82,23 +82,23 @@ 
 		| \xF4[\x80-\x8F][\x80-\xBF]{2}
 	)/x';
 
-	$chars = array( '' ); // Start with 1 element instead of 0 since the first thing we do is pop
+	$chars = array(''); // Start with 1 element instead of 0 since the first thing we do is pop
 	do {
 		// We had some string left over from the last round, but we counted it in that last round.
-		array_pop( $chars );
+		array_pop($chars);
 
 		// Split by UTF-8 character, limit to 1000 characters (last array element will contain the rest of the string)
-		$pieces = preg_split( $regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+		$pieces = preg_split($regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		$chars = array_merge( $chars, $pieces );
-	} while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) ); // If there's anything left over, repeat the loop.
+		$chars = array_merge($chars, $pieces);
+	} while (count($pieces) > 1 && $str = array_pop($pieces)); // If there's anything left over, repeat the loop.
 
-	return join( '', array_slice( $chars, $start, $length ) );
+	return join('', array_slice($chars, $start, $length));
 }
 
-if ( ! function_exists( 'mb_strlen' ) ) :
-	function mb_strlen( $str, $encoding = null ) {
-		return _mb_strlen( $str, $encoding );
+if ( ! function_exists('mb_strlen')) :
+	function mb_strlen($str, $encoding = null) {
+		return _mb_strlen($str, $encoding);
 	}
 endif;
 
@@ -107,21 +107,21 @@ 
  * For $encoding === UTF-8, the $str input is expected to be a valid UTF-8 byte sequence.
  * The behavior of this function for invalid inputs is undefined.
  */
-function _mb_strlen( $str, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_strlen($str, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	// The solution below works only for UTF-8,
 	// so in case of a different charset just use built-in strlen()
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return strlen( $str );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return strlen($str);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array
-		preg_match_all( '/./us', $str, $match );
-		return count( $match[0] );
+		preg_match_all('/./us', $str, $match);
+		return count($match[0]);
 	}
 
 	$regex = '/(?:
@@ -142,17 +142,17 @@ 
 		$count--;
 
 		// Split by UTF-8 character, limit to 1000 characters (last array element will contain the rest of the string)
-		$pieces = preg_split( $regex, $str, 1000 );
+		$pieces = preg_split($regex, $str, 1000);
 
 		// Increment
-		$count += count( $pieces );
-	} while ( $str = array_pop( $pieces ) ); // If there's anything left over, repeat the loop.
+		$count += count($pieces);
+	} while ($str = array_pop($pieces)); // If there's anything left over, repeat the loop.
 
 	// Fencepost: preg_split() always returns one extra item in the array
 	return --$count;
 }
 
-if ( !function_exists('hash_hmac') ):
+if ( ! function_exists('hash_hmac')):
 function hash_hmac($algo, $data, $key, $raw_output = false) {
 	return _hash_hmac($algo, $data, $key, $raw_output);
 }
@@ -161,7 +161,7 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
+	if ( ! isset($packs[$algo]))
 		return false;
 
 	$pack = $packs[$algo];
@@ -174,44 +174,44 @@ 
 	$ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
 	$opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
 
-	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
+	$hmac = $algo($opad.pack($pack, $algo($ipad.$data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ($raw_output)
+		return pack($pack, $hmac);
 	return $hmac;
 }
 
-if ( !function_exists('json_encode') ) {
-	function json_encode( $string ) {
+if ( ! function_exists('json_encode')) {
+	function json_encode($string) {
 		global $wp_json;
 
-		if ( ! ( $wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		return $wp_json->encodeUnsafe( $string );
+		return $wp_json->encodeUnsafe($string);
 	}
 }
 
-if ( !function_exists('json_decode') ) {
+if ( ! function_exists('json_decode')) {
 	/**
 	 * @global Services_JSON $wp_json
 	 * @param string $string
 	 * @param bool   $assoc_array
 	 * @return object|array
 	 */
-	function json_decode( $string, $assoc_array = false ) {
+	function json_decode($string, $assoc_array = false) {
 		global $wp_json;
 
-		if ( ! ($wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		$res = $wp_json->decode($string);
+		if ($assoc_array)
+			$res = _json_decode_object_helper($res);
 		return $res;
 	}
 
@@ -220,13 +220,13 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
+		if (is_object($data))
 			$data = get_object_vars($data);
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }
 
-if ( ! function_exists( 'hash_equals' ) ) :
+if ( ! function_exists('hash_equals')) :
 /**
  * Compare two strings in constant time.
  *
@@ -239,16 +239,16 @@ 
  * @param string $b Actual string.
  * @return bool Whether strings are equal.
  */
-function hash_equals( $a, $b ) {
-	$a_length = strlen( $a );
-	if ( $a_length !== strlen( $b ) ) {
+function hash_equals($a, $b) {
+	$a_length = strlen($a);
+	if ($a_length !== strlen($b)) {
 		return false;
 	}
 	$result = 0;
 
 	// Do not attempt to "optimize" this.
-	for ( $i = 0; $i < $a_length; $i++ ) {
-		$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+	for ($i = 0; $i < $a_length; $i++) {
+		$result |= ord($a[$i]) ^ ord($b[$i]);
 	}
 
 	return $result === 0;
@@ -257,6 +257,6 @@ 
 
 // JSON_PRETTY_PRINT was introduced in PHP 5.4
 // Defined here to prevent a notice when using it with wp_json_encode()
-if ( ! defined( 'JSON_PRETTY_PRINT' ) ) {
-	define( 'JSON_PRETTY_PRINT', 128 );
+if ( ! defined('JSON_PRETTY_PRINT')) {
+	define('JSON_PRETTY_PRINT', 128);
 }

Braces +15 added lines, -10 removed lines

@@ -161,13 +161,15 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
-		return false;
+	if ( !isset($packs[$algo]) ) {
+			return false;
+	}
 
 	$pack = $packs[$algo];
 
-	if (strlen($key) > 64)
-		$key = pack($pack, $algo($key));
+	if (strlen($key) > 64) {
+			$key = pack($pack, $algo($key));
+	}
 
 	$key = str_pad($key, 64, chr(0));
 
@@ -176,8 +178,9 @@ 
 
 	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ( $raw_output ) {
+			return pack( $pack, $hmac );
+	}
 	return $hmac;
 }
 
@@ -210,8 +213,9 @@ 
 		}
 
 		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		if ( $assoc_array ) {
+					$res = _json_decode_object_helper( $res );
+		}
 		return $res;
 	}
 
@@ -220,8 +224,9 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
-			$data = get_object_vars($data);
+		if ( is_object($data) ) {
+					$data = get_object_vars($data);
+		}
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }

src/wp-includes/date.php

Doc Comments +2 added lines, -2 removed lines

@@ -799,7 +799,7 @@ 
 	 *
 	 * @param string $compare The compare operator to use
 	 * @param string|array $value The value
-	 * @return string|false|int The value to be used in SQL or false on error.
+	 * @return string The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
 		if ( ! isset( $value ) )
@@ -862,7 +862,7 @@ 
 	 *                                     of $datetime that are arrays, or string values that are a
 	 *                                     subset of MySQL date format ('Y', 'Y-m', 'Y-m-d', 'Y-m-d H:i').
 	 *                                     Default: false.
-	 * @return string|false A MySQL format date/time or false on failure
+	 * @return string A MySQL format date/time or false on failure
 	 */
 	public function build_mysql_datetime( $datetime, $default_to_max = false ) {
 		$now = current_time( 'timestamp' );

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Class for generating SQL clauses that filter a primary query according to date.
- *
- * `WP_Date_Query` is a helper that allows primary query classes, such as {@see WP_Query},
- * to filter their results by date columns, by generating `WHERE` subclauses to be attached
- * to the primary SQL query string.
- *
- * Attempting to filter by an invalid date value (eg month=13) will generate SQL that will
- * return no results. In these cases, a _doing_it_wrong() error notice is also thrown.
- * See {@link WP_Date_Query::validate_date_values()}.
- *
- * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page.
- *
- * @since 3.7.0
- */
+	 * Class for generating SQL clauses that filter a primary query according to date.
+	 *
+	 * `WP_Date_Query` is a helper that allows primary query classes, such as {@see WP_Query},
+	 * to filter their results by date columns, by generating `WHERE` subclauses to be attached
+	 * to the primary SQL query string.
+	 *
+	 * Attempting to filter by an invalid date value (eg month=13) will generate SQL that will
+	 * return no results. In these cases, a _doing_it_wrong() error notice is also thrown.
+	 * See {@link WP_Date_Query::validate_date_values()}.
+	 *
+	 * @link https://codex.wordpress.org/Function_Reference/WP_Query Codex page.
+	 *
+	 * @since 3.7.0
+	 */
 class WP_Date_Query {
 	/**
 	 * Array of date queries.

Spacing +198 added lines, -198 removed lines

@@ -60,7 +60,7 @@ 
 	 * @access public
 	 * @var array
 	 */
-	public $time_keys = array( 'after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second' );
+	public $time_keys = array('after', 'before', 'year', 'month', 'monthnum', 'week', 'w', 'dayofyear', 'day', 'dayofweek', 'dayofweek_iso', 'hour', 'minute', 'second');
 
 	/**
 	 * Constructor.
@@ -150,38 +150,38 @@ 
 	 *                              Accepts 'post_date', 'post_date_gmt', 'post_modified', 'post_modified_gmt',
 	 *                              'comment_date', 'comment_date_gmt'.
 	 */
-	public function __construct( $date_query, $default_column = 'post_date' ) {
+	public function __construct($date_query, $default_column = 'post_date') {
 
-		if ( isset( $date_query['relation'] ) && 'OR' === strtoupper( $date_query['relation'] ) ) {
+		if (isset($date_query['relation']) && 'OR' === strtoupper($date_query['relation'])) {
 			$this->relation = 'OR';
 		} else {
 			$this->relation = 'AND';
 		}
 
-		if ( ! is_array( $date_query ) ) {
+		if ( ! is_array($date_query)) {
 			return;
 		}
 
 		// Support for passing time-based keys in the top level of the $date_query array.
-		if ( ! isset( $date_query[0] ) && ! empty( $date_query ) ) {
-			$date_query = array( $date_query );
+		if ( ! isset($date_query[0]) && ! empty($date_query)) {
+			$date_query = array($date_query);
 		}
 
-		if ( empty( $date_query ) ) {
+		if (empty($date_query)) {
 			return;
 		}
 
-		if ( ! empty( $date_query['column'] ) ) {
-			$date_query['column'] = esc_sql( $date_query['column'] );
+		if ( ! empty($date_query['column'])) {
+			$date_query['column'] = esc_sql($date_query['column']);
 		} else {
-			$date_query['column'] = esc_sql( $default_column );
+			$date_query['column'] = esc_sql($default_column);
 		}
 
-		$this->column = $this->validate_column( $this->column );
+		$this->column = $this->validate_column($this->column);
 
-		$this->compare = $this->get_compare( $date_query );
+		$this->compare = $this->get_compare($date_query);
 
-		$this->queries = $this->sanitize_query( $date_query );
+		$this->queries = $this->sanitize_query($date_query);
 	}
 
 	/**
@@ -199,7 +199,7 @@ 
 	 *
 	 * @return array Sanitized queries.
 	 */
-	public function sanitize_query( $queries, $parent_query = null ) {
+	public function sanitize_query($queries, $parent_query = null) {
 		$cleaned_query = array();
 
 		$defaults = array(
@@ -209,37 +209,37 @@ 
 		);
 
 		// Numeric keys should always have array values.
-		foreach ( $queries as $qkey => $qvalue ) {
-			if ( is_numeric( $qkey ) && ! is_array( $qvalue ) ) {
-				unset( $queries[ $qkey ] );
+		foreach ($queries as $qkey => $qvalue) {
+			if (is_numeric($qkey) && ! is_array($qvalue)) {
+				unset($queries[$qkey]);
 			}
 		}
 
 		// Each query should have a value for each default key. Inherit from the parent when possible.
-		foreach ( $defaults as $dkey => $dvalue ) {
-			if ( isset( $queries[ $dkey ] ) ) {
+		foreach ($defaults as $dkey => $dvalue) {
+			if (isset($queries[$dkey])) {
 				continue;
 			}
 
-			if ( isset( $parent_query[ $dkey ] ) ) {
-				$queries[ $dkey ] = $parent_query[ $dkey ];
+			if (isset($parent_query[$dkey])) {
+				$queries[$dkey] = $parent_query[$dkey];
 			} else {
-				$queries[ $dkey ] = $dvalue;
+				$queries[$dkey] = $dvalue;
 			}
 		}
 
 		// Validate the dates passed in the query.
-		if ( $this->is_first_order_clause( $queries ) ) {
-			$this->validate_date_values( $queries );
+		if ($this->is_first_order_clause($queries)) {
+			$this->validate_date_values($queries);
 		}
 
-		foreach ( $queries as $key => $q ) {
-			if ( ! is_array( $q ) || in_array( $key, $this->time_keys, true ) ) {
+		foreach ($queries as $key => $q) {
+			if ( ! is_array($q) || in_array($key, $this->time_keys, true)) {
 				// This is a first-order query. Trust the values and sanitize when building SQL.
-				$cleaned_query[ $key ] = $q;
+				$cleaned_query[$key] = $q;
 			} else {
 				// Any array without a time key is another query, so we recurse.
-				$cleaned_query[] = $this->sanitize_query( $q, $queries );
+				$cleaned_query[] = $this->sanitize_query($q, $queries);
 			}
 		}
 
@@ -255,9 +255,9 @@ 
 	 * @param  array $query Query clause.
 	 * @return bool True if this is a first-order clause.
 	 */
-	protected function is_first_order_clause( $query ) {
-		$time_keys = array_intersect( $this->time_keys, array_keys( $query ) );
-		return ! empty( $time_keys );
+	protected function is_first_order_clause($query) {
+		$time_keys = array_intersect($this->time_keys, array_keys($query));
+		return ! empty($time_keys);
 	}
 
 	/**
@@ -269,9 +269,9 @@ 
 	 * @param array $query A date query or a date subquery.
 	 * @return string The comparison operator.
 	 */
-	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+	public function get_compare($query) {
+		if ( ! empty($query['compare']) && in_array($query['compare'], array('=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN')))
+			return strtoupper($query['compare']);
 
 		return $this->compare;
 	}
@@ -289,8 +289,8 @@ 
 	 * @param  array $date_query The date_query array.
 	 * @return bool  True if all values in the query are valid, false if one or more fail.
 	 */
-	public function validate_date_values( $date_query = array() ) {
-		if ( empty( $date_query ) ) {
+	public function validate_date_values($date_query = array()) {
+		if (empty($date_query)) {
 			return false;
 		}
 
@@ -301,30 +301,30 @@ 
 		 * validation routine continue to be sure that all invalid
 		 * values generate errors too.
 		 */
-		if ( array_key_exists( 'before', $date_query ) && is_array( $date_query['before'] ) ){
-			$valid = $this->validate_date_values( $date_query['before'] );
+		if (array_key_exists('before', $date_query) && is_array($date_query['before'])) {
+			$valid = $this->validate_date_values($date_query['before']);
 		}
 
-		if ( array_key_exists( 'after', $date_query ) && is_array( $date_query['after'] ) ){
-			$valid = $this->validate_date_values( $date_query['after'] );
+		if (array_key_exists('after', $date_query) && is_array($date_query['after'])) {
+			$valid = $this->validate_date_values($date_query['after']);
 		}
 
 		// Array containing all min-max checks.
 		$min_max_checks = array();
 
 		// Days per year.
-		if ( array_key_exists( 'year', $date_query ) ) {
+		if (array_key_exists('year', $date_query)) {
 			/*
 			 * If a year exists in the date query, we can use it to get the days.
 			 * If multiple years are provided (as in a BETWEEN), use the first one.
 			 */
-			if ( is_array( $date_query['year'] ) ) {
-				$_year = reset( $date_query['year'] );
+			if (is_array($date_query['year'])) {
+				$_year = reset($date_query['year']);
 			} else {
 				$_year = $date_query['year'];
 			}
 
-			$max_days_of_year = date( 'z', mktime( 0, 0, 0, 12, 31, $_year ) ) + 1;
+			$max_days_of_year = date('z', mktime(0, 0, 0, 12, 31, $_year)) + 1;
 		} else {
 			// otherwise we use the max of 366 (leap-year)
 			$max_days_of_year = 366;
@@ -354,11 +354,11 @@ 
 		);
 
 		// Weeks per year.
-		if ( isset( $_year ) ) {
+		if (isset($_year)) {
 			// If we have a specific year, use it to calculate number of weeks.
 			$date = new DateTime();
-			$date->setISODate( $_year, 53 );
-			$week_count = $date->format( "W" ) === "53" ? 53 : 52;
+			$date->setISODate($_year, 53);
+			$week_count = $date->format("W") === "53" ? 53 : 52;
 
 		} else {
 			// Otherwise set the week-count to a maximum of 53.
@@ -395,26 +395,26 @@ 
 		);
 
 		// Concatenate and throw a notice for each invalid value.
-		foreach ( $min_max_checks as $key => $check ) {
-			if ( ! array_key_exists( $key, $date_query ) ) {
+		foreach ($min_max_checks as $key => $check) {
+			if ( ! array_key_exists($key, $date_query)) {
 				continue;
 			}
 
 			// Throw a notice for each failing value.
-			foreach ( (array) $date_query[ $key ] as $_value ) {
+			foreach ((array) $date_query[$key] as $_value) {
 				$is_between = $_value >= $check['min'] && $_value <= $check['max'];
 
-				if ( ! is_numeric( $_value ) || ! $is_between ) {
+				if ( ! is_numeric($_value) || ! $is_between) {
 					$error = sprintf(
 						/* translators: Date query invalid date message: 1: invalid value, 2: type of value, 3: minimum valid value, 4: maximum valid value */
-						__( 'Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.' ),
-						'<code>' . esc_html( $_value ) . '</code>',
-						'<code>' . esc_html( $key ) . '</code>',
-						'<code>' . esc_html( $check['min'] ) . '</code>',
-						'<code>' . esc_html( $check['max'] ) . '</code>'
+						__('Invalid value %1$s for %2$s. Expected value should be between %3$s and %4$s.'),
+						'<code>'.esc_html($_value).'</code>',
+						'<code>'.esc_html($key).'</code>',
+						'<code>'.esc_html($check['min']).'</code>',
+						'<code>'.esc_html($check['max']).'</code>'
 					);
 
-					_doing_it_wrong( __CLASS__, $error, '4.1.0' );
+					_doing_it_wrong(__CLASS__, $error, '4.1.0');
 
 					$valid = false;
 				}
@@ -422,49 +422,49 @@ 
 		}
 
 		// If we already have invalid date messages, don't bother running through checkdate().
-		if ( ! $valid ) {
+		if ( ! $valid) {
 			return $valid;
 		}
 
 		$day_month_year_error_msg = '';
 
-		$day_exists   = array_key_exists( 'day', $date_query ) && is_numeric( $date_query['day'] );
-		$month_exists = array_key_exists( 'month', $date_query ) && is_numeric( $date_query['month'] );
-		$year_exists  = array_key_exists( 'year', $date_query ) && is_numeric( $date_query['year'] );
+		$day_exists   = array_key_exists('day', $date_query) && is_numeric($date_query['day']);
+		$month_exists = array_key_exists('month', $date_query) && is_numeric($date_query['month']);
+		$year_exists  = array_key_exists('year', $date_query) && is_numeric($date_query['year']);
 
-		if ( $day_exists && $month_exists && $year_exists ) {
+		if ($day_exists && $month_exists && $year_exists) {
 			// 1. Checking day, month, year combination.
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], $date_query['year'], sprintf( '%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], $date_query['year'], sprintf('%s-%s-%s', $date_query['year'], $date_query['month'], $date_query['day']))) {
 				/* translators: 1: year, 2: month, 3: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.' ),
-					'<code>' . esc_html( $date_query['year'] ) . '</code>',
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: year %1$s, month %2$s, day %3$s.'),
+					'<code>'.esc_html($date_query['year']).'</code>',
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 
-		} elseif ( $day_exists && $month_exists ) {
+		} elseif ($day_exists && $month_exists) {
 			/*
 			 * 2. checking day, month combination
 			 * We use 2012 because, as a leap year, it's the most permissive.
 			 */
-			if ( ! wp_checkdate( $date_query['month'], $date_query['day'], 2012, sprintf( '2012-%s-%s', $date_query['month'], $date_query['day'] ) ) ) {
+			if ( ! wp_checkdate($date_query['month'], $date_query['day'], 2012, sprintf('2012-%s-%s', $date_query['month'], $date_query['day']))) {
 				/* translators: 1: month, 2: day of month */
 				$day_month_year_error_msg = sprintf(
-					__( 'The following values do not describe a valid date: month %1$s, day %2$s.' ),
-					'<code>' . esc_html( $date_query['month'] ) . '</code>',
-					'<code>' . esc_html( $date_query['day'] ) . '</code>'
+					__('The following values do not describe a valid date: month %1$s, day %2$s.'),
+					'<code>'.esc_html($date_query['month']).'</code>',
+					'<code>'.esc_html($date_query['day']).'</code>'
 				);
 
 				$valid = false;
 			}
 		}
 
-		if ( ! empty( $day_month_year_error_msg ) ) {
-			_doing_it_wrong( __CLASS__, $day_month_year_error_msg, '4.1.0' );
+		if ( ! empty($day_month_year_error_msg)) {
+			_doing_it_wrong(__CLASS__, $day_month_year_error_msg, '4.1.0');
 		}
 
 		return $valid;
@@ -484,7 +484,7 @@ 
 	 * @param string $column The user-supplied column name.
 	 * @return string A validated column name value.
 	 */
-	public function validate_column( $column ) {
+	public function validate_column($column) {
 		global $wpdb;
 
 		$valid_columns = array(
@@ -494,7 +494,7 @@ 
 		);
 
 		// Attempt to detect a table prefix.
-		if ( false === strpos( $column, '.' ) ) {
+		if (false === strpos($column, '.')) {
 			/**
 			 * Filter the list of valid date query columns.
 			 *
@@ -506,7 +506,7 @@ 
 			 *                             'post_modified_gmt', 'comment_date', 'comment_date_gmt',
 			 *	                           'user_registered'
 			 */
-			if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
+			if ( ! in_array($column, apply_filters('date_query_valid_columns', $valid_columns))) {
 				$column = 'post_date';
 			}
 
@@ -527,9 +527,9 @@ 
 			);
 
 			// If it's a known column name, add the appropriate table prefix.
-			foreach ( $known_columns as $table_name => $table_columns ) {
-				if ( in_array( $column, $table_columns ) ) {
-					$column = $table_name . '.' . $column;
+			foreach ($known_columns as $table_name => $table_columns) {
+				if (in_array($column, $table_columns)) {
+					$column = $table_name.'.'.$column;
 					break;
 				}
 			}
@@ -537,7 +537,7 @@ 
 		}
 
 		// Remove unsafe characters.
-		return preg_replace( '/[^a-zA-Z0-9_$\.]/', '', $column );
+		return preg_replace('/[^a-zA-Z0-9_$\.]/', '', $column);
 	}
 
 	/**
@@ -561,7 +561,7 @@ 
 		 * @param string        $where WHERE clause of the date query.
 		 * @param WP_Date_Query $this  The WP_Date_Query instance.
 		 */
-		return apply_filters( 'get_date_sql', $where, $this );
+		return apply_filters('get_date_sql', $where, $this);
 	}
 
 	/**
@@ -581,10 +581,10 @@ 
 	 * }
 	 */
 	protected function get_sql_clauses() {
-		$sql = $this->get_sql_for_query( $this->queries );
+		$sql = $this->get_sql_for_query($this->queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -609,7 +609,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( $query, $depth = 0 ) {
+	protected function get_sql_for_query($query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -621,32 +621,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => $clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => $clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -655,21 +655,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -692,8 +692,8 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_subquery( $query ) {
-		return $this->get_sql_for_clause( $query, '' );
+	protected function get_sql_for_subquery($query) {
+		return $this->get_sql_for_clause($query, '');
 	}
 
 	/**
@@ -711,72 +711,72 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_clause( $query, $parent_query ) {
+	protected function get_sql_for_clause($query, $parent_query) {
 		global $wpdb;
 
 		// The sub-parts of a $where part.
 		$where_parts = array();
 
-		$column = ( ! empty( $query['column'] ) ) ? esc_sql( $query['column'] ) : $this->column;
+		$column = ( ! empty($query['column'])) ? esc_sql($query['column']) : $this->column;
 
-		$column = $this->validate_column( $column );
+		$column = $this->validate_column($column);
 
-		$compare = $this->get_compare( $query );
+		$compare = $this->get_compare($query);
 
-		$inclusive = ! empty( $query['inclusive'] );
+		$inclusive = ! empty($query['inclusive']);
 
 		// Assign greater- and less-than values.
 		$lt = '<';
 		$gt = '>';
 
-		if ( $inclusive ) {
+		if ($inclusive) {
 			$lt .= '=';
 			$gt .= '=';
 		}
 
 		// Range queries.
-		if ( ! empty( $query['after'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		if ( ! empty($query['after']))
+			$where_parts[] = $wpdb->prepare("$column $gt %s", $this->build_mysql_datetime($query['after'], ! $inclusive));
 
-		if ( ! empty( $query['before'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		if ( ! empty($query['before']))
+			$where_parts[] = $wpdb->prepare("$column $lt %s", $this->build_mysql_datetime($query['before'], $inclusive));
 
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
+		if (isset($query['year']) && $value = $this->build_value($compare, $query['year']))
 			$where_parts[] = "YEAR( $column ) $compare $value";
 
-		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
+		if (isset($query['month']) && $value = $this->build_value($compare, $query['month'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
-		} elseif ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) ) {
+		} elseif (isset($query['monthnum']) && $value = $this->build_value($compare, $query['monthnum'])) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
 		}
-		if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
-			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
+		if (isset($query['week']) && false !== ($value = $this->build_value($compare, $query['week']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
+		} elseif (isset($query['w']) && false !== ($value = $this->build_value($compare, $query['w']))) {
+			$where_parts[] = _wp_mysql_week($column)." $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
+		if (isset($query['dayofyear']) && $value = $this->build_value($compare, $query['dayofyear']))
 			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
+		if (isset($query['day']) && $value = $this->build_value($compare, $query['day']))
 			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
+		if (isset($query['dayofweek']) && $value = $this->build_value($compare, $query['dayofweek']))
 			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
+		if (isset($query['dayofweek_iso']) && $value = $this->build_value($compare, $query['dayofweek_iso']))
 			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
 
-		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
+		if (isset($query['hour']) || isset($query['minute']) || isset($query['second'])) {
 			// Avoid notices.
-			foreach ( array( 'hour', 'minute', 'second' ) as $unit ) {
-				if ( ! isset( $query[ $unit ] ) ) {
-					$query[ $unit ] = null;
+			foreach (array('hour', 'minute', 'second') as $unit) {
+				if ( ! isset($query[$unit])) {
+					$query[$unit] = null;
 				}
 			}
 
-			if ( $time_query = $this->build_time_query( $column, $compare, $query['hour'], $query['minute'], $query['second'] ) ) {
+			if ($time_query = $this->build_time_query($column, $compare, $query['hour'], $query['minute'], $query['second'])) {
 				$where_parts[] = $time_query;
 			}
 		}
@@ -801,45 +801,45 @@ 
 	 * @param string|array $value The value
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
-	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
+	public function build_value($compare, $value) {
+		if ( ! isset($value))
 			return false;
 
-		switch ( $compare ) {
+		switch ($compare) {
 			case 'IN':
 			case 'NOT IN':
 				$value = (array) $value;
 
 				// Remove non-numeric values.
-				$value = array_filter( $value, 'is_numeric' );
+				$value = array_filter($value, 'is_numeric');
 
-				if ( empty( $value ) ) {
+				if (empty($value)) {
 					return false;
 				}
 
-				return '(' . implode( ',', array_map( 'intval', $value ) ) . ')';
+				return '('.implode(',', array_map('intval', $value)).')';
 
 			case 'BETWEEN':
 			case 'NOT BETWEEN':
-				if ( ! is_array( $value ) || 2 != count( $value ) ) {
-					$value = array( $value, $value );
+				if ( ! is_array($value) || 2 != count($value)) {
+					$value = array($value, $value);
 				} else {
-					$value = array_values( $value );
+					$value = array_values($value);
 				}
 
 				// If either value is non-numeric, bail.
-				foreach ( $value as $v ) {
-					if ( ! is_numeric( $v ) ) {
+				foreach ($value as $v) {
+					if ( ! is_numeric($v)) {
 						return false;
 					}
 				}
 
-				$value = array_map( 'intval', $value );
+				$value = array_map('intval', $value);
 
-				return $value[0] . ' AND ' . $value[1];
+				return $value[0].' AND '.$value[1];
 
 			default;
-				if ( ! is_numeric( $value ) ) {
+				if ( ! is_numeric($value)) {
 					return false;
 				}
 
@@ -864,75 +864,75 @@ 
 	 *                                     Default: false.
 	 * @return string|false A MySQL format date/time or false on failure
 	 */
-	public function build_mysql_datetime( $datetime, $default_to_max = false ) {
-		$now = current_time( 'timestamp' );
+	public function build_mysql_datetime($datetime, $default_to_max = false) {
+		$now = current_time('timestamp');
 
-		if ( ! is_array( $datetime ) ) {
+		if ( ! is_array($datetime)) {
 
 			/*
 			 * Try to parse some common date formats, so we can detect
 			 * the level of precision and support the 'inclusive' parameter.
 			 */
-			if ( preg_match( '/^(\d{4})$/', $datetime, $matches ) ) {
+			if (preg_match('/^(\d{4})$/', $datetime, $matches)) {
 				// Y
 				$datetime = array(
-					'year' => intval( $matches[1] ),
+					'year' => intval($matches[1]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d
 				$datetime = array(
-					'year'  => intval( $matches[1] ),
-					'month' => intval( $matches[2] ),
-					'day'   => intval( $matches[3] ),
+					'year'  => intval($matches[1]),
+					'month' => intval($matches[2]),
+					'day'   => intval($matches[3]),
 				);
 
-			} elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
+			} elseif (preg_match('/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches)) {
 				// Y-m-d H:i
 				$datetime = array(
-					'year'   => intval( $matches[1] ),
-					'month'  => intval( $matches[2] ),
-					'day'    => intval( $matches[3] ),
-					'hour'   => intval( $matches[4] ),
-					'minute' => intval( $matches[5] ),
+					'year'   => intval($matches[1]),
+					'month'  => intval($matches[2]),
+					'day'    => intval($matches[3]),
+					'hour'   => intval($matches[4]),
+					'minute' => intval($matches[5]),
 				);
 			}
 
 			// If no match is found, we don't support default_to_max.
-			if ( ! is_array( $datetime ) ) {
+			if ( ! is_array($datetime)) {
 				// @todo Timezone issues here possibly
-				return gmdate( 'Y-m-d H:i:s', strtotime( $datetime, $now ) );
+				return gmdate('Y-m-d H:i:s', strtotime($datetime, $now));
 			}
 		}
 
-		$datetime = array_map( 'absint', $datetime );
+		$datetime = array_map('absint', $datetime);
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset($datetime['year']))
+			$datetime['year'] = gmdate('Y', $now);
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset($datetime['month']))
+			$datetime['month'] = ($default_to_max) ? 12 : 1;
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset($datetime['day']))
+			$datetime['day'] = ($default_to_max) ? (int) date('t', mktime(0, 0, 0, $datetime['month'], 1, $datetime['year'])) : 1;
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset($datetime['hour']))
+			$datetime['hour'] = ($default_to_max) ? 23 : 0;
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['minute']))
+			$datetime['minute'] = ($default_to_max) ? 59 : 0;
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset($datetime['second']))
+			$datetime['second'] = ($default_to_max) ? 59 : 0;
 
-		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
+		return sprintf('%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second']);
 	}
 
 	/**
@@ -952,48 +952,48 @@ 
 	 * @param int|null $second Optional. A second value (0-59).
 	 * @return string|false A query part or false on failure.
 	 */
-	public function build_time_query( $column, $compare, $hour = null, $minute = null, $second = null ) {
+	public function build_time_query($column, $compare, $hour = null, $minute = null, $second = null) {
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
+		if ( ! isset($hour) && ! isset($minute) && ! isset($second))
 			return false;
 
 		// Complex combined queries aren't supported for multi-value queries
-		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+		if (in_array($compare, array('IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'))) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
+			if (isset($hour) && false !== ($value = $this->build_value($compare, $hour)))
 				$return[] = "HOUR( $column ) $compare $value";
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
+			if (isset($minute) && false !== ($value = $this->build_value($compare, $minute)))
 				$return[] = "MINUTE( $column ) $compare $value";
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
+			if (isset($second) && false !== ($value = $this->build_value($compare, $second)))
 				$return[] = "SECOND( $column ) $compare $value";
 
-			return implode( ' AND ', $return );
+			return implode(' AND ', $return);
 		}
 
 		// Cases where just one unit is set
-		if ( isset( $hour ) && ! isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+		if (isset($hour) && ! isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $hour))) {
 			return "HOUR( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && isset( $minute ) && ! isset( $second ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+		} elseif ( ! isset($hour) && isset($minute) && ! isset($second) && false !== ($value = $this->build_value($compare, $minute))) {
 			return "MINUTE( $column ) $compare $value";
-		} elseif ( ! isset( $hour ) && ! isset( $minute ) && isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+		} elseif ( ! isset($hour) && ! isset($minute) && isset($second) && false !== ($value = $this->build_value($compare, $second))) {
 			return "SECOND( $column ) $compare $value";
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
+		if ( ! isset($minute))
 			return false;
 
 		$format = $time = '';
 
 		// Hour
-		if ( $hour ) {
+		if ($hour) {
 			$format .= '%H.';
-			$time   .= sprintf( '%02d', $hour ) . '.';
+			$time   .= sprintf('%02d', $hour).'.';
 		} else {
 			$format .= '0.';
 			$time   .= '0.';
@@ -1001,13 +1001,13 @@ 
 
 		// Minute
 		$format .= '%i';
-		$time   .= sprintf( '%02d', $minute );
+		$time   .= sprintf('%02d', $minute);
 
-		if ( isset( $second ) ) {
+		if (isset($second)) {
 			$format .= '%s';
-			$time   .= sprintf( '%02d', $second );
+			$time   .= sprintf('%02d', $second);
 		}
 
-		return $wpdb->prepare( "DATE_FORMAT( $column, %s ) $compare %f", $format, $time );
+		return $wpdb->prepare("DATE_FORMAT( $column, %s ) $compare %f", $format, $time);
 	}
 }

Braces +60 added lines, -40 removed lines

@@ -270,8 +270,9 @@ 
 	 * @return string The comparison operator.
 	 */
 	public function get_compare( $query ) {
-		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
-			return strtoupper( $query['compare'] );
+		if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
+					return strtoupper( $query['compare'] );
+		}
 
 		return $this->compare;
 	}
@@ -735,16 +736,19 @@ 
 		}
 
 		// Range queries.
-		if ( ! empty( $query['after'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		if ( ! empty( $query['after'] ) ) {
+					$where_parts[] = $wpdb->prepare( "$column $gt %s", $this->build_mysql_datetime( $query['after'], ! $inclusive ) );
+		}
 
-		if ( ! empty( $query['before'] ) )
-			$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		if ( ! empty( $query['before'] ) ) {
+					$where_parts[] = $wpdb->prepare( "$column $lt %s", $this->build_mysql_datetime( $query['before'], $inclusive ) );
+		}
 
 		// Specific value queries.
 
-		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
-			$where_parts[] = "YEAR( $column ) $compare $value";
+		if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) ) {
+					$where_parts[] = "YEAR( $column ) $compare $value";
+		}
 
 		if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
 			$where_parts[] = "MONTH( $column ) $compare $value";
@@ -756,17 +760,21 @@ 
 		} elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
 			$where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
 		}
-		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
-			$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) ) {
+					$where_parts[] = "DAYOFYEAR( $column ) $compare $value";
+		}
 
-		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) )
-			$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		if ( isset( $query['day'] ) && $value = $this->build_value( $compare, $query['day'] ) ) {
+					$where_parts[] = "DAYOFMONTH( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) )
-			$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		if ( isset( $query['dayofweek'] ) && $value = $this->build_value( $compare, $query['dayofweek'] ) ) {
+					$where_parts[] = "DAYOFWEEK( $column ) $compare $value";
+		}
 
-		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) )
-			$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		if ( isset( $query['dayofweek_iso'] ) && $value = $this->build_value( $compare, $query['dayofweek_iso'] ) ) {
+					$where_parts[] = "WEEKDAY( $column ) + 1 $compare $value";
+		}
 
 		if ( isset( $query['hour'] ) || isset( $query['minute'] ) || isset( $query['second'] ) ) {
 			// Avoid notices.
@@ -802,8 +810,9 @@ 
 	 * @return string|false|int The value to be used in SQL or false on error.
 	 */
 	public function build_value( $compare, $value ) {
-		if ( ! isset( $value ) )
-			return false;
+		if ( ! isset( $value ) ) {
+					return false;
+		}
 
 		switch ( $compare ) {
 			case 'IN':
@@ -914,23 +923,29 @@ 
 
 		$datetime = array_map( 'absint', $datetime );
 
-		if ( ! isset( $datetime['year'] ) )
-			$datetime['year'] = gmdate( 'Y', $now );
+		if ( ! isset( $datetime['year'] ) ) {
+					$datetime['year'] = gmdate( 'Y', $now );
+		}
 
-		if ( ! isset( $datetime['month'] ) )
-			$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		if ( ! isset( $datetime['month'] ) ) {
+					$datetime['month'] = ( $default_to_max ) ? 12 : 1;
+		}
 
-		if ( ! isset( $datetime['day'] ) )
-			$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		if ( ! isset( $datetime['day'] ) ) {
+					$datetime['day'] = ( $default_to_max ) ? (int) date( 't', mktime( 0, 0, 0, $datetime['month'], 1, $datetime['year'] ) ) : 1;
+		}
 
-		if ( ! isset( $datetime['hour'] ) )
-			$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		if ( ! isset( $datetime['hour'] ) ) {
+					$datetime['hour'] = ( $default_to_max ) ? 23 : 0;
+		}
 
-		if ( ! isset( $datetime['minute'] ) )
-			$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['minute'] ) ) {
+					$datetime['minute'] = ( $default_to_max ) ? 59 : 0;
+		}
 
-		if ( ! isset( $datetime['second'] ) )
-			$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		if ( ! isset( $datetime['second'] ) ) {
+					$datetime['second'] = ( $default_to_max ) ? 59 : 0;
+		}
 
 		return sprintf( '%04d-%02d-%02d %02d:%02d:%02d', $datetime['year'], $datetime['month'], $datetime['day'], $datetime['hour'], $datetime['minute'], $datetime['second'] );
 	}
@@ -956,21 +971,25 @@ 
 		global $wpdb;
 
 		// Have to have at least one
-		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) )
-			return false;
+		if ( ! isset( $hour ) && ! isset( $minute ) && ! isset( $second ) ) {
+					return false;
+		}
 
 		// Complex combined queries aren't supported for multi-value queries
 		if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
 			$return = array();
 
-			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) )
-				$return[] = "HOUR( $column ) $compare $value";
+			if ( isset( $hour ) && false !== ( $value = $this->build_value( $compare, $hour ) ) ) {
+							$return[] = "HOUR( $column ) $compare $value";
+			}
 
-			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) )
-				$return[] = "MINUTE( $column ) $compare $value";
+			if ( isset( $minute ) && false !== ( $value = $this->build_value( $compare, $minute ) ) ) {
+							$return[] = "MINUTE( $column ) $compare $value";
+			}
 
-			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) )
-				$return[] = "SECOND( $column ) $compare $value";
+			if ( isset( $second ) && false !== ( $value = $this->build_value( $compare, $second ) ) ) {
+							$return[] = "SECOND( $column ) $compare $value";
+			}
 
 			return implode( ' AND ', $return );
 		}
@@ -985,8 +1004,9 @@ 
 		}
 
 		// Single units were already handled. Since hour & second isn't allowed, minute must to be set.
-		if ( ! isset( $minute ) )
-			return false;
+		if ( ! isset( $minute ) ) {
+					return false;
+		}
 
 		$format = $time = '';
 

src/wp-includes/deprecated.php

Doc Comments +5 added lines, -6 removed lines

@@ -610,7 +610,7 @@ 
  * @param string $feed_image
  * @param string $exclude
  * @param bool $hierarchical
- * @return false|null
+ * @return false|string
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
 				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
@@ -630,7 +630,7 @@ 
  * @see wp_list_categories()
  *
  * @param string|array $args
- * @return false|null|string
+ * @return false|string
  */
 function wp_list_cats($args = '') {
 	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
@@ -780,7 +780,7 @@ 
  * @param bool $echo
  * @param int $author_id
  * @param string $author_nicename Optional.
- * @return string|null
+ * @return string
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
 	_deprecated_function( __FUNCTION__, '2.1', 'get_author_posts_url()' );
@@ -1600,7 +1600,7 @@ 
  * @deprecated 2.8.0 Use get_the_author_meta()
  * @see get_the_author_meta()
  *
- * @return string|int The author's ID.
+ * @return string The author's ID.
  */
 function get_the_author_ID() {
 	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
@@ -2082,7 +2082,6 @@ 
  * @param string|int $name Widget ID.
  * @param callback $output_callback Run when widget is called.
  * @param string $classname Classname widget option.
- * @param mixed $params ,... Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
 	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_sidebar_widget()' );
@@ -3552,7 +3551,7 @@ 
  * @deprecated 4.4.0 Use get_permalink()
  * @see get_permalink()
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
 function post_permalink( $post_id = 0 ) {

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Deprecated functions from past WordPress versions. You shouldn't use these
- * functions and look for the alternatives instead. The functions will be
- * removed in a later version.
- *
- * @package WordPress
- * @subpackage Deprecated
- */
+	 * Deprecated functions from past WordPress versions. You shouldn't use these
+	 * functions and look for the alternatives instead. The functions will be
+	 * removed in a later version.
+	 *
+	 * @package WordPress
+	 * @subpackage Deprecated
+	 */
 
 /*
  * Deprecated functions come here to die.

Spacing +499 added lines, -499 removed lines

@@ -23,11 +23,11 @@ 
  * @return array
  */
 function get_postdata($postid) {
-	_deprecated_function( __FUNCTION__, '1.5.1', 'get_post()' );
+	_deprecated_function(__FUNCTION__, '1.5.1', 'get_post()');
 
 	$post = get_post($postid);
 
-	$postdata = array (
+	$postdata = array(
 		'ID' => $post->ID,
 		'Author_ID' => $post->post_author,
 		'Date' => $post->post_date,
@@ -61,12 +61,12 @@ 
 function start_wp() {
 	global $wp_query;
 
-	_deprecated_function( __FUNCTION__, '1.5', __('new WordPress Loop') );
+	_deprecated_function(__FUNCTION__, '1.5', __('new WordPress Loop'));
 
 	// Since the old style loop is being used, advance the query iterator here.
 	$wp_query->next_post();
 
-	setup_postdata( get_post() );
+	setup_postdata(get_post());
 }
 
 /**
@@ -80,13 +80,13 @@ 
  * @return null|int
  */
 function the_category_ID($echo = true) {
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
+	if ($echo)
 		echo $cat;
 
 	return $cat;
@@ -102,15 +102,15 @@ 
  * @param string $before
  * @param string $after
  */
-function the_category_head($before='', $after='') {
+function the_category_head($before = '', $after = '') {
 	global $currentcat, $previouscat;
 
-	_deprecated_function( __FUNCTION__, '0.71', 'get_the_category_by_ID()' );
+	_deprecated_function(__FUNCTION__, '0.71', 'get_the_category_by_ID()');
 
 	// Grab the first cat in the list.
 	$categories = get_the_category();
 	$currentcat = $categories[0]->category_id;
-	if ( $currentcat != $previouscat ) {
+	if ($currentcat != $previouscat) {
 		echo $before;
 		echo get_the_category_by_ID($currentcat);
 		echo $after;
@@ -132,22 +132,22 @@ 
  * @param int $limitprev
  * @param string $excluded_categories
  */
-function previous_post($format='%', $previous='previous post: ', $title='yes', $in_same_cat='no', $limitprev=1, $excluded_categories='') {
+function previous_post($format = '%', $previous = 'previous post: ', $title = 'yes', $in_same_cat = 'no', $limitprev = 1, $excluded_categories = '') {
 
-	_deprecated_function( __FUNCTION__, '2.0', 'previous_post_link()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'previous_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -168,21 +168,21 @@ 
  * @param int $limitnext
  * @param string $excluded_categories
  */
-function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
-	_deprecated_function( __FUNCTION__, '2.0', 'next_post_link()' );
+function next_post($format = '%', $next = 'next post: ', $title = 'yes', $in_same_cat = 'no', $limitnext = 1, $excluded_categories = '') {
+	_deprecated_function(__FUNCTION__, '2.0', 'next_post_link()');
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
+	if (empty($in_same_cat) || 'no' == $in_same_cat)
 		$in_same_cat = false;
 	else
 		$in_same_cat = true;
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
+	if ( ! $post)
 		return;
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
+	if ('yes' == $title)
 		$string .= apply_filters('the_title', $post->post_title, $post->ID);
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
@@ -202,7 +202,7 @@ 
  * @return bool
  */
 function user_can_create_post($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level > 1);
@@ -221,7 +221,7 @@ 
  * @return bool
  */
 function user_can_create_draft($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return ($author_data->user_level >= 1);
@@ -240,15 +240,15 @@ 
  * @return bool
  */
 function user_can_edit_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	$post = get_post($post_id);
 	$post_author_data = get_userdata($post->post_author);
 
-	if ( (($user_id == $post_author_data->ID) && !($post->post_status == 'publish' && $author_data->user_level < 2))
+	if ((($user_id == $post_author_data->ID) && ! ($post->post_status == 'publish' && $author_data->user_level < 2))
 			 || ($author_data->user_level > $post_author_data->user_level)
-			 || ($author_data->user_level >= 10) ) {
+			 || ($author_data->user_level >= 10)) {
 		return true;
 	} else {
 		return false;
@@ -268,7 +268,7 @@ 
  * @return bool
  */
 function user_can_delete_post($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	// right now if one can edit, one can delete
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -287,7 +287,7 @@ 
  * @return bool
  */
 function user_can_set_post_date($user_id, $blog_id = 1, $category_id = 'None') {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_create_post($user_id, $blog_id, $category_id));
@@ -306,7 +306,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's date
  */
 function user_can_edit_post_date($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$author_data = get_userdata($user_id);
 	return (($author_data->user_level > 4) && user_can_edit_post($user_id, $post_id, $blog_id));
@@ -325,7 +325,7 @@ 
  * @return bool returns true if $user_id can edit $post_id's comments
  */
 function user_can_edit_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	// right now if one can edit a post, one can edit comments made on it
 	return user_can_edit_post($user_id, $post_id, $blog_id);
@@ -344,7 +344,7 @@ 
  * @return bool returns true if $user_id can delete $post_id's comments
  */
 function user_can_delete_post_comments($user_id, $post_id, $blog_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	// right now if one can edit comments, one can delete comments
 	return user_can_edit_post_comments($user_id, $post_id, $blog_id);
@@ -362,11 +362,11 @@ 
  * @return bool
  */
 function user_can_edit_user($user_id, $other_user) {
-	_deprecated_function( __FUNCTION__, '2.0', 'current_user_can()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'current_user_can()');
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
+	if ($user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID)
 		return true;
 	else
 		return false;
@@ -395,11 +395,11 @@ 
 function get_linksbyname($cat_name = "noname", $before = '', $after = '<br />', $between = " ", $show_images = true, $orderby = 'id',
 						 $show_description = true, $show_rating = false,
 						 $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
@@ -430,7 +430,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -454,12 +454,12 @@ 
  * @param int $limit Limit to X entries. If not specified, all entries are shown.
  * @return array
  */
-function get_linkobjectsbyname($cat_name = "noname" , $orderby = 'name', $limit = -1) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+function get_linkobjectsbyname($cat_name = "noname", $orderby = 'name', $limit = -1) {
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
+	if ($cat)
 		$cat_id = $cat->term_id;
 
 	return get_linkobjects($cat_id, $orderby, $limit);
@@ -506,9 +506,9 @@ 
  * @return array
  */
 function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
-	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
+	$links = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'limit' => $limit));
 
 	$links_array = array();
 	foreach ($links as $link)
@@ -539,7 +539,7 @@ 
  */
 function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = '<br />', $between = " ",
 									$show_images = true, $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	get_linksbyname($cat_name, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -566,7 +566,7 @@ 
  */
 function get_links_withrating($category = -1, $before = '', $after = '<br />', $between = " ", $show_images = true,
 							  $orderby = 'id', $show_description = true, $limit = -1, $show_updated = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	get_links($category, $before, $after, $between, $show_images, $orderby, $show_description, true, $limit, $show_updated);
 }
@@ -581,7 +581,7 @@ 
  * @return int Only returns 0.
  */
 function get_autotoggle($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1' );
+	_deprecated_function(__FUNCTION__, '2.1');
 	return 0;
 }
 
@@ -613,9 +613,9 @@ 
  * @return false|null
  */
 function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_order = 'asc', $file = '', $list = true, $optiondates = 0,
-				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children=false, $child_of=0, $categories=0,
-				   $recurse=0, $feed = '', $feed_image = '', $exclude = '', $hierarchical=false) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
+				   $optioncount = 0, $hide_empty = 1, $use_desc_for_title = 1, $children = false, $child_of = 0, $categories = 0,
+				   $recurse = 0, $feed = '', $feed_image = '', $exclude = '', $hierarchical = false) {
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_categories()');
 
 	$query = compact('optionall', 'all', 'sort_column', 'sort_order', 'file', 'list', 'optiondates', 'optioncount', 'hide_empty', 'use_desc_for_title', 'children',
 		'child_of', 'categories', 'recurse', 'feed', 'feed_image', 'exclude', 'hierarchical');
@@ -633,22 +633,22 @@ 
  * @return false|null|string
  */
 function wp_list_cats($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_categories()');
 
-	$r = wp_parse_args( $args );
+	$r = wp_parse_args($args);
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
+	if (isset($r['optionall']) && isset($r['all']))
 		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
+	if (isset($r['sort_column']))
 		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
+	if (isset($r['sort_order']))
 		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
+	if (isset($r['optiondates']))
 		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
+	if (isset($r['optioncount']))
 		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
+	if (isset($r['list']))
 		$r['style'] = $r['list'] ? 'list' : 'break';
 	$r['title_li'] = '';
 
@@ -677,14 +677,14 @@ 
 function dropdown_cats($optionall = 1, $all = 'All', $orderby = 'ID', $order = 'asc',
 		$show_last_update = 0, $show_count = 0, $hide_empty = 1, $optionnone = false,
 		$selected = 0, $exclude = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_dropdown_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_dropdown_categories()');
 
 	$show_option_all = '';
-	if ( $optionall )
+	if ($optionall)
 		$show_option_all = $all;
 
 	$show_option_none = '';
-	if ( $optionnone )
+	if ($optionnone)
 		$show_option_none = __('None');
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
@@ -709,7 +709,7 @@ 
  * @return null|string
  */
 function list_authors($optioncount = false, $exclude_admin = true, $show_fullname = false, $hide_empty = true, $feed = '', $feed_image = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_authors()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_authors()');
 
 	$args = compact('optioncount', 'exclude_admin', 'show_fullname', 'hide_empty', 'feed', 'feed_image');
 	return wp_list_authors($args);
@@ -727,7 +727,7 @@ 
  * @return array
  */
 function wp_get_post_cats($blogid = '1', $post_ID = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_get_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_get_post_categories()');
 	return wp_get_post_categories($post_ID);
 }
 
@@ -745,7 +745,7 @@ 
  * @return bool|mixed
  */
 function wp_set_post_cats($blogid = '1', $post_ID = 0, $post_categories = array()) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_set_post_categories()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_set_post_categories()');
 	return wp_set_post_categories($post_ID, $post_categories);
 }
 
@@ -764,8 +764,8 @@ 
  * @param bool $show_post_count
  * @return string|null
  */
-function get_archives($type='', $limit='', $format='html', $before = '', $after = '', $show_post_count = false) {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_get_archives()' );
+function get_archives($type = '', $limit = '', $format = 'html', $before = '', $after = '', $show_post_count = false) {
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_get_archives()');
 	$args = compact('type', 'limit', 'format', 'before', 'after', 'show_post_count');
 	return wp_get_archives($args);
 }
@@ -783,11 +783,11 @@ 
  * @return string|null
  */
 function get_author_link($echo, $author_id, $author_nicename = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_author_posts_url()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_author_posts_url()');
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -808,9 +808,9 @@ 
  * @param string $more_file
  * @return string
  */
-function link_pages($before='<br />', $after='<br />', $next_or_number='number', $nextpagelink='next page', $previouspagelink='previous page',
-					$pagelink='%', $more_file='') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_link_pages()' );
+function link_pages($before = '<br />', $after = '<br />', $next_or_number = 'number', $nextpagelink = 'next page', $previouspagelink = 'previous page',
+					$pagelink = '%', $more_file = '') {
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_link_pages()');
 
 	$args = compact('before', 'after', 'next_or_number', 'nextpagelink', 'previouspagelink', 'pagelink', 'more_file');
 	return wp_link_pages($args);
@@ -827,7 +827,7 @@ 
  * @return string
  */
 function get_settings($option) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_option()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_option()');
 
 	return get_option($option);
 }
@@ -840,7 +840,7 @@ 
  * @see the_permalink()
  */
 function permalink_link() {
-	_deprecated_function( __FUNCTION__, '1.2', 'the_permalink()' );
+	_deprecated_function(__FUNCTION__, '1.2', 'the_permalink()');
 	the_permalink();
 }
 
@@ -854,7 +854,7 @@ 
  * @param string $deprecated
  */
 function permalink_single_rss($deprecated = '') {
-	_deprecated_function( __FUNCTION__, '2.3', 'the_permalink_rss()' );
+	_deprecated_function(__FUNCTION__, '2.3', 'the_permalink_rss()');
 	the_permalink_rss();
 }
 
@@ -869,11 +869,11 @@ 
  * @return null|string
  */
 function wp_get_links($args = '') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
 
-	if ( strpos( $args, '=' ) === false ) {
+	if (strpos($args, '=') === false) {
 		$cat_id = $args;
-		$args = add_query_arg( 'category', $cat_id, $args );
+		$args = add_query_arg('category', $cat_id, $args);
 	}
 
 	$defaults = array(
@@ -892,7 +892,7 @@ 
 		'title_li' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	return wp_list_bookmarks($r);
 }
@@ -923,81 +923,81 @@ 
  */
 function get_links($category = -1, $before = '', $after = '<br />', $between = ' ', $show_images = true, $orderby = 'name',
 			$show_description = true, $show_rating = false, $limit = -1, $show_updated = 1, $echo = true) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmarks()');
 
 	$order = 'ASC';
-	if ( substr($orderby, 0, 1) == '_' ) {
+	if (substr($orderby, 0, 1) == '_') {
 		$order = 'DESC';
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ($category == -1) //get_bookmarks uses '' to signify all categories
 		$category = '';
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
+	if ( ! $results)
 		return;
 
 	$output = '';
 
-	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
+	foreach ((array) $results as $row) {
+		if ( ! isset($row->recently_updated))
 			$row->recently_updated = false;
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_prepend');
 		$the_link = '#';
-		if ( !empty($row->link_url) )
+		if ( ! empty($row->link_url))
 			$the_link = esc_url($row->link_url);
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ('' != $rel)
+			$rel = ' rel="'.$rel.'"';
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
+		if ($show_updated)
 			if (substr($row->link_updated_f, 0, 2) != '00')
-				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+				$title .= ' ('.__('Last updated').' '.date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)).')';
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ('' != $title)
+			$title = ' title="'.$title.'"';
 
-		$alt = ' alt="' . $name . '"';
+		$alt = ' alt="'.$name.'"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ('' != $target)
+			$target = ' target="'.$target.'"';
 
-		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
+		$output .= '<a href="'.$the_link.'"'.$rel.$title.$target.'>';
 
-		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
+		if ($row->link_image != null && $show_images) {
+			if (strpos($row->link_image, 'http') !== false)
 				$output .= "<img src=\"$row->link_image\" $alt $title />";
 			else // If it's a relative path
-				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+				$output .= "<img src=\"".get_option('siteurl')."$row->link_image\" $alt $title />";
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
+		if ($show_updated && $row->recently_updated)
 			$output .= get_option('links_recently_updated_append');
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ($show_description && '' != $desc)
+			$output .= $between.$desc;
 
 		if ($show_rating) {
-			$output .= $between . get_linkrating($row);
+			$output .= $between.get_linkrating($row);
 		}
 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
+	if ( ! $echo)
 		return $output;
 	echo $output;
 }
@@ -1015,29 +1015,29 @@ 
  * @param string $order Sort link categories by 'name' or 'id'
  */
 function get_links_list($order = 'name') {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_list_bookmarks()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_list_bookmarks()');
 
 	$order = strtolower($order);
 
 	// Handle link category sorting
 	$direction = 'ASC';
-	if ( '_' == substr($order,0,1) ) {
+	if ('_' == substr($order, 0, 1)) {
 		$direction = 'DESC';
-		$order = substr($order,1);
+		$order = substr($order, 1);
 	}
 
-	if ( !isset($direction) )
+	if ( ! isset($direction))
 		$direction = '';
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
 	// Display each category
-	if ( $cats ) {
-		foreach ( (array) $cats as $cat ) {
+	if ($cats) {
+		foreach ((array) $cats as $cat) {
 			// Handle each category.
 
 			// Display the category name
-			echo '  <li id="linkcat-' . $cat->term_id . '" class="linkcat"><h2>' . apply_filters('link_category', $cat->name ) . "</h2>\n\t<ul>\n";
+			echo '  <li id="linkcat-'.$cat->term_id.'" class="linkcat"><h2>'.apply_filters('link_category', $cat->name)."</h2>\n\t<ul>\n";
 			// Call get_links() with all the appropriate params
 			get_links($cat->term_id, '<li>', "</li>", "\n", true, 'name', false);
 
@@ -1059,8 +1059,8 @@ 
  * @param string $file the page to open in the popup window
  * @param bool $count the number of links in the db
  */
-function links_popup_script($text = 'Links', $width=400, $height=400, $file='links.all.php', $count = true) {
-	_deprecated_function( __FUNCTION__, '2.1' );
+function links_popup_script($text = 'Links', $width = 400, $height = 400, $file = 'links.all.php', $count = true) {
+	_deprecated_function(__FUNCTION__, '2.1');
 }
 
 /**
@@ -1072,7 +1072,7 @@ 
  * @return mixed
  */
 function get_linkrating($link) {
-	_deprecated_function( __FUNCTION__, '2.1', 'sanitize_bookmark_field()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'sanitize_bookmark_field()');
 	return sanitize_bookmark_field('link_rating', $link->link_rating, $link->link_id, 'display');
 }
 
@@ -1087,16 +1087,16 @@ 
  * @return string
  */
 function get_linkcatname($id = 0) {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_category()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_category()');
 
 	$id = (int) $id;
 
-	if ( empty($id) )
+	if (empty($id))
 		return '';
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
+	if (empty($cats) || ! is_array($cats))
 		return '';
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
@@ -1115,7 +1115,7 @@ 
  * @param string $link_text
  */
 function comments_rss_link($link_text = 'Comments RSS') {
-	_deprecated_function( __FUNCTION__, '2.5', 'post_comments_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'post_comments_feed_link()');
 	post_comments_feed_link($link_text);
 }
 
@@ -1131,11 +1131,11 @@ 
  * @return string
  */
 function get_category_rss_link($echo = false, $cat_ID = 1) {
-	_deprecated_function( __FUNCTION__, '2.5', 'get_category_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'get_category_feed_link()');
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1152,10 +1152,10 @@ 
  * @return string
  */
 function get_author_rss_link($echo = false, $author_id = 1) {
-	_deprecated_function( __FUNCTION__, '2.5', 'get_author_feed_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'get_author_feed_link()');
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	return $link;
 }
@@ -1170,8 +1170,8 @@ 
  * @return string
  */
 function comments_rss() {
-	_deprecated_function( __FUNCTION__, '2.2', 'get_post_comments_feed_link()' );
-	return esc_url( get_post_comments_feed_link() );
+	_deprecated_function(__FUNCTION__, '2.2', 'get_post_comments_feed_link()');
+	return esc_url(get_post_comments_feed_link());
 }
 
 /**
@@ -1187,7 +1187,7 @@ 
  * @return int The new user's ID.
  */
 function create_user($username, $password, $email) {
-	_deprecated_function( __FUNCTION__, '2.0', 'wp_create_user()' );
+	_deprecated_function(__FUNCTION__, '2.0', 'wp_create_user()');
 	return wp_create_user($username, $password, $email);
 }
 
@@ -1197,7 +1197,7 @@ 
  * @deprecated 2.5.0
 */
 function gzip_compression() {
-	_deprecated_function( __FUNCTION__, '2.5' );
+	_deprecated_function(__FUNCTION__, '2.5');
 	return false;
 }
 
@@ -1213,8 +1213,8 @@ 
  * @param bool $include_unapproved Whether to include unapproved comments
  * @return array The comment data
  */
-function get_commentdata( $comment_ID, $no_cache = 0, $include_unapproved = false ) {
-	_deprecated_function( __FUNCTION__, '2.7', 'get_comment()' );
+function get_commentdata($comment_ID, $no_cache = 0, $include_unapproved = false) {
+	_deprecated_function(__FUNCTION__, '2.7', 'get_comment()');
 	return get_comment($comment_ID, ARRAY_A);
 }
 
@@ -1228,9 +1228,9 @@ 
  * @param int $cat_ID Category ID
  * @return string category name
  */
-function get_catname( $cat_ID ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_cat_name()' );
-	return get_cat_name( $cat_ID );
+function get_catname($cat_ID) {
+	_deprecated_function(__FUNCTION__, '2.8', 'get_cat_name()');
+	return get_cat_name($cat_ID);
 }
 
 /**
@@ -1246,25 +1246,25 @@ 
  * @param array $visited Optional. Category Term IDs that have already been added.
  * @return string
  */
-function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_term_children()' );
-	if ( 0 == $id )
+function get_category_children($id, $before = '/', $after = '', $visited = array()) {
+	_deprecated_function(__FUNCTION__, '2.8', 'get_term_children()');
+	if (0 == $id)
 		return '';
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
-	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
+	foreach ((array) $cat_ids as $cat_id) {
+		if ($cat_id == $id)
 			continue;
 
-		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
+		$category = get_category($cat_id);
+		if (is_wp_error($category))
 			return $category;
-		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
+		if ($category->parent == $id && ! in_array($category->term_id, $visited)) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
-			$chain .= get_category_children( $category->term_id, $before, $after );
+			$chain .= get_category_children($category->term_id, $before, $after);
 		}
 	}
 	return $chain;
@@ -1282,11 +1282,11 @@ 
  * @return object List of all of the category IDs.
  */
 function get_all_category_ids() {
-	_deprecated_function( __FUNCTION__, '4.0', 'get_terms()' );
+	_deprecated_function(__FUNCTION__, '4.0', 'get_terms()');
 
-	if ( ! $cat_ids = wp_cache_get( 'all_category_ids', 'category' ) ) {
-		$cat_ids = get_terms( 'category', array('fields' => 'ids', 'get' => 'all') );
-		wp_cache_add( 'all_category_ids', $cat_ids, 'category' );
+	if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category')) {
+		$cat_ids = get_terms('category', array('fields' => 'ids', 'get' => 'all'));
+		wp_cache_add('all_category_ids', $cat_ids, 'category');
 	}
 
 	return $cat_ids;
@@ -1302,7 +1302,7 @@ 
  * @return string The author's description.
  */
 function get_the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'description\')');
 	return get_the_author_meta('description');
 }
 
@@ -1314,7 +1314,7 @@ 
  * @see the_author_meta()
  */
 function the_author_description() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'description\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'description\')');
 	the_author_meta('description');
 }
 
@@ -1328,7 +1328,7 @@ 
  * @return string The author's login name (username).
  */
 function get_the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'login\')');
 	return get_the_author_meta('login');
 }
 
@@ -1340,7 +1340,7 @@ 
  * @see the_author_meta()
  */
 function the_author_login() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'login\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'login\')');
 	the_author_meta('login');
 }
 
@@ -1354,7 +1354,7 @@ 
  * @return string The author's first name.
  */
 function get_the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'first_name\')');
 	return get_the_author_meta('first_name');
 }
 
@@ -1366,7 +1366,7 @@ 
  * @see the_author_meta()
  */
 function the_author_firstname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'first_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'first_name\')');
 	the_author_meta('first_name');
 }
 
@@ -1380,7 +1380,7 @@ 
  * @return string The author's last name.
  */
 function get_the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'last_name\')');
 	return get_the_author_meta('last_name');
 }
 
@@ -1392,7 +1392,7 @@ 
  * @see the_author_meta()
  */
 function the_author_lastname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'last_name\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'last_name\')');
 	the_author_meta('last_name');
 }
 
@@ -1406,7 +1406,7 @@ 
  * @return string The author's nickname.
  */
 function get_the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'nickname\')');
 	return get_the_author_meta('nickname');
 }
 
@@ -1418,7 +1418,7 @@ 
  * @see the_author_meta()
  */
 function the_author_nickname() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'nickname\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'nickname\')');
 	the_author_meta('nickname');
 }
 
@@ -1432,7 +1432,7 @@ 
  * @return string The author's username.
  */
 function get_the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'email\')');
 	return get_the_author_meta('email');
 }
 
@@ -1444,7 +1444,7 @@ 
  * @see the_author_meta()
  */
 function the_author_email() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'email\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'email\')');
 	the_author_meta('email');
 }
 
@@ -1458,7 +1458,7 @@ 
  * @return string The author's ICQ number.
  */
 function get_the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'icq\')');
 	return get_the_author_meta('icq');
 }
 
@@ -1470,7 +1470,7 @@ 
  * @see the_author_meta()
  */
 function the_author_icq() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'icq\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'icq\')');
 	the_author_meta('icq');
 }
 
@@ -1484,7 +1484,7 @@ 
  * @return string The author's Yahoo! IM name.
  */
 function get_the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'yim\')');
 	return get_the_author_meta('yim');
 }
 
@@ -1496,7 +1496,7 @@ 
  * @see the_author_meta()
  */
 function the_author_yim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'yim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'yim\')');
 	the_author_meta('yim');
 }
 
@@ -1510,7 +1510,7 @@ 
  * @return string The author's MSN address.
  */
 function get_the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'msn\')');
 	return get_the_author_meta('msn');
 }
 
@@ -1522,7 +1522,7 @@ 
  * @see the_author_meta()
  */
 function the_author_msn() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'msn\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'msn\')');
 	the_author_meta('msn');
 }
 
@@ -1536,7 +1536,7 @@ 
  * @return string The author's AIM address.
  */
 function get_the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'aim\')');
 	return get_the_author_meta('aim');
 }
 
@@ -1548,7 +1548,7 @@ 
  * @see the_author_meta()
  */
 function the_author_aim() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'aim\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'aim\')');
 	the_author_meta('aim');
 }
 
@@ -1562,8 +1562,8 @@ 
  * @param int $auth_id The ID of the author.
  * @return string The author's display name.
  */
-function get_author_name( $auth_id = false ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')' );
+function get_author_name($auth_id = false) {
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'display_name\')');
 	return get_the_author_meta('display_name', $auth_id);
 }
 
@@ -1577,7 +1577,7 @@ 
  * @return string The URL to the author's page.
  */
 function get_the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'url\')');
 	return get_the_author_meta('url');
 }
 
@@ -1589,7 +1589,7 @@ 
  * @see the_author_meta()
  */
 function the_author_url() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'url\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'url\')');
 	the_author_meta('url');
 }
 
@@ -1603,7 +1603,7 @@ 
  * @return string|int The author's ID.
  */
 function get_the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')');
 	return get_the_author_meta('ID');
 }
 
@@ -1615,7 +1615,7 @@ 
  * @see the_author_meta()
 */
 function the_author_ID() {
-	_deprecated_function( __FUNCTION__, '2.8', 'the_author_meta(\'ID\')' );
+	_deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'ID\')');
 	the_author_meta('ID');
 }
 
@@ -1647,23 +1647,23 @@ 
  * @param int $cut Optional. Amount of words to keep for the content.
  * @param int $encode_html Optional. How to encode the content.
  */
-function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file='', $cut = 0, $encode_html = 0) {
-	_deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
+function the_content_rss($more_link_text = '(more...)', $stripteaser = 0, $more_file = '', $cut = 0, $encode_html = 0) {
+	_deprecated_function(__FUNCTION__, '2.9', 'the_content_feed');
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
+	if ($cut && ! $encode_html)
 		$encode_html = 2;
-	if ( 1== $encode_html ) {
+	if (1 == $encode_html) {
 		$content = esc_html($content);
 		$cut = 0;
-	} elseif ( 0 == $encode_html ) {
+	} elseif (0 == $encode_html) {
 		$content = make_url_footnote($content);
-	} elseif ( 2 == $encode_html ) {
+	} elseif (2 == $encode_html) {
 		$content = strip_tags($content);
 	}
-	if ( $cut ) {
+	if ($cut) {
 		$blah = explode(' ', $content);
-		if ( count($blah) > $cut ) {
+		if (count($blah) > $cut) {
 			$k = $cut;
 			$use_dotdotdot = 1;
 		} else {
@@ -1672,7 +1672,7 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
+		for ($i = 0; $i < $k; $i++)
 			$excerpt .= $blah[$i].' ';
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
@@ -1693,20 +1693,20 @@ 
  * @param string $content Content to get links
  * @return string HTML stripped out of content with links at the bottom.
  */
-function make_url_footnote( $content ) {
-	_deprecated_function( __FUNCTION__, '2.9', '' );
-	preg_match_all( '/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches );
+function make_url_footnote($content) {
+	_deprecated_function(__FUNCTION__, '2.9', '');
+	preg_match_all('/<a(.+?)href=\"(.+?)\"(.*?)>(.+?)<\/a>/', $content, $matches);
 	$links_summary = "\n";
-	for ( $i = 0, $c = count( $matches[0] ); $i < $c; $i++ ) {
+	for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
 		$link_match = $matches[0][$i];
-		$link_number = '['.($i+1).']';
+		$link_number = '['.($i + 1).']';
 		$link_url = $matches[2][$i];
 		$link_text = $matches[4][$i];
-		$content = str_replace( $link_match, $link_text . ' ' . $link_number, $content );
-		$link_url = ( ( strtolower( substr( $link_url, 0, 7 ) ) != 'http://' ) && ( strtolower( substr( $link_url, 0, 8 ) ) != 'https://' ) ) ? get_option( 'home' ) . $link_url : $link_url;
-		$links_summary .= "\n" . $link_number . ' ' . $link_url;
+		$content = str_replace($link_match, $link_text.' '.$link_number, $content);
+		$link_url = ((strtolower(substr($link_url, 0, 7)) != 'http://') && (strtolower(substr($link_url, 0, 8)) != 'https://')) ? get_option('home').$link_url : $link_url;
+		$links_summary .= "\n".$link_number.' '.$link_url;
 	}
-	$content  = strip_tags( $content );
+	$content  = strip_tags($content);
 	$content .= $links_summary;
 	return $content;
 }
@@ -1732,9 +1732,9 @@ 
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
-function _c( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function _c($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1749,9 +1749,9 @@ 
  * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function translate_with_context( $text, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9', '_x()' );
-	return before_last_bar( translate( $text, $domain ) );
+function translate_with_context($text, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9', '_x()');
+	return before_last_bar(translate($text, $domain));
 }
 
 /**
@@ -1762,9 +1762,9 @@ 
  * @deprecated 3.0.0 Use _nx()
  * @see _nx()
  */
-function _nc( $single, $plural, $number, $domain = 'default' ) {
-	_deprecated_function( __FUNCTION__, '2.9', '_nx()' );
-	return before_last_bar( _n( $single, $plural, $number, $domain ) );
+function _nc($single, $plural, $number, $domain = 'default') {
+	_deprecated_function(__FUNCTION__, '2.9', '_nx()');
+	return before_last_bar(_n($single, $plural, $number, $domain));
 }
 
 /**
@@ -1775,7 +1775,7 @@ 
  * @see _n()
  */
 function __ngettext() {
-	_deprecated_function( __FUNCTION__, '2.8', '_n()' );
+	_deprecated_function(__FUNCTION__, '2.8', '_n()');
 	$args = func_get_args();
 	return call_user_func_array('_n', $args);
 }
@@ -1788,7 +1788,7 @@ 
  * @see _n_noop()
  */
 function __ngettext_noop() {
-	_deprecated_function( __FUNCTION__, '2.8', '_n_noop()' );
+	_deprecated_function(__FUNCTION__, '2.8', '_n_noop()');
 	$args = func_get_args();
 	return call_user_func_array('_n_noop', $args);
 
@@ -1804,7 +1804,7 @@ 
  * @return array List of all options.
  */
 function get_alloptions() {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_load_alloptions()' );
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_load_alloptions()');
 	return wp_load_alloptions();
 }
 
@@ -1822,14 +1822,14 @@ 
  * @return string
  */
 function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_link()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_link()');
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
+	if (('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
 		return __('Missing Attachment');
 
-	if ( $permalink )
+	if ($permalink)
 		$url = get_attachment_link($_post->ID);
 
 	$post_title = esc_attr($_post->post_title);
@@ -1849,31 +1849,31 @@ 
  * @param bool $fullsize Optional, default to false. Whether to have full image.
  * @return array Icon URL and full path to file, respectively.
  */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image_src()' );
+function get_attachment_icon_src($id = 0, $fullsize = false) {
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_image_src()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
+	if ( ! $fullsize && $src = wp_get_attachment_thumb_url($post->ID)) {
 		// We have a thumbnail desired, specified and existing
 
 		$src_file = basename($src);
-	} elseif ( wp_attachment_is_image( $post->ID ) ) {
+	} elseif (wp_attachment_is_image($post->ID)) {
 		// We have an image without a thumbnail
 
-		$src = wp_get_attachment_url( $post->ID );
+		$src = wp_get_attachment_url($post->ID);
 		$src_file = & $file;
-	} elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
+	} elseif ($src = wp_mime_type_icon($post->ID)) {
 		// No thumb, no image. We'll look for a mime-related icon instead.
 
-		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-		$src_file = $icon_dir . '/' . basename($src);
+		$icon_dir = apply_filters('icon_dir', get_template_directory().'/images');
+		$src_file = $icon_dir.'/'.basename($src);
 	}
 
-	if ( !isset($src) || !$src )
+	if ( ! isset($src) || ! $src)
 		return false;
 
 	return array($src, $src_file);
@@ -1891,27 +1891,27 @@ 
  * @param array $max_dims Optional. Dimensions of image.
  * @return false|string HTML content.
  */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
+function get_attachment_icon($id = 0, $fullsize = false, $max_dims = false) {
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
+	if ( ! $src = get_attachment_icon_src($post->ID, $fullsize))
 		return false;
 
 	list($src, $src_file) = $src;
 
 	// Do we need to constrain the image?
-	if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
+	if (($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file)) {
 
 		$imagesize = getimagesize($src_file);
 
-		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
+		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1]) {
 			$actual_aspect = $imagesize[0] / $imagesize[1];
 			$desired_aspect = $max_dims[0] / $max_dims[1];
 
-			if ( $actual_aspect >= $desired_aspect ) {
+			if ($actual_aspect >= $desired_aspect) {
 				$height = $actual_aspect * $max_dims[0];
 				$constraint = "width='{$max_dims[0]}' ";
 				$post->iconsize = array($max_dims[0], $height);
@@ -1932,7 +1932,7 @@ 
 
 	$icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
 
-	return apply_filters( 'attachment_icon', $icon, $post->ID );
+	return apply_filters('attachment_icon', $icon, $post->ID);
 }
 
 /**
@@ -1948,12 +1948,12 @@ 
  * @return false|string
  */
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
+	_deprecated_function(__FUNCTION__, '2.5', 'wp_get_attachment_image()');
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
+	if ( ! $post = get_post($id))
 		return false;
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
+	if ($innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
 		return $innerHTML;
 
 	$innerHTML = esc_attr($post->post_title);
@@ -1973,7 +1973,7 @@ 
  * @return object|array
  */
 function get_link($bookmark_id, $output = OBJECT, $filter = 'raw') {
-	_deprecated_function( __FUNCTION__, '2.1', 'get_bookmark()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'get_bookmark()');
 	return get_bookmark($bookmark_id, $output, $filter);
 }
 
@@ -1988,9 +1988,9 @@ 
  * @param array $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function sanitize_url( $url, $protocols = null ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_url_raw()' );
-	return esc_url_raw( $url, $protocols );
+function sanitize_url($url, $protocols = null) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_url_raw()');
+	return esc_url_raw($url, $protocols);
 }
 
 /**
@@ -2009,12 +2009,12 @@ 
  * @param string $context Optional. How the URL will be used. Default is 'display'.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()' );
+function clean_url($url, $protocols = null, $context = 'display') {
+	if ($context == 'db')
+		_deprecated_function('clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()');
 	else
-		_deprecated_function( __FUNCTION__, '3.0', 'esc_url()' );
-	return esc_url( $url, $protocols, $context );
+		_deprecated_function(__FUNCTION__, '3.0', 'esc_url()');
+	return esc_url($url, $protocols, $context);
 }
 
 /**
@@ -2029,9 +2029,9 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function js_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_js()' );
-	return esc_js( $text );
+function js_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_js()');
+	return esc_js($text);
 }
 
 /**
@@ -2040,13 +2040,13 @@ 
  * @deprecated 2.8.0 Use esc_html()
  * @see esc_html()
  */
-function wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_html()' );
-	if ( func_num_args() > 1 ) { // Maintain backwards compat for people passing additional args
+function wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_html()');
+	if (func_num_args() > 1) { // Maintain backwards compat for people passing additional args
 		$args = func_get_args();
-		return call_user_func_array( '_wp_specialchars', $args );
+		return call_user_func_array('_wp_specialchars', $args);
 	} else {
-		return esc_html( $string );
+		return esc_html($string);
 	}
 }
 
@@ -2060,9 +2060,9 @@ 
  * @param string $text
  * @return string
  */
-function attribute_escape( $text ) {
-	_deprecated_function( __FUNCTION__, '2.8', 'esc_attr()' );
-	return esc_attr( $text );
+function attribute_escape($text) {
+	_deprecated_function(__FUNCTION__, '2.8', 'esc_attr()');
+	return esc_attr($text);
 }
 
 /**
@@ -2085,10 +2085,10 @@ 
  * @param mixed $params ,... Widget parameters.
  */
 function register_sidebar_widget($name, $output_callback, $classname = '') {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_register_sidebar_widget()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2096,11 +2096,11 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
+	if ( ! empty($classname) && is_string($classname))
 		$options['classname'] = $classname;
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
@@ -2116,7 +2116,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_sidebar_widget($id) {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_unregister_sidebar_widget()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_unregister_sidebar_widget()');
 	return wp_unregister_sidebar_widget($id);
 }
 
@@ -2140,10 +2140,10 @@ 
  * @param int $height Widget height.
  */
 function register_widget_control($name, $control_callback, $width = '', $height = '') {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_register_widget_control()');
 	// Compat
-	if ( is_array($name) ) {
-		if ( count($name) == 3 )
+	if (is_array($name)) {
+		if (count($name) == 3)
 			$name = sprintf($name[0], $name[2]);
 		else
 			$name = $name[0];
@@ -2151,13 +2151,13 @@ 
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
+	if ( ! empty($width))
 		$options['width'] = $width;
-	if ( !empty($height) )
+	if ( ! empty($height))
 		$options['height'] = $height;
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
+	if ( ! empty($params))
 		$args = array_merge($args, $params);
 
 	call_user_func_array('wp_register_widget_control', $args);
@@ -2173,7 +2173,7 @@ 
  * @param int|string $id Widget ID.
  */
 function unregister_widget_control($id) {
-	_deprecated_function( __FUNCTION__, '2.8', 'wp_unregister_widget_control()' );
+	_deprecated_function(__FUNCTION__, '2.8', 'wp_unregister_widget_control()');
 	return wp_unregister_widget_control($id);
 }
 
@@ -2189,32 +2189,32 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True deletion completed and false if user_id is not a number.
  */
-function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'delete_user_meta()' );
+function delete_usermeta($user_id, $meta_key, $meta_value = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'delete_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
+	if (is_array($meta_value) || is_object($meta_value))
 		$meta_value = serialize($meta_value);
-	$meta_value = trim( $meta_value );
+	$meta_value = trim($meta_value);
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	if ( ! empty($meta_value))
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value));
 	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur && $cur->umeta_id)
+		do_action('deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2235,28 +2235,28 @@ 
  * @param string $meta_key Optional. Metadata key.
  * @return mixed
  */
-function get_usermeta( $user_id, $meta_key = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'get_user_meta()' );
+function get_usermeta($user_id, $meta_key = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'get_user_meta()');
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
+	if ( ! $user_id)
 		return false;
 
-	if ( !empty($meta_key) ) {
+	if ( ! empty($meta_key)) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
+		if (false !== $user && isset($user->$meta_key))
 			$metas = array($user->$meta_key);
 		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+			$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 	} else {
-		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
+		$metas = $wpdb->get_col($wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id));
 	}
 
-	if ( empty($metas) ) {
-		if ( empty($meta_key) )
+	if (empty($metas)) {
+		if (empty($meta_key))
 			return array();
 		else
 			return '';
@@ -2264,7 +2264,7 @@ 
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
+	if (count($metas) == 1)
 		return $metas[0];
 	else
 		return $metas;
@@ -2288,15 +2288,15 @@ 
  * @param mixed $meta_value Metadata value.
  * @return bool True on successful update, false on failure.
  */
-function update_usermeta( $user_id, $meta_key, $meta_value ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'update_user_meta()' );
+function update_usermeta($user_id, $meta_key, $meta_value) {
+	_deprecated_function(__FUNCTION__, '3.0', 'update_user_meta()');
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
+	if ( ! is_numeric($user_id))
 		return false;
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
+	if (is_string($meta_value))
 		$meta_value = stripslashes($meta_value);
 	$meta_value = maybe_serialize($meta_value);
 
@@ -2304,25 +2304,25 @@ 
 		return delete_usermeta($user_id, $meta_key);
 	}
 
-	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	$cur = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key));
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ($cur)
+		do_action('update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	if ( ! $cur)
+		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value'));
+	elseif ($cur->meta_value != $meta_value)
+		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key'));
 	else
 		return false;
 
-	clean_user_cache( $user_id );
-	wp_cache_delete( $user_id, 'user_meta' );
+	clean_user_cache($user_id);
+	wp_cache_delete($user_id, 'user_meta');
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	if ( ! $cur)
+		do_action('added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value);
 	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+		do_action('updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value);
 
 	return true;
 }
@@ -2343,14 +2343,14 @@ 
  * @param int $id Blog ID.
  * @return array List of users that are part of that Blog ID
  */
-function get_users_of_blog( $id = '' ) {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+function get_users_of_blog($id = '') {
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb, $blog_id;
-	if ( empty($id) )
+	if (empty($id))
 		$id = (int) $blog_id;
 	$blog_prefix = $wpdb->get_blog_prefix($id);
-	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
+	$users = $wpdb->get_results("SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id");
 	return $users;
 }
 
@@ -2363,13 +2363,13 @@ 
  *
  * @param bool $add Optional, default is true. Add or remove links. Defaults to true.
  */
-function automatic_feed_links( $add = true ) {
-	_deprecated_function( __FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )" );
+function automatic_feed_links($add = true) {
+	_deprecated_function(__FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )");
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
+	if ($add)
+		add_theme_support('automatic-feed-links');
 	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+		remove_action('wp_head', 'feed_links_extra', 3); // Just do this yourself in 3.0+
 }
 
 /**
@@ -2379,13 +2379,13 @@ 
  * @deprecated 3.0.0 Use get_the_author_meta()
  * @see get_the_author_meta()
  */
-function get_profile( $field, $user = false ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'get_the_author_meta()' );
-	if ( $user ) {
-		$user = get_user_by( 'login', $user );
+function get_profile($field, $user = false) {
+	_deprecated_function(__FUNCTION__, '3.0', 'get_the_author_meta()');
+	if ($user) {
+		$user = get_user_by('login', $user);
 		$user = $user->ID;
 	}
-	return get_the_author_meta( $field, $user );
+	return get_the_author_meta($field, $user);
 }
 
 /**
@@ -2395,9 +2395,9 @@ 
  * @deprecated 3.0.0 Use count_user_posts()
  * @see count_user_posts()
  */
-function get_usernumposts( $userid ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'count_user_posts()' );
-	return count_user_posts( $userid );
+function get_usernumposts($userid) {
+	_deprecated_function(__FUNCTION__, '3.0', 'count_user_posts()');
+	return count_user_posts($userid);
 }
 
 /**
@@ -2411,7 +2411,7 @@ 
  * @return string An HTML entity
  */
 function funky_javascript_callback($matches) {
-	return "&#".base_convert($matches[1],16,10).";";
+	return "&#".base_convert($matches[1], 16, 10).";";
 }
 
 /**
@@ -2429,12 +2429,12 @@ 
  * @return string Fixed text.
  */
 function funky_javascript_fix($text) {
-	_deprecated_function( __FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ($is_winIE || $is_macIE)
+		$text = preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
 
@@ -2451,9 +2451,9 @@ 
  * @param string $taxonomy Name of taxonomy object
  * @return bool Whether the taxonomy exists.
  */
-function is_taxonomy( $taxonomy ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'taxonomy_exists()' );
-	return taxonomy_exists( $taxonomy );
+function is_taxonomy($taxonomy) {
+	_deprecated_function(__FUNCTION__, '3.0', 'taxonomy_exists()');
+	return taxonomy_exists($taxonomy);
 }
 
 /**
@@ -2468,9 +2468,9 @@ 
  * @param int $parent ID of parent term under which to confine the exists search.
  * @return mixed Get the term id or Term Object, if exists.
  */
-function is_term( $term, $taxonomy = '', $parent = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'term_exists()' );
-	return term_exists( $term, $taxonomy, $parent );
+function is_term($term, $taxonomy = '', $parent = 0) {
+	_deprecated_function(__FUNCTION__, '3.0', 'term_exists()');
+	return term_exists($term, $taxonomy, $parent);
 }
 
 /**
@@ -2486,11 +2486,11 @@ 
  * @return bool
  */
 function is_plugin_page() {
-	_deprecated_function( __FUNCTION__, '3.1'  );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
+	if (isset($plugin_page))
 		return true;
 
 	return false;
@@ -2509,7 +2509,7 @@ 
  * @return bool Always return True
  */
 function update_category_cache() {
-	_deprecated_function( __FUNCTION__, '3.1'  );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	return true;
 }
@@ -2523,7 +2523,7 @@ 
  * @return bool
  */
 function wp_timezone_supported() {
-	_deprecated_function( __FUNCTION__, '3.2' );
+	_deprecated_function(__FUNCTION__, '3.2');
 
 	return true;
 }
@@ -2542,9 +2542,9 @@ 
  * @param int $tab_index Optional, not used
  */
 function the_editor($content, $id = 'content', $prev_id = 'title', $media_buttons = true, $tab_index = 2, $extended = true) {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 
-	wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) );
+	wp_editor($content, $id, array('media_buttons' => $media_buttons));
 }
 
 /**
@@ -2557,20 +2557,20 @@ 
  * @return array of arrays. The array is indexed by user_id, containing $metavalues object arrays.
  */
 function get_user_metavalues($ids) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
+	foreach ($ids as $id)
 		$objects[$id] = array();
 
 	$metas = update_meta_cache('user', $ids);
 
-	foreach ( $metas as $id => $meta ) {
-		foreach ( $meta as $key => $metavalues ) {
-			foreach ( $metavalues as $value ) {
-				$objects[$id][] = (object)array( 'user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
+	foreach ($metas as $id => $meta) {
+		foreach ($meta as $key => $metavalues) {
+			foreach ($metavalues as $value) {
+				$objects[$id][] = (object) array('user_id' => $id, 'meta_key' => $key, 'meta_value' => $value);
 			}
 		}
 	}
@@ -2591,23 +2591,23 @@ 
  * @return object|array The now sanitized User Object or Array (will be the same type as $user)
  */
 function sanitize_user_object($user, $context = 'display') {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
-	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
+	if (is_object($user)) {
+		if ( ! isset($user->ID))
 			$user->ID = 0;
-		if ( ! ( $user instanceof WP_User ) ) {
+		if ( ! ($user instanceof WP_User)) {
 			$vars = get_object_vars($user);
-			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
+			foreach (array_keys($vars) as $field) {
+				if (is_string($user->$field) || is_numeric($user->$field))
 					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
+		if ( ! isset($user['ID']))
 			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
+		foreach (array_keys($user) as $field)
 			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
 		$user['filter'] = $context;
 	}
@@ -2630,17 +2630,17 @@ 
  * @return string
  */
 function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
+	if (empty($posts))
 		return;
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
+	if (empty($post->post_title))
 		$post->post_title = $start ? __('First Post') : __('Last Post');
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2651,10 +2651,10 @@ 
 
 	$link = $start ? "<link rel='start' title='" : "<link rel='end' title='";
 	$link .= esc_attr($title);
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$boundary = $start ? 'start' : 'end';
-	return apply_filters( "{$boundary}_post_rel_link", $link );
+	return apply_filters("{$boundary}_post_rel_link", $link);
 }
 
 /**
@@ -2668,7 +2668,7 @@ 
  * @param string $excluded_categories Optional. Excluded categories IDs.
  */
 function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	echo get_boundary_post_rel_link($title, $in_same_cat, $excluded_categories, true);
 }
@@ -2682,10 +2682,10 @@ 
  * @return string
  */
 function get_index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
-	$link = "<link rel='index' title='" . esc_attr( get_bloginfo( 'name', 'display' ) ) . "' href='" . esc_url( user_trailingslashit( get_bloginfo( 'url', 'display' ) ) ) . "' />\n";
-	return apply_filters( "index_rel_link", $link );
+	$link = "<link rel='index' title='".esc_attr(get_bloginfo('name', 'display'))."' href='".esc_url(user_trailingslashit(get_bloginfo('url', 'display')))."' />\n";
+	return apply_filters("index_rel_link", $link);
 }
 
 /**
@@ -2695,7 +2695,7 @@ 
  * @deprecated 3.3.0
  */
 function index_rel_link() {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	echo get_index_rel_link();
 }
@@ -2710,12 +2710,12 @@ 
  * @return string
  */
 function get_parent_post_rel_link($title = '%title') {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
+	if ( ! empty($GLOBALS['post']) && ! empty($GLOBALS['post']->post_parent))
 		$post = get_post($GLOBALS['post']->post_parent);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
@@ -2725,10 +2725,10 @@ 
 	$title = apply_filters('the_title', $title, $post->ID);
 
 	$link = "<link rel='up' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink($post) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
-	return apply_filters( "parent_post_rel_link", $link );
+	return apply_filters("parent_post_rel_link", $link);
 }
 
 /**
@@ -2738,7 +2738,7 @@ 
  * @deprecated 3.3.0
  */
 function parent_post_rel_link($title = '%title') {
-	_deprecated_function( __FUNCTION__, '3.3' );
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	echo get_parent_post_rel_link($title);
 }
@@ -2749,18 +2749,18 @@ 
  * @since 3.2.0
  * @deprecated 3.3.0
  */
-function wp_admin_bar_dashboard_view_site_menu( $wp_admin_bar ) {
-	_deprecated_function( __FUNCTION__, '3.3' );
+function wp_admin_bar_dashboard_view_site_menu($wp_admin_bar) {
+	_deprecated_function(__FUNCTION__, '3.3');
 
 	$user_id = get_current_user_id();
 
-	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+	if (0 != $user_id) {
+		if (is_admin())
+			$wp_admin_bar->add_menu(array('id' => 'view-site', 'title' => __('Visit Site'), 'href' => home_url()));
+		elseif (is_multisite())
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => get_dashboard_url($user_id)));
 		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+			$wp_admin_bar->add_menu(array('id' => 'dashboard', 'title' => __('Dashboard'), 'href' => admin_url()));
 	}
 }
 
@@ -2774,10 +2774,10 @@ 
  * @param int $blog_id Blog ID
  * @return bool True if the current users belong to $blog_id, false if not.
  */
-function is_blog_user( $blog_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.3', 'is_user_member_of_blog()' );
+function is_blog_user($blog_id = 0) {
+	_deprecated_function(__FUNCTION__, '3.3', 'is_user_member_of_blog()');
 
-	return is_user_member_of_blog( get_current_user_id(), $blog_id );
+	return is_user_member_of_blog(get_current_user_id(), $blog_id);
 }
 
 /**
@@ -2789,8 +2789,8 @@ 
  *
  * @link http://www.php.net/manual/en/function.error-log.php
  */
-function debug_fopen( $filename, $mode ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fopen($filename, $mode) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 	return false;
 }
 
@@ -2803,10 +2803,10 @@ 
  *
  * @link http://www.php.net/manual/en/function.error-log.php
  */
-function debug_fwrite( $fp, $string ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
+function debug_fwrite($fp, $string) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
+	if ( ! empty($GLOBALS['debug']))
+		error_log($string);
 }
 
 /**
@@ -2818,8 +2818,8 @@ 
  *
  * @link http://www.php.net/manual/en/function.error-log.php
  */
-function debug_fclose( $fp ) {
-	_deprecated_function( __FUNCTION__, 'error_log()' );
+function debug_fclose($fp) {
+	_deprecated_function(__FUNCTION__, 'error_log()');
 }
 
 /**
@@ -2836,21 +2836,21 @@ 
  * @return array Theme list with theme data.
  */
 function get_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_themes()' );
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_themes()');
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
+	if (isset($wp_themes))
 		return $wp_themes;
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		if (isset($wp_themes[$name]))
+			$wp_themes[$name.'/'.$theme->get_stylesheet()] = $theme;
 		else
-			$wp_themes[ $name ] = $theme;
+			$wp_themes[$name] = $theme;
 	}
 
 	return $wp_themes;
@@ -2866,12 +2866,12 @@ 
  * @param string $theme Theme name.
  * @return array|null Null, if theme name does not exist. Theme data, if exists.
  */
-function get_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme( $stylesheet )' );
+function get_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme( $stylesheet )');
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if (is_array($themes) && array_key_exists($theme, $themes))
+		return $themes[$theme];
 	return null;
 }
 
@@ -2885,9 +2885,9 @@ 
  * @return string
  */
 function get_current_theme() {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme()');
 
-	if ( $theme = get_option( 'current_theme' ) )
+	if ($theme = get_option('current_theme'))
 		return $theme;
 
 	return wp_get_theme()->get('Name');
@@ -2906,10 +2906,10 @@ 
  * @return string The pre block without paragraph/line-break conversion.
  */
 function clean_pre($matches) {
-	_deprecated_function( __FUNCTION__, '3.4' );
+	_deprecated_function(__FUNCTION__, '3.4');
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
+	if (is_array($matches))
+		$text = $matches[1].$matches[2]."</pre>";
 	else
 		$text = $matches;
 
@@ -2932,15 +2932,15 @@ 
  * @param callback $admin_head_callback Call on custom header administration screen.
  * @param callback $admin_preview_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header( $wp_head_callback, $admin_head_callback, $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )' );
+function add_custom_image_header($wp_head_callback, $admin_head_callback, $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4', 'add_theme_support( \'custom-header\', $args )');
 	$args = array(
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-header', $args );
+	return add_theme_support('custom-header', $args);
 }
 
 /**
@@ -2953,8 +2953,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_image_header() {
-	_deprecated_function( __FUNCTION__, '3.4', 'remove_theme_support( \'custom-header\' )' );
-	return remove_theme_support( 'custom-header' );
+	_deprecated_function(__FUNCTION__, '3.4', 'remove_theme_support( \'custom-header\' )');
+	return remove_theme_support('custom-header');
 }
 
 /**
@@ -2968,16 +2968,16 @@ 
  * @param callback $admin_head_callback Call on custom background administration screen.
  * @param callback $admin_preview_callback Output a custom background image div on the custom background administration screen. Optional.
  */
-function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
+function add_custom_background($wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )');
 	$args = array();
-	if ( $wp_head_callback )
+	if ($wp_head_callback)
 		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
+	if ($admin_head_callback)
 		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
+	if ($admin_preview_callback)
 		$args['admin-preview-callback'] = $admin_preview_callback;
-	return add_theme_support( 'custom-background', $args );
+	return add_theme_support('custom-background', $args);
 }
 
 /**
@@ -2990,8 +2990,8 @@ 
  * @return null|bool Whether support was removed.
  */
 function remove_custom_background() {
-	_deprecated_function( __FUNCTION__, '3.4', 'remove_theme_support( \'custom-background\' )' );
-	return remove_theme_support( 'custom-background' );
+	_deprecated_function(__FUNCTION__, '3.4', 'remove_theme_support( \'custom-background\' )');
+	return remove_theme_support('custom-background');
 }
 
 /**
@@ -3004,9 +3004,9 @@ 
  * @param string $theme_file Theme file path.
  * @return array Theme data.
  */
-function get_theme_data( $theme_file ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
-	$theme = new WP_Theme( basename( dirname( $theme_file ) ), dirname( dirname( $theme_file ) ) );
+function get_theme_data($theme_file) {
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme()');
+	$theme = new WP_Theme(basename(dirname($theme_file)), dirname(dirname($theme_file)));
 
 	$theme_data = array(
 		'Name' => $theme->get('Name'),
@@ -3022,9 +3022,9 @@ 
 		'AuthorName' => $theme->get('Author'),
 	);
 
-	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+	foreach (apply_filters('extra_theme_headers', array()) as $extra_header) {
+		if ( ! isset($theme_data[$extra_header]))
+			$theme_data[$extra_header] = $theme->get($extra_header);
 	}
 
 	return $theme_data;
@@ -3041,10 +3041,10 @@ 
  *
  * @param array $pages list of page objects
  */
-function update_page_cache( &$pages ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'update_post_cache()' );
+function update_page_cache(&$pages) {
+	_deprecated_function(__FUNCTION__, '3.4', 'update_post_cache()');
 
-	update_post_cache( $pages );
+	update_post_cache($pages);
 }
 
 /**
@@ -3059,10 +3059,10 @@ 
  *
  * @param int $id Page ID to clean
  */
-function clean_page_cache( $id ) {
-	_deprecated_function( __FUNCTION__, '3.4', 'clean_post_cache()' );
+function clean_page_cache($id) {
+	_deprecated_function(__FUNCTION__, '3.4', 'clean_post_cache()');
 
-	clean_post_cache( $id );
+	clean_post_cache($id);
 }
 
 /**
@@ -3077,9 +3077,9 @@ 
  * @param string $action Nonce action.
  * @return string Are you sure message.
  */
-function wp_explain_nonce( $action ) {
-	_deprecated_function( __FUNCTION__, '3.4.1', 'wp_nonce_ays()' );
-	return __( 'Are you sure you want to do this?' );
+function wp_explain_nonce($action) {
+	_deprecated_function(__FUNCTION__, '3.4.1', 'wp_nonce_ays()');
+	return __('Are you sure you want to do this?');
 }
 
 /**
@@ -3091,9 +3091,9 @@ 
  *
  * @param int $post_id An optional post ID.
  */
-function sticky_class( $post_id = null ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'post_class()' );
-	if ( is_sticky( $post_id ) )
+function sticky_class($post_id = null) {
+	_deprecated_function(__FUNCTION__, '3.5', 'post_class()');
+	if (is_sticky($post_id))
 		echo ' sticky';
 }
 
@@ -3107,8 +3107,8 @@ 
  * @deprecated 3.5.0 Use get_post_ancestors()
  * @see get_post_ancestors()
  */
-function _get_post_ancestors( &$post ) {
-	_deprecated_function( __FUNCTION__, '3.5' );
+function _get_post_ancestors(&$post) {
+	_deprecated_function(__FUNCTION__, '3.5');
 }
 
 /**
@@ -3121,23 +3121,23 @@ 
  * @param string $file Filename of the image to load.
  * @return resource The resulting image resource on success, Error string on failure.
  */
-function wp_load_image( $file ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
+function wp_load_image($file) {
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_get_image_editor()');
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if (is_numeric($file))
+		$file = get_attached_file($file);
 
-	if ( ! is_file( $file ) )
+	if ( ! is_file($file))
 		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
 
-	if ( ! function_exists('imagecreatefromstring') )
+	if ( ! function_exists('imagecreatefromstring'))
 		return __('The GD image library is not installed.');
 
 	// Set artificially high because GD uses uncompressed images in memory
-	@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
-	$image = imagecreatefromstring( file_get_contents( $file ) );
+	@ini_set('memory_limit', apply_filters('image_memory_limit', WP_MAX_MEMORY_LIMIT));
+	$image = imagecreatefromstring(file_get_contents($file));
 
-	if ( !is_resource( $image ) )
+	if ( ! is_resource($image))
 		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
 
 	return $image;
@@ -3167,22 +3167,22 @@ 
  * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
  * @return mixed WP_Error on failure. String with new destination path.
  */
-function image_resize( $file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90 ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
+function image_resize($file, $max_w, $max_h, $crop = false, $suffix = null, $dest_path = null, $jpeg_quality = 90) {
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_get_image_editor()');
 
-	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($file);
+	if (is_wp_error($editor))
 		return $editor;
-	$editor->set_quality( $jpeg_quality );
+	$editor->set_quality($jpeg_quality);
 
-	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
+	$resized = $editor->resize($max_w, $max_h, $crop);
+	if (is_wp_error($resized))
 		return $resized;
 
-	$dest_file = $editor->generate_filename( $suffix, $dest_path );
-	$saved = $editor->save( $dest_file );
+	$dest_file = $editor->generate_filename($suffix, $dest_path);
+	$saved = $editor->save($dest_file);
 
-	if ( is_wp_error( $saved ) )
+	if (is_wp_error($saved))
 		return $saved;
 
 	return $dest_file;
@@ -3202,9 +3202,9 @@ 
  * @param string $mode How to return result, either OBJECT, ARRAY_N, or ARRAY_A.
  * @return WP_Post|null Post object or array holding post contents and information
  */
-function wp_get_single_post( $postid = 0, $mode = OBJECT ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'get_post()' );
-	return get_post( $postid, $mode );
+function wp_get_single_post($postid = 0, $mode = OBJECT) {
+	_deprecated_function(__FUNCTION__, '3.5', 'get_post()');
+	return get_post($postid, $mode);
 }
 
 /**
@@ -3219,9 +3219,9 @@ 
  * @return bool False if does not authenticate, true if username and password authenticates.
  */
 function user_pass_ok($user_login, $user_pass) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_authenticate()' );
-	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_authenticate()');
+	$user = wp_authenticate($user_login, $user_pass);
+	if (is_wp_error($user))
 		return false;
 
 	return true;
@@ -3246,10 +3246,10 @@ 
  * @return bool
  */
 function gd_edit_image_support($mime_type) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_image_editor_supports()' );
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_image_editor_supports()');
 
-	if ( function_exists('imagetypes') ) {
-		switch( $mime_type ) {
+	if (function_exists('imagetypes')) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return (imagetypes() & IMG_JPG) != 0;
 			case 'image/png':
@@ -3258,7 +3258,7 @@ 
 				return (imagetypes() & IMG_GIF) != 0;
 		}
 	} else {
-		switch( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 				return function_exists('imagecreatefromjpeg');
 			case 'image/png':
@@ -3280,22 +3280,22 @@ 
  * @param int $bytes An integer byte value.
  * @return string A shorthand byte value.
  */
-function wp_convert_bytes_to_hr( $bytes ) {
-	_deprecated_function( __FUNCTION__, '3.6', 'size_format()' );
+function wp_convert_bytes_to_hr($bytes) {
+	_deprecated_function(__FUNCTION__, '3.6', 'size_format()');
 
-	$units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB', 4 => 'TB' );
-	$log   = log( $bytes, 1024 );
+	$units = array(0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB', 4 => 'TB');
+	$log   = log($bytes, 1024);
 	$power = (int) $log;
-	$size  = pow( 1024, $log - $power );
+	$size  = pow(1024, $log - $power);
 
-	if ( ! is_nan( $size ) && array_key_exists( $power, $units ) ) {
-		$unit = $units[ $power ];
+	if ( ! is_nan($size) && array_key_exists($power, $units)) {
+		$unit = $units[$power];
 	} else {
 		$size = $bytes;
 		$unit = $units[0];
 	}
 
-	return $size . $unit;
+	return $size.$unit;
 }
 
 /**
@@ -3305,9 +3305,9 @@ 
  * @access private
  * @deprecated 3.7.0
  */
-function _search_terms_tidy( $t ) {
-	_deprecated_function( __FUNCTION__, '3.7' );
-	return trim( $t, "\"'\n\r " );
+function _search_terms_tidy($t) {
+	_deprecated_function(__FUNCTION__, '3.7');
+	return trim($t, "\"'\n\r ");
 }
 
 /**
@@ -3323,10 +3323,10 @@ 
  */
 function rich_edit_exists() {
 	global $wp_rich_edit_exists;
-	_deprecated_function( __FUNCTION__, '3.9' );
+	_deprecated_function(__FUNCTION__, '3.9');
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset($wp_rich_edit_exists))
+		$wp_rich_edit_exists = file_exists(ABSPATH.WPINC.'/js/tinymce/tinymce.js');
 
 	return $wp_rich_edit_exists;
 }
@@ -3338,7 +3338,7 @@ 
  * @access private
  * @deprecated 3.9.0
  */
-function default_topic_count_text( $count ) {
+function default_topic_count_text($count) {
 	return $count;
 }
 
@@ -3353,8 +3353,8 @@ 
  * @param string $content The text to format.
  * @return string The very same text.
  */
-function format_to_post( $content ) {
-	_deprecated_function( __FUNCTION__, '3.9' );
+function format_to_post($content) {
+	_deprecated_function(__FUNCTION__, '3.9');
 	return $content;
 }
 
@@ -3369,8 +3369,8 @@ 
  * @return string text, safe for inclusion in LIKE query.
  */
 function like_escape($text) {
-	_deprecated_function( __FUNCTION__, '4.0', 'wpdb::esc_like()' );
-	return str_replace( array( "%", "_" ), array( "\\%", "\\_" ), $text );
+	_deprecated_function(__FUNCTION__, '4.0', 'wpdb::esc_like()');
+	return str_replace(array("%", "_"), array("\\%", "\\_"), $text);
 }
 
 /**
@@ -3385,14 +3385,14 @@ 
  * @param string $url The URL to test.
  * @return bool Whether SSL access is available.
  */
-function url_is_accessable_via_ssl( $url ) {
-	_deprecated_function( __FUNCTION__, '4.0' );
+function url_is_accessable_via_ssl($url) {
+	_deprecated_function(__FUNCTION__, '4.0');
 
-	$response = wp_remote_get( set_url_scheme( $url, 'https' ) );
+	$response = wp_remote_get(set_url_scheme($url, 'https'));
 
-	if ( !is_wp_error( $response ) ) {
-		$status = wp_remote_retrieve_response_code( $response );
-		if ( 200 == $status || 401 == $status ) {
+	if ( ! is_wp_error($response)) {
+		$status = wp_remote_retrieve_response_code($response);
+		if (200 == $status || 401 == $status) {
 			return true;
 		}
 	}
@@ -3410,7 +3410,7 @@ 
  * @deprecated 4.3.0
  */
 function preview_theme() {
-	_deprecated_function( __FUNCTION__, '4.3' );
+	_deprecated_function(__FUNCTION__, '4.3');
 }
 
 /**
@@ -3423,7 +3423,7 @@ 
  * @return string
  */
 function _preview_theme_template_filter() {
-	_deprecated_function( __FUNCTION__, '4.3' );
+	_deprecated_function(__FUNCTION__, '4.3');
 	return '';
 }
 
@@ -3437,7 +3437,7 @@ 
  * @return string
  */
 function _preview_theme_stylesheet_filter() {
-	_deprecated_function( __FUNCTION__, '4.3' );
+	_deprecated_function(__FUNCTION__, '4.3');
 	return '';
 }
 
@@ -3451,8 +3451,8 @@ 
  * @param string $content
  * @return string
  */
-function preview_theme_ob_filter( $content ) {
-	_deprecated_function( __FUNCTION__, '4.3' );
+function preview_theme_ob_filter($content) {
+	_deprecated_function(__FUNCTION__, '4.3');
 	return $content;
 }
 
@@ -3468,8 +3468,8 @@ 
  * @param array $matches
  * @return string
  */
-function preview_theme_ob_filter_callback( $matches ) {
-	_deprecated_function( __FUNCTION__, '4.3' );
+function preview_theme_ob_filter_callback($matches) {
+	_deprecated_function(__FUNCTION__, '4.3');
 	return '';
 }
 
@@ -3486,9 +3486,9 @@ 
  * @return string The formatted text after filter is applied.
  */
 function wp_richedit_pre($text) {
-	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3', 'format_for_editor()');
 
-	if ( empty( $text ) ) {
+	if (empty($text)) {
 		/**
 		 * Filter text returned for the rich text editor.
 		 *
@@ -3504,15 +3504,15 @@ 
 		 *
 		 * @param string $output Text for the rich text editor.
 		 */
-		return apply_filters( 'richedit_pre', '' );
+		return apply_filters('richedit_pre', '');
 	}
 
 	$output = convert_chars($text);
 	$output = wpautop($output);
-	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset'));
 
 	/** This filter is documented in wp-includes/deprecated.php */
-	return apply_filters( 'richedit_pre', $output );
+	return apply_filters('richedit_pre', $output);
 }
 
 /**
@@ -3529,10 +3529,10 @@ 
  * @return string Formatted text after filter applied.
  */
 function wp_htmledit_pre($output) {
-	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
+	_deprecated_function(__FUNCTION__, '4.3', 'format_for_editor()');
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( ! empty($output))
+		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option('blog_charset')); // convert only < > &
 
 	/**
 	 * Filter the text before it is formatted for the HTML editor.
@@ -3542,7 +3542,7 @@ 
 	 *
 	 * @param string $output The HTML-formatted text.
 	 */
-	return apply_filters( 'htmledit_pre', $output );
+	return apply_filters('htmledit_pre', $output);
 }
 
 /**
@@ -3555,9 +3555,9 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string|false
  */
-function post_permalink( $post_id = 0 ) {
-	_deprecated_function( __FUNCTION__, '4.4', 'get_permalink()' );
+function post_permalink($post_id = 0) {
+	_deprecated_function(__FUNCTION__, '4.4', 'get_permalink()');
 
-	return get_permalink( $post_id );
+	return get_permalink($post_id);
 }
 

Braces +371 added lines, -258 removed lines

@@ -86,8 +86,9 @@ 
 	$categories = get_the_category();
 	$cat = $categories[0]->term_id;
 
-	if ( $echo )
-		echo $cat;
+	if ( $echo ) {
+			echo $cat;
+	}
 
 	return $cat;
 }
@@ -136,19 +137,22 @@ 
 
 	_deprecated_function( __FUNCTION__, '2.0', 'previous_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_previous_post($in_same_cat, $excluded_categories);
 
-	if ( !$post )
-		return;
+	if ( !$post ) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$previous;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -171,19 +175,22 @@ 
 function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
 	_deprecated_function( __FUNCTION__, '2.0', 'next_post_link()' );
 
-	if ( empty($in_same_cat) || 'no' == $in_same_cat )
-		$in_same_cat = false;
-	else
-		$in_same_cat = true;
+	if ( empty($in_same_cat) || 'no' == $in_same_cat ) {
+			$in_same_cat = false;
+	} else {
+			$in_same_cat = true;
+	}
 
 	$post = get_next_post($in_same_cat, $excluded_categories);
 
-	if ( !$post	)
-		return;
+	if ( !$post	) {
+			return;
+	}
 
 	$string = '<a href="'.get_permalink($post->ID).'">'.$next;
-	if ( 'yes' == $title )
-		$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	if ( 'yes' == $title ) {
+			$string .= apply_filters('the_title', $post->post_title, $post->ID);
+	}
 	$string .= '</a>';
 	$format = str_replace('%', $string, $format);
 	echo $format;
@@ -366,11 +373,12 @@ 
 
 	$user  = get_userdata($user_id);
 	$other = get_userdata($other_user);
-	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID )
-		return true;
-	else
-		return false;
-}
+	if ( $user->user_level > $other->user_level || $user->user_level > 8 || $user->ID == $other->ID ) {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Gets the links associated with category $cat_name.
@@ -399,8 +407,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	get_links($cat_id, $before, $after, $between, $show_images, $orderby, $show_description, $show_rating, $limit, $show_updated);
 }
@@ -459,8 +468,9 @@ 
 
 	$cat_id = -1;
 	$cat = get_term_by('name', $cat_name, 'link_category');
-	if ( $cat )
-		$cat_id = $cat->term_id;
+	if ( $cat ) {
+			$cat_id = $cat->term_id;
+	}
 
 	return get_linkobjects($cat_id, $orderby, $limit);
 }
@@ -511,8 +521,9 @@ 
 	$links = get_bookmarks( array( 'category' => $category, 'orderby' => $orderby, 'limit' => $limit ) ) ;
 
 	$links_array = array();
-	foreach ($links as $link)
-		$links_array[] = $link;
+	foreach ($links as $link) {
+			$links_array[] = $link;
+	}
 
 	return $links_array;
 }
@@ -638,18 +649,24 @@ 
 	$r = wp_parse_args( $args );
 
 	// Map to new names.
-	if ( isset($r['optionall']) && isset($r['all']))
-		$r['show_option_all'] = $r['all'];
-	if ( isset($r['sort_column']) )
-		$r['orderby'] = $r['sort_column'];
-	if ( isset($r['sort_order']) )
-		$r['order'] = $r['sort_order'];
-	if ( isset($r['optiondates']) )
-		$r['show_last_update'] = $r['optiondates'];
-	if ( isset($r['optioncount']) )
-		$r['show_count'] = $r['optioncount'];
-	if ( isset($r['list']) )
-		$r['style'] = $r['list'] ? 'list' : 'break';
+	if ( isset($r['optionall']) && isset($r['all'])) {
+			$r['show_option_all'] = $r['all'];
+	}
+	if ( isset($r['sort_column']) ) {
+			$r['orderby'] = $r['sort_column'];
+	}
+	if ( isset($r['sort_order']) ) {
+			$r['order'] = $r['sort_order'];
+	}
+	if ( isset($r['optiondates']) ) {
+			$r['show_last_update'] = $r['optiondates'];
+	}
+	if ( isset($r['optioncount']) ) {
+			$r['show_count'] = $r['optioncount'];
+	}
+	if ( isset($r['list']) ) {
+			$r['style'] = $r['list'] ? 'list' : 'break';
+	}
 	$r['title_li'] = '';
 
 	return wp_list_categories($r);
@@ -680,12 +697,14 @@ 
 	_deprecated_function( __FUNCTION__, '2.1', 'wp_dropdown_categories()' );
 
 	$show_option_all = '';
-	if ( $optionall )
-		$show_option_all = $all;
+	if ( $optionall ) {
+			$show_option_all = $all;
+	}
 
 	$show_option_none = '';
-	if ( $optionnone )
-		$show_option_none = __('None');
+	if ( $optionnone ) {
+			$show_option_none = __('None');
+	}
 
 	$vars = compact('show_option_all', 'show_option_none', 'orderby', 'order',
 					'show_last_update', 'show_count', 'hide_empty', 'selected', 'exclude');
@@ -787,8 +806,9 @@ 
 
 	$link = get_author_posts_url($author_id, $author_nicename);
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -931,64 +951,78 @@ 
 		$orderby = substr($orderby, 1);
 	}
 
-	if ( $category == -1 ) //get_bookmarks uses '' to signify all categories
+	if ( $category == -1 ) {
+		//get_bookmarks uses '' to signify all categories
 		$category = '';
+	}
 
 	$results = get_bookmarks(array('category' => $category, 'orderby' => $orderby, 'order' => $order, 'show_updated' => $show_updated, 'limit' => $limit));
 
-	if ( !$results )
-		return;
+	if ( !$results ) {
+			return;
+	}
 
 	$output = '';
 
 	foreach ( (array) $results as $row ) {
-		if ( !isset($row->recently_updated) )
-			$row->recently_updated = false;
+		if ( !isset($row->recently_updated) ) {
+					$row->recently_updated = false;
+		}
 		$output .= $before;
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_prepend');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_prepend');
+		}
 		$the_link = '#';
-		if ( !empty($row->link_url) )
-			$the_link = esc_url($row->link_url);
+		if ( !empty($row->link_url) ) {
+					$the_link = esc_url($row->link_url);
+		}
 		$rel = $row->link_rel;
-		if ( '' != $rel )
-			$rel = ' rel="' . $rel . '"';
+		if ( '' != $rel ) {
+					$rel = ' rel="' . $rel . '"';
+		}
 
 		$desc = esc_attr(sanitize_bookmark_field('link_description', $row->link_description, $row->link_id, 'display'));
 		$name = esc_attr(sanitize_bookmark_field('link_name', $row->link_name, $row->link_id, 'display'));
 		$title = $desc;
 
-		if ( $show_updated )
-			if (substr($row->link_updated_f, 0, 2) != '00')
+		if ( $show_updated ) {
+					if (substr($row->link_updated_f, 0, 2) != '00')
 				$title .= ' ('.__('Last updated') . ' ' . date(get_option('links_updated_date_format'), $row->link_updated_f + (get_option('gmt_offset') * HOUR_IN_SECONDS)) . ')';
+		}
 
-		if ( '' != $title )
-			$title = ' title="' . $title . '"';
+		if ( '' != $title ) {
+					$title = ' title="' . $title . '"';
+		}
 
 		$alt = ' alt="' . $name . '"';
 
 		$target = $row->link_target;
-		if ( '' != $target )
-			$target = ' target="' . $target . '"';
+		if ( '' != $target ) {
+					$target = ' target="' . $target . '"';
+		}
 
 		$output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
 
 		if ( $row->link_image != null && $show_images ) {
-			if ( strpos($row->link_image, 'http') !== false )
-				$output .= "<img src=\"$row->link_image\" $alt $title />";
-			else // If it's a relative path
+			if ( strpos($row->link_image, 'http') !== false ) {
+							$output .= "<img src=\"$row->link_image\" $alt $title />";
+			} else {
+				// If it's a relative path
 				$output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
+			}
 		} else {
 			$output .= $name;
 		}
 
 		$output .= '</a>';
 
-		if ( $show_updated && $row->recently_updated )
-			$output .= get_option('links_recently_updated_append');
+		if ( $show_updated && $row->recently_updated ) {
+					$output .= get_option('links_recently_updated_append');
+		}
 
-		if ( $show_description && '' != $desc )
-			$output .= $between . $desc;
+		if ( $show_description && '' != $desc ) {
+					$output .= $between . $desc;
+		}
 
 		if ($show_rating) {
 			$output .= $between . get_linkrating($row);
@@ -997,8 +1031,9 @@ 
 		$output .= "$after\n";
 	} // end while
 
-	if ( !$echo )
-		return $output;
+	if ( !$echo ) {
+			return $output;
+	}
 	echo $output;
 }
 
@@ -1026,8 +1061,9 @@ 
 		$order = substr($order,1);
 	}
 
-	if ( !isset($direction) )
-		$direction = '';
+	if ( !isset($direction) ) {
+			$direction = '';
+	}
 
 	$cats = get_categories(array('type' => 'link', 'orderby' => $order, 'order' => $direction, 'hierarchical' => 0));
 
@@ -1091,13 +1127,15 @@ 
 
 	$id = (int) $id;
 
-	if ( empty($id) )
-		return '';
+	if ( empty($id) ) {
+			return '';
+	}
 
 	$cats = wp_get_link_cats($id);
 
-	if ( empty($cats) || ! is_array($cats) )
-		return '';
+	if ( empty($cats) || ! is_array($cats) ) {
+			return '';
+	}
 
 	$cat_id = (int) $cats[0]; // Take the first cat.
 
@@ -1135,8 +1173,9 @@ 
 
 	$link = get_category_feed_link($cat_ID, 'rss2');
 
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1155,8 +1194,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.5', 'get_author_feed_link()' );
 
 	$link = get_author_feed_link($author_id);
-	if ( $echo )
-		echo $link;
+	if ( $echo ) {
+			echo $link;
+	}
 	return $link;
 }
 
@@ -1248,19 +1288,22 @@ 
  */
 function get_category_children( $id, $before = '/', $after = '', $visited = array() ) {
 	_deprecated_function( __FUNCTION__, '2.8', 'get_term_children()' );
-	if ( 0 == $id )
-		return '';
+	if ( 0 == $id ) {
+			return '';
+	}
 
 	$chain = '';
 	/** TODO: consult hierarchy */
 	$cat_ids = get_all_category_ids();
 	foreach ( (array) $cat_ids as $cat_id ) {
-		if ( $cat_id == $id )
-			continue;
+		if ( $cat_id == $id ) {
+					continue;
+		}
 
 		$category = get_category( $cat_id );
-		if ( is_wp_error( $category ) )
-			return $category;
+		if ( is_wp_error( $category ) ) {
+					return $category;
+		}
 		if ( $category->parent == $id && !in_array( $category->term_id, $visited ) ) {
 			$visited[] = $category->term_id;
 			$chain .= $before.$category->term_id.$after;
@@ -1651,8 +1694,9 @@ 
 	_deprecated_function( __FUNCTION__, '2.9', 'the_content_feed' );
 	$content = get_the_content($more_link_text, $stripteaser);
 	$content = apply_filters('the_content_rss', $content);
-	if ( $cut && !$encode_html )
-		$encode_html = 2;
+	if ( $cut && !$encode_html ) {
+			$encode_html = 2;
+	}
 	if ( 1== $encode_html ) {
 		$content = esc_html($content);
 		$cut = 0;
@@ -1672,8 +1716,9 @@ 
 		}
 
 		/** @todo Check performance, might be faster to use array slice instead. */
-		for ( $i=0; $i<$k; $i++ )
-			$excerpt .= $blah[$i].' ';
+		for ( $i=0; $i<$k; $i++ ) {
+					$excerpt .= $blah[$i].' ';
+		}
 		$excerpt .= ($use_dotdotdot) ? '...' : '';
 		$content = $excerpt;
 	}
@@ -1826,11 +1871,13 @@ 
 	$id = (int) $id;
 	$_post = get_post($id);
 
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
+	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) ) {
+			return __('Missing Attachment');
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
+	if ( $permalink ) {
+			$url = get_attachment_link($_post->ID);
+	}
 
 	$post_title = esc_attr($_post->post_title);
 
@@ -1852,8 +1899,9 @@ 
 function get_attachment_icon_src( $id = 0, $fullsize = false ) {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image_src()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -1873,8 +1921,9 @@ 
 		$src_file = $icon_dir . '/' . basename($src);
 	}
 
-	if ( !isset($src) || !$src )
-		return false;
+	if ( !isset($src) || !$src ) {
+			return false;
+	}
 
 	return array($src, $src_file);
 }
@@ -1894,11 +1943,13 @@ 
 function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
+	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) {
+			return false;
+	}
 
 	list($src, $src_file) = $src;
 
@@ -1950,11 +2001,13 @@ 
 function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
 	_deprecated_function( __FUNCTION__, '2.5', 'wp_get_attachment_image()' );
 	$id = (int) $id;
-	if ( !$post = get_post($id) )
-		return false;
+	if ( !$post = get_post($id) ) {
+			return false;
+	}
 
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
+	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims)) {
+			return $innerHTML;
+	}
 
 	$innerHTML = esc_attr($post->post_title);
 
@@ -2010,10 +2063,11 @@ 
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
 function clean_url( $url, $protocols = null, $context = 'display' ) {
-	if ( $context == 'db' )
-		_deprecated_function( 'clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()' );
-	else
-		_deprecated_function( __FUNCTION__, '3.0', 'esc_url()' );
+	if ( $context == 'db' ) {
+			_deprecated_function( 'clean_url( $context = \'db\' )', '3.0', 'esc_url_raw()' );
+	} else {
+			_deprecated_function( __FUNCTION__, '3.0', 'esc_url()' );
+	}
 	return esc_url( $url, $protocols, $context );
 }
 
@@ -2088,20 +2142,23 @@ 
 	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_sidebar_widget()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($classname) && is_string($classname) )
-		$options['classname'] = $classname;
+	if ( !empty($classname) && is_string($classname) ) {
+			$options['classname'] = $classname;
+	}
 	$params = array_slice(func_get_args(), 2);
 	$args = array($id, $name, $output_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_sidebar_widget', $args);
 }
@@ -2143,22 +2200,26 @@ 
 	_deprecated_function( __FUNCTION__, '2.8', 'wp_register_widget_control()' );
 	// Compat
 	if ( is_array($name) ) {
-		if ( count($name) == 3 )
-			$name = sprintf($name[0], $name[2]);
-		else
-			$name = $name[0];
+		if ( count($name) == 3 ) {
+					$name = sprintf($name[0], $name[2]);
+		} else {
+					$name = $name[0];
+		}
 	}
 
 	$id = sanitize_title($name);
 	$options = array();
-	if ( !empty($width) )
-		$options['width'] = $width;
-	if ( !empty($height) )
-		$options['height'] = $height;
+	if ( !empty($width) ) {
+			$options['width'] = $width;
+	}
+	if ( !empty($height) ) {
+			$options['height'] = $height;
+	}
 	$params = array_slice(func_get_args(), 4);
 	$args = array($id, $name, $control_callback, $options);
-	if ( !empty($params) )
-		$args = array_merge($args, $params);
+	if ( !empty($params) ) {
+			$args = array_merge($args, $params);
+	}
 
 	call_user_func_array('wp_register_widget_control', $args);
 }
@@ -2192,29 +2253,34 @@ 
 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'delete_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
-	if ( is_array($meta_value) || is_object($meta_value) )
-		$meta_value = serialize($meta_value);
+	if ( is_array($meta_value) || is_object($meta_value) ) {
+			$meta_value = serialize($meta_value);
+	}
 	$meta_value = trim( $meta_value );
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'delete_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( ! empty($meta_value) )
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
-	else
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	if ( ! empty($meta_value) ) {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) );
+	} else {
+			$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( $cur && $cur->umeta_id )
-		do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur && $cur->umeta_id ) {
+			do_action( 'deleted_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2240,35 +2306,39 @@ 
 	global $wpdb;
 	$user_id = (int) $user_id;
 
-	if ( !$user_id )
-		return false;
+	if ( !$user_id ) {
+			return false;
+	}
 
 	if ( !empty($meta_key) ) {
 		$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 		$user = wp_cache_get($user_id, 'users');
 		// Check the cached user object
-		if ( false !== $user && isset($user->$meta_key) )
-			$metas = array($user->$meta_key);
-		else
-			$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		if ( false !== $user && isset($user->$meta_key) ) {
+					$metas = array($user->$meta_key);
+		} else {
+					$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
+		}
 	} else {
 		$metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM $wpdb->usermeta WHERE user_id = %d", $user_id) );
 	}
 
 	if ( empty($metas) ) {
-		if ( empty($meta_key) )
-			return array();
-		else
-			return '';
+		if ( empty($meta_key) ) {
+					return array();
+		} else {
+					return '';
+		}
 	}
 
 	$metas = array_map('maybe_unserialize', $metas);
 
-	if ( count($metas) == 1 )
-		return $metas[0];
-	else
-		return $metas;
-}
+	if ( count($metas) == 1 ) {
+			return $metas[0];
+	} else {
+			return $metas;
+	}
+	}
 
 /**
  * Update metadata of user.
@@ -2291,13 +2361,15 @@ 
 function update_usermeta( $user_id, $meta_key, $meta_value ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'update_user_meta()' );
 	global $wpdb;
-	if ( !is_numeric( $user_id ) )
-		return false;
+	if ( !is_numeric( $user_id ) ) {
+			return false;
+	}
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
 
 	/** @todo Might need fix because usermeta data is assumed to be already escaped */
-	if ( is_string($meta_value) )
-		$meta_value = stripslashes($meta_value);
+	if ( is_string($meta_value) ) {
+			$meta_value = stripslashes($meta_value);
+	}
 	$meta_value = maybe_serialize($meta_value);
 
 	if (empty($meta_value)) {
@@ -2306,23 +2378,26 @@ 
 
 	$cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
 
-	if ( $cur )
-		do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( $cur ) {
+			do_action( 'update_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
-	if ( !$cur )
-		$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
-	elseif ( $cur->meta_value != $meta_value )
-		$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
-	else
-		return false;
+	if ( !$cur ) {
+			$wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
+	} elseif ( $cur->meta_value != $meta_value ) {
+			$wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
+	} else {
+			return false;
+	}
 
 	clean_user_cache( $user_id );
 	wp_cache_delete( $user_id, 'user_meta' );
 
-	if ( !$cur )
-		do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
-	else
-		do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	if ( !$cur ) {
+			do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
+	} else {
+			do_action( 'updated_usermeta', $cur->umeta_id, $user_id, $meta_key, $meta_value );
+	}
 
 	return true;
 }
@@ -2347,8 +2422,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
 
 	global $wpdb, $blog_id;
-	if ( empty($id) )
-		$id = (int) $blog_id;
+	if ( empty($id) ) {
+			$id = (int) $blog_id;
+	}
 	$blog_prefix = $wpdb->get_blog_prefix($id);
 	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
 	return $users;
@@ -2366,10 +2442,12 @@ 
 function automatic_feed_links( $add = true ) {
 	_deprecated_function( __FUNCTION__, '3.0', "add_theme_support( 'automatic-feed-links' )" );
 
-	if ( $add )
-		add_theme_support( 'automatic-feed-links' );
-	else
-		remove_action( 'wp_head', 'feed_links_extra', 3 ); // Just do this yourself in 3.0+
+	if ( $add ) {
+			add_theme_support( 'automatic-feed-links' );
+	} else {
+			remove_action( 'wp_head', 'feed_links_extra', 3 );
+	}
+	// Just do this yourself in 3.0+
 }
 
 /**
@@ -2433,10 +2511,11 @@ 
 	// Fixes for browsers' JavaScript bugs.
 	global $is_macIE, $is_winIE;
 
-	if ( $is_winIE || $is_macIE )
-		$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
+	if ( $is_winIE || $is_macIE ) {
+			$text =  preg_replace_callback("/\%u([0-9A-F]{4,4})/",
 					"funky_javascript_callback",
 					$text);
+	}
 
 	return $text;
 }
@@ -2490,8 +2569,9 @@ 
 
 	global $plugin_page;
 
-	if ( isset($plugin_page) )
-		return true;
+	if ( isset($plugin_page) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -2562,8 +2642,9 @@ 
 	$objects = array();
 
 	$ids = array_map('intval', $ids);
-	foreach ( $ids as $id )
-		$objects[$id] = array();
+	foreach ( $ids as $id ) {
+			$objects[$id] = array();
+	}
 
 	$metas = update_meta_cache('user', $ids);
 
@@ -2594,21 +2675,25 @@ 
 	_deprecated_function( __FUNCTION__, '3.3' );
 
 	if ( is_object($user) ) {
-		if ( !isset($user->ID) )
-			$user->ID = 0;
+		if ( !isset($user->ID) ) {
+					$user->ID = 0;
+		}
 		if ( ! ( $user instanceof WP_User ) ) {
 			$vars = get_object_vars($user);
 			foreach ( array_keys($vars) as $field ) {
-				if ( is_string($user->$field) || is_numeric($user->$field) )
-					$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				if ( is_string($user->$field) || is_numeric($user->$field) ) {
+									$user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
+				}
 			}
 		}
 		$user->filter = $context;
 	} else {
-		if ( !isset($user['ID']) )
-			$user['ID'] = 0;
-		foreach ( array_keys($user) as $field )
-			$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		if ( !isset($user['ID']) ) {
+					$user['ID'] = 0;
+		}
+		foreach ( array_keys($user) as $field ) {
+					$user[$field] = sanitize_user_field($field, $user[$field], $user['ID'], $context);
+		}
 		$user['filter'] = $context;
 	}
 
@@ -2634,14 +2719,16 @@ 
 
 	$posts = get_boundary_post($in_same_cat, $excluded_categories, $start);
 	// If there is no post stop.
-	if ( empty($posts) )
-		return;
+	if ( empty($posts) ) {
+			return;
+	}
 
 	// Even though we limited get_posts to return only 1 item it still returns an array of objects.
 	$post = $posts[0];
 
-	if ( empty($post->post_title) )
-		$post->post_title = $start ? __('First Post') : __('Last Post');
+	if ( empty($post->post_title) ) {
+			$post->post_title = $start ? __('First Post') : __('Last Post');
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2712,11 +2799,13 @@ 
 function get_parent_post_rel_link($title = '%title') {
 	_deprecated_function( __FUNCTION__, '3.3' );
 
-	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) )
-		$post = get_post($GLOBALS['post']->post_parent);
+	if ( ! empty( $GLOBALS['post'] ) && ! empty( $GLOBALS['post']->post_parent ) ) {
+			$post = get_post($GLOBALS['post']->post_parent);
+	}
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$date = mysql2date(get_option('date_format'), $post->post_date);
 
@@ -2755,12 +2844,13 @@ 
 	$user_id = get_current_user_id();
 
 	if ( 0 != $user_id ) {
-		if ( is_admin() )
-			$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
-		elseif ( is_multisite() )
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
-		else
-			$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		if ( is_admin() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'view-site', 'title' => __( 'Visit Site' ), 'href' => home_url() ) );
+		} elseif ( is_multisite() ) {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => get_dashboard_url( $user_id ) ) );
+		} else {
+					$wp_admin_bar->add_menu( array( 'id' => 'dashboard', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+		}
 	}
 }
 
@@ -2805,9 +2895,10 @@ 
  */
 function debug_fwrite( $fp, $string ) {
 	_deprecated_function( __FUNCTION__, 'error_log()' );
-	if ( ! empty( $GLOBALS['debug'] ) )
-		error_log( $string );
-}
+	if ( ! empty( $GLOBALS['debug'] ) ) {
+			error_log( $string );
+	}
+	}
 
 /**
  * Close the debugging file handle.
@@ -2839,18 +2930,20 @@ 
 	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_themes()' );
 
 	global $wp_themes;
-	if ( isset( $wp_themes ) )
-		return $wp_themes;
+	if ( isset( $wp_themes ) ) {
+			return $wp_themes;
+	}
 
 	$themes = wp_get_themes();
 	$wp_themes = array();
 
 	foreach ( $themes as $theme ) {
 		$name = $theme->get('Name');
-		if ( isset( $wp_themes[ $name ] ) )
-			$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
-		else
-			$wp_themes[ $name ] = $theme;
+		if ( isset( $wp_themes[ $name ] ) ) {
+					$wp_themes[ $name . '/' . $theme->get_stylesheet() ] = $theme;
+		} else {
+					$wp_themes[ $name ] = $theme;
+		}
 	}
 
 	return $wp_themes;
@@ -2870,8 +2963,9 @@ 
 	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme( $stylesheet )' );
 
 	$themes = get_themes();
-	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
-		return $themes[ $theme ];
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) ) {
+			return $themes[ $theme ];
+	}
 	return null;
 }
 
@@ -2887,8 +2981,9 @@ 
 function get_current_theme() {
 	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
 
-	if ( $theme = get_option( 'current_theme' ) )
-		return $theme;
+	if ( $theme = get_option( 'current_theme' ) ) {
+			return $theme;
+	}
 
 	return wp_get_theme()->get('Name');
 }
@@ -2908,10 +3003,11 @@ 
 function clean_pre($matches) {
 	_deprecated_function( __FUNCTION__, '3.4' );
 
-	if ( is_array($matches) )
-		$text = $matches[1] . $matches[2] . "</pre>";
-	else
-		$text = $matches;
+	if ( is_array($matches) ) {
+			$text = $matches[1] . $matches[2] . "</pre>";
+	} else {
+			$text = $matches;
+	}
 
 	$text = str_replace(array('<br />', '<br/>', '<br>'), array('', '', ''), $text);
 	$text = str_replace('<p>', "\n", $text);
@@ -2938,8 +3034,9 @@ 
 		'wp-head-callback'    => $wp_head_callback,
 		'admin-head-callback' => $admin_head_callback,
 	);
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-header', $args );
 }
 
@@ -2971,12 +3068,15 @@ 
 function add_custom_background( $wp_head_callback = '', $admin_head_callback = '', $admin_preview_callback = '' ) {
 	_deprecated_function( __FUNCTION__, '3.4', 'add_theme_support( \'custom-background\', $args )' );
 	$args = array();
-	if ( $wp_head_callback )
-		$args['wp-head-callback'] = $wp_head_callback;
-	if ( $admin_head_callback )
-		$args['admin-head-callback'] = $admin_head_callback;
-	if ( $admin_preview_callback )
-		$args['admin-preview-callback'] = $admin_preview_callback;
+	if ( $wp_head_callback ) {
+			$args['wp-head-callback'] = $wp_head_callback;
+	}
+	if ( $admin_head_callback ) {
+			$args['admin-head-callback'] = $admin_head_callback;
+	}
+	if ( $admin_preview_callback ) {
+			$args['admin-preview-callback'] = $admin_preview_callback;
+	}
 	return add_theme_support( 'custom-background', $args );
 }
 
@@ -3023,8 +3123,9 @@ 
 	);
 
 	foreach ( apply_filters( 'extra_theme_headers', array() ) as $extra_header ) {
-		if ( ! isset( $theme_data[ $extra_header ] ) )
-			$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		if ( ! isset( $theme_data[ $extra_header ] ) ) {
+					$theme_data[ $extra_header ] = $theme->get( $extra_header );
+		}
 	}
 
 	return $theme_data;
@@ -3093,9 +3194,10 @@ 
  */
 function sticky_class( $post_id = null ) {
 	_deprecated_function( __FUNCTION__, '3.5', 'post_class()' );
-	if ( is_sticky( $post_id ) )
-		echo ' sticky';
-}
+	if ( is_sticky( $post_id ) ) {
+			echo ' sticky';
+	}
+	}
 
 /**
  * Retrieve post ancestors.
@@ -3124,21 +3226,25 @@ 
 function wp_load_image( $file ) {
 	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
 
-	if ( is_numeric( $file ) )
-		$file = get_attached_file( $file );
+	if ( is_numeric( $file ) ) {
+			$file = get_attached_file( $file );
+	}
 
-	if ( ! is_file( $file ) )
-		return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
+	if ( ! is_file( $file ) ) {
+			return sprintf(__('File &#8220;%s&#8221; doesn&#8217;t exist?'), $file);
+	}
 
-	if ( ! function_exists('imagecreatefromstring') )
-		return __('The GD image library is not installed.');
+	if ( ! function_exists('imagecreatefromstring') ) {
+			return __('The GD image library is not installed.');
+	}
 
 	// Set artificially high because GD uses uncompressed images in memory
 	@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 	$image = imagecreatefromstring( file_get_contents( $file ) );
 
-	if ( !is_resource( $image ) )
-		return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
+	if ( !is_resource( $image ) ) {
+			return sprintf(__('File &#8220;%s&#8221; is not an image.'), $file);
+	}
 
 	return $image;
 }
@@ -3171,19 +3277,22 @@ 
 	_deprecated_function( __FUNCTION__, '3.5', 'wp_get_image_editor()' );
 
 	$editor = wp_get_image_editor( $file );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 	$editor->set_quality( $jpeg_quality );
 
 	$resized = $editor->resize( $max_w, $max_h, $crop );
-	if ( is_wp_error( $resized ) )
-		return $resized;
+	if ( is_wp_error( $resized ) ) {
+			return $resized;
+	}
 
 	$dest_file = $editor->generate_filename( $suffix, $dest_path );
 	$saved = $editor->save( $dest_file );
 
-	if ( is_wp_error( $saved ) )
-		return $saved;
+	if ( is_wp_error( $saved ) ) {
+			return $saved;
+	}
 
 	return $dest_file;
 }
@@ -3221,8 +3330,9 @@ 
 function user_pass_ok($user_login, $user_pass) {
 	_deprecated_function( __FUNCTION__, '3.5', 'wp_authenticate()' );
 	$user = wp_authenticate( $user_login, $user_pass );
-	if ( is_wp_error( $user ) )
-		return false;
+	if ( is_wp_error( $user ) ) {
+			return false;
+	}
 
 	return true;
 }
@@ -3325,8 +3435,9 @@ 
 	global $wp_rich_edit_exists;
 	_deprecated_function( __FUNCTION__, '3.9' );
 
-	if ( ! isset( $wp_rich_edit_exists ) )
-		$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	if ( ! isset( $wp_rich_edit_exists ) ) {
+			$wp_rich_edit_exists = file_exists( ABSPATH . WPINC . '/js/tinymce/tinymce.js' );
+	}
 
 	return $wp_rich_edit_exists;
 }
@@ -3531,8 +3642,10 @@ 
 function wp_htmledit_pre($output) {
 	_deprecated_function( __FUNCTION__, '4.3', 'format_for_editor()' );
 
-	if ( !empty($output) )
-		$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
+	if ( !empty($output) ) {
+			$output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+	}
+	// convert only < > &
 
 	/**
 	 * Filter the text before it is formatted for the HTML editor.

src/wp-includes/feed.php

Doc Comments +1 added lines, -1 removed lines

@@ -524,7 +524,7 @@
  * @since 2.5.0
  *
  * @param string $data Input string
- * @return array array(type, value)
+ * @return string[] array(type, value)
  */
 function prep_atom_text_construct($data) {
 	if (strpos($data, '<') === false && strpos($data, '&') === false) {

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * WordPress Feed API
- *
- * Many of the functions used in here belong in The Loop, or The Loop for the
- * Feeds.
- *
- * @package WordPress
- * @subpackage Feed
- */
+	 * WordPress Feed API
+	 *
+	 * Many of the functions used in here belong in The Loop, or The Loop for the
+	 * Feeds.
+	 *
+	 * @package WordPress
+	 * @subpackage Feed
+	 */
 
 /**
  * RSS container for the bloginfo function.

Spacing +70 added lines, -70 removed lines

@@ -35,7 +35,7 @@ 
 	 * @param string $info Converted string value of the blog information.
 	 * @param string $show The type of blog information to retrieve.
 	 */
-	return apply_filters( 'get_bloginfo_rss', convert_chars( $info ), $show );
+	return apply_filters('get_bloginfo_rss', convert_chars($info), $show);
 }
 
 /**
@@ -61,7 +61,7 @@ 
 	 * @param string $rss_container RSS container for the blog information.
 	 * @param string $show          The type of blog information to retrieve.
 	 */
-	echo apply_filters( 'bloginfo_rss', get_bloginfo_rss( $show ), $show );
+	echo apply_filters('bloginfo_rss', get_bloginfo_rss($show), $show);
 }
 
 /**
@@ -83,7 +83,7 @@ 
 	 * @param string $feed_type Type of default feed. Possible values include 'rss2', 'atom'.
 	 *                          Default 'rss2'.
 	 */
-	$default_feed = apply_filters( 'default_feed', 'rss2' );
+	$default_feed = apply_filters('default_feed', 'rss2');
 	return 'rss' == $default_feed ? 'rss2' : $default_feed;
 }
 
@@ -95,15 +95,15 @@ 
  * @param string $sep Optional. How to separate the title. See wp_title() for more info.
  * @return string Error message on failure or blog title on success.
  */
-function get_wp_title_rss( $sep = '»' ) {
-	$title = wp_title( $sep, false );
+function get_wp_title_rss($sep = '»') {
+	$title = wp_title($sep, false);
 
-	if ( is_wp_error( $title ) ) {
+	if (is_wp_error($title)) {
 		return $title->get_error_message();
 	}
 
-	if ( $title && $sep && ' ' !== substr( $title, 0, 1 ) ) {
-		$title = " $sep " . $title;
+	if ($title && $sep && ' ' !== substr($title, 0, 1)) {
+		$title = " $sep ".$title;
 	}
 
 	/**
@@ -114,7 +114,7 @@ 
 	 * @param string $title The current blog title.
 	 * @param string $sep   Separator used by wp_title().
 	 */
-	$title = apply_filters( 'get_wp_title_rss', $title, $sep );
+	$title = apply_filters('get_wp_title_rss', $title, $sep);
 	return $title;
 }
 
@@ -126,7 +126,7 @@ 
  *
  * @param string $sep Optional.
  */
-function wp_title_rss( $sep = '»' ) {
+function wp_title_rss($sep = '»') {
 	/**
 	 * Filter the blog title for display of the feed title.
 	 *
@@ -137,7 +137,7 @@ 
 	 * @param string $wp_title The current blog title.
 	 * @param string $sep      Separator used by wp_title().
 	 */
-	echo apply_filters( 'wp_title_rss', get_wp_title_rss( $sep ), $sep );
+	echo apply_filters('wp_title_rss', get_wp_title_rss($sep), $sep);
 }
 
 /**
@@ -156,7 +156,7 @@ 
 	 *
 	 * @param string $title The current post title.
 	 */
-	$title = apply_filters( 'the_title_rss', $title );
+	$title = apply_filters('the_title_rss', $title);
 	return $title;
 }
 
@@ -179,11 +179,11 @@ 
  * @return string The filtered content.
  */
 function get_the_content_feed($feed_type = null) {
-	if ( !$feed_type )
+	if ( ! $feed_type)
 		$feed_type = get_default_feed();
 
 	/** This filter is documented in wp-includes/post-template.php */
-	$content = apply_filters( 'the_content', get_the_content() );
+	$content = apply_filters('the_content', get_the_content());
 	$content = str_replace(']]>', ']]>', $content);
 	/**
 	 * Filter the post content for use in feeds.
@@ -194,7 +194,7 @@ 
 	 * @param string $feed_type Type of feed. Possible values include 'rss2', 'atom'.
 	 *                          Default 'rss2'.
 	 */
-	return apply_filters( 'the_content_feed', $content, $feed_type );
+	return apply_filters('the_content_feed', $content, $feed_type);
 }
 
 /**
@@ -222,7 +222,7 @@ 
 	 *
 	 * @param string $output The current post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt_rss', $output );
+	echo apply_filters('the_excerpt_rss', $output);
 }
 
 /**
@@ -238,7 +238,7 @@ 
 	 *
 	 * @param string $post_permalink The current post permalink.
 	 */
-	echo esc_url( apply_filters( 'the_permalink_rss', get_permalink() ) );
+	echo esc_url(apply_filters('the_permalink_rss', get_permalink()));
 }
 
 /**
@@ -256,7 +256,7 @@ 
 	 * @param string $comment_permalink The current comment permalink with
 	 *                                  '#comments' appended.
 	 */
-	echo esc_url( apply_filters( 'comments_link_feed', get_comments_link() ) );
+	echo esc_url(apply_filters('comments_link_feed', get_comments_link()));
 }
 
 /**
@@ -267,7 +267,7 @@ 
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
  */
 function comment_guid($comment_id = null) {
-	echo esc_url( get_comment_guid($comment_id) );
+	echo esc_url(get_comment_guid($comment_id));
 }
 
 /**
@@ -281,10 +281,10 @@ 
 function get_comment_guid($comment_id = null) {
 	$comment = get_comment($comment_id);
 
-	if ( !is_object($comment) )
+	if ( ! is_object($comment))
 		return false;
 
-	return get_the_guid($comment->comment_post_ID) . '#comment-' . $comment->comment_ID;
+	return get_the_guid($comment->comment_post_ID).'#comment-'.$comment->comment_ID;
 }
 
 /**
@@ -302,7 +302,7 @@ 
 	 *
 	 * @param string $comment_permalink The current comment permalink.
 	 */
-	echo esc_url( apply_filters( 'comment_link', get_comment_link() ) );
+	echo esc_url(apply_filters('comment_link', get_comment_link()));
 }
 
 /**
@@ -322,7 +322,7 @@ 
 	 *
 	 * @param string $comment_author The current comment author.
 	 */
-	return apply_filters( 'comment_author_rss', get_comment_author() );
+	return apply_filters('comment_author_rss', get_comment_author());
 }
 
 /**
@@ -348,7 +348,7 @@ 
 	 *
 	 * @param string $comment_text The content of the current comment.
 	 */
-	$comment_text = apply_filters( 'comment_text_rss', $comment_text );
+	$comment_text = apply_filters('comment_text_rss', $comment_text);
 	echo $comment_text;
 }
 
@@ -365,7 +365,7 @@ 
  * @return string All of the post categories for displaying in the feed.
  */
 function get_the_category_rss($type = null) {
-	if ( empty($type) )
+	if (empty($type))
 		$type = get_default_feed();
 	$categories = get_the_category();
 	$tags = get_the_tags();
@@ -373,26 +373,26 @@ 
 	$cat_names = array();
 
 	$filter = 'rss';
-	if ( 'atom' == $type )
+	if ('atom' == $type)
 		$filter = 'raw';
 
-	if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
+	if ( ! empty($categories)) foreach ((array) $categories as $category) {
 		$cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
 	}
 
-	if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
+	if ( ! empty($tags)) foreach ((array) $tags as $tag) {
 		$cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
 	}
 
 	$cat_names = array_unique($cat_names);
 
-	foreach ( $cat_names as $cat_name ) {
-		if ( 'rdf' == $type )
+	foreach ($cat_names as $cat_name) {
+		if ('rdf' == $type)
 			$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
-		elseif ( 'atom' == $type )
-			$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
+		elseif ('atom' == $type)
+			$the_list .= sprintf('<category scheme="%1$s" term="%2$s" />', esc_attr(get_bloginfo_rss('url')), esc_attr($cat_name));
 		else
-			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+			$the_list .= "\t\t<category><![CDATA[".@html_entity_decode($cat_name, ENT_COMPAT, get_option('blog_charset'))."]]></category>\n";
 	}
 
 	/**
@@ -404,7 +404,7 @@ 
 	 * @param string $type     Type of feed. Possible values include 'rss2', 'atom'.
 	 *                         Default 'rss2'.
 	 */
-	return apply_filters( 'the_category_rss', $the_list, $type );
+	return apply_filters('the_category_rss', $the_list, $type);
 }
 
 /**
@@ -450,16 +450,16 @@ 
  * @since 1.5.0
  */
 function rss_enclosure() {
-	if ( post_password_required() )
+	if (post_password_required())
 		return;
 
-	foreach ( (array) get_post_custom() as $key => $val) {
+	foreach ((array) get_post_custom() as $key => $val) {
 		if ($key == 'enclosure') {
-			foreach ( (array) $val as $enc ) {
+			foreach ((array) $val as $enc) {
 				$enclosure = explode("\n", $enc);
 
 				// only get the first element, e.g. audio/mpeg from 'audio/mpeg mpga mp2 mp3'
-				$t = preg_split('/[ \t]/', trim($enclosure[2]) );
+				$t = preg_split('/[ \t]/', trim($enclosure[2]));
 				$type = $t[0];
 
 				/**
@@ -469,7 +469,7 @@ 
 				 *
 				 * @param string $html_link_tag The HTML link tag with a URI and other attributes.
 				 */
-				echo apply_filters( 'rss_enclosure', '<enclosure url="' . trim( htmlspecialchars( $enclosure[0] ) ) . '" length="' . trim( $enclosure[1] ) . '" type="' . $type . '" />' . "\n" );
+				echo apply_filters('rss_enclosure', '<enclosure url="'.trim(htmlspecialchars($enclosure[0])).'" length="'.trim($enclosure[1]).'" type="'.$type.'" />'."\n");
 			}
 		}
 	}
@@ -489,12 +489,12 @@ 
  * @since 2.2.0
  */
 function atom_enclosure() {
-	if ( post_password_required() )
+	if (post_password_required())
 		return;
 
-	foreach ( (array) get_post_custom() as $key => $val ) {
+	foreach ((array) get_post_custom() as $key => $val) {
 		if ($key == 'enclosure') {
-			foreach ( (array) $val as $enc ) {
+			foreach ((array) $val as $enc) {
 				$enclosure = explode("\n", $enc);
 				/**
 				 * Filter the atom enclosure HTML link tag for the current post.
@@ -503,7 +503,7 @@ 
 				 *
 				 * @param string $html_link_tag The HTML link tag with a URI and other attributes.
 				 */
-				echo apply_filters( 'atom_enclosure', '<link href="' . trim( htmlspecialchars( $enclosure[0] ) ) . '" rel="enclosure" length="' . trim( $enclosure[1] ) . '" type="' . trim( $enclosure[2] ) . '" />' . "\n" );
+				echo apply_filters('atom_enclosure', '<link href="'.trim(htmlspecialchars($enclosure[0])).'" rel="enclosure" length="'.trim($enclosure[1]).'" type="'.trim($enclosure[2]).'" />'."\n");
 			}
 		}
 	}
@@ -532,11 +532,11 @@ 
 	}
 
 	$parser = xml_parser_create();
-	xml_parse($parser, '<div>' . $data . '</div>', true);
+	xml_parse($parser, '<div>'.$data.'</div>', true);
 	$code = xml_get_error_code($parser);
 	xml_parser_free($parser);
 
-	if (!$code) {
+	if ( ! $code) {
 		if (strpos($data, '<') === false) {
 			return array('text', $data);
 		} else {
@@ -560,8 +560,8 @@ 
  * @see get_site_icon_url()
  */
 function atom_site_icon() {
-	$url = get_site_icon_url( 32 );
-	if ( $url ) {
+	$url = get_site_icon_url(32);
+	if ($url) {
 		echo "<icon>$url</icon>\n";
 	}
 }
@@ -573,17 +573,17 @@ 
  */
 function rss2_site_icon() {
 	$rss_title = get_wp_title_rss();
-	if ( empty( $rss_title ) ) {
-		$rss_title = get_bloginfo_rss( 'name' );
+	if (empty($rss_title)) {
+		$rss_title = get_bloginfo_rss('name');
 	}
 
-	$url = get_site_icon_url( 32 );
-	if ( $url ) {
+	$url = get_site_icon_url(32);
+	if ($url) {
 		echo '
 <image>
-	<url>' . convert_chars( $url ) . '</url>
-	<title>' . $rss_title . '</title>
-	<link>' . get_bloginfo_rss( 'url' ) . '</link>
+	<url>' . convert_chars($url).'</url>
+	<title>' . $rss_title.'</title>
+	<link>' . get_bloginfo_rss('url').'</link>
 	<width>32</width>
 	<height>32</height>
 </image> ' . "\n";
@@ -609,7 +609,7 @@ 
 	 *
 	 * @param string $feed_link The link for the feed with set URL scheme.
 	 */
-	echo esc_url( apply_filters( 'self_link', set_url_scheme( 'http://' . $host['host'] . wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
+	echo esc_url(apply_filters('self_link', set_url_scheme('http://'.$host['host'].wp_unslash($_SERVER['REQUEST_URI']))));
 }
 
 /**
@@ -617,8 +617,8 @@ 
  *
  * @since 2.8.0
  */
-function feed_content_type( $type = '' ) {
-	if ( empty($type) )
+function feed_content_type($type = '') {
+	if (empty($type))
 		$type = get_default_feed();
 
 	$types = array(
@@ -629,7 +629,7 @@ 
 		'rdf'  => 'application/rdf+xml'
 	);
 
-	$content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
+	$content_type = ( ! empty($types[$type])) ? $types[$type] : 'application/octet-stream';
 
 	/**
 	 * Filter the content type for a specific feed type.
@@ -640,7 +640,7 @@ 
 	 * @param string $type         Type of feed. Possible values include 'rss2', 'atom'.
 	 *                             Default 'rss2'.
 	 */
-	return apply_filters( 'feed_content_type', $content_type, $type );
+	return apply_filters('feed_content_type', $content_type, $type);
 }
 
 /**
@@ -654,22 +654,22 @@ 
  *
  * @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
  */
-function fetch_feed( $url ) {
-	require_once( ABSPATH . WPINC . '/class-feed.php' );
+function fetch_feed($url) {
+	require_once(ABSPATH.WPINC.'/class-feed.php');
 
 	$feed = new SimplePie();
 
-	$feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
+	$feed->set_sanitize_class('WP_SimplePie_Sanitize_KSES');
 	// We must manually overwrite $feed->sanitize because SimplePie's
 	// constructor sets it before we have a chance to set the sanitization class
 	$feed->sanitize = new WP_SimplePie_Sanitize_KSES();
 
-	$feed->set_cache_class( 'WP_Feed_Cache' );
-	$feed->set_file_class( 'WP_SimplePie_File' );
+	$feed->set_cache_class('WP_Feed_Cache');
+	$feed->set_file_class('WP_SimplePie_File');
 
-	$feed->set_feed_url( $url );
+	$feed->set_feed_url($url);
 	/** This filter is documented in wp-includes/class-feed.php */
-	$feed->set_cache_duration( apply_filters( 'wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url ) );
+	$feed->set_cache_duration(apply_filters('wp_feed_cache_transient_lifetime', 12 * HOUR_IN_SECONDS, $url));
 	/**
 	 * Fires just before processing the SimplePie feed object.
 	 *
@@ -678,13 +678,13 @@ 
 	 * @param object &$feed SimplePie feed object, passed by reference.
 	 * @param mixed  $url   URL of feed to retrieve. If an array of URLs, the feeds are merged.
 	 */
-	do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
+	do_action_ref_array('wp_feed_options', array(&$feed, $url));
 	$feed->init();
-	$feed->set_output_encoding( get_option( 'blog_charset' ) );
+	$feed->set_output_encoding(get_option('blog_charset'));
 	$feed->handle_content_type();
 
-	if ( $feed->error() )
-		return new WP_Error( 'simplepie-error', $feed->error() );
+	if ($feed->error())
+		return new WP_Error('simplepie-error', $feed->error());
 
 	return $feed;
 }

Braces +42 added lines, -28 removed lines

@@ -179,8 +179,9 @@ 
  * @return string The filtered content.
  */
 function get_the_content_feed($feed_type = null) {
-	if ( !$feed_type )
-		$feed_type = get_default_feed();
+	if ( !$feed_type ) {
+			$feed_type = get_default_feed();
+	}
 
 	/** This filter is documented in wp-includes/post-template.php */
 	$content = apply_filters( 'the_content', get_the_content() );
@@ -281,8 +282,9 @@ 
 function get_comment_guid($comment_id = null) {
 	$comment = get_comment($comment_id);
 
-	if ( !is_object($comment) )
-		return false;
+	if ( !is_object($comment) ) {
+			return false;
+	}
 
 	return get_the_guid($comment->comment_post_ID) . '#comment-' . $comment->comment_ID;
 }
@@ -365,34 +367,41 @@ 
  * @return string All of the post categories for displaying in the feed.
  */
 function get_the_category_rss($type = null) {
-	if ( empty($type) )
-		$type = get_default_feed();
+	if ( empty($type) ) {
+			$type = get_default_feed();
+	}
 	$categories = get_the_category();
 	$tags = get_the_tags();
 	$the_list = '';
 	$cat_names = array();
 
 	$filter = 'rss';
-	if ( 'atom' == $type )
-		$filter = 'raw';
+	if ( 'atom' == $type ) {
+			$filter = 'raw';
+	}
 
-	if ( !empty($categories) ) foreach ( (array) $categories as $category ) {
+	if ( !empty($categories) ) {
+		foreach ( (array) $categories as $category ) {
 		$cat_names[] = sanitize_term_field('name', $category->name, $category->term_id, 'category', $filter);
 	}
+	}
 
-	if ( !empty($tags) ) foreach ( (array) $tags as $tag ) {
+	if ( !empty($tags) ) {
+		foreach ( (array) $tags as $tag ) {
 		$cat_names[] = sanitize_term_field('name', $tag->name, $tag->term_id, 'post_tag', $filter);
 	}
+	}
 
 	$cat_names = array_unique($cat_names);
 
 	foreach ( $cat_names as $cat_name ) {
-		if ( 'rdf' == $type )
-			$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
-		elseif ( 'atom' == $type )
-			$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
-		else
-			$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+		if ( 'rdf' == $type ) {
+					$the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
+		} elseif ( 'atom' == $type ) {
+					$the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
+		} else {
+					$the_list .= "\t\t<category><![CDATA[" . @html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n";
+		}
 	}
 
 	/**
@@ -428,10 +437,11 @@ 
  */
 function html_type_rss() {
 	$type = get_bloginfo('html_type');
-	if (strpos($type, 'xhtml') !== false)
-		$type = 'xhtml';
-	else
-		$type = 'html';
+	if (strpos($type, 'xhtml') !== false) {
+			$type = 'xhtml';
+	} else {
+			$type = 'html';
+	}
 	echo $type;
 }
 
@@ -450,8 +460,9 @@ 
  * @since 1.5.0
  */
 function rss_enclosure() {
-	if ( post_password_required() )
-		return;
+	if ( post_password_required() ) {
+			return;
+	}
 
 	foreach ( (array) get_post_custom() as $key => $val) {
 		if ($key == 'enclosure') {
@@ -489,8 +500,9 @@ 
  * @since 2.2.0
  */
 function atom_enclosure() {
-	if ( post_password_required() )
-		return;
+	if ( post_password_required() ) {
+			return;
+	}
 
 	foreach ( (array) get_post_custom() as $key => $val ) {
 		if ($key == 'enclosure') {
@@ -618,8 +630,9 @@ 
  * @since 2.8.0
  */
 function feed_content_type( $type = '' ) {
-	if ( empty($type) )
-		$type = get_default_feed();
+	if ( empty($type) ) {
+			$type = get_default_feed();
+	}
 
 	$types = array(
 		'rss'  => 'application/rss+xml',
@@ -683,8 +696,9 @@ 
 	$feed->set_output_encoding( get_option( 'blog_charset' ) );
 	$feed->handle_content_type();
 
-	if ( $feed->error() )
-		return new WP_Error( 'simplepie-error', $feed->error() );
+	if ( $feed->error() ) {
+			return new WP_Error( 'simplepie-error', $feed->error() );
+	}
 
 	return $feed;
 }

src/wp-includes/formatting.php

Doc Comments +3 added lines, -4 removed lines

@@ -884,7 +884,7 @@ 
  * @since 2.8.0
  *
  * @param string     $string The text which is to be decoded.
- * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
  *                                both single and double if set to ENT_QUOTES or
  *                                none if set to ENT_NOQUOTES.
  *                                Also compatible with old _wp_specialchars() values;
@@ -2546,7 +2546,7 @@ 
  * @since 1.5.0
  *
  * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
- * @return int|float The offset in seconds.
+ * @return integer The offset in seconds.
  */
 function iso8601_timezone_to_offset( $timezone ) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
@@ -3215,7 +3215,7 @@ 
  * @since 2.8.1
  * @access private
  *
- * @param string|array $search  The value being searched for, otherwise known as the needle.
+ * @param string[] $search  The value being searched for, otherwise known as the needle.
  *                              An array may be used to designate multiple needles.
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
@@ -3795,7 +3795,6 @@ 
  * @link http://www.php.net/sprintf
  *
  * @param string $pattern   The string which formatted args are inserted.
- * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
 function wp_sprintf( $pattern ) {

Indentation +13 added lines, -13 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Main WordPress Formatting API.
- *
- * Handles many functions for formatting output.
- *
- * @package WordPress
- */
+	 * Main WordPress Formatting API.
+	 *
+	 * Handles many functions for formatting output.
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Replaces common plain text characters into formatted entities
@@ -741,7 +741,7 @@ 
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
 		.     '(?![\\w-])'                   // Not followed by word character or hyphen
-		                                     // Unroll the loop: Inside the opening shortcode tag
+											 // Unroll the loop: Inside the opening shortcode tag
 		.     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
 		.     '(?:'
 		.         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
@@ -2153,7 +2153,7 @@ 
 				)
 				(\)?)                                                  # 3: Trailing closing parenthesis (for parethesis balancing post processing)
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
-			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
+				  // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
 			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
 
@@ -3369,7 +3369,7 @@ 
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'js_escape', $safe_text, $text );
 }
@@ -3394,7 +3394,7 @@ 
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_html', $safe_text, $text );
 }
@@ -3419,7 +3419,7 @@ 
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'attribute_escape', $safe_text, $text );
 }
@@ -3440,7 +3440,7 @@ 
 	 * @since 3.1.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_textarea', $safe_text, $text );
 }
@@ -3461,7 +3461,7 @@ 
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_tag The tag name after it has been escaped.
- 	 * @param string $tag_name The text before it was escaped.
+	 * @param string $tag_name The text before it was escaped.
 	 */
 	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
 }

Spacing +899 added lines, -900 removed lines

@@ -38,7 +38,7 @@ 
  * @param bool   $reset Set to true for unit testing. Translated patterns will reset.
  * @return string The string replaced with html entities
  */
-function wptexturize( $text, $reset = false ) {
+function wptexturize($text, $reset = false) {
 	global $wp_cockneyreplace, $shortcode_tags;
 	static $static_characters = null,
 		$static_replacements = null,
@@ -59,12 +59,12 @@ 
 		$apos_flag = '<!--apos-->';
 
 	// If there's nothing to do, just stop.
-	if ( empty( $text ) || false === $run_texturize ) {
+	if (empty($text) || false === $run_texturize) {
 		return $text;
 	}
 
 	// Set up static variables. Run once only.
-	if ( $reset || ! isset( $static_characters ) ) {
+	if ($reset || ! isset($static_characters)) {
 		/**
 		 * Filter whether to skip running wptexturize().
 		 *
@@ -79,118 +79,118 @@ 
 		 *
 		 * @param bool $run_texturize Whether to short-circuit wptexturize().
 		 */
-		$run_texturize = apply_filters( 'run_wptexturize', $run_texturize );
-		if ( false === $run_texturize ) {
+		$run_texturize = apply_filters('run_wptexturize', $run_texturize);
+		if (false === $run_texturize) {
 			return $text;
 		}
 
 		/* translators: opening curly double quote */
-		$opening_quote = _x( '&#8220;', 'opening curly double quote' );
+		$opening_quote = _x('&#8220;', 'opening curly double quote');
 		/* translators: closing curly double quote */
-		$closing_quote = _x( '&#8221;', 'closing curly double quote' );
+		$closing_quote = _x('&#8221;', 'closing curly double quote');
 
 		/* translators: apostrophe, for example in 'cause or can't */
-		$apos = _x( '&#8217;', 'apostrophe' );
+		$apos = _x('&#8217;', 'apostrophe');
 
 		/* translators: prime, for example in 9' (nine feet) */
-		$prime = _x( '&#8242;', 'prime' );
+		$prime = _x('&#8242;', 'prime');
 		/* translators: double prime, for example in 9" (nine inches) */
-		$double_prime = _x( '&#8243;', 'double prime' );
+		$double_prime = _x('&#8243;', 'double prime');
 
 		/* translators: opening curly single quote */
-		$opening_single_quote = _x( '&#8216;', 'opening curly single quote' );
+		$opening_single_quote = _x('&#8216;', 'opening curly single quote');
 		/* translators: closing curly single quote */
-		$closing_single_quote = _x( '&#8217;', 'closing curly single quote' );
+		$closing_single_quote = _x('&#8217;', 'closing curly single quote');
 
 		/* translators: en dash */
-		$en_dash = _x( '&#8211;', 'en dash' );
+		$en_dash = _x('&#8211;', 'en dash');
 		/* translators: em dash */
-		$em_dash = _x( '&#8212;', 'em dash' );
+		$em_dash = _x('&#8212;', 'em dash');
 
 		$default_no_texturize_tags = array('pre', 'code', 'kbd', 'style', 'script', 'tt');
 		$default_no_texturize_shortcodes = array('code');
 
 		// if a plugin has provided an autocorrect array, use it
-		if ( isset($wp_cockneyreplace) ) {
-			$cockney = array_keys( $wp_cockneyreplace );
-			$cockneyreplace = array_values( $wp_cockneyreplace );
+		if (isset($wp_cockneyreplace)) {
+			$cockney = array_keys($wp_cockneyreplace);
+			$cockneyreplace = array_values($wp_cockneyreplace);
 		} else {
 			/* translators: This is a comma-separated list of words that defy the syntax of quotations in normal use,
 			 * for example...  'We do not have enough words yet' ... is a typical quoted phrase.  But when we write
 			 * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.
 			 */
-			$cockney = explode( ',', _x( "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
-				'Comma-separated list of words to texturize in your language' ) );
+			$cockney = explode(',', _x("'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
+				'Comma-separated list of words to texturize in your language'));
 
-			$cockneyreplace = explode( ',', _x( '&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
-				'Comma-separated list of replacement words in your language' ) );
+			$cockneyreplace = explode(',', _x('&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
+				'Comma-separated list of replacement words in your language'));
 		}
 
-		$static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
-		$static_replacements = array_merge( array( '&#8230;', $opening_quote, $closing_quote, ' &#8482;' ), $cockneyreplace );
+		$static_characters = array_merge(array('...', '``', '\'\'', ' (tm)'), $cockney);
+		$static_replacements = array_merge(array('&#8230;', $opening_quote, $closing_quote, ' &#8482;'), $cockneyreplace);
 
 
 		// Pattern-based replacements of characters.
 		// Sort the remaining patterns into several arrays for performance tuning.
-		$dynamic_characters = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
-		$dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
+		$dynamic_characters = array('apos' => array(), 'quote' => array(), 'dash' => array());
+		$dynamic_replacements = array('apos' => array(), 'quote' => array(), 'dash' => array());
 		$dynamic = array();
 		$spaces = wp_spaces_regexp();
 
 		// '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
-		if ( "'" !== $apos || "'" !== $closing_single_quote ) {
-			$dynamic[ '/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_single_quote;
+		if ("'" !== $apos || "'" !== $closing_single_quote) {
+			$dynamic['/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_single_quote;
 		}
-		if ( "'" !== $apos || '"' !== $closing_quote ) {
-			$dynamic[ '/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_quote;
+		if ("'" !== $apos || '"' !== $closing_quote) {
+			$dynamic['/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_quote;
 		}
 
 		// '99 '99s '99's (apostrophe)  But never '9 or '99% or '999 or '99.0.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/'] = $apos_flag;
 		}
 
 		// Quoted Numbers like '0.42'
-		if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $open_sq_flag . '$1' . $closing_single_quote;
+		if ("'" !== $opening_single_quote && "'" !== $closing_single_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')\'(\d[.,\d]*)\'/'] = $open_sq_flag.'$1'.$closing_single_quote;
 		}
 
 		// Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
-		if ( "'" !== $opening_single_quote ) {
-			$dynamic[ '/(?<=\A|[([{"\-]|&lt;|' . $spaces . ')\'/' ] = $open_sq_flag;
+		if ("'" !== $opening_single_quote) {
+			$dynamic['/(?<=\A|[([{"\-]|&lt;|'.$spaces.')\'/'] = $open_sq_flag;
 		}
 
 		// Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/(?<!'.$spaces.')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|'.$spaces.')/'] = $apos_flag;
 		}
 
-		$dynamic_characters['apos'] = array_keys( $dynamic );
-		$dynamic_replacements['apos'] = array_values( $dynamic );
+		$dynamic_characters['apos'] = array_keys($dynamic);
+		$dynamic_replacements['apos'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Quoted Numbers like "42"
-		if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $open_q_flag . '$1' . $closing_quote;
+		if ('"' !== $opening_quote && '"' !== $closing_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')"(\d[.,\d]*)"/'] = $open_q_flag.'$1'.$closing_quote;
 		}
 
 		// Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
-		if ( '"' !== $opening_quote ) {
-			$dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"(?!' . $spaces . ')/' ] = $open_q_flag;
+		if ('"' !== $opening_quote) {
+			$dynamic['/(?<=\A|[([{\-]|&lt;|'.$spaces.')"(?!'.$spaces.')/'] = $open_q_flag;
 		}
 
-		$dynamic_characters['quote'] = array_keys( $dynamic );
-		$dynamic_replacements['quote'] = array_values( $dynamic );
+		$dynamic_characters['quote'] = array_keys($dynamic);
+		$dynamic_replacements['quote'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Dashes and spaces
-		$dynamic[ '/---/' ] = $em_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;
-		$dynamic[ '/(?<!xn)--/' ] = $en_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ] = $en_dash;
+		$dynamic['/---/'] = $em_dash;
+		$dynamic['/(?<=^|'.$spaces.')--(?=$|'.$spaces.')/'] = $em_dash;
+		$dynamic['/(?<!xn)--/'] = $en_dash;
+		$dynamic['/(?<=^|'.$spaces.')-(?=$|'.$spaces.')/'] = $en_dash;
 
-		$dynamic_characters['dash'] = array_keys( $dynamic );
-		$dynamic_replacements['dash'] = array_values( $dynamic );
+		$dynamic_characters['dash'] = array_keys($dynamic);
+		$dynamic_replacements['dash'] = array_values($dynamic);
 	}
 
 	// Must do this every time in case plugins use these filters in a context sensitive manner
@@ -201,7 +201,7 @@ 
 	 *
 	 * @param array $default_no_texturize_tags An array of HTML element names.
 	 */
-	$no_texturize_tags = apply_filters( 'no_texturize_tags', $default_no_texturize_tags );
+	$no_texturize_tags = apply_filters('no_texturize_tags', $default_no_texturize_tags);
 	/**
 	 * Filter the list of shortcodes not to texturize.
 	 *
@@ -209,15 +209,15 @@ 
 	 *
 	 * @param array $default_no_texturize_shortcodes An array of shortcode names.
 	 */
-	$no_texturize_shortcodes = apply_filters( 'no_texturize_shortcodes', $default_no_texturize_shortcodes );
+	$no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', $default_no_texturize_shortcodes);
 
 	$no_texturize_tags_stack = array();
 	$no_texturize_shortcodes_stack = array();
 
 	// Look for shortcodes and HTML elements.
 
-	$tagnames = array_keys( $shortcode_tags );
-	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
+	$tagnames = array_keys($shortcode_tags);
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$tagregexp = "(?:$tagregexp)(?![\\w-])"; // Excerpt of get_shortcode_regex().
 
 	$comment_regex =
@@ -226,7 +226,7 @@ 
 		.     '-(?!->)' // Dash not followed by end of comment.
 		.     '[^\-]*+' // Consume non-dashes.
 		. ')*+'         // Loop possessively.
-		. '(?:-->)?';   // End of comment. If not found, match all input.
+		. '(?:-->)?'; // End of comment. If not found, match all input.
 
 	$shortcode_regex =
 		  '\['              // Find start of shortcode.
@@ -238,7 +238,7 @@ 
 		.     '<[^\[\]>]*>' // HTML elements permitted. Prevents matching ] before >.
 		. ')*+'             // Possessive critical.
 		. '\]'              // Find end of shortcode.
-		. '\]?';            // Shortcodes may end with ]]
+		. '\]?'; // Shortcodes may end with ]]
 
 	$regex =
 		  '/('                   // Capture the entire match.
@@ -252,68 +252,68 @@ 
 		.     $shortcode_regex   // Find shortcodes.
 		. ')/s';
 
-	$textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+	$textarr = preg_split($regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-	foreach ( $textarr as &$curl ) {
+	foreach ($textarr as &$curl) {
 		// Only call _wptexturize_pushpop_element if $curl is a delimiter.
 		$first = $curl[0];
-		if ( '<' === $first && '<!--' === substr( $curl, 0, 4 ) ) {
+		if ('<' === $first && '<!--' === substr($curl, 0, 4)) {
 			// This is an HTML comment delimeter.
 
 			continue;
 
-		} elseif ( '<' === $first && '>' === substr( $curl, -1 ) ) {
+		} elseif ('<' === $first && '>' === substr($curl, -1)) {
 			// This is an HTML element delimiter.
 
-			_wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
+			_wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags);
 
-		} elseif ( '' === trim( $curl ) ) {
+		} elseif ('' === trim($curl)) {
 			// This is a newline between delimiters.  Performance improves when we check this.
 
 			continue;
 
-		} elseif ( '[' === $first && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
+		} elseif ('[' === $first && 1 === preg_match('/^'.$shortcode_regex.'$/', $curl)) {
 			// This is a shortcode delimiter.
 
-			if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
+			if ('[[' !== substr($curl, 0, 2) && ']]' !== substr($curl, -2)) {
 				// Looks like a normal shortcode.
-				_wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
+				_wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes);
 			} else {
 				// Looks like an escaped shortcode.
 				continue;
 			}
 
-		} elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) {
+		} elseif (empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
 			// This is neither a delimiter, nor is this content inside of no_texturize pairs.  Do texturize.
 
-			$curl = str_replace( $static_characters, $static_replacements, $curl );
+			$curl = str_replace($static_characters, $static_replacements, $curl);
 
-			if ( false !== strpos( $curl, "'" ) ) {
-				$curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
-				$curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
-				$curl = str_replace( $apos_flag, $apos, $curl );
-				$curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
+			if (false !== strpos($curl, "'")) {
+				$curl = preg_replace($dynamic_characters['apos'], $dynamic_replacements['apos'], $curl);
+				$curl = wptexturize_primes($curl, "'", $prime, $open_sq_flag, $closing_single_quote);
+				$curl = str_replace($apos_flag, $apos, $curl);
+				$curl = str_replace($open_sq_flag, $opening_single_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '"' ) ) {
-				$curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
-				$curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
-				$curl = str_replace( $open_q_flag, $opening_quote, $curl );
+			if (false !== strpos($curl, '"')) {
+				$curl = preg_replace($dynamic_characters['quote'], $dynamic_replacements['quote'], $curl);
+				$curl = wptexturize_primes($curl, '"', $double_prime, $open_q_flag, $closing_quote);
+				$curl = str_replace($open_q_flag, $opening_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '-' ) ) {
-				$curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
+			if (false !== strpos($curl, '-')) {
+				$curl = preg_replace($dynamic_characters['dash'], $dynamic_replacements['dash'], $curl);
 			}
 
 			// 9x9 (times), but never 0x9999
-			if ( 1 === preg_match( '/(?<=\d)x\d/', $curl ) ) {
+			if (1 === preg_match('/(?<=\d)x\d/', $curl)) {
 				// Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
-				$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
+				$curl = preg_replace('/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl);
 			}
 		}
 	}
-	$text = implode( '', $textarr );
+	$text = implode('', $textarr);
 
 	// Replace each & with &#038; unless it already looks like an entity.
-	return preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $text );
+	return preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $text);
 }
 
 /**
@@ -330,59 +330,59 @@ 
  * @param string $close_quote The closing quote char to use for replacement.
  * @return string The $haystack value after primes and quotes replacements.
  */
-function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quote ) {
+function wptexturize_primes($haystack, $needle, $prime, $open_quote, $close_quote) {
 	$spaces = wp_spaces_regexp();
 	$flag = '<!--wp-prime-or-quote-->';
-	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|" . $spaces . ")/";
+	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|".$spaces.")/";
 	$prime_pattern    = "/(?<=\\d)$needle/";
 	$flag_after_digit = "/(?<=\\d)$flag/";
 	$flag_no_digit    = "/(?<!\\d)$flag/";
 
-	$sentences = explode( $open_quote, $haystack );
+	$sentences = explode($open_quote, $haystack);
 
-	foreach( $sentences as $key => &$sentence ) {
-		if ( false === strpos( $sentence, $needle ) ) {
+	foreach ($sentences as $key => &$sentence) {
+		if (false === strpos($sentence, $needle)) {
 			continue;
-		} elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
-			$sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
-			if ( $count > 1 ) {
+		} elseif (0 !== $key && 0 === substr_count($sentence, $close_quote)) {
+			$sentence = preg_replace($quote_pattern, $flag, $sentence, -1, $count);
+			if ($count > 1) {
 				// This sentence appears to have multiple closing quotes.  Attempt Vulcan logic.
-				$sentence = preg_replace( $flag_no_digit, $close_quote, $sentence, -1, $count2 );
-				if ( 0 === $count2 ) {
+				$sentence = preg_replace($flag_no_digit, $close_quote, $sentence, -1, $count2);
+				if (0 === $count2) {
 					// Try looking for a quote followed by a period.
-					$count2 = substr_count( $sentence, "$flag." );
-					if ( $count2 > 0 ) {
+					$count2 = substr_count($sentence, "$flag.");
+					if ($count2 > 0) {
 						// Assume the rightmost quote-period match is the end of quotation.
-						$pos = strrpos( $sentence, "$flag." );
+						$pos = strrpos($sentence, "$flag.");
 					} else {
 						// When all else fails, make the rightmost candidate a closing quote.
 						// This is most likely to be problematic in the context of bug #18549.
-						$pos = strrpos( $sentence, $flag );
+						$pos = strrpos($sentence, $flag);
 					}
-					$sentence = substr_replace( $sentence, $close_quote, $pos, strlen( $flag ) );
+					$sentence = substr_replace($sentence, $close_quote, $pos, strlen($flag));
 				}
 				// Use conventional replacement on any remaining primes and quotes.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-				$sentence = preg_replace( $flag_after_digit, $prime, $sentence );
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-			} elseif ( 1 == $count ) {
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
+				$sentence = preg_replace($flag_after_digit, $prime, $sentence);
+				$sentence = str_replace($flag, $close_quote, $sentence);
+			} elseif (1 == $count) {
 				// Found only one closing quote candidate, so give it priority over primes.
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = str_replace($flag, $close_quote, $sentence);
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			} else {
 				// No closing quotes found.  Just run primes pattern.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			}
 		} else {
-			$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-			$sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
+			$sentence = preg_replace($prime_pattern, $prime, $sentence);
+			$sentence = preg_replace($quote_pattern, $close_quote, $sentence);
 		}
-		if ( '"' == $needle && false !== strpos( $sentence, '"' ) ) {
-			$sentence = str_replace( '"', $close_quote, $sentence );
+		if ('"' == $needle && false !== strpos($sentence, '"')) {
+			$sentence = str_replace('"', $close_quote, $sentence);
 		}
 	}
 
-	return implode( $open_quote, $sentences );
+	return implode($open_quote, $sentences);
 }
 
 /**
@@ -399,12 +399,12 @@ 
  * @param array  $stack List of open tag elements.
  * @param array  $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
  */
-function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
+function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) {
 	// Is it an opening tag or closing tag?
-	if ( '/' !== $text[1] ) {
+	if ('/' !== $text[1]) {
 		$opening_tag = true;
 		$name_offset = 1;
-	} elseif ( 0 == count( $stack ) ) {
+	} elseif (0 == count($stack)) {
 		// Stack is empty. Just stop.
 		return;
 	} else {
@@ -413,17 +413,17 @@ 
 	}
 
 	// Parse out the tag name.
-	$space = strpos( $text, ' ' );
-	if ( false === $space ) {
+	$space = strpos($text, ' ');
+	if (false === $space) {
 		$space = -1;
 	} else {
 		$space -= $name_offset;
 	}
-	$tag = substr( $text, $name_offset, $space );
+	$tag = substr($text, $name_offset, $space);
 
 	// Handle disabled tags.
-	if ( in_array( $tag, $disabled_elements ) ) {
-		if ( $opening_tag ) {
+	if (in_array($tag, $disabled_elements)) {
+		if ($opening_tag) {
 			/*
 			 * This disables texturize until we find a closing tag of our type
 			 * (e.g. <pre>) even if there was invalid nesting before that
@@ -432,9 +432,9 @@ 
 			 *          "baba" won't be texturize
 			 */
 
-			array_push( $stack, $tag );
-		} elseif ( end( $stack ) == $tag ) {
-			array_pop( $stack );
+			array_push($stack, $tag);
+		} elseif (end($stack) == $tag) {
+			array_pop($stack);
 		}
 	}
 }
@@ -453,38 +453,38 @@ 
  *                    after paragraphing. Default true.
  * @return string Text which has been converted into correct paragraph tags.
  */
-function wpautop( $pee, $br = true ) {
+function wpautop($pee, $br = true) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
+	if (trim($pee) === '')
 		return '';
 
 	// Just to make things a little easier, pad the end.
-	$pee = $pee . "\n";
+	$pee = $pee."\n";
 
 	/*
 	 * Pre tags shouldn't be touched by autop.
 	 * Replace pre tags with placeholders and bring them back after autop.
 	 */
-	if ( strpos($pee, '<pre') !== false ) {
-		$pee_parts = explode( '</pre>', $pee );
+	if (strpos($pee, '<pre') !== false) {
+		$pee_parts = explode('</pre>', $pee);
 		$last_pee = array_pop($pee_parts);
 		$pee = '';
 		$i = 0;
 
-		foreach ( $pee_parts as $pee_part ) {
+		foreach ($pee_parts as $pee_part) {
 			$start = strpos($pee_part, '<pre');
 
 			// Malformed html?
-			if ( $start === false ) {
+			if ($start === false) {
 				$pee .= $pee_part;
 				continue;
 			}
 
 			$name = "<pre wp-pre-tag-$i></pre>";
-			$pre_tags[$name] = substr( $pee_part, $start ) . '</pre>';
+			$pre_tags[$name] = substr($pee_part, $start).'</pre>';
 
-			$pee .= substr( $pee_part, 0, $start ) . $name;
+			$pee .= substr($pee_part, 0, $start).$name;
 			$i++;
 		}
 
@@ -496,41 +496,41 @@ 
 	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
 	// Add a single line break above block-level opening tags.
-	$pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
+	$pee = preg_replace('!(<'.$allblocks.'[^>]*>)!', "\n$1", $pee);
 
 	// Add a double line break below block-level closing tags.
-	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
+	$pee = preg_replace('!(</'.$allblocks.'>)!', "$1\n\n", $pee);
 
 	// Standardize newline characters to "\n".
 	$pee = str_replace(array("\r\n", "\r"), "\n", $pee);
 
 	// Find newlines in all elements and add placeholders.
-	$pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
+	$pee = wp_replace_in_html_tags($pee, array("\n" => " <!-- wpnl --> "));
 
 	// Collapse line breaks before and after <option> elements so they don't get autop'd.
-	if ( strpos( $pee, '<option' ) !== false ) {
-		$pee = preg_replace( '|\s*<option|', '<option', $pee );
-		$pee = preg_replace( '|</option>\s*|', '</option>', $pee );
+	if (strpos($pee, '<option') !== false) {
+		$pee = preg_replace('|\s*<option|', '<option', $pee);
+		$pee = preg_replace('|</option>\s*|', '</option>', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
 	 * so they don't get autop'd.
 	 */
-	if ( strpos( $pee, '</object>' ) !== false ) {
-		$pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
-		$pee = preg_replace( '|\s*</object>|', '</object>', $pee );
-		$pee = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '</object>') !== false) {
+		$pee = preg_replace('|(<object[^>]*>)\s*|', '$1', $pee);
+		$pee = preg_replace('|\s*</object>|', '</object>', $pee);
+		$pee = preg_replace('%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <audio> and <video> elements,
 	 * before and after <source> and <track> elements.
 	 */
-	if ( strpos( $pee, '<source' ) !== false || strpos( $pee, '<track' ) !== false ) {
-		$pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee );
-		$pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
-		$pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '<source') !== false || strpos($pee, '<track') !== false) {
+		$pee = preg_replace('%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee);
+		$pee = preg_replace('%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee);
+		$pee = preg_replace('%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	// Remove more than two contiguous line breaks.
@@ -543,8 +543,8 @@ 
 	$pee = '';
 
 	// Rebuild the content as a string, wrapping every bit with a <p>.
-	foreach ( $pees as $tinkle ) {
-		$pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+	foreach ($pees as $tinkle) {
+		$pee .= '<p>'.trim($tinkle, "\n")."</p>\n";
 	}
 
 	// Under certain strange conditions it could create a P of entirely whitespace.
@@ -554,7 +554,7 @@ 
 	$pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
 
 	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// In some cases <li> may get wrapped in <p>, fix them.
 	$pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
@@ -564,18 +564,18 @@ 
 	$pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
 
 	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)!', "$1", $pee);
 
 	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// Optionally insert line breaks.
-	if ( $br ) {
+	if ($br) {
 		// Replace newlines that shouldn't be touched with a placeholder.
 		$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
 
 		// Normalize <br>
-		$pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );
+		$pee = str_replace(array('<br>', '<br/>'), '<br />', $pee);
 
 		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
 		$pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
@@ -585,18 +585,18 @@ 
 	}
 
 	// If a <br /> tag is after an opening or closing block tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*<br />!', "$1", $pee);
 
 	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
 	$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
+	$pee = preg_replace("|\n</p>$|", '</p>', $pee);
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
+	if ( ! empty($pre_tags))
 		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
 	// Restore newlines in all elements.
-	$pee = str_replace( " <!-- wpnl --> ", "\n", $pee );
+	$pee = str_replace(" <!-- wpnl --> ", "\n", $pee);
 
 	return $pee;
 }
@@ -609,17 +609,17 @@ 
  * @param string $input The text which has to be formatted.
  * @return array The formatted text.
  */
-function wp_html_split( $input ) {
+function wp_html_split($input) {
 	static $regex;
 
-	if ( ! isset( $regex ) ) {
+	if ( ! isset($regex)) {
 		$comments =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
 		$cdata =
 			  '!\[CDATA\['  // Start of comment, after the <.
@@ -628,7 +628,7 @@ 
 			.     '](?!]>)' // One ] not followed by end of comment.
 			.     '[^\]]*+' // Consume non-].
 			. ')*+'         // Loop possessively.
-			. '(?:]]>)?';   // End of comment. If not found, match all input.
+			. '(?:]]>)?'; // End of comment. If not found, match all input.
 
 		$regex =
 			  '/('              // Capture the entire match.
@@ -645,7 +645,7 @@ 
 			. ')/s';
 	}
 
-	return preg_split( $regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE );
+	return preg_split($regex, $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 }
 
 /**
@@ -657,32 +657,32 @@ 
  * @param array $replace_pairs In the form array('from' => 'to', ...).
  * @return string The formatted text.
  */
-function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
+function wp_replace_in_html_tags($haystack, $replace_pairs) {
 	// Find all elements.
-	$textarr = wp_html_split( $haystack );
+	$textarr = wp_html_split($haystack);
 	$changed = false;
 
 	// Optimize when searching for one item.
-	if ( 1 === count( $replace_pairs ) ) {
+	if (1 === count($replace_pairs)) {
 		// Extract $needle and $replace.
-		foreach ( $replace_pairs as $needle => $replace );
+		foreach ($replace_pairs as $needle => $replace);
 
 		// Loop through delimeters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			if ( false !== strpos( $textarr[$i], $needle ) ) {
-				$textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			if (false !== strpos($textarr[$i], $needle)) {
+				$textarr[$i] = str_replace($needle, $replace, $textarr[$i]);
 				$changed = true;
 			}
 		}
 	} else {
 		// Extract all $needles.
-		$needles = array_keys( $replace_pairs );
+		$needles = array_keys($replace_pairs);
 
 		// Loop through delimeters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[$i], $needle ) ) {
-					$textarr[$i] = strtr( $textarr[$i], $replace_pairs );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			foreach ($needles as $needle) {
+				if (false !== strpos($textarr[$i], $needle)) {
+					$textarr[$i] = strtr($textarr[$i], $replace_pairs);
 					$changed = true;
 					// After one strtr() break out of the foreach loop and look at next element.
 					break;
@@ -691,8 +691,8 @@ 
 		}
 	}
 
-	if ( $changed ) {
-		$haystack = implode( $textarr );
+	if ($changed) {
+		$haystack = implode($textarr);
 	}
 
 	return $haystack;
@@ -707,8 +707,8 @@ 
  * @param array $matches preg_replace_callback matches array
  * @return string
  */
-function _autop_newline_preservation_helper( $matches ) {
-	return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
+function _autop_newline_preservation_helper($matches) {
+	return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
 }
 
 /**
@@ -723,20 +723,20 @@ 
  * @param string $pee The content.
  * @return string The filtered content.
  */
-function shortcode_unautop( $pee ) {
+function shortcode_unautop($pee) {
 	global $shortcode_tags;
 
-	if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags)) {
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	$tagregexp = join('|', array_map('preg_quote', array_keys($shortcode_tags)));
 	$spaces = wp_spaces_regexp();
 
 	$pattern =
 		  '/'
 		. '<p>'                              // Opening paragraph
-		. '(?:' . $spaces . ')*+'            // Optional leading whitespace
+		. '(?:'.$spaces.')*+'            // Optional leading whitespace
 		. '('                                // 1: The shortcode
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
@@ -761,11 +761,11 @@ 
 		.         ')?'
 		.     ')'
 		. ')'
-		. '(?:' . $spaces . ')*+'            // optional trailing whitespace
+		. '(?:'.$spaces.')*+'            // optional trailing whitespace
 		. '<\\/p>'                           // closing paragraph
 		. '/s';
 
-	return preg_replace( $pattern, '$1', $pee );
+	return preg_replace($pattern, '$1', $pee);
 }
 
 /**
@@ -780,20 +780,20 @@ 
  * @param string $str The string to be checked
  * @return bool True if $str fits a UTF-8 model, false otherwise.
  */
-function seems_utf8( $str ) {
+function seems_utf8($str) {
 	mbstring_binary_safe_encoding();
 	$length = strlen($str);
 	reset_mbstring_encoding();
-	for ($i=0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$c = ord($str[$i]);
 		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
+		elseif (($c & 0xE0) == 0xC0) $n = 1; // 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) $n = 2; // 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) $n = 3; // 11110bbb
+		elseif (($c & 0xFC) == 0xF8) $n = 4; // 111110bb
+		elseif (($c & 0xFE) == 0xFC) $n = 5; // 1111110b
 		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
 			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
 				return false;
 		}
@@ -820,55 +820,55 @@ 
  * @param bool   $double_encode  Optional. Whether to encode existing html entities. Default is false.
  * @return string The encoded text with HTML entities.
  */
-function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
+function _wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
+	if (0 === strlen($string))
 		return '';
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
+	if ( ! preg_match('/[&<>"\']/', $string))
 		return $string;
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
+	if (empty($quote_style))
 		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+	elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true))
 		$quote_style = ENT_QUOTES;
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
-	if ( ! $charset ) {
+	if ( ! $charset) {
 		static $_charset = null;
-		if ( ! isset( $_charset ) ) {
+		if ( ! isset($_charset)) {
 			$alloptions = wp_load_alloptions();
-			$_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
+			$_charset = isset($alloptions['blog_charset']) ? $alloptions['blog_charset'] : '';
 		}
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
+	if (in_array($charset, array('utf8', 'utf-8', 'UTF8')))
 		$charset = 'UTF-8';
 
 	$_quote_style = $quote_style;
 
-	if ( $quote_style === 'double' ) {
+	if ($quote_style === 'double') {
 		$quote_style = ENT_COMPAT;
 		$_quote_style = ENT_COMPAT;
-	} elseif ( $quote_style === 'single' ) {
+	} elseif ($quote_style === 'single') {
 		$quote_style = ENT_NOQUOTES;
 	}
 
-	if ( ! $double_encode ) {
+	if ( ! $double_encode) {
 		// Guarantee every &entity; is valid, convert &garbage; into &amp;garbage;
 		// This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
-		$string = wp_kses_normalize_entities( $string );
+		$string = wp_kses_normalize_entities($string);
 	}
 
-	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
+	$string = @htmlspecialchars($string, $quote_style, $charset, $double_encode);
 
 	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ('single' === $_quote_style)
+		$string = str_replace("'", '&#039;', $string);
 
 	return $string;
 }
@@ -893,52 +893,52 @@ 
  *                                Default is ENT_NOQUOTES.
  * @return string The decoded text without HTML entities.
  */
-function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
+function wp_specialchars_decode($string, $quote_style = ENT_NOQUOTES) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Don't bother if there are no entities - saves a lot of processing
-	if ( strpos( $string, '&' ) === false ) {
+	if (strpos($string, '&') === false) {
 		return $string;
 	}
 
 	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) ) {
+	if (empty($quote_style)) {
 		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+	} elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true)) {
 		$quote_style = ENT_QUOTES;
 	}
 
 	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
-
-	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
-		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
-	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
-		$translation_preg = array_merge( $double_preg, $others_preg );
-	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
-		$translation_preg = array_merge( $single_preg, $others_preg );
-	} elseif ( $quote_style === ENT_NOQUOTES ) {
+	$single = array('&#039;'  => '\'', '&#x27;' => '\'');
+	$single_preg = array('/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;');
+	$double = array('&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"');
+	$double_preg = array('/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;');
+	$others = array('&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&');
+	$others_preg = array('/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;');
+
+	if ($quote_style === ENT_QUOTES) {
+		$translation = array_merge($single, $double, $others);
+		$translation_preg = array_merge($single_preg, $double_preg, $others_preg);
+	} elseif ($quote_style === ENT_COMPAT || $quote_style === 'double') {
+		$translation = array_merge($double, $others);
+		$translation_preg = array_merge($double_preg, $others_preg);
+	} elseif ($quote_style === 'single') {
+		$translation = array_merge($single, $others);
+		$translation_preg = array_merge($single_preg, $others_preg);
+	} elseif ($quote_style === ENT_NOQUOTES) {
 		$translation = $others;
 		$translation_preg = $others_preg;
 	}
 
 	// Remove zero padding on numeric entities
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+	$string = preg_replace(array_keys($translation_preg), array_values($translation_preg), $string);
 
 	// Replace characters according to translation table
-	return strtr( $string, $translation );
+	return strtr($string, $translation);
 }
 
 /**
@@ -953,40 +953,40 @@ 
  * @param bool    $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
  * @return string The checked text.
  */
-function wp_check_invalid_utf8( $string, $strip = false ) {
+function wp_check_invalid_utf8($string, $strip = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Store the site charset as a static to avoid multiple calls to get_option()
 	static $is_utf8 = null;
-	if ( ! isset( $is_utf8 ) ) {
-		$is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );
+	if ( ! isset($is_utf8)) {
+		$is_utf8 = in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8'));
 	}
-	if ( ! $is_utf8 ) {
+	if ( ! $is_utf8) {
 		return $string;
 	}
 
 	// Check for support for utf8 in the installed PCRE library once and store the result in a static
 	static $utf8_pcre = null;
-	if ( ! isset( $utf8_pcre ) ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ( ! isset($utf8_pcre)) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( !$utf8_pcre ) {
+	if ( ! $utf8_pcre) {
 		return $string;
 	}
 
 	// preg_match fails when it encounters invalid UTF8 in $string
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
+	if (1 === @preg_match('/^./us', $string)) {
 		return $string;
 	}
 
 	// Attempt to strip the bad chars if requested (not recommended)
-	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
+	if ($strip && function_exists('iconv')) {
+		return iconv('utf-8', 'utf-8', $string);
 	}
 
 	return '';
@@ -1001,30 +1001,30 @@ 
  * @param int    $length Max  length of the string
  * @return string String with Unicode encoded for URI.
  */
-function utf8_uri_encode( $utf8_string, $length = 0 ) {
+function utf8_uri_encode($utf8_string, $length = 0) {
 	$unicode = '';
 	$values = array();
 	$num_octets = 1;
 	$unicode_length = 0;
 
 	mbstring_binary_safe_encoding();
-	$string_length = strlen( $utf8_string );
+	$string_length = strlen($utf8_string);
 	reset_mbstring_encoding();
 
-	for ($i = 0; $i < $string_length; $i++ ) {
+	for ($i = 0; $i < $string_length; $i++) {
 
-		$value = ord( $utf8_string[ $i ] );
+		$value = ord($utf8_string[$i]);
 
-		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
+		if ($value < 128) {
+			if ($length && ($unicode_length >= $length))
 				break;
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
-			if ( count( $values ) == 0 ) {
-				if ( $value < 224 ) {
+			if (count($values) == 0) {
+				if ($value < 224) {
 					$num_octets = 2;
-				} elseif ( $value < 240 ) {
+				} elseif ($value < 240) {
 					$num_octets = 3;
 				} else {
 					$num_octets = 4;
@@ -1033,11 +1033,11 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
+			if ($length && ($unicode_length + ($num_octets * 3)) > $length)
 				break;
-			if ( count( $values ) == $num_octets ) {
-				for ( $j = 0; $j < $num_octets; $j++ ) {
-					$unicode .= '%' . dechex( $values[ $j ] );
+			if (count($values) == $num_octets) {
+				for ($j = 0; $j < $num_octets; $j++) {
+					$unicode .= '%'.dechex($values[$j]);
 				}
 
 				$unicode_length += $num_octets * 3;
@@ -1061,8 +1061,8 @@ 
  * @param string $string Text that might have accent characters
  * @return string Filtered string with replaced "nice" characters.
  */
-function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
+function remove_accents($string) {
+	if ( ! preg_match('/[\x80-\xff]/', $string))
 		return $string;
 
 	if (seems_utf8($string)) {
@@ -1072,7 +1072,7 @@ 
 		chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
 		chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
 		chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
-		chr(195).chr(134) => 'AE',chr(195).chr(135) => 'C',
+		chr(195).chr(134) => 'AE', chr(195).chr(135) => 'C',
 		chr(195).chr(136) => 'E', chr(195).chr(137) => 'E',
 		chr(195).chr(138) => 'E', chr(195).chr(139) => 'E',
 		chr(195).chr(140) => 'I', chr(195).chr(141) => 'I',
@@ -1083,11 +1083,11 @@ 
 		chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
 		chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
 		chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
-		chr(195).chr(158) => 'TH',chr(195).chr(159) => 's',
+		chr(195).chr(158) => 'TH', chr(195).chr(159) => 's',
 		chr(195).chr(160) => 'a', chr(195).chr(161) => 'a',
 		chr(195).chr(162) => 'a', chr(195).chr(163) => 'a',
 		chr(195).chr(164) => 'a', chr(195).chr(165) => 'a',
-		chr(195).chr(166) => 'ae',chr(195).chr(167) => 'c',
+		chr(195).chr(166) => 'ae', chr(195).chr(167) => 'c',
 		chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
 		chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
 		chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
@@ -1126,7 +1126,7 @@ 
 		chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -1142,13 +1142,13 @@ 
 		chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -1245,21 +1245,21 @@ 
 		// Used for locale-specific rules
 		$locale = get_locale();
 
-		if ( 'de_DE' == $locale || 'de_DE_formal' == $locale ) {
-			$chars[ chr(195).chr(132) ] = 'Ae';
-			$chars[ chr(195).chr(164) ] = 'ae';
-			$chars[ chr(195).chr(150) ] = 'Oe';
-			$chars[ chr(195).chr(182) ] = 'oe';
-			$chars[ chr(195).chr(156) ] = 'Ue';
-			$chars[ chr(195).chr(188) ] = 'ue';
-			$chars[ chr(195).chr(159) ] = 'ss';
-		} elseif ( 'da_DK' === $locale ) {
-			$chars[ chr(195).chr(134) ] = 'Ae';
- 			$chars[ chr(195).chr(166) ] = 'ae';
-			$chars[ chr(195).chr(152) ] = 'Oe';
-			$chars[ chr(195).chr(184) ] = 'oe';
-			$chars[ chr(195).chr(133) ] = 'Aa';
-			$chars[ chr(195).chr(165) ] = 'aa';
+		if ('de_DE' == $locale || 'de_DE_formal' == $locale) {
+			$chars[chr(195).chr(132)] = 'Ae';
+			$chars[chr(195).chr(164)] = 'ae';
+			$chars[chr(195).chr(150)] = 'Oe';
+			$chars[chr(195).chr(182)] = 'oe';
+			$chars[chr(195).chr(156)] = 'Ue';
+			$chars[chr(195).chr(188)] = 'ue';
+			$chars[chr(195).chr(159)] = 'ss';
+		} elseif ('da_DK' === $locale) {
+			$chars[chr(195).chr(134)] = 'Ae';
+ 			$chars[chr(195).chr(166)] = 'ae';
+			$chars[chr(195).chr(152)] = 'Oe';
+			$chars[chr(195).chr(184)] = 'oe';
+			$chars[chr(195).chr(133)] = 'Aa';
+			$chars[chr(195).chr(165)] = 'aa';
 		}
 
 		$string = strtr($string, $chars);
@@ -1303,7 +1303,7 @@ 
  * @param string $filename The filename to be sanitized
  * @return string The sanitized filename
  */
-function sanitize_file_name( $filename ) {
+function sanitize_file_name($filename) {
 	$filename_raw = $filename;
 	$special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", chr(0));
 	/**
@@ -1314,18 +1314,18 @@ 
 	 * @param array  $special_chars Characters to remove.
 	 * @param string $filename_raw  Filename as it was passed into sanitize_file_name().
 	 */
-	$special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
-	$filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
-	$filename = str_replace( $special_chars, '', $filename );
-	$filename = str_replace( array( '%20', '+' ), '-', $filename );
-	$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
-	$filename = trim( $filename, '.-_' );
+	$special_chars = apply_filters('sanitize_file_name_chars', $special_chars, $filename_raw);
+	$filename = preg_replace("#\x{00a0}#siu", ' ', $filename);
+	$filename = str_replace($special_chars, '', $filename);
+	$filename = str_replace(array('%20', '+'), '-', $filename);
+	$filename = preg_replace('/[\r\n\t -]+/', '-', $filename);
+	$filename = trim($filename, '.-_');
 
 	// Split the filename into a base and extension[s]
 	$parts = explode('.', $filename);
 
 	// Return if only one extension
-	if ( count( $parts ) <= 2 ) {
+	if (count($parts) <= 2) {
 		/**
 		 * Filter a sanitized filename string.
 		 *
@@ -1334,7 +1334,7 @@ 
 		 * @param string $filename     Sanitized filename.
 		 * @param string $filename_raw The filename prior to sanitization.
 		 */
-		return apply_filters( 'sanitize_file_name', $filename, $filename_raw );
+		return apply_filters('sanitize_file_name', $filename, $filename_raw);
 	}
 
 	// Process multiple extensions
@@ -1346,23 +1346,23 @@ 
 	 * Loop over any intermediate extensions. Postfix them with a trailing underscore
 	 * if they are a 2 - 5 character long alpha string not in the extension whitelist.
 	 */
-	foreach ( (array) $parts as $part) {
-		$filename .= '.' . $part;
+	foreach ((array) $parts as $part) {
+		$filename .= '.'.$part;
 
-		if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+		if (preg_match("/^[a-zA-Z]{2,5}\d?$/", $part)) {
 			$allowed = false;
-			foreach ( $mimes as $ext_preg => $mime_match ) {
-				$ext_preg = '!^(' . $ext_preg . ')$!i';
-				if ( preg_match( $ext_preg, $part ) ) {
+			foreach ($mimes as $ext_preg => $mime_match) {
+				$ext_preg = '!^('.$ext_preg.')$!i';
+				if (preg_match($ext_preg, $part)) {
 					$allowed = true;
 					break;
 				}
 			}
-			if ( !$allowed )
+			if ( ! $allowed)
 				$filename .= '_';
 		}
 	}
-	$filename .= '.' . $extension;
+	$filename .= '.'.$extension;
 	/** This filter is documented in wp-includes/formatting.php */
 	return apply_filters('sanitize_file_name', $filename, $filename_raw);
 }
@@ -1381,21 +1381,21 @@ 
  * @param bool   $strict   If set limits $username to specific characters. Default false.
  * @return string The sanitized username, after passing through filters.
  */
-function sanitize_user( $username, $strict = false ) {
+function sanitize_user($username, $strict = false) {
 	$raw_username = $username;
-	$username = wp_strip_all_tags( $username );
-	$username = remove_accents( $username );
+	$username = wp_strip_all_tags($username);
+	$username = remove_accents($username);
 	// Kill octets
-	$username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
-	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
+	$username = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $username);
+	$username = preg_replace('/&.+?;/', '', $username); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ($strict)
+		$username = preg_replace('|[^a-z0-9 _.\-@]|i', '', $username);
 
-	$username = trim( $username );
+	$username = trim($username);
 	// Consolidate contiguous whitespace
-	$username = preg_replace( '|\s+|', ' ', $username );
+	$username = preg_replace('|\s+|', ' ', $username);
 
 	/**
 	 * Filter a sanitized username string.
@@ -1406,7 +1406,7 @@ 
 	 * @param string $raw_username The username prior to sanitization.
 	 * @param bool   $strict       Whether to limit the sanitization to specific characters. Default false.
 	 */
-	return apply_filters( 'sanitize_user', $username, $raw_username, $strict );
+	return apply_filters('sanitize_user', $username, $raw_username, $strict);
 }
 
 /**
@@ -1419,10 +1419,10 @@ 
  * @param string $key String key
  * @return string Sanitized key
  */
-function sanitize_key( $key ) {
+function sanitize_key($key) {
 	$raw_key = $key;
-	$key = strtolower( $key );
-	$key = preg_replace( '/[^a-z0-9_\-]/', '', $key );
+	$key = strtolower($key);
+	$key = preg_replace('/[^a-z0-9_\-]/', '', $key);
 
 	/**
 	 * Filter a sanitized key string.
@@ -1432,7 +1432,7 @@ 
 	 * @param string $key     Sanitized key.
 	 * @param string $raw_key The key prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_key', $key, $raw_key );
+	return apply_filters('sanitize_key', $key, $raw_key);
 }
 
 /**
@@ -1449,10 +1449,10 @@ 
  * @param string $context        Optional. The operation for which the string is sanitized
  * @return string The sanitized string.
  */
-function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
+function sanitize_title($title, $fallback_title = '', $context = 'save') {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
+	if ('save' == $context)
 		$title = remove_accents($title);
 
 	/**
@@ -1464,9 +1464,9 @@ 
 	 * @param string $raw_title The title prior to sanitization.
 	 * @param string $context   The context for which the title is being sanitized.
 	 */
-	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
+	$title = apply_filters('sanitize_title', $title, $raw_title, $context);
 
-	if ( '' === $title || false === $title )
+	if ('' === $title || false === $title)
 		$title = $fallback_title;
 
 	return $title;
@@ -1482,8 +1482,8 @@ 
  * @param string $title The string to be sanitized.
  * @return string The sanitized string.
  */
-function sanitize_title_for_query( $title ) {
-	return sanitize_title( $title, '', 'query' );
+function sanitize_title_for_query($title) {
+	return sanitize_title($title, '', 'query');
 }
 
 /**
@@ -1499,7 +1499,7 @@ 
  * @param string $context   Optional. The operation for which the string is sanitized.
  * @return string The sanitized title.
  */
-function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'display' ) {
+function sanitize_title_with_dashes($title, $raw_title = '', $context = 'display') {
 	$title = strip_tags($title);
 	// Preserve escaped octets.
 	$title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title);
@@ -1519,12 +1519,12 @@ 
 	$title = preg_replace('/&.+?;/', '', $title); // kill entities
 	$title = str_replace('.', '-', $title);
 
-	if ( 'save' == $context ) {
+	if ('save' == $context) {
 		// Convert nbsp, ndash and mdash to hyphens
-		$title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
+		$title = str_replace(array('%c2%a0', '%e2%80%93', '%e2%80%94'), '-', $title);
 
 		// Strip these characters entirely
-		$title = str_replace( array(
+		$title = str_replace(array(
 			// iexcl and iquest
 			'%c2%a1', '%c2%bf',
 			// angle quotes
@@ -1538,10 +1538,10 @@ 
 			'%c2%b4', '%cb%8a', '%cc%81', '%cd%81',
 			// grave accent, macron, caron
 			'%cc%80', '%cc%84', '%cc%8c',
-		), '', $title );
+		), '', $title);
 
 		// Convert times to x
-		$title = str_replace( '%c3%97', 'x', $title );
+		$title = str_replace('%c3%97', 'x', $title);
 	}
 
 	$title = preg_replace('/[^%a-z0-9 _-]/', '', $title);
@@ -1565,8 +1565,8 @@ 
  * @param string $orderby Order by clause to be validated.
  * @return string|false Returns $orderby if valid, false otherwise.
  */
-function sanitize_sql_orderby( $orderby ) {
-	if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) {
+function sanitize_sql_orderby($orderby) {
+	if (preg_match('/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby) || preg_match('/^\s*RAND\(\s*\)\s*$/i', $orderby)) {
 		return $orderby;
 	}
 	return false;
@@ -1587,14 +1587,14 @@ 
  * 	Defaults to an empty string.
  * @return string The sanitized value
  */
-function sanitize_html_class( $class, $fallback = '' ) {
+function sanitize_html_class($class, $fallback = '') {
 	//Strip out any % encoded octets
-	$sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );
+	$sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
 
 	//Limit to A-Z,a-z,0-9,_,-
-	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
+	$sanitized = preg_replace('/[^A-Za-z0-9_-]/', '', $sanitized);
 
-	if ( '' == $sanitized )
+	if ('' == $sanitized)
 		$sanitized = $fallback;
 
 	/**
@@ -1606,7 +1606,7 @@ 
 	 * @param string $class     HTML class before sanitization.
 	 * @param string $fallback  The fallback string.
 	 */
-	return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
+	return apply_filters('sanitize_html_class', $sanitized, $class, $fallback);
 }
 
 /**
@@ -1618,13 +1618,13 @@ 
  * @param string $deprecated Not used.
  * @return string Converted string.
  */
-function convert_chars( $content, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '0.71' );
+function convert_chars($content, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '0.71');
 	}
 
-	if ( strpos( $content, '&' ) !== false ) {
-		$content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content );
+	if (strpos($content, '&') !== false) {
+		$content = preg_replace('/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content);
 	}
 
 	return $content;
@@ -1638,12 +1638,12 @@ 
  * @param string $content String with entities that need converting.
  * @return string Converted string.
  */
-function convert_invalid_entities( $content ) {
+function convert_invalid_entities($content) {
 	$wp_htmltranswinuni = array(
 		'&#128;' => '&#8364;', // the Euro sign
 		'&#129;' => '',
 		'&#130;' => '&#8218;', // these are Windows CP1252 specific characters
-		'&#131;' => '&#402;',  // they would look weird on non-Windows browsers
+		'&#131;' => '&#402;', // they would look weird on non-Windows browsers
 		'&#132;' => '&#8222;',
 		'&#133;' => '&#8230;',
 		'&#134;' => '&#8224;',
@@ -1674,8 +1674,8 @@ 
 		'&#159;' => '&#376;'
 	);
 
-	if ( strpos( $content, '&#1' ) !== false ) {
-		$content = strtr( $content, $wp_htmltranswinuni );
+	if (strpos($content, '&#1') !== false) {
+		$content = strtr($content, $wp_htmltranswinuni);
 	}
 
 	return $content;
@@ -1690,9 +1690,9 @@ 
  * @param bool   $force If true, forces balancing, ignoring the value of the option. Default false.
  * @return string Balanced text
  */
-function balanceTags( $text, $force = false ) {
-	if ( $force || get_option('use_balanceTags') == 1 ) {
-		return force_balance_tags( $text );
+function balanceTags($text, $force = false) {
+	if ($force || get_option('use_balanceTags') == 1) {
+		return force_balance_tags($text);
 	} else {
 		return $text;
 	}
@@ -1716,22 +1716,22 @@ 
  * @param string $text Text to be balanced.
  * @return string Balanced text.
  */
-function force_balance_tags( $text ) {
+function force_balance_tags($text) {
 	$tagstack = array();
 	$stacksize = 0;
 	$tagqueue = '';
 	$newtext = '';
 	// Known single-entity/self-closing tags
-	$single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );
+	$single_tags = array('area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source');
 	// Tags that can be immediately nested within themselves
-	$nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
+	$nestable_tags = array('blockquote', 'div', 'object', 'q', 'span');
 
 	// WP bug fix for comments - in case you REALLY meant to type '< !--'
 	$text = str_replace('< !--', '<    !--', $text);
 	// WP bug fix for LOVE <3 (and other situations with '<' before a number)
 	$text = preg_replace('#<([0-9]{1})#', '&lt;$1', $text);
 
-	while ( preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex) ) {
+	while (preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex)) {
 		$newtext .= $tagqueue;
 
 		$i = strpos($text, $regex[0]);
@@ -1740,25 +1740,25 @@ 
 		// clear the shifter
 		$tagqueue = '';
 		// Pop or Push
-		if ( isset($regex[1][0]) && '/' == $regex[1][0] ) { // End Tag
-			$tag = strtolower(substr($regex[1],1));
+		if (isset($regex[1][0]) && '/' == $regex[1][0]) { // End Tag
+			$tag = strtolower(substr($regex[1], 1));
 			// if too many closing tags
-			if ( $stacksize <= 0 ) {
+			if ($stacksize <= 0) {
 				$tag = '';
 				// or close to be safe $tag = '/' . $tag;
 			}
 			// if stacktop value = tag close value then pop
-			elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
-				$tag = '</' . $tag . '>'; // Close Tag
+			elseif ($tagstack[$stacksize - 1] == $tag) { // found closing tag
+				$tag = '</'.$tag.'>'; // Close Tag
 				// Pop
-				array_pop( $tagstack );
+				array_pop($tagstack);
 				$stacksize--;
 			} else { // closing tag not at top, search for it
-				for ( $j = $stacksize-1; $j >= 0; $j-- ) {
-					if ( $tagstack[$j] == $tag ) {
+				for ($j = $stacksize - 1; $j >= 0; $j--) {
+					if ($tagstack[$j] == $tag) {
 					// add tag to tagqueue
-						for ( $k = $stacksize-1; $k >= $j; $k--) {
-							$tagqueue .= '</' . array_pop( $tagstack ) . '>';
+						for ($k = $stacksize - 1; $k >= $j; $k--) {
+							$tagqueue .= '</'.array_pop($tagstack).'>';
 							$stacksize--;
 						}
 						break;
@@ -1772,43 +1772,43 @@ 
 			// Tag Cleaning
 
 			// If it's an empty tag "< >", do nothing
-			if ( '' == $tag ) {
+			if ('' == $tag) {
 				// do nothing
 			}
 			// ElseIf it presents itself as a self-closing tag...
-			elseif ( substr( $regex[2], -1 ) == '/' ) {
+			elseif (substr($regex[2], -1) == '/') {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array($tag, $single_tags))
+					$regex[2] = trim(substr($regex[2], 0, -1))."></$tag";
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
-			elseif ( in_array($tag, $single_tags) ) {
+			elseif (in_array($tag, $single_tags)) {
 				$regex[2] .= '/';
 			}
 			// Else it's not a single-entity tag
 			else {
 				// If the top of the stack is the same as the tag we want to push, close previous tag
-				if ( $stacksize > 0 && !in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag ) {
-					$tagqueue = '</' . array_pop( $tagstack ) . '>';
+				if ($stacksize > 0 && ! in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag) {
+					$tagqueue = '</'.array_pop($tagstack).'>';
 					$stacksize--;
 				}
-				$stacksize = array_push( $tagstack, $tag );
+				$stacksize = array_push($tagstack, $tag);
 			}
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty($attributes) && $attributes[0] != '>')
+				$attributes = ' '.$attributes;
 
-			$tag = '<' . $tag . $attributes . '>';
+			$tag = '<'.$tag.$attributes.'>';
 			//If already queuing a close tag, then put this tag on, too
-			if ( !empty($tagqueue) ) {
+			if ( ! empty($tagqueue)) {
 				$tagqueue .= $tag;
 				$tag = '';
 			}
 		}
-		$newtext .= substr($text, 0, $i) . $tag;
+		$newtext .= substr($text, 0, $i).$tag;
 		$text = substr($text, $i + $l);
 	}
 
@@ -1819,12 +1819,12 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while ($x = array_pop($tagstack))
+		$newtext .= '</'.$x.'>'; // Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
-	$newtext = str_replace("< !--","<!--",$newtext);
-	$newtext = str_replace("<    !--","< !--",$newtext);
+	$newtext = str_replace("< !--", "<!--", $newtext);
+	$newtext = str_replace("<    !--", "< !--", $newtext);
 
 	return $newtext;
 }
@@ -1842,7 +1842,7 @@ 
  * @param bool   $richedit Whether the $content should not pass through htmlspecialchars(). Default false (meaning it will be passed).
  * @return string The text after the filter (and possibly htmlspecialchars()) has been run.
  */
-function format_to_edit( $content, $richedit = false ) {
+function format_to_edit($content, $richedit = false) {
 	/**
 	 * Filter the text to be formatted for editing.
 	 *
@@ -1850,9 +1850,9 @@ 
 	 *
 	 * @param string $content The text, prior to formatting for editing.
 	 */
-	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $richedit )
-		$content = esc_textarea( $content );
+	$content = apply_filters('format_to_edit', $content);
+	if ( ! $richedit)
+		$content = esc_textarea($content);
 	return $content;
 }
 
@@ -1873,8 +1873,8 @@ 
  * @param int $threshold  Digit places number needs to be to not have zeros added.
  * @return string Adds leading zeros to number if needed.
  */
-function zeroise( $number, $threshold ) {
-	return sprintf( '%0' . $threshold . 's', $number );
+function zeroise($number, $threshold) {
+	return sprintf('%0'.$threshold.'s', $number);
 }
 
 /**
@@ -1885,10 +1885,10 @@ 
  * @param string $string Value to which backslashes will be added.
  * @return string String with backslashes inserted.
  */
-function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
-	return addcslashes( $string, 'A..Za..z' );
+function backslashit($string) {
+	if (isset($string[0]) && $string[0] >= '0' && $string[0] <= '9')
+		$string = '\\\\'.$string;
+	return addcslashes($string, 'A..Za..z');
 }
 
 /**
@@ -1905,8 +1905,8 @@ 
  * @param string $string What to add the trailing slash to.
  * @return string String with trailing slash added.
  */
-function trailingslashit( $string ) {
-	return untrailingslashit( $string ) . '/';
+function trailingslashit($string) {
+	return untrailingslashit($string).'/';
 }
 
 /**
@@ -1920,8 +1920,8 @@ 
  * @param string $string What to remove the trailing slashes from.
  * @return string String without the trailing slashes.
  */
-function untrailingslashit( $string ) {
-	return rtrim( $string, '/\\' );
+function untrailingslashit($string) {
+	return rtrim($string, '/\\');
 }
 
 /**
@@ -1936,7 +1936,7 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
+	if (get_magic_quotes_gpc())
 		$gpc = stripslashes($gpc);
 
 	return wp_slash($gpc);
@@ -1953,15 +1953,15 @@ 
  * @param mixed $value The value to be stripped.
  * @return mixed Stripped value.
  */
-function stripslashes_deep( $value ) {
-	if ( is_array($value) ) {
+function stripslashes_deep($value) {
+	if (is_array($value)) {
 		$value = array_map('stripslashes_deep', $value);
-	} elseif ( is_object($value) ) {
-		$vars = get_object_vars( $value );
+	} elseif (is_object($value)) {
+		$vars = get_object_vars($value);
 		foreach ($vars as $key=>$data) {
-			$value->{$key} = stripslashes_deep( $data );
+			$value->{$key} = stripslashes_deep($data);
 		}
-	} elseif ( is_string( $value ) ) {
+	} elseif (is_string($value)) {
 		$value = stripslashes($value);
 	}
 
@@ -1977,8 +1977,8 @@ 
  * @param array|string $value The array or string to be encoded.
  * @return array|string $value The encoded array (or string from the callback).
  */
-function urlencode_deep( $value ) {
-	return is_array( $value ) ? array_map( 'urlencode_deep', $value ) : urlencode( $value );
+function urlencode_deep($value) {
+	return is_array($value) ? array_map('urlencode_deep', $value) : urlencode($value);
 }
 
 /**
@@ -1989,8 +1989,8 @@ 
  * @param array|string $value The array or string to be encoded.
  * @return array|string $value The encoded array (or string from the callback).
  */
-function rawurlencode_deep( $value ) {
-	return is_array( $value ) ? array_map( 'rawurlencode_deep', $value ) : rawurlencode( $value );
+function rawurlencode_deep($value) {
+	return is_array($value) ? array_map('rawurlencode_deep', $value) : rawurlencode($value);
 }
 
 /**
@@ -2002,20 +2002,20 @@ 
  * @param int    $hex_encoding  Optional. Set to 1 to enable hex encoding.
  * @return string Converted email address.
  */
-function antispambot( $email_address, $hex_encoding = 0 ) {
+function antispambot($email_address, $hex_encoding = 0) {
 	$email_no_spam_address = '';
-	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
-		$j = rand( 0, 1 + $hex_encoding );
-		if ( $j == 0 ) {
-			$email_no_spam_address .= '&#' . ord( $email_address[$i] ) . ';';
-		} elseif ( $j == 1 ) {
+	for ($i = 0, $len = strlen($email_address); $i < $len; $i++) {
+		$j = rand(0, 1 + $hex_encoding);
+		if ($j == 0) {
+			$email_no_spam_address .= '&#'.ord($email_address[$i]).';';
+		} elseif ($j == 1) {
 			$email_no_spam_address .= $email_address[$i];
-		} elseif ( $j == 2 ) {
-			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[$i] ) ), 2 );
+		} elseif ($j == 2) {
+			$email_no_spam_address .= '%'.zeroise(dechex(ord($email_address[$i])), 2);
 		}
 	}
 
-	return str_replace( '@', '&#64;', $email_no_spam_address );
+	return str_replace('@', '&#64;', $email_no_spam_address);
 }
 
 /**
@@ -2030,10 +2030,10 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URI address.
  */
-function _make_url_clickable_cb( $matches ) {
+function _make_url_clickable_cb($matches) {
 	$url = $matches[2];
 
-	if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+	if (')' == $matches[3] && strpos($url, '(')) {
 		// If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
 		// Then we can let the parenthesis balancer do its thing below.
 		$url .= $matches[3];
@@ -2043,16 +2043,16 @@ 
 	}
 
 	// Include parentheses in the URL only if paired
-	while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-		$suffix = strrchr( $url, ')' ) . $suffix;
-		$url = substr( $url, 0, strrpos( $url, ')' ) );
+	while (substr_count($url, '(') < substr_count($url, ')')) {
+		$suffix = strrchr($url, ')').$suffix;
+		$url = substr($url, 0, strrpos($url, ')'));
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
+	if (empty($url))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+	return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -2067,20 +2067,20 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URL address.
  */
-function _make_web_ftp_clickable_cb( $matches ) {
+function _make_web_ftp_clickable_cb($matches) {
 	$ret = '';
 	$dest = $matches[2];
-	$dest = 'http://' . $dest;
+	$dest = 'http://'.$dest;
 	$dest = esc_url($dest);
-	if ( empty($dest) )
+	if (empty($dest))
 		return $matches[0];
 
 	// removed trailing [.,;:)] from URL
-	if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+	if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
 		$ret = substr($dest, -1);
-		$dest = substr($dest, 0, strlen($dest)-1);
+		$dest = substr($dest, 0, strlen($dest) - 1);
 	}
-	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+	return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -2095,9 +2095,9 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with email address.
  */
-function _make_email_clickable_cb( $matches ) {
-	$email = $matches[2] . '@' . $matches[3];
-	return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+function _make_email_clickable_cb($matches) {
+	$email = $matches[2].'@'.$matches[3];
+	return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -2111,30 +2111,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
 	$r = '';
-	$textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+	$textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-	foreach ( $textarr as $piece ) {
+	foreach ($textarr as $piece) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
+		if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece))
 			$nested_code_pre++;
-		elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
+		elseif (('</code>' === strtolower($piece) || '</pre>' === strtolower($piece)) && $nested_code_pre)
 			$nested_code_pre--;
 
-		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+		if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && ! preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
 			$r .= $piece;
 			continue;
 		}
 
 		// Long strings might contain expensive edge cases ...
-		if ( 10000 < strlen( $piece ) ) {
+		if (10000 < strlen($piece)) {
 			// ... break it up
-			foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-				if ( 2101 < strlen( $chunk ) ) {
+			foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+				if (2101 < strlen($chunk)) {
 					$r .= $chunk; // Too big, no whitespace: bail.
 				} else {
-					$r .= make_clickable( $chunk );
+					$r .= make_clickable($chunk);
 				}
 			}
 		} else {
@@ -2155,18 +2155,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
 			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+			$ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-			$ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-			$ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+			$ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+			$ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-			$ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+			$ret = substr($ret, 1, -1); // Remove our whitespace padding.
 			$r .= $ret;
 		}
 	}
 
 	// Cleanup of accidental links within links
-	return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+	return preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
 }
 
 /**
@@ -2198,27 +2198,27 @@ 
  * @param int    $goal   The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
 	$chunks = array();
 
-	$string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+	$string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-	while ( $goal < strlen( $string_nullspace ) ) {
-		$pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+	while ($goal < strlen($string_nullspace)) {
+		$pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-		if ( false === $pos ) {
-			$pos = strpos( $string_nullspace, "\000", $goal + 1 );
-			if ( false === $pos ) {
+		if (false === $pos) {
+			$pos = strpos($string_nullspace, "\000", $goal + 1);
+			if (false === $pos) {
 				break;
 			}
 		}
 
-		$chunks[] = substr( $string, 0, $pos + 1 );
-		$string = substr( $string, $pos + 1 );
-		$string_nullspace = substr( $string_nullspace, $pos + 1 );
+		$chunks[] = substr($string, 0, $pos + 1);
+		$string = substr($string, $pos + 1);
+		$string_nullspace = substr($string_nullspace, $pos + 1);
 	}
 
-	if ( $string ) {
+	if ($string) {
 		$chunks[] = $string;
 	}
 
@@ -2233,11 +2233,11 @@ 
  * @param string $text Content that may contain HTML A elements.
  * @return string Converted content.
  */
-function wp_rel_nofollow( $text ) {
+function wp_rel_nofollow($text) {
 	// This is a pre save filter, so text is already escaped.
 	$text = stripslashes($text);
 	$text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
-	return wp_slash( $text );
+	return wp_slash($text);
 }
 
 /**
@@ -2251,7 +2251,7 @@ 
  * @param array $matches Single Match
  * @return string HTML A Element with rel nofollow.
  */
-function wp_rel_nofollow_callback( $matches ) {
+function wp_rel_nofollow_callback($matches) {
 	$text = $matches[1];
 	$text = str_replace(array(' rel="nofollow"', " rel='nofollow'"), '', $text);
 	return "<a $text rel=\"nofollow\">";
@@ -2271,21 +2271,21 @@ 
  * @param array $matches Single match. Smiley code to convert to image.
  * @return string Image string for smiley.
  */
-function translate_smiley( $matches ) {
+function translate_smiley($matches) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
+	if (count($matches) == 0)
 		return '';
 
-	$smiley = trim( reset( $matches ) );
-	$img = $wpsmiliestrans[ $smiley ];
+	$smiley = trim(reset($matches));
+	$img = $wpsmiliestrans[$smiley];
 
 	$matches = array();
-	$ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
-	$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+	$ext = preg_match('/\.([^.]+)$/', $img, $matches) ? strtolower($matches[1]) : false;
+	$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
 
 	// Don't convert smilies that aren't images - they're probably emoji.
-	if ( ! in_array( $ext, $image_exts ) ) {
+	if ( ! in_array($ext, $image_exts)) {
 		return $img;
 	}
 
@@ -2298,9 +2298,9 @@ 
 	 * @param string $img        Filename for the smiley image.
 	 * @param string $site_url   Site URL, as returned by site_url().
 	 */
-	$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
+	$src_url = apply_filters('smilies_src', includes_url("images/smilies/$img"), $img, site_url());
 
-	return sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url( $src_url ), esc_attr( $smiley ) );
+	return sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url($src_url), esc_attr($smiley));
 }
 
 /**
@@ -2316,33 +2316,33 @@ 
  * @param string $text Content to convert smilies from text.
  * @return string Converted content with text smilies replaced with images.
  */
-function convert_smilies( $text ) {
+function convert_smilies($text) {
 	global $wp_smiliessearch;
 	$output = '';
-	if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
+	if (get_option('use_smilies') && ! empty($wp_smiliessearch)) {
 		// HTML loop taken from texturize function, could possible be consolidated
-		$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
-		$stop = count( $textarr );// loop stuff
+		$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
+		$stop = count($textarr); // loop stuff
 
 		// Ignore proessing of specific tags
 		$tags_to_ignore = 'code|pre|style|script|textarea';
 		$ignore_block_element = '';
 
-		for ( $i = 0; $i < $stop; $i++ ) {
+		for ($i = 0; $i < $stop; $i++) {
 			$content = $textarr[$i];
 
 			// If we're in an ignore block, wait until we find its closing tag
-			if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+			if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 				$ignore_block_element = $matches[1];
 			}
 
 			// If it's not a tag and not in ignore block
-			if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
-				$content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
+			if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
+				$content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
 			}
 
 			// did we exit ignore block
-			if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+			if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 				$ignore_block_element = '';
 			}
 
@@ -2366,12 +2366,12 @@ 
  * @param bool   $deprecated Deprecated.
  * @return string|bool Either false or the valid email address.
  */
-function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+function is_email($email, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0');
 
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filter whether an email address is valid.
 		 *
@@ -2386,65 +2386,65 @@ 
 		 * @param string $message  An explanatory message to the user.
 		 * @param string $context  Context under which the email was tested.
 		 */
-		return apply_filters( 'is_email', false, $email, 'email_too_short' );
+		return apply_filters('is_email', false, $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'email_no_at' );
+		return apply_filters('is_email', false, $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	if ( !preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
+	if ( ! preg_match('/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
+		return apply_filters('is_email', false, $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	if ( preg_match( '/\.{2,}/', $domain ) ) {
+	if (preg_match('/\.{2,}/', $domain)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_sequence' );
+		return apply_filters('is_email', false, $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	if ( trim( $domain, " \t\n\r\0\x0B." ) !== $domain ) {
+	if (trim($domain, " \t\n\r\0\x0B.") !== $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_limits' );
+		return apply_filters('is_email', false, $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_no_periods' );
+		return apply_filters('is_email', false, $email, 'domain_no_periods');
 	}
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens and whitespace
-		if ( trim( $sub, " \t\n\r\0\x0B-" ) !== $sub ) {
+		if (trim($sub, " \t\n\r\0\x0B-") !== $sub) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_hyphen_limits' );
+			return apply_filters('is_email', false, $email, 'sub_hyphen_limits');
 		}
 
 		// Test for invalid characters
-		if ( !preg_match('/^[a-z0-9-]+$/i', $sub ) ) {
+		if ( ! preg_match('/^[a-z0-9-]+$/i', $sub)) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );
+			return apply_filters('is_email', false, $email, 'sub_invalid_chars');
 		}
 	}
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'is_email', $email, $email, null );
+	return apply_filters('is_email', $email, $email, null);
 }
 
 /**
@@ -2455,13 +2455,13 @@ 
  * @param string $string Subject line
  * @return string Converted string to ASCII
  */
-function wp_iso_descrambler( $string ) {
+function wp_iso_descrambler($string) {
 	/* this may only work with iso-8859-1, I'm afraid */
-	if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
+	if ( ! preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
 		return $string;
 	} else {
 		$subject = str_replace('_', ' ', $matches[2]);
-		return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
+		return preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject);
 	}
 }
 
@@ -2474,8 +2474,8 @@ 
  * @param array $match The preg_replace_callback matches array
  * @return string Converted chars
  */
-function _wp_iso_convert( $match ) {
-	return chr( hexdec( strtolower( $match[1] ) ) );
+function _wp_iso_convert($match) {
+	return chr(hexdec(strtolower($match[1])));
 }
 
 /**
@@ -2492,19 +2492,19 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string GMT version of the date provided.
  */
-function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( $tz ) );
-		if ( ! $datetime )
-			return gmdate( $format, 0 );
-		$datetime->setTimezone( new DateTimeZone( 'UTC' ) );
-		$string_gmt = $datetime->format( $format );
+function get_gmt_from_date($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone($tz));
+		if ( ! $datetime)
+			return gmdate($format, 0);
+		$datetime->setTimezone(new DateTimeZone('UTC'));
+		$string_gmt = $datetime->format($format);
 	} else {
-		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) )
-			return gmdate( $format, 0 );
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_gmt = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches))
+			return gmdate($format, 0);
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_gmt;
 }
@@ -2523,19 +2523,19 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string Formatted date relative to the timezone / GMT offset.
  */
-function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
-		$datetime->setTimezone( new DateTimeZone( $tz ) );
-		$string_localtime = $datetime->format( $format );
+function get_date_from_gmt($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone('UTC'));
+		if ( ! $datetime)
+			return date($format, 0);
+		$datetime->setTimezone(new DateTimeZone($tz));
+		$string_localtime = $datetime->format($format);
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches))
+			return date($format, 0);
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_localtime = gmdate($format, $string_time + get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_localtime;
 }
@@ -2548,7 +2548,7 @@ 
  * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
  * @return int|float The offset in seconds.
  */
-function iso8601_timezone_to_offset( $timezone ) {
+function iso8601_timezone_to_offset($timezone) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
 	if ($timezone == 'Z') {
 		$offset = 0;
@@ -2570,14 +2570,14 @@ 
  * @param string $timezone    Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
  * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
  */
-function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
+function iso8601_to_datetime($date_string, $timezone = 'user') {
 	$timezone = strtolower($timezone);
 
 	if ($timezone == 'gmt') {
 
 		preg_match('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits);
 
-		if (!empty($date_bits[7])) { // we have a timezone, so let's compute an offset
+		if ( ! empty($date_bits[7])) { // we have a timezone, so let's compute an offset
 			$offset = iso8601_timezone_to_offset($date_bits[7]);
 		} else { // we don't have a timezone, so we assume user local timezone (not server's!)
 			$offset = HOUR_IN_SECONDS * get_option('gmt_offset');
@@ -2605,7 +2605,7 @@ 
  * @param string $text Content to replace links to open in a new window.
  * @return string Content that has filtered links.
  */
-function popuplinks( $text ) {
+function popuplinks($text) {
 	$text = preg_replace('/<a (.+?)>/i', "<a $1 target='_blank' rel='external'>", $text);
 	return $text;
 }
@@ -2618,9 +2618,9 @@ 
  * @param string $email Email address to filter.
  * @return string Filtered email address.
  */
-function sanitize_email( $email ) {
+function sanitize_email($email) {
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filter a sanitized email address.
 		 *
@@ -2634,82 +2634,82 @@ 
 		 * @param string $email   The email address, as provided to sanitize_email().
 		 * @param string $message A message to pass to the user.
 		 */
-		return apply_filters( 'sanitize_email', '', $email, 'email_too_short' );
+		return apply_filters('sanitize_email', '', $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );
+		return apply_filters('sanitize_email', '', $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	$local = preg_replace( '/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local );
-	if ( '' === $local ) {
+	$local = preg_replace('/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local);
+	if ('' === $local) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'local_invalid_chars' );
+		return apply_filters('sanitize_email', '', $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	$domain = preg_replace( '/\.{2,}/', '', $domain );
-	if ( '' === $domain ) {
+	$domain = preg_replace('/\.{2,}/', '', $domain);
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_sequence' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	$domain = trim( $domain, " \t\n\r\0\x0B." );
-	if ( '' === $domain ) {
+	$domain = trim($domain, " \t\n\r\0\x0B.");
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_limits' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_periods' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_periods');
 	}
 
 	// Create an array that will contain valid subs
 	$new_subs = array();
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens
-		$sub = trim( $sub, " \t\n\r\0\x0B-" );
+		$sub = trim($sub, " \t\n\r\0\x0B-");
 
 		// Test for invalid characters
-		$sub = preg_replace( '/[^a-z0-9-]+/i', '', $sub );
+		$sub = preg_replace('/[^a-z0-9-]+/i', '', $sub);
 
 		// If there's anything left, add it to the valid subs
-		if ( '' !== $sub ) {
+		if ('' !== $sub) {
 			$new_subs[] = $sub;
 		}
 	}
 
 	// If there aren't 2 or more valid subs
-	if ( 2 > count( $new_subs ) ) {
+	if (2 > count($new_subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_valid_subs' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_valid_subs');
 	}
 
 	// Join valid subs into the new domain
-	$domain = join( '.', $new_subs );
+	$domain = join('.', $new_subs);
 
 	// Put the email back together
-	$email = $local . '@' . $domain;
+	$email = $local.'@'.$domain;
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'sanitize_email', $email, $email, null );
+	return apply_filters('sanitize_email', $email, $email, null);
 }
 
 /**
@@ -2724,44 +2724,44 @@ 
  * @param int $to   Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
  * @return string Human readable time difference.
  */
-function human_time_diff( $from, $to = '' ) {
-	if ( empty( $to ) ) {
+function human_time_diff($from, $to = '') {
+	if (empty($to)) {
 		$to = time();
 	}
 
-	$diff = (int) abs( $to - $from );
+	$diff = (int) abs($to - $from);
 
-	if ( $diff < HOUR_IN_SECONDS ) {
-		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
+	if ($diff < HOUR_IN_SECONDS) {
+		$mins = round($diff / MINUTE_IN_SECONDS);
+		if ($mins <= 1)
 			$mins = 1;
 		/* translators: min=minute */
-		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
-	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
-		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
+		$since = sprintf(_n('%s min', '%s mins', $mins), $mins);
+	} elseif ($diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS) {
+		$hours = round($diff / HOUR_IN_SECONDS);
+		if ($hours <= 1)
 			$hours = 1;
-		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
-	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
-		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
+		$since = sprintf(_n('%s hour', '%s hours', $hours), $hours);
+	} elseif ($diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS) {
+		$days = round($diff / DAY_IN_SECONDS);
+		if ($days <= 1)
 			$days = 1;
-		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
-	} elseif ( $diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
-		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
+		$since = sprintf(_n('%s day', '%s days', $days), $days);
+	} elseif ($diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS) {
+		$weeks = round($diff / WEEK_IN_SECONDS);
+		if ($weeks <= 1)
 			$weeks = 1;
-		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
-	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS ) {
-		$months = round( $diff / ( 30 * DAY_IN_SECONDS ) );
-		if ( $months <= 1 )
+		$since = sprintf(_n('%s week', '%s weeks', $weeks), $weeks);
+	} elseif ($diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS) {
+		$months = round($diff / (30 * DAY_IN_SECONDS));
+		if ($months <= 1)
 			$months = 1;
-		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
-	} elseif ( $diff >= YEAR_IN_SECONDS ) {
-		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
+		$since = sprintf(_n('%s month', '%s months', $months), $months);
+	} elseif ($diff >= YEAR_IN_SECONDS) {
+		$years = round($diff / YEAR_IN_SECONDS);
+		if ($years <= 1)
 			$years = 1;
-		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
+		$since = sprintf(_n('%s year', '%s years', $years), $years);
 	}
 
 	/**
@@ -2774,7 +2774,7 @@ 
 	 * @param int    $from  Unix timestamp from which the difference begins.
 	 * @param int    $to    Unix timestamp to end the time difference.
 	 */
-	return apply_filters( 'human_time_diff', $since, $diff, $from, $to );
+	return apply_filters('human_time_diff', $since, $diff, $from, $to);
 }
 
 /**
@@ -2792,15 +2792,15 @@ 
  * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
  * @return string The excerpt.
  */
-function wp_trim_excerpt( $text = '' ) {
+function wp_trim_excerpt($text = '') {
 	$raw_excerpt = $text;
-	if ( '' == $text ) {
+	if ('' == $text) {
 		$text = get_the_content('');
 
-		$text = strip_shortcodes( $text );
+		$text = strip_shortcodes($text);
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$text = apply_filters( 'the_content', $text );
+		$text = apply_filters('the_content', $text);
 		$text = str_replace(']]>', ']]&gt;', $text);
 
 		/**
@@ -2810,7 +2810,7 @@ 
 		 *
 		 * @param int $number The number of words. Default 55.
 		 */
-		$excerpt_length = apply_filters( 'excerpt_length', 55 );
+		$excerpt_length = apply_filters('excerpt_length', 55);
 		/**
 		 * Filter the string in the "more" link displayed after a trimmed excerpt.
 		 *
@@ -2818,8 +2818,8 @@ 
 		 *
 		 * @param string $more_string The string shown within the more link.
 		 */
-		$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[&hellip;]' );
-		$text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
+		$excerpt_more = apply_filters('excerpt_more', ' '.'[&hellip;]');
+		$text = wp_trim_words($text, $excerpt_length, $excerpt_more);
 	}
 	/**
 	 * Filter the trimmed excerpt string.
@@ -2829,7 +2829,7 @@ 
 	 * @param string $text        The trimmed text.
 	 * @param string $raw_excerpt The text prior to trimming.
 	 */
-	return apply_filters( 'wp_trim_excerpt', $text, $raw_excerpt );
+	return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
 }
 
 /**
@@ -2846,35 +2846,35 @@ 
  * @param string $more      Optional. What to append if $text needs to be trimmed. Default '&hellip;'.
  * @return string Trimmed text.
  */
-function wp_trim_words( $text, $num_words = 55, $more = null ) {
-	if ( null === $more ) {
-		$more = __( '&hellip;' );
+function wp_trim_words($text, $num_words = 55, $more = null) {
+	if (null === $more) {
+		$more = __('&hellip;');
 	}
 
 	$original_text = $text;
-	$text = wp_strip_all_tags( $text );
+	$text = wp_strip_all_tags($text);
 
 	/*
 	 * translators: If your word count is based on single characters (e.g. East Asian characters),
 	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
 	 * Do not translate into your own language.
 	 */
-	if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-		$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-		preg_match_all( '/./u', $text, $words_array );
-		$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+	if (strpos(_x('words', 'Word count type. Do not translate!'), 'characters') === 0 && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+		$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+		preg_match_all('/./u', $text, $words_array);
+		$words_array = array_slice($words_array[0], 0, $num_words + 1);
 		$sep = '';
 	} else {
-		$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+		$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 		$sep = ' ';
 	}
 
-	if ( count( $words_array ) > $num_words ) {
-		array_pop( $words_array );
-		$text = implode( $sep, $words_array );
-		$text = $text . $more;
+	if (count($words_array) > $num_words) {
+		array_pop($words_array);
+		$text = implode($sep, $words_array);
+		$text = $text.$more;
 	} else {
-		$text = implode( $sep, $words_array );
+		$text = implode($sep, $words_array);
 	}
 
 	/**
@@ -2887,7 +2887,7 @@ 
 	 * @param string $more          An optional string to append to the end of the trimmed text, e.g. &hellip;.
 	 * @param string $original_text The text before it was trimmed.
 	 */
-	return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+	return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 }
 
 /**
@@ -2898,7 +2898,7 @@ 
  * @param string $text The text within which entities will be converted.
  * @return string Text with converted entities.
  */
-function ent2ncr( $text ) {
+function ent2ncr($text) {
 
 	/**
 	 * Filter text before named entities are converted into numbered entities.
@@ -2910,8 +2910,8 @@ 
 	 * @param null   $converted_text The text to be converted. Default null.
 	 * @param string $text           The text prior to entity conversion.
 	 */
-	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
+	$filtered = apply_filters('pre_ent2ncr', null, $text);
+	if (null !== $filtered)
 		return $filtered;
 
 	$to_ncr = array(
@@ -3173,7 +3173,7 @@ 
 		'&diams;' => '&#9830;'
 	);
 
-	return str_replace( array_keys($to_ncr), array_values($to_ncr), $text );
+	return str_replace(array_keys($to_ncr), array_values($to_ncr), $text);
 }
 
 /**
@@ -3190,9 +3190,9 @@ 
  * @param string $text The text to be formatted.
  * @return string The formatted text after filter is applied.
  */
-function format_for_editor( $text, $default_editor = null ) {
-	if ( $text ) {
-		$text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+function format_for_editor($text, $default_editor = null) {
+	if ($text) {
+		$text = htmlspecialchars($text, ENT_NOQUOTES, get_option('blog_charset'));
 	}
 
 	/**
@@ -3202,7 +3202,7 @@ 
 	 *
 	 * @param string $text The formatted text.
 	 */
-	return apply_filters( 'format_for_editor', $text, $default_editor );
+	return apply_filters('format_for_editor', $text, $default_editor);
 }
 
 /**
@@ -3220,12 +3220,12 @@ 
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
 	$subject = (string) $subject;
 
 	$count = 1;
-	while ( $count ) {
-		$subject = str_replace( $search, '', $subject, $count );
+	while ($count) {
+		$subject = str_replace($search, '', $subject, $count);
 	}
 
 	return $subject;
@@ -3245,9 +3245,9 @@ 
  * @param string|array $data Unescaped data
  * @return string|array Escaped data
  */
-function esc_sql( $data ) {
+function esc_sql($data) {
 	global $wpdb;
-	return $wpdb->_escape( $data );
+	return $wpdb->_escape($data);
 }
 
 /**
@@ -3265,13 +3265,13 @@ 
  * @param string $_context  Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
 	$original_url = $url;
 
-	if ( '' == $url )
+	if ('' == $url)
 		return $url;
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
-	if ( 0 !== stripos( $url, 'mailto:' ) ) {
+	if (0 !== stripos($url, 'mailto:')) {
 		$strip = array('%0d', '%0a', '%0D', '%0A');
 		$url = _deep_replace($strip, $url);
 	}
@@ -3280,24 +3280,24 @@ 
 	 * presume it needs http:// appended (unless a relative
 	 * link starting with /, # or ? or a php file).
 	 */
-	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+	if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) &&
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url))
+		$url = 'http://'.$url;
 
 	// Replace ampersands and single quotes only when displaying.
-	if ( 'display' == $_context ) {
-		$url = wp_kses_normalize_entities( $url );
-		$url = str_replace( '&amp;', '&#038;', $url );
-		$url = str_replace( "'", '&#039;', $url );
+	if ('display' == $_context) {
+		$url = wp_kses_normalize_entities($url);
+		$url = str_replace('&amp;', '&#038;', $url);
+		$url = str_replace("'", '&#039;', $url);
 	}
 
-	if ( '/' === $url[0] ) {
+	if ('/' === $url[0]) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
+		if ( ! is_array($protocols))
 			$protocols = wp_allowed_protocols();
-		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
+		$good_protocol_url = wp_kses_bad_protocol($url, $protocols);
+		if (strtolower($good_protocol_url) != strtolower($url))
 			return '';
 	}
 
@@ -3310,7 +3310,7 @@ 
 	 * @param string $original_url      The URL prior to cleaning.
 	 * @param string $_context          If 'display', replace ampersands and single quotes only.
 	 */
-	return apply_filters( 'clean_url', $good_protocol_url, $original_url, $_context );
+	return apply_filters('clean_url', $good_protocol_url, $original_url, $_context);
 }
 
 /**
@@ -3322,8 +3322,8 @@ 
  * @param array  $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function esc_url_raw( $url, $protocols = null ) {
-	return esc_url( $url, $protocols, 'db' );
+function esc_url_raw($url, $protocols = null) {
+	return esc_url($url, $protocols, 'db');
 }
 
 /**
@@ -3336,10 +3336,10 @@ 
  * @param string $myHTML The text to be converted.
  * @return string Converted text.
  */
-function htmlentities2( $myHTML ) {
-	$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+function htmlentities2($myHTML) {
+	$translation_table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
 	$translation_table[chr(38)] = '&';
-	return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) );
+	return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table));
 }
 
 /**
@@ -3354,12 +3354,12 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function esc_js( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
-	$safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-	$safe_text = str_replace( "\r", '', $safe_text );
-	$safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
+function esc_js($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_COMPAT);
+	$safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text));
+	$safe_text = str_replace("\r", '', $safe_text);
+	$safe_text = str_replace("\n", '\\n', addslashes($safe_text));
 	/**
 	 * Filter a string cleaned and escaped for output in JavaScript.
 	 *
@@ -3371,7 +3371,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'js_escape', $safe_text, $text );
+	return apply_filters('js_escape', $safe_text, $text);
 }
 
 /**
@@ -3382,9 +3382,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_html( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_html($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filter a string cleaned and escaped for output in HTML.
 	 *
@@ -3396,7 +3396,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_html', $safe_text, $text );
+	return apply_filters('esc_html', $safe_text, $text);
 }
 
 /**
@@ -3407,9 +3407,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_attr( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_attr($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filter a string cleaned and escaped for output in an HTML attribute.
 	 *
@@ -3421,7 +3421,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'attribute_escape', $safe_text, $text );
+	return apply_filters('attribute_escape', $safe_text, $text);
 }
 
 /**
@@ -3432,8 +3432,8 @@ 
  * @param string $text
  * @return string
  */
-function esc_textarea( $text ) {
-	$safe_text = htmlspecialchars( $text, ENT_QUOTES, get_option( 'blog_charset' ) );
+function esc_textarea($text) {
+	$safe_text = htmlspecialchars($text, ENT_QUOTES, get_option('blog_charset'));
 	/**
 	 * Filter a string cleaned and escaped for output in a textarea element.
 	 *
@@ -3442,7 +3442,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_textarea', $safe_text, $text );
+	return apply_filters('esc_textarea', $safe_text, $text);
 }
 
 /**
@@ -3453,8 +3453,8 @@ 
  * @param string $tag_name
  * @return string
  */
-function tag_escape( $tag_name ) {
-	$safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
+function tag_escape($tag_name) {
+	$safe_tag = strtolower(preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name));
 	/**
 	 * Filter a string cleaned and escaped for output as an HTML tag.
 	 *
@@ -3463,7 +3463,7 @@ 
 	 * @param string $safe_tag The tag name after it has been escaped.
  	 * @param string $tag_name The text before it was escaped.
 	 */
-	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
+	return apply_filters('tag_escape', $safe_tag, $tag_name);
 }
 
 /**
@@ -3478,8 +3478,8 @@ 
  * @param string $link Full URL path.
  * @return string Absolute path.
  */
-function wp_make_link_relative( $link ) {
-	return preg_replace( '|^(https?:)?//[^/]+(/.*)|i', '$2', $link );
+function wp_make_link_relative($link) {
+	return preg_replace('|^(https?:)?//[^/]+(/.*)|i', '$2', $link);
 }
 
 /**
@@ -3496,22 +3496,22 @@ 
  * @param string $value  The unsanitised value.
  * @return string Sanitized value.
  */
-function sanitize_option( $option, $value ) {
+function sanitize_option($option, $value) {
 	global $wpdb;
 
 	$original_value = $value;
 	$error = '';
 
-	switch ( $option ) {
+	switch ($option) {
 		case 'admin_email' :
 		case 'new_admin_email' :
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = sanitize_email( $value );
-				if ( ! is_email( $value ) ) {
-					$error = __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' );
+				$value = sanitize_email($value);
+				if ( ! is_email($value)) {
+					$error = __('The email address entered did not appear to be a valid email address. Please enter a valid email address.');
 				}
 			}
 			break;
@@ -3536,33 +3536,33 @@ 
 		case 'users_can_register':
 		case 'start_of_week':
 		case 'site_icon':
-			$value = absint( $value );
+			$value = absint($value);
 			break;
 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
+			if (empty($value))
 				$value = 1;
-			if ( $value < -1 )
+			if ($value < -1)
 				$value = abs($value);
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
+			if ($value == '0' || $value == '')
 				$value = 'closed';
 			break;
 
 		case 'blogdescription':
 		case 'blogname':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = wp_kses_post( $value );
-				$value = esc_html( $value );
+				$value = wp_kses_post($value);
+				$value = esc_html($value);
 			}
 			break;
 
@@ -3572,10 +3572,10 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
+			if (null === $value)
 				$value = 1;
 			else
-				$value = intval( $value );
+				$value = intval($value);
 			break;
 
 		case 'date_format':
@@ -3584,20 +3584,20 @@ 
 		case 'mailserver_login':
 		case 'mailserver_pass':
 		case 'upload_path':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = strip_tags( $value );
-				$value = wp_kses_data( $value );
+				$value = strip_tags($value);
+				$value = wp_kses_data($value);
 			}
 			break;
 
 		case 'ping_sites':
-			$value = explode( "\n", $value );
-			$value = array_filter( array_map( 'trim', $value ) );
-			$value = array_filter( array_map( 'esc_url_raw', $value ) );
-			$value = implode( "\n", $value );
+			$value = explode("\n", $value);
+			$value = array_filter(array_map('trim', $value));
+			$value = array_filter(array_map('esc_url_raw', $value));
+			$value = implode("\n", $value);
 			break;
 
 		case 'gmt_offset':
@@ -3605,120 +3605,120 @@ 
 			break;
 
 		case 'siteurl':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'home':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'WPLANG':
 			$allowed = get_available_languages();
-			if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) {
+			if ( ! is_multisite() && defined('WPLANG') && '' !== WPLANG && 'en_US' !== WPLANG) {
 				$allowed[] = WPLANG;
 			}
-			if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
-				$value = get_option( $option );
+			if ( ! in_array($value, $allowed) && ! empty($value)) {
+				$value = get_option($option);
 			}
 			break;
 
 		case 'illegal_names':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array($value))
+					$value = explode(' ', $value);
 
-				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$value = array_values(array_filter(array_map('trim', $value)));
 
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'limited_email_domains':
 		case 'banned_email_domains':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array($value))
+					$value = explode("\n", $value);
 
-				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$domains = array_values(array_filter(array_map('trim', $value)));
 				$value = array();
 
-				foreach ( $domains as $domain ) {
-					if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) {
+				foreach ($domains as $domain) {
+					if ( ! preg_match('/(--|\.\.)/', $domain) && preg_match('|^([a-zA-Z0-9-\.])+$|', $domain)) {
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'timezone_string':
 			$allowed_zones = timezone_identifiers_list();
-			if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
-				$error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
+			if ( ! in_array($value, $allowed_zones) && ! empty($value)) {
+				$error = __('The timezone you have entered is not valid. Please select a valid timezone.');
 			}
 			break;
 
 		case 'permalink_structure':
 		case 'category_base':
 		case 'tag_base':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_url_raw( $value );
-				$value = str_replace( 'http://', '', $value );
+				$value = esc_url_raw($value);
+				$value = str_replace('http://', '', $value);
 			}
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
+			if ( ! get_role($value) && get_role('subscriber'))
 				$value = 'subscriber';
 			break;
 
 		case 'moderation_keys':
 		case 'blacklist_keys':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = explode( "\n", $value );
-				$value = array_filter( array_map( 'trim', $value ) );
-				$value = array_unique( $value );
-				$value = implode( "\n", $value );
+				$value = explode("\n", $value);
+				$value = array_filter(array_map('trim', $value));
+				$value = array_unique($value);
+				$value = implode("\n", $value);
 			}
 			break;
 	}
 
-	if ( ! empty( $error ) ) {
-		$value = get_option( $option );
-		if ( function_exists( 'add_settings_error' ) ) {
-			add_settings_error( $option, "invalid_{$option}", $error );
+	if ( ! empty($error)) {
+		$value = get_option($option);
+		if (function_exists('add_settings_error')) {
+			add_settings_error($option, "invalid_{$option}", $error);
 		}
 	}
 
@@ -3732,7 +3732,7 @@ 
 	 * @param string $option         The option name.
 	 * @param string $original_value The original value passed to the function.
 	 */
-	return apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
+	return apply_filters("sanitize_option_{$option}", $value, $option, $original_value);
 }
 
 /**
@@ -3746,10 +3746,10 @@ 
  * @param string $string The string to be parsed.
  * @param array  $array  Variables will be stored in this array.
  */
-function wp_parse_str( $string, &$array ) {
-	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+function wp_parse_str($string, &$array) {
+	parse_str($string, $array);
+	if (get_magic_quotes_gpc())
+		$array = stripslashes_deep($array);
 	/**
 	 * Filter the array of variables derived from a parsed string.
 	 *
@@ -3757,7 +3757,7 @@ 
 	 *
 	 * @param array $array The array populated with variables.
 	 */
-	$array = apply_filters( 'wp_parse_str', $array );
+	$array = apply_filters('wp_parse_str', $array);
 }
 
 /**
@@ -3770,7 +3770,7 @@ 
  * @param string $text Text to be converted.
  * @return string Converted text.
  */
-function wp_pre_kses_less_than( $text ) {
+function wp_pre_kses_less_than($text) {
 	return preg_replace_callback('%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text);
 }
 
@@ -3782,8 +3782,8 @@ 
  * @param array $matches Populated by matches to preg_replace.
  * @return string The text returned after esc_html if needed.
  */
-function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
+function wp_pre_kses_less_than_callback($matches) {
+	if (false === strpos($matches[0], '>'))
 		return esc_html($matches[0]);
 	return $matches[0];
 }
@@ -3798,21 +3798,21 @@ 
  * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
-function wp_sprintf( $pattern ) {
+function wp_sprintf($pattern) {
 	$args = func_get_args();
 	$len = strlen($pattern);
 	$start = 0;
 	$result = '';
 	$arg_index = 0;
-	while ( $len > $start ) {
+	while ($len > $start) {
 		// Last character: append and break
-		if ( strlen($pattern) - 1 == $start ) {
+		if (strlen($pattern) - 1 == $start) {
 			$result .= substr($pattern, -1);
 			break;
 		}
 
 		// Literal %: append and continue
-		if ( substr($pattern, $start, 2) == '%%' ) {
+		if (substr($pattern, $start, 2) == '%%') {
 			$start += 2;
 			$result .= '%';
 			continue;
@@ -3820,14 +3820,14 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
+		if (false === $end)
 			$end = $len;
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
-		if ( $pattern[$start] == '%' ) {
+		if ($pattern[$start] == '%') {
 			// Find numbered arguments or take the next one in order
-			if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
+			if (preg_match('/^%(\d+)\$/', $fragment, $matches)) {
 				$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';
 				$fragment = str_replace("%{$matches[1]}$", '%', $fragment);
 			} else {
@@ -3845,11 +3845,11 @@ 
 			 * @param string $fragment A fragment from the pattern.
 			 * @param string $arg      The argument.
 			 */
-			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
+			$_fragment = apply_filters('wp_sprintf', $fragment, $arg);
+			if ($_fragment != $fragment)
 				$fragment = $_fragment;
 			else
-				$fragment = sprintf($fragment, strval($arg) );
+				$fragment = sprintf($fragment, strval($arg));
 		}
 
 		// Append to result and move to next fragment
@@ -3872,13 +3872,13 @@ 
  * @param array  $args    List items to prepend to the content and replace '%l'.
  * @return string Localized list items and rest of the content.
  */
-function wp_sprintf_l( $pattern, $args ) {
+function wp_sprintf_l($pattern, $args) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
+	if (substr($pattern, 0, 2) != '%l')
 		return $pattern;
 
 	// Nothing to work with
-	if ( empty($args) )
+	if (empty($args))
 		return '';
 
 	/**
@@ -3892,30 +3892,30 @@ 
 	 *
 	 * @param array $delimiters An array of translated delimiters.
 	 */
-	$l = apply_filters( 'wp_sprintf_l', array(
+	$l = apply_filters('wp_sprintf_l', array(
 		/* translators: used to join items in a list with more than 2 items */
-		'between'          => sprintf( __('%s, %s'), '', '' ),
+		'between'          => sprintf(__('%s, %s'), '', ''),
 		/* translators: used to join last two items in a list with more than 2 times */
-		'between_last_two' => sprintf( __('%s, and %s'), '', '' ),
+		'between_last_two' => sprintf(__('%s, and %s'), '', ''),
 		/* translators: used to join items in a list with only 2 items */
-		'between_only_two' => sprintf( __('%s and %s'), '', '' ),
-	) );
+		'between_only_two' => sprintf(__('%s and %s'), '', ''),
+	));
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if (count($args) == 1)
+		$result .= $l['between_only_two'].array_shift($args);
 	// Loop when more than two args
 	$i = count($args);
-	while ( $i ) {
+	while ($i) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
+		if (0 == $i)
+			$result .= $l['between_last_two'].$arg;
 		else
-			$result .= $l['between'] . $arg;
+			$result .= $l['between'].$arg;
 	}
-	return $result . substr($pattern, 2);
+	return $result.substr($pattern, 2);
 }
 
 /**
@@ -3932,15 +3932,15 @@ 
  * @param string $more  Optional. What to append if $str needs to be trimmed. Defaults to empty string.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
+function wp_html_excerpt($str, $count, $more = null) {
+	if (null === $more)
 		$more = '';
-	$str = wp_strip_all_tags( $str, true );
-	$excerpt = mb_substr( $str, 0, $count );
+	$str = wp_strip_all_tags($str, true);
+	$excerpt = mb_substr($str, 0, $count);
 	// remove part of an entity at the end
-	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	$excerpt = preg_replace('/&[^;\s]{0,6}$/', '', $excerpt);
+	if ($str != $excerpt)
+		$excerpt = trim($excerpt).$more;
 	return $excerpt;
 }
 
@@ -3959,11 +3959,11 @@ 
  * @param array  $attrs   The attributes which should be processed.
  * @return string The processed content.
  */
-function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
+function links_add_base_url($content, $base, $attrs = array('src', 'href')) {
 	global $_links_add_base;
 	$_links_add_base = $base;
-	$attrs = implode('|', (array)$attrs);
-	return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
+	$attrs = implode('|', (array) $attrs);
+	return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content);
 }
 
 /**
@@ -3977,13 +3977,12 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_base( $m ) {
+function _links_add_base($m) {
 	global $_links_add_base;
 	//1 = attribute name  2 = quotation mark  3 = URL
-	return $m[1] . '=' . $m[2] .
-		( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
-			$m[3] :
-			WP_HTTP::make_absolute_url( $m[3], $_links_add_base )
+	return $m[1].'='.$m[2].
+		(preg_match('#^(\w{1,20}):#', $m[3], $protocol) && in_array($protocol[1], wp_allowed_protocols()) ?
+			$m[3] : WP_HTTP::make_absolute_url($m[3], $_links_add_base)
 		)
 		. $m[2];
 }
@@ -4005,11 +4004,11 @@ 
  * @param array  $tags    An array of tags to apply to.
  * @return string The processed content.
  */
-function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
+function links_add_target($content, $target = '_blank', $tags = array('a')) {
 	global $_links_add_target;
 	$_links_add_target = $target;
-	$tags = implode('|', (array)$tags);
-	return preg_replace_callback( "!<($tags)([^>]*)>!i", '_links_add_target', $content );
+	$tags = implode('|', (array) $tags);
+	return preg_replace_callback("!<($tags)([^>]*)>!i", '_links_add_target', $content);
 }
 
 /**
@@ -4023,11 +4022,11 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_target( $m ) {
+function _links_add_target($m) {
 	global $_links_add_target;
 	$tag = $m[1];
 	$link = preg_replace('|( target=([\'"])(.*?)\2)|i', '', $m[2]);
-	return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
+	return '<'.$tag.$link.' target="'.esc_attr($_links_add_target).'">';
 }
 
 /**
@@ -4038,10 +4037,10 @@ 
  * @param string $str The string to normalize.
  * @return string The normalized string.
  */
-function normalize_whitespace( $str ) {
-	$str  = trim( $str );
-	$str  = str_replace( "\r", "\n", $str );
-	$str  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
+function normalize_whitespace($str) {
+	$str  = trim($str);
+	$str  = str_replace("\r", "\n", $str);
+	$str  = preg_replace(array('/\n+/', '/[ \t]+/'), array("\n", ' '), $str);
 	return $str;
 }
 
@@ -4059,13 +4058,13 @@ 
  * @return string The processed string.
  */
 function wp_strip_all_tags($string, $remove_breaks = false) {
-	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
+	$string = preg_replace('@<(script|style)[^>]*?>.*?</\\1>@si', '', $string);
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
+	if ($remove_breaks)
 		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
 
-	return trim( $string );
+	return trim($string);
 }
 
 /**
@@ -4082,26 +4081,26 @@ 
  * @param string $str
  * @return string
  */
-function sanitize_text_field( $str ) {
-	$filtered = wp_check_invalid_utf8( $str );
+function sanitize_text_field($str) {
+	$filtered = wp_check_invalid_utf8($str);
 
-	if ( strpos($filtered, '<') !== false ) {
-		$filtered = wp_pre_kses_less_than( $filtered );
+	if (strpos($filtered, '<') !== false) {
+		$filtered = wp_pre_kses_less_than($filtered);
 		// This will strip extra whitespace for us.
-		$filtered = wp_strip_all_tags( $filtered, true );
+		$filtered = wp_strip_all_tags($filtered, true);
 	} else {
-		$filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/[\r\n\t ]+/', ' ', $filtered));
 	}
 
 	$found = false;
-	while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
+	while (preg_match('/%[a-f0-9]{2}/i', $filtered, $match)) {
 		$filtered = str_replace($match[0], '', $filtered);
 		$found = true;
 	}
 
-	if ( $found ) {
+	if ($found) {
 		// Strip out the whitespace that may now exist after removing the octets.
-		$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/ +/', ' ', $filtered));
 	}
 
 	/**
@@ -4112,7 +4111,7 @@ 
 	 * @param string $filtered The sanitized string.
 	 * @param string $str      The string prior to being sanitized.
 	 */
-	return apply_filters( 'sanitize_text_field', $filtered, $str );
+	return apply_filters('sanitize_text_field', $filtered, $str);
 }
 
 /**
@@ -4124,8 +4123,8 @@ 
  * @param string $suffix If the filename ends in suffix this will also be cut off.
  * @return string
  */
-function wp_basename( $path, $suffix = '' ) {
-	return urldecode( basename( str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ), $suffix ) );
+function wp_basename($path, $suffix = '') {
+	return urldecode(basename(str_replace(array('%2F', '%5C'), '/', urlencode($path)), $suffix));
 }
 
 /**
@@ -4137,19 +4136,19 @@ 
  *
  * @staticvar string|false $dblq
  */
-function capital_P_dangit( $text ) {
+function capital_P_dangit($text) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ('the_title' === $current_filter || 'wp_title' === $current_filter)
+		return str_replace('Wordpress', 'WordPress', $text);
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
-	if ( false === $dblq ) {
-		$dblq = _x( '&#8220;', 'opening curly double quote' );
+	if (false === $dblq) {
+		$dblq = _x('&#8220;', 'opening curly double quote');
 	}
 	return str_replace(
-		array( ' Wordpress', '&#8216;Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
-		array( ' WordPress', '&#8216;WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+		array(' Wordpress', '&#8216;Wordpress', $dblq.'Wordpress', '>Wordpress', '(Wordpress'),
+		array(' WordPress', '&#8216;WordPress', $dblq.'WordPress', '>WordPress', '(WordPress'),
 	$text );
 }
 
@@ -4161,8 +4160,8 @@ 
  * @param string $mime_type Mime type
  * @return string Sanitized mime type
  */
-function sanitize_mime_type( $mime_type ) {
-	$sani_mime_type = preg_replace( '/[^-+*.a-zA-Z0-9\/]/', '', $mime_type );
+function sanitize_mime_type($mime_type) {
+	$sani_mime_type = preg_replace('/[^-+*.a-zA-Z0-9\/]/', '', $mime_type);
 	/**
 	 * Filter a mime type following sanitization.
 	 *
@@ -4171,7 +4170,7 @@ 
 	 * @param string $sani_mime_type The sanitized mime type.
 	 * @param string $mime_type      The mime type prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_mime_type', $sani_mime_type, $mime_type );
+	return apply_filters('sanitize_mime_type', $sani_mime_type, $mime_type);
 }
 
 /**
@@ -4182,14 +4181,14 @@ 
  * @param string $to_ping Space or carriage return separated URLs
  * @return string URLs starting with the http or https protocol, separated by a carriage return.
  */
-function sanitize_trackback_urls( $to_ping ) {
-	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
-	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+function sanitize_trackback_urls($to_ping) {
+	$urls_to_ping = preg_split('/[\r\n\t ]/', trim($to_ping), -1, PREG_SPLIT_NO_EMPTY);
+	foreach ($urls_to_ping as $k => $url) {
+		if ( ! preg_match('#^https?://.#i', $url))
+			unset($urls_to_ping[$k]);
 	}
-	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
-	$urls_to_ping = implode( "\n", $urls_to_ping );
+	$urls_to_ping = array_map('esc_url_raw', $urls_to_ping);
+	$urls_to_ping = implode("\n", $urls_to_ping);
 	/**
 	 * Filter a list of trackback URLs following sanitization.
 	 *
@@ -4201,7 +4200,7 @@ 
 	 * @param string $urls_to_ping Sanitized space or carriage return separated URLs.
 	 * @param string $to_ping      Space or carriage return separated URLs before sanitization.
 	 */
-	return apply_filters( 'sanitize_trackback_urls', $urls_to_ping, $to_ping );
+	return apply_filters('sanitize_trackback_urls', $urls_to_ping, $to_ping);
 }
 
 /**
@@ -4215,17 +4214,17 @@ 
  * @param string|array $value String or array of strings to slash.
  * @return string|array Slashed $value
  */
-function wp_slash( $value ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $k => $v ) {
-			if ( is_array( $v ) ) {
-				$value[$k] = wp_slash( $v );
+function wp_slash($value) {
+	if (is_array($value)) {
+		foreach ($value as $k => $v) {
+			if (is_array($v)) {
+				$value[$k] = wp_slash($v);
 			} else {
-				$value[$k] = addslashes( $v );
+				$value[$k] = addslashes($v);
 			}
 		}
 	} else {
-		$value = addslashes( $value );
+		$value = addslashes($value);
 	}
 
 	return $value;
@@ -4242,8 +4241,8 @@ 
  * @param string|array $value String or array of strings to unslash.
  * @return string|array Unslashed $value
  */
-function wp_unslash( $value ) {
-	return stripslashes_deep( $value );
+function wp_unslash($value) {
+	return stripslashes_deep($value);
 }
 
 /**
@@ -4254,13 +4253,13 @@ 
  * @param string $content A string which might contain a URL.
  * @return string|false The found URL.
  */
-function get_url_in_content( $content ) {
-	if ( empty( $content ) ) {
+function get_url_in_content($content) {
+	if (empty($content)) {
 		return false;
 	}
 
-	if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
-		return esc_url_raw( $matches[2] );
+	if (preg_match('/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches)) {
+		return esc_url_raw($matches[2]);
 	}
 
 	return false;
@@ -4282,7 +4281,7 @@ 
 function wp_spaces_regexp() {
 	static $spaces = '';
 
-	if ( empty( $spaces ) ) {
+	if (empty($spaces)) {
 		/**
 		 * Filter the regexp for common whitespace characters.
 		 *
@@ -4295,7 +4294,7 @@ 
 		 *
 		 * @param string $spaces Regexp pattern for matching common whitespace characters.
 		 */
-		$spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;' );
+		$spaces = apply_filters('wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;');
 	}
 
 	return $spaces;
@@ -4311,7 +4310,7 @@ 
 function print_emoji_styles() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4343,7 +4342,7 @@ 
 	global $wp_version;
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4357,7 +4356,7 @@ 
 		 *
 		 * @param string The emoji base URL.
 		 */
-		'baseUrl' => apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) ),
+		'baseUrl' => apply_filters('emoji_url', set_url_scheme('//s.w.org/images/core/emoji/72x72/')),
 
 		/**
 		 * Filter the extension of the emoji files.
@@ -4366,29 +4365,29 @@ 
 		 *
 		 * @param string The emoji extension. Default .png.
 		 */
-		'ext' => apply_filters( 'emoji_ext', '.png' ),
+		'ext' => apply_filters('emoji_ext', '.png'),
 	);
 
-	$version = 'ver=' . $wp_version;
+	$version = 'ver='.$wp_version;
 
-	if ( SCRIPT_DEBUG ) {
+	if (SCRIPT_DEBUG) {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'wpemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji.js?$version" ), 'wpemoji' ),
+			'wpemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji.js?$version"), 'wpemoji'),
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'twemoji' => apply_filters( 'script_loader_src', includes_url( "js/twemoji.js?$version" ), 'twemoji' ),
+			'twemoji' => apply_filters('script_loader_src', includes_url("js/twemoji.js?$version"), 'twemoji'),
 		);
 
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
-			<?php readfile( ABSPATH . WPINC . "/js/wp-emoji-loader.js" ); ?>
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
+			<?php readfile(ABSPATH.WPINC."/js/wp-emoji-loader.js"); ?>
 		</script>
 		<?php
 	} else {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'concatemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
+			'concatemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji-release.min.js?$version"), 'concatemoji'),
 		);
 
 		/*
@@ -4403,7 +4402,7 @@ 
 		 */
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
 			include "js/wp-emoji-loader.min.js"
 		</script>
 		<?php
@@ -4423,8 +4422,8 @@ 
  * @param string $content The content to encode.
  * @return string The encoded content.
  */
-function wp_encode_emoji( $content ) {
-	if ( function_exists( 'mb_convert_encoding' ) ) {
+function wp_encode_emoji($content) {
+	if (function_exists('mb_convert_encoding')) {
 		$regex = '/(
 		     \x23\xE2\x83\xA3               # Digits
 		     [\x30-\x39]\xE2\x83\xA3
@@ -4436,18 +4435,18 @@ 
 		)/x';
 
 		$matches = array();
-		if ( preg_match_all( $regex, $content, $matches ) ) {
-			if ( ! empty( $matches[1] ) ) {
-				foreach( $matches[1] as $emoji ) {
+		if (preg_match_all($regex, $content, $matches)) {
+			if ( ! empty($matches[1])) {
+				foreach ($matches[1] as $emoji) {
 					/*
 					 * UTF-32's hex encoding is the same as HTML's hex encoding.
 					 * So, by converting the emoji from UTF-8 to UTF-32, we magically
 					 * get the correct hex encoding.
 					 */
-					$unpacked = unpack( 'H*', mb_convert_encoding( $emoji, 'UTF-32', 'UTF-8' ) );
-					if ( isset( $unpacked[1] ) ) {
-						$entity = '&#x' . ltrim( $unpacked[1], '0' ) . ';';
-						$content = str_replace( $emoji, $entity, $content );
+					$unpacked = unpack('H*', mb_convert_encoding($emoji, 'UTF-32', 'UTF-8'));
+					if (isset($unpacked[1])) {
+						$entity = '&#x'.ltrim($unpacked[1], '0').';';
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
@@ -4465,14 +4464,14 @@ 
  * @param string $text The content to encode.
  * @return string The encoded content.
  */
-function wp_staticize_emoji( $text ) {
-	$text = wp_encode_emoji( $text );
+function wp_staticize_emoji($text) {
+	$text = wp_encode_emoji($text);
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) );
+	$cdn_url = apply_filters('emoji_url', set_url_scheme('//s.w.org/images/core/emoji/72x72/'));
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$ext = apply_filters( 'emoji_ext', '.png' );
+	$ext = apply_filters('emoji_ext', '.png');
 
 	$output = '';
 	/*
@@ -4481,33 +4480,33 @@ 
 	 *
 	 * First, capture the tags as well as in between.
 	 */
-	$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-	$stop = count( $textarr );
+	$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+	$stop = count($textarr);
 
 	// Ignore processing of specific tags.
 	$tags_to_ignore = 'code|pre|style|script|textarea';
 	$ignore_block_element = '';
 
-	for ( $i = 0; $i < $stop; $i++ ) {
+	for ($i = 0; $i < $stop; $i++) {
 		$content = $textarr[$i];
 
 		// If we're in an ignore block, wait until we find its closing tag.
-		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+		if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 			$ignore_block_element = $matches[1];
 		}
 
 		// If it's not a tag and not in ignore block.
-		if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+		if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
 			$matches = array();
-			if ( preg_match_all( '/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches ) ) {
-				if ( ! empty( $matches[0] ) ) {
-					foreach ( $matches[0] as $flag ) {
-						$chars = str_replace( array( '&#x', ';'), '', $flag );
+			if (preg_match_all('/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches)) {
+				if ( ! empty($matches[0])) {
+					foreach ($matches[0] as $flag) {
+						$chars = str_replace(array('&#x', ';'), '', $flag);
 
-						list( $char1, $char2 ) = str_split( $chars, 5 );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char1 . '-' . $char2 . $ext, html_entity_decode( $flag ) );
+						list($char1, $char2) = str_split($chars, 5);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char1.'-'.$char2.$ext, html_entity_decode($flag));
 
-						$content = str_replace( $flag, $entity, $content );
+						$content = str_replace($flag, $entity, $content);
 					}
 				}
 			}
@@ -4516,20 +4515,20 @@ 
 			$regex = '/(&#x[2-3][0-9a-f]{3};|&#x1f[1-6][0-9a-f]{2};)/';
 
 			$matches = array();
-			if ( preg_match_all( $regex, $content, $matches ) ) {
-				if ( ! empty( $matches[1] ) ) {
-					foreach ( $matches[1] as $emoji ) {
-						$char = str_replace( array( '&#x', ';'), '', $emoji );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char . $ext, html_entity_decode( $emoji ) );
+			if (preg_match_all($regex, $content, $matches)) {
+				if ( ! empty($matches[1])) {
+					foreach ($matches[1] as $emoji) {
+						$char = str_replace(array('&#x', ';'), '', $emoji);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char.$ext, html_entity_decode($emoji));
 
-						$content = str_replace( $emoji, $entity, $content );
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
 		}
 
 		// Did we exit ignore block.
-		if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+		if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 			$ignore_block_element = '';
 		}
 
@@ -4547,8 +4546,8 @@ 
  * @param array $mail The email data array.
  * @return array The email data array, with emoji in the message staticized.
  */
-function wp_staticize_emoji_for_email( $mail ) {
-	if ( ! isset( $mail['message'] ) ) {
+function wp_staticize_emoji_for_email($mail) {
+	if ( ! isset($mail['message'])) {
 		return $mail;
 	}
 
@@ -4560,47 +4559,47 @@ 
 	 * is handling changing the Content-Type.
 	 */
 	$headers = array();
-	if ( isset( $mail['headers'] ) ) {
-		if ( is_array( $mail['headers'] ) ) {
+	if (isset($mail['headers'])) {
+		if (is_array($mail['headers'])) {
 			$headers = $mail['headers'];
 		} else {
-			$headers = explode( "\n", str_replace( "\r\n", "\n", $mail['headers'] ) );
+			$headers = explode("\n", str_replace("\r\n", "\n", $mail['headers']));
 		}
 	}
 
-	foreach ( $headers as $header ) {
-		if ( strpos($header, ':') === false ) {
+	foreach ($headers as $header) {
+		if (strpos($header, ':') === false) {
 			continue;
 		}
 
 		// Explode them out.
-		list( $name, $content ) = explode( ':', trim( $header ), 2 );
+		list($name, $content) = explode(':', trim($header), 2);
 
 		// Cleanup crew.
-		$name    = trim( $name    );
-		$content = trim( $content );
+		$name    = trim($name);
+		$content = trim($content);
 
-		if ( 'content-type' === strtolower( $name ) ) {
-			if ( strpos( $content, ';' ) !== false ) {
-				list( $type, $charset ) = explode( ';', $content );
-				$content_type = trim( $type );
+		if ('content-type' === strtolower($name)) {
+			if (strpos($content, ';') !== false) {
+				list($type, $charset) = explode(';', $content);
+				$content_type = trim($type);
 			} else {
-				$content_type = trim( $content );
+				$content_type = trim($content);
 			}
 			break;
 		}
 	}
 
 	// Set Content-Type if we don't have a content-type from the input headers.
-	if ( ! isset( $content_type ) ) {
+	if ( ! isset($content_type)) {
 		$content_type = 'text/plain';
 	}
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+	$content_type = apply_filters('wp_mail_content_type', $content_type);
 
-	if ( 'text/html' === $content_type ) {
-		$mail['message'] = wp_staticize_emoji( $mail['message'] );
+	if ('text/html' === $content_type) {
+		$mail['message'] = wp_staticize_emoji($mail['message']);
 	}
 
 	return $mail;

Braces +231 added lines, -145 removed lines

@@ -456,8 +456,9 @@ 
 function wpautop( $pee, $br = true ) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
-		return '';
+	if ( trim($pee) === '' ) {
+			return '';
+	}
 
 	// Just to make things a little easier, pad the end.
 	$pee = $pee . "\n";
@@ -592,8 +593,9 @@ 
 	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
-		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	if ( !empty($pre_tags) ) {
+			$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	}
 
 	// Restore newlines in all elements.
 	$pee = str_replace( " <!-- wpnl --> ", "\n", $pee );
@@ -786,16 +788,38 @@ 
 	reset_mbstring_encoding();
 	for ($i=0; $i < $length; $i++) {
 		$c = ord($str[$i]);
-		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
+		if ($c < 0x80) {
+			$n = 0;
+		}
+		// 0bbbbbbb
+		elseif (($c & 0xE0) == 0xC0) {
+			$n=1;
+		}
+		// 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) {
+			$n=2;
+		}
+		// 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) {
+			$n=3;
+		}
+		// 11110bbb
+		elseif (($c & 0xFC) == 0xF8) {
+			$n=4;
+		}
+		// 111110bb
+		elseif (($c & 0xFE) == 0xFC) {
+			$n=5;
+		}
+		// 1111110b
+		else {
+			return false;
+		}
+		// Does not match any model
 		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
-				return false;
+			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+							return false;
+			}
 		}
 	}
 	return true;
@@ -823,18 +847,21 @@ 
 function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
-		return '';
+	if ( 0 === strlen( $string ) ) {
+			return '';
+	}
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
-		return $string;
+	if ( ! preg_match( '/[&<>"\']/', $string ) ) {
+			return $string;
+	}
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
-		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
-		$quote_style = ENT_QUOTES;
+	if ( empty( $quote_style ) ) {
+			$quote_style = ENT_NOQUOTES;
+	} elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+			$quote_style = ENT_QUOTES;
+	}
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
 	if ( ! $charset ) {
@@ -846,8 +873,9 @@ 
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
-		$charset = 'UTF-8';
+	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
+			$charset = 'UTF-8';
+	}
 
 	$_quote_style = $quote_style;
 
@@ -867,8 +895,9 @@ 
 	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
 
 	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ( 'single' === $_quote_style ) {
+			$string = str_replace( "'", '&#039;', $string );
+	}
 
 	return $string;
 }
@@ -1016,8 +1045,9 @@ 
 		$value = ord( $utf8_string[ $i ] );
 
 		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
-				break;
+			if ( $length && ( $unicode_length >= $length ) ) {
+							break;
+			}
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
@@ -1033,8 +1063,9 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
-				break;
+			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length ) {
+							break;
+			}
 			if ( count( $values ) == $num_octets ) {
 				for ( $j = 0; $j < $num_octets; $j++ ) {
 					$unicode .= '%' . dechex( $values[ $j ] );
@@ -1062,8 +1093,9 @@ 
  * @return string Filtered string with replaced "nice" characters.
  */
 function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
-		return $string;
+	if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+	}
 
 	if (seems_utf8($string)) {
 		$chars = array(
@@ -1358,8 +1390,9 @@ 
 					break;
 				}
 			}
-			if ( !$allowed )
-				$filename .= '_';
+			if ( !$allowed ) {
+							$filename .= '_';
+			}
 		}
 	}
 	$filename .= '.' . $extension;
@@ -1390,8 +1423,9 @@ 
 	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ( $strict ) {
+			$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	}
 
 	$username = trim( $username );
 	// Consolidate contiguous whitespace
@@ -1452,8 +1486,9 @@ 
 function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
-		$title = remove_accents($title);
+	if ( 'save' == $context ) {
+			$title = remove_accents($title);
+	}
 
 	/**
 	 * Filter a sanitized title string.
@@ -1466,8 +1501,9 @@ 
 	 */
 	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
 
-	if ( '' === $title || false === $title )
-		$title = $fallback_title;
+	if ( '' === $title || false === $title ) {
+			$title = $fallback_title;
+	}
 
 	return $title;
 }
@@ -1594,8 +1630,9 @@ 
 	//Limit to A-Z,a-z,0-9,_,-
 	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
 
-	if ( '' == $sanitized )
-		$sanitized = $fallback;
+	if ( '' == $sanitized ) {
+			$sanitized = $fallback;
+	}
 
 	/**
 	 * Filter a sanitized HTML class string.
@@ -1779,8 +1816,9 @@ 
 			elseif ( substr( $regex[2], -1 ) == '/' ) {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array( $tag, $single_tags ) ) {
+									$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				}
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
 			elseif ( in_array($tag, $single_tags) ) {
@@ -1798,8 +1836,9 @@ 
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty( $attributes ) && $attributes[0] != '>' ) {
+							$attributes = ' ' . $attributes;
+			}
 
 			$tag = '<' . $tag . $attributes . '>';
 			//If already queuing a close tag, then put this tag on, too
@@ -1819,8 +1858,10 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while( $x = array_pop($tagstack) ) {
+			$newtext .= '</' . $x . '>';
+	}
+	// Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
 	$newtext = str_replace("< !--","<!--",$newtext);
@@ -1851,8 +1892,9 @@ 
 	 * @param string $content The text, prior to formatting for editing.
 	 */
 	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $richedit )
-		$content = esc_textarea( $content );
+	if ( ! $richedit ) {
+			$content = esc_textarea( $content );
+	}
 	return $content;
 }
 
@@ -1886,8 +1928,9 @@ 
  * @return string String with backslashes inserted.
  */
 function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
+	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) {
+			$string = '\\\\' . $string;
+	}
 	return addcslashes( $string, 'A..Za..z' );
 }
 
@@ -1936,8 +1979,9 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
-		$gpc = stripslashes($gpc);
+	if ( get_magic_quotes_gpc() ) {
+			$gpc = stripslashes($gpc);
+	}
 
 	return wp_slash($gpc);
 }
@@ -2049,8 +2093,9 @@ 
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
-		return $matches[0];
+	if ( empty($url) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -2072,8 +2117,9 @@ 
 	$dest = $matches[2];
 	$dest = 'http://' . $dest;
 	$dest = esc_url($dest);
-	if ( empty($dest) )
-		return $matches[0];
+	if ( empty($dest) ) {
+			return $matches[0];
+	}
 
 	// removed trailing [.,;:)] from URL
 	if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
@@ -2117,10 +2163,11 @@ 
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
 	foreach ( $textarr as $piece ) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) )
-			$nested_code_pre++;
-		elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre )
-			$nested_code_pre--;
+		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) ) {
+					$nested_code_pre++;
+		} elseif ( ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) ) && $nested_code_pre ) {
+					$nested_code_pre--;
+		}
 
 		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
 			$r .= $piece;
@@ -2274,8 +2321,9 @@ 
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
-		return '';
+	if ( count( $matches ) == 0 ) {
+			return '';
+	}
 
 	$smiley = trim( reset( $matches ) );
 	$img = $wpsmiliestrans[ $smiley ];
@@ -2367,8 +2415,9 @@ 
  * @return string|bool Either false or the valid email address.
  */
 function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0' );
+	}
 
 	// Test for the minimum length the email can be
 	if ( strlen( $email ) < 3 ) {
@@ -2496,13 +2545,15 @@ 
 	$tz = get_option( 'timezone_string' );
 	if ( $tz ) {
 		$datetime = date_create( $string, new DateTimeZone( $tz ) );
-		if ( ! $datetime )
-			return gmdate( $format, 0 );
+		if ( ! $datetime ) {
+					return gmdate( $format, 0 );
+		}
 		$datetime->setTimezone( new DateTimeZone( 'UTC' ) );
 		$string_gmt = $datetime->format( $format );
 	} else {
-		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) )
-			return gmdate( $format, 0 );
+		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) ) {
+					return gmdate( $format, 0 );
+		}
 		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
 		$string_gmt = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
@@ -2527,13 +2578,15 @@ 
 	$tz = get_option( 'timezone_string' );
 	if ( $tz ) {
 		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
+		if ( ! $datetime ) {
+					return date( $format, 0 );
+		}
 		$datetime->setTimezone( new DateTimeZone( $tz ) );
 		$string_localtime = $datetime->format( $format );
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) ) {
+					return date( $format, 0 );
+		}
 		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
 		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
@@ -2733,34 +2786,40 @@ 
 
 	if ( $diff < HOUR_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
-			$mins = 1;
+		if ( $mins <= 1 ) {
+					$mins = 1;
+		}
 		/* translators: min=minute */
 		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
 	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
 		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
-			$hours = 1;
+		if ( $hours <= 1 ) {
+					$hours = 1;
+		}
 		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
 	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
 		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
-			$days = 1;
+		if ( $days <= 1 ) {
+					$days = 1;
+		}
 		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
 	} elseif ( $diff < 30 * DAY_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
 		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
-			$weeks = 1;
+		if ( $weeks <= 1 ) {
+					$weeks = 1;
+		}
 		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
 	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= 30 * DAY_IN_SECONDS ) {
 		$months = round( $diff / ( 30 * DAY_IN_SECONDS ) );
-		if ( $months <= 1 )
-			$months = 1;
+		if ( $months <= 1 ) {
+					$months = 1;
+		}
 		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
 	} elseif ( $diff >= YEAR_IN_SECONDS ) {
 		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
-			$years = 1;
+		if ( $years <= 1 ) {
+					$years = 1;
+		}
 		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
 	}
 
@@ -2911,8 +2970,9 @@ 
 	 * @param string $text           The text prior to entity conversion.
 	 */
 	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
-		return $filtered;
+	if ( null !== $filtered ) {
+			return $filtered;
+	}
 
 	$to_ncr = array(
 		'&quot;' => '&#34;',
@@ -3268,8 +3328,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	$original_url = $url;
 
-	if ( '' == $url )
-		return $url;
+	if ( '' == $url ) {
+			return $url;
+	}
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
 	if ( 0 !== stripos( $url, 'mailto:' ) ) {
 		$strip = array('%0d', '%0a', '%0D', '%0A');
@@ -3281,8 +3342,9 @@ 
 	 * link starting with /, # or ? or a php file).
 	 */
 	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+			$url = 'http://' . $url;
+	}
 
 	// Replace ampersands and single quotes only when displaying.
 	if ( 'display' == $_context ) {
@@ -3294,11 +3356,13 @@ 
 	if ( '/' === $url[0] ) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
-			$protocols = wp_allowed_protocols();
+		if ( ! is_array( $protocols ) ) {
+					$protocols = wp_allowed_protocols();
+		}
 		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
-			return '';
+		if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) {
+					return '';
+		}
 	}
 
 	/**
@@ -3542,17 +3606,20 @@ 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
-				$value = 1;
-			if ( $value < -1 )
-				$value = abs($value);
+			if ( empty($value) ) {
+							$value = 1;
+			}
+			if ( $value < -1 ) {
+							$value = abs($value);
+			}
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
-				$value = 'closed';
+			if ( $value == '0' || $value == '') {
+							$value = 'closed';
+			}
 			break;
 
 		case 'blogdescription':
@@ -3572,10 +3639,11 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
-				$value = 1;
-			else
-				$value = intval( $value );
+			if ( null === $value ) {
+							$value = 1;
+			} else {
+							$value = intval( $value );
+			}
 			break;
 
 		case 'date_format':
@@ -3645,13 +3713,15 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( ' ', $value );
+				}
 
 				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
 
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -3661,8 +3731,9 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( "\n", $value );
+				}
 
 				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
 				$value = array();
@@ -3672,8 +3743,9 @@ 
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -3697,8 +3769,9 @@ 
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
-				$value = 'subscriber';
+			if ( ! get_role( $value ) && get_role( 'subscriber' ) ) {
+							$value = 'subscriber';
+			}
 			break;
 
 		case 'moderation_keys':
@@ -3748,8 +3821,9 @@ 
  */
 function wp_parse_str( $string, &$array ) {
 	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+	if ( get_magic_quotes_gpc() ) {
+			$array = stripslashes_deep( $array );
+	}
 	/**
 	 * Filter the array of variables derived from a parsed string.
 	 *
@@ -3783,8 +3857,9 @@ 
  * @return string The text returned after esc_html if needed.
  */
 function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
-		return esc_html($matches[0]);
+	if ( false === strpos($matches[0], '>') ) {
+			return esc_html($matches[0]);
+	}
 	return $matches[0];
 }
 
@@ -3820,8 +3895,9 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
-			$end = $len;
+		if ( false === $end ) {
+					$end = $len;
+		}
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
@@ -3846,10 +3922,11 @@ 
 			 * @param string $arg      The argument.
 			 */
 			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
-				$fragment = $_fragment;
-			else
-				$fragment = sprintf($fragment, strval($arg) );
+			if ( $_fragment != $fragment ) {
+							$fragment = $_fragment;
+			} else {
+							$fragment = sprintf($fragment, strval($arg) );
+			}
 		}
 
 		// Append to result and move to next fragment
@@ -3874,12 +3951,14 @@ 
  */
 function wp_sprintf_l( $pattern, $args ) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
-		return $pattern;
+	if ( substr($pattern, 0, 2) != '%l' ) {
+			return $pattern;
+	}
 
 	// Nothing to work with
-	if ( empty($args) )
-		return '';
+	if ( empty($args) ) {
+			return '';
+	}
 
 	/**
 	 * Filter the translated delimiters used by wp_sprintf_l().
@@ -3903,17 +3982,19 @@ 
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if ( count($args) == 1 ) {
+			$result .= $l['between_only_two'] . array_shift($args);
+	}
 	// Loop when more than two args
 	$i = count($args);
 	while ( $i ) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
-		else
-			$result .= $l['between'] . $arg;
+		if ( 0 == $i ) {
+					$result .= $l['between_last_two'] . $arg;
+		} else {
+					$result .= $l['between'] . $arg;
+		}
 	}
 	return $result . substr($pattern, 2);
 }
@@ -3933,14 +4014,16 @@ 
  * @return string The excerpt.
  */
 function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
-		$more = '';
+	if ( null === $more ) {
+			$more = '';
+	}
 	$str = wp_strip_all_tags( $str, true );
 	$excerpt = mb_substr( $str, 0, $count );
 	// remove part of an entity at the end
 	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	if ( $str != $excerpt ) {
+			$excerpt = trim( $excerpt ) . $more;
+	}
 	return $excerpt;
 }
 
@@ -4062,8 +4145,9 @@ 
 	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
-		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	if ( $remove_breaks ) {
+			$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	}
 
 	return trim( $string );
 }
@@ -4140,8 +4224,9 @@ 
 function capital_P_dangit( $text ) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) {
+			return str_replace( 'Wordpress', 'WordPress', $text );
+	}
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
 	if ( false === $dblq ) {
@@ -4185,8 +4270,9 @@ 
 function sanitize_trackback_urls( $to_ping ) {
 	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
 	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+		if ( !preg_match( '#^https?://.#i', $url ) ) {
+					unset( $urls_to_ping[$k] );
+		}
 	}
 	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
 	$urls_to_ping = implode( "\n", $urls_to_ping );

src/wp-includes/functions.php

Doc Comments +7 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
  *
  * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp', or PHP date
  *                       format string (e.g. 'Y-m-d').
- * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
+ * @param integer $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
@@ -229,7 +229,7 @@ 
  *
  * @param string     $mysqlstring   Date or datetime field type from MySQL.
  * @param int|string $start_of_week Optional. Start of the week as an integer. Default empty string.
- * @return array Keys are 'start' and 'end'.
+ * @return string Keys are 'start' and 'end'.
  */
 function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
 	// MySQL string year.
@@ -377,7 +377,7 @@ 
  * @since 2.0.5
  *
  * @param string|array|object $data Data that might be serialized.
- * @return mixed A scalar data
+ * @return string A scalar data
  */
 function maybe_serialize( $data ) {
 	if ( is_array( $data ) || is_object( $data ) )
@@ -738,9 +738,6 @@ 
  *
  * @since 1.5.0
  *
- * @param string|array $param1 Either newkey or an associative_array.
- * @param string       $param2 Either newvalue or oldquery or URI.
- * @param string       $param3 Optional. Old query or URI.
  * @return string New URL query string.
  */
 function add_query_arg() {
@@ -1343,7 +1340,7 @@ 
  * @since 2.0.4
  *
  * @param string     $actionurl URL to add nonce action.
- * @param int|string $action    Optional. Nonce action name. Default -1.
+ * @param integer $action    Optional. Nonce action name. Default -1.
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
@@ -1372,7 +1369,7 @@ 
  *
  * @since 2.0.4
  *
- * @param int|string $action  Optional. Action name. Default -1.
+ * @param integer $action  Optional. Action name. Default -1.
  * @param string     $name    Optional. Nonce name. Default '_wpnonce'.
  * @param bool       $referer Optional. Whether to set the referer field for validation. Default true.
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
@@ -4349,7 +4346,7 @@ 
  *
  * @see __return_false()
  *
- * @return true True.
+ * @return boolean True.
  */
 function __return_true() {
 	return true;
@@ -4471,7 +4468,7 @@ 
  * @param int      $start         The ID to start the loop check at.
  * @param int      $start_parent  The parent_ID of $start to use instead of calling $callback( $start ).
  *                                Use null to always use $callback
- * @param array    $callback_args Optional. Additional arguments to send to $callback.
+ * @param string[]    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {

Indentation +66 added lines, -66 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * Main WordPress API
- *
- * @package WordPress
- */
+	 * Main WordPress API
+	 *
+	 * @package WordPress
+	 */
 
 require( ABSPATH . WPINC . '/option.php' );
 
@@ -2284,14 +2284,14 @@ 
 	) );
 }
 /**
- * Retrieve list of allowed mime types and file extensions.
- *
- * @since 2.8.6
- *
- * @param int|WP_User $user Optional. User to check. Defaults to current user.
- * @return array Array of mime types keyed by the file extension regex corresponding
- *               to those types.
- */
+	 * Retrieve list of allowed mime types and file extensions.
+	 *
+	 * @since 2.8.6
+	 *
+	 * @param int|WP_User $user Optional. User to check. Defaults to current user.
+	 * @return array Array of mime types keyed by the file extension regex corresponding
+	 *               to those types.
+	 */
 function get_allowed_mime_types( $user = null ) {
 	$t = wp_get_mime_types();
 
@@ -2971,7 +2971,7 @@ 
 		  ':arrow:' => "\xe2\x9e\xa1",
 		  ':shock:' => "\xf0\x9f\x98\xaf",
 		  ':smile:' => 'simple-smile.png',
-		    ':???:' => "\xf0\x9f\x98\x95",
+			':???:' => "\xf0\x9f\x98\x95",
 		   ':cool:' => "\xf0\x9f\x98\x8e",
 		   ':evil:' => "\xf0\x9f\x91\xbf",
 		   ':grin:' => "\xf0\x9f\x98\x80",
@@ -2980,36 +2980,36 @@ 
 		   ':razz:' => "\xf0\x9f\x98\x9b",
 		   ':roll:' => 'rolleyes.png',
 		   ':wink:' => "\xf0\x9f\x98\x89",
-		    ':cry:' => "\xf0\x9f\x98\xa5",
-		    ':eek:' => "\xf0\x9f\x98\xae",
-		    ':lol:' => "\xf0\x9f\x98\x86",
-		    ':mad:' => "\xf0\x9f\x98\xa1",
-		    ':sad:' => 'frownie.png',
-		      '8-)' => "\xf0\x9f\x98\x8e",
-		      '8-O' => "\xf0\x9f\x98\xaf",
-		      ':-(' => 'frownie.png',
-		      ':-)' => 'simple-smile.png',
-		      ':-?' => "\xf0\x9f\x98\x95",
-		      ':-D' => "\xf0\x9f\x98\x80",
-		      ':-P' => "\xf0\x9f\x98\x9b",
-		      ':-o' => "\xf0\x9f\x98\xae",
-		      ':-x' => "\xf0\x9f\x98\xa1",
-		      ':-|' => "\xf0\x9f\x98\x90",
-		      ';-)' => "\xf0\x9f\x98\x89",
+			':cry:' => "\xf0\x9f\x98\xa5",
+			':eek:' => "\xf0\x9f\x98\xae",
+			':lol:' => "\xf0\x9f\x98\x86",
+			':mad:' => "\xf0\x9f\x98\xa1",
+			':sad:' => 'frownie.png',
+			  '8-)' => "\xf0\x9f\x98\x8e",
+			  '8-O' => "\xf0\x9f\x98\xaf",
+			  ':-(' => 'frownie.png',
+			  ':-)' => 'simple-smile.png',
+			  ':-?' => "\xf0\x9f\x98\x95",
+			  ':-D' => "\xf0\x9f\x98\x80",
+			  ':-P' => "\xf0\x9f\x98\x9b",
+			  ':-o' => "\xf0\x9f\x98\xae",
+			  ':-x' => "\xf0\x9f\x98\xa1",
+			  ':-|' => "\xf0\x9f\x98\x90",
+			  ';-)' => "\xf0\x9f\x98\x89",
 		// This one transformation breaks regular text with frequency.
 		//     '8)' => "\xf0\x9f\x98\x8e",
-		       '8O' => "\xf0\x9f\x98\xaf",
-		       ':(' => 'frownie.png',
-		       ':)' => 'simple-smile.png',
-		       ':?' => "\xf0\x9f\x98\x95",
-		       ':D' => "\xf0\x9f\x98\x80",
-		       ':P' => "\xf0\x9f\x98\x9b",
-		       ':o' => "\xf0\x9f\x98\xae",
-		       ':x' => "\xf0\x9f\x98\xa1",
-		       ':|' => "\xf0\x9f\x98\x90",
-		       ';)' => "\xf0\x9f\x98\x89",
-		      ':!:' => "\xe2\x9d\x97",
-		      ':?:' => "\xe2\x9d\x93",
+			   '8O' => "\xf0\x9f\x98\xaf",
+			   ':(' => 'frownie.png',
+			   ':)' => 'simple-smile.png',
+			   ':?' => "\xf0\x9f\x98\x95",
+			   ':D' => "\xf0\x9f\x98\x80",
+			   ':P' => "\xf0\x9f\x98\x9b",
+			   ':o' => "\xf0\x9f\x98\xae",
+			   ':x' => "\xf0\x9f\x98\xa1",
+			   ':|' => "\xf0\x9f\x98\x90",
+			   ';)' => "\xf0\x9f\x98\x89",
+			  ':!:' => "\xe2\x9d\x97",
+			  ':?:' => "\xe2\x9d\x93",
 		);
 	}
 
@@ -3519,31 +3519,31 @@ 
 	}
 }
 /**
- * Mark a function argument as deprecated and inform when it has been used.
- *
- * This function is to be used whenever a deprecated function argument is used.
- * Before this function is called, the argument must be checked for whether it was
- * used by comparing it to its default value or evaluating whether it is empty.
- * For example:
- *
- *     if ( ! empty( $deprecated ) ) {
- *         _deprecated_argument( __FUNCTION__, '3.0' );
- *     }
- *
- *
- * There is a hook deprecated_argument_run that will be called that can be used
- * to get the backtrace up to what file and function used the deprecated
- * argument.
- *
- * The current behavior is to trigger a user error if WP_DEBUG is true.
- *
- * @since 3.0.0
- * @access private
- *
- * @param string $function The function that was called.
- * @param string $version  The version of WordPress that deprecated the argument used.
- * @param string $message  Optional. A message regarding the change. Default null.
- */
+	 * Mark a function argument as deprecated and inform when it has been used.
+	 *
+	 * This function is to be used whenever a deprecated function argument is used.
+	 * Before this function is called, the argument must be checked for whether it was
+	 * used by comparing it to its default value or evaluating whether it is empty.
+	 * For example:
+	 *
+	 *     if ( ! empty( $deprecated ) ) {
+	 *         _deprecated_argument( __FUNCTION__, '3.0' );
+	 *     }
+	 *
+	 *
+	 * There is a hook deprecated_argument_run that will be called that can be used
+	 * to get the backtrace up to what file and function used the deprecated
+	 * argument.
+	 *
+	 * The current behavior is to trigger a user error if WP_DEBUG is true.
+	 *
+	 * @since 3.0.0
+	 * @access private
+	 *
+	 * @param string $function The function that was called.
+	 * @param string $version  The version of WordPress that deprecated the argument used.
+	 * @param string $message  Optional. A message regarding the change. Default null.
+	 */
 function _deprecated_argument( $function, $version, $message = null ) {
 
 	/**

Switch Indentation +20 added lines, -20 removed lines

@@ -2440,15 +2440,15 @@ 
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
-		case 0 :
-			$message = '';
-			break;
-		case 1 :
-			$message = "<p>{$errors[0]}</p>";
-			break;
-		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
-			break;
+			case 0 :
+				$message = '';
+				break;
+			case 1 :
+				$message = "<p>{$errors[0]}</p>";
+				break;
+			default :
+				$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+				break;
 		}
 	} elseif ( is_string( $message ) ) {
 		$message = "<p>$message</p>";
@@ -4447,17 +4447,17 @@ 
  */
 function _wp_mysql_week( $column ) {
 	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
-	case 1 :
-		return "WEEK( $column, 1 )";
-	case 2 :
-	case 3 :
-	case 4 :
-	case 5 :
-	case 6 :
-		return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
-	case 0 :
-	default :
-		return "WEEK( $column, 0 )";
+		case 1 :
+			return "WEEK( $column, 1 )";
+		case 2 :
+		case 3 :
+		case 4 :
+		case 5 :
+		case 6 :
+			return "WEEK( DATE_SUB( $column, INTERVAL $start_of_week DAY ), 0 )";
+		case 0 :
+		default :
+			return "WEEK( $column, 0 )";
 	}
 }
 

Spacing +970 added lines, -970 removed lines

@@ -5,7 +5,7 @@ 
  * @package WordPress
  */
 
-require( ABSPATH . WPINC . '/option.php' );
+require(ABSPATH.WPINC.'/option.php');
 
 /**
  * Convert given date string into a different format.
@@ -23,22 +23,22 @@ 
  * @param bool   $translate Whether the return date should be translated. Default true.
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
-function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
+function mysql2date($format, $date, $translate = true) {
+	if (empty($date))
 		return false;
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ('G' == $format)
+		return strtotime($date.' +0000');
 
-	$i = strtotime( $date );
+	$i = strtotime($date);
 
-	if ( 'U' == $format )
+	if ('U' == $format)
 		return $i;
 
-	if ( $translate )
-		return date_i18n( $format, $i );
+	if ($translate)
+		return date_i18n($format, $i);
 	else
-		return date( $format, $i );
+		return date($format, $i);
 }
 
 /**
@@ -58,14 +58,14 @@ 
  * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
-function current_time( $type, $gmt = 0 ) {
-	switch ( $type ) {
+function current_time($type, $gmt = 0) {
+	switch ($type) {
 		case 'mysql':
-			return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );
+			return ($gmt) ? gmdate('Y-m-d H:i:s') : gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * HOUR_IN_SECONDS)));
 		case 'timestamp':
-			return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+			return ($gmt) ? time() : time() + (get_option('gmt_offset') * HOUR_IN_SECONDS);
 		default:
-			return ( $gmt ) ? date( $type ) : date( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+			return ($gmt) ? date($type) : date($type, time() + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 	}
 }
 
@@ -86,13 +86,13 @@ 
  *
  * @return string The date, translated if locale specifies it.
  */
-function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
+function date_i18n($dateformatstring, $unixtimestamp = false, $gmt = false) {
 	global $wp_locale;
 	$i = $unixtimestamp;
 
-	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
+	if (false === $i) {
+		if ( ! $gmt)
+			$i = current_time('timestamp');
 		else
 			$i = time();
 		// we should not let date() interfere with our
@@ -106,43 +106,43 @@ 
 	 */
 	$req_format = $dateformatstring;
 
-	$datefunc = $gmt? 'gmdate' : 'date';
+	$datefunc = $gmt ? 'gmdate' : 'date';
 
-	if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-		$datemonth = $wp_locale->get_month( $datefunc( 'm', $i ) );
-		$datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-		$dateweekday = $wp_locale->get_weekday( $datefunc( 'w', $i ) );
-		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-		$datemeridiem = $wp_locale->get_meridiem( $datefunc( 'a', $i ) );
-		$datemeridiem_capital = $wp_locale->get_meridiem( $datefunc( 'A', $i ) );
+	if (( ! empty($wp_locale->month)) && ( ! empty($wp_locale->weekday))) {
+		$datemonth = $wp_locale->get_month($datefunc('m', $i));
+		$datemonth_abbrev = $wp_locale->get_month_abbrev($datemonth);
+		$dateweekday = $wp_locale->get_weekday($datefunc('w', $i));
+		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev($dateweekday);
+		$datemeridiem = $wp_locale->get_meridiem($datefunc('a', $i));
+		$datemeridiem_capital = $wp_locale->get_meridiem($datefunc('A', $i));
 		$dateformatstring = ' '.$dateformatstring;
-		$dateformatstring = preg_replace( "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])F/", "\\1" . backslashit( $datemonth ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])l/", "\\1" . backslashit( $dateweekday ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])M/", "\\1" . backslashit( $datemonth_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])a/", "\\1" . backslashit( $datemeridiem ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])A/", "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring );
-
-		$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+		$dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring);
+
+		$dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring) - 1);
 	}
-	$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
-	$timezone_formats_re = implode( '|', $timezone_formats );
-	if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) ) {
-		$timezone_string = get_option( 'timezone_string' );
-		if ( $timezone_string ) {
-			$timezone_object = timezone_open( $timezone_string );
-			$date_object = date_create( null, $timezone_object );
-			foreach( $timezone_formats as $timezone_format ) {
-				if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
-					$formatted = date_format( $date_object, $timezone_format );
+	$timezone_formats = array('P', 'I', 'O', 'T', 'Z', 'e');
+	$timezone_formats_re = implode('|', $timezone_formats);
+	if (preg_match("/$timezone_formats_re/", $dateformatstring)) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
+			$timezone_object = timezone_open($timezone_string);
+			$date_object = date_create(null, $timezone_object);
+			foreach ($timezone_formats as $timezone_format) {
+				if (false !== strpos($dateformatstring, $timezone_format)) {
+					$formatted = date_format($date_object, $timezone_format);
 					$dateformatstring = ' '.$dateformatstring;
-					$dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
-					$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+					$dateformatstring = preg_replace("/([^\\\])$timezone_format/", "\\1".backslashit($formatted), $dateformatstring);
+					$dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring) - 1);
 				}
 			}
 		}
 	}
-	$j = @$datefunc( $dateformatstring, $i );
+	$j = @$datefunc($dateformatstring, $i);
 
 	/**
 	 * Filter the date formatted based on the locale.
@@ -154,7 +154,7 @@ 
 	 * @param int    $i          Unix timestamp.
 	 * @param bool   $gmt        Whether to convert to GMT for time. Default false.
 	 */
-	$j = apply_filters( 'date_i18n', $j, $req_format, $i, $gmt );
+	$j = apply_filters('date_i18n', $j, $req_format, $i, $gmt);
 	return $j;
 }
 
@@ -169,9 +169,9 @@ 
  * @param int $decimals Optional. Precision of the number of decimal places. Default 0.
  * @return string Converted number in string format.
  */
-function number_format_i18n( $number, $decimals = 0 ) {
+function number_format_i18n($number, $decimals = 0) {
 	global $wp_locale;
-	$formatted = number_format( $number, absint( $decimals ), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
+	$formatted = number_format($number, absint($decimals), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep']);
 
 	/**
 	 * Filter the number formatted based on the locale.
@@ -180,7 +180,7 @@ 
 	 *
 	 * @param string $formatted Converted number in string format.
 	 */
-	return apply_filters( 'number_format_i18n', $formatted );
+	return apply_filters('number_format_i18n', $formatted);
 }
 
 /**
@@ -203,19 +203,19 @@ 
  * @param int        $decimals Optional. Precision of number of decimal places. Default 0.
  * @return string|false False on failure. Number string on success.
  */
-function size_format( $bytes, $decimals = 0 ) {
+function size_format($bytes, $decimals = 0) {
 	$quant = array(
 		// ========================= Origin ====
-		'TB' => 1099511627776,  // pow( 1024, 4)
-		'GB' => 1073741824,     // pow( 1024, 3)
-		'MB' => 1048576,        // pow( 1024, 2)
-		'kB' => 1024,           // pow( 1024, 1)
-		'B'  => 1,              // pow( 1024, 0)
+		'TB' => 1099511627776, // pow( 1024, 4)
+		'GB' => 1073741824, // pow( 1024, 3)
+		'MB' => 1048576, // pow( 1024, 2)
+		'kB' => 1024, // pow( 1024, 1)
+		'B'  => 1, // pow( 1024, 0)
 	);
 
-	foreach ( $quant as $unit => $mag ) {
-		if ( doubleval( $bytes ) >= $mag ) {
-			return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
+	foreach ($quant as $unit => $mag) {
+		if (doubleval($bytes) >= $mag) {
+			return number_format_i18n($bytes / $mag, $decimals).' '.$unit;
 		}
 	}
 
@@ -231,34 +231,34 @@ 
  * @param int|string $start_of_week Optional. Start of the week as an integer. Default empty string.
  * @return array Keys are 'start' and 'end'.
  */
-function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
+function get_weekstartend($mysqlstring, $start_of_week = '') {
 	// MySQL string year.
-	$my = substr( $mysqlstring, 0, 4 );
+	$my = substr($mysqlstring, 0, 4);
 
 	// MySQL string month.
-	$mm = substr( $mysqlstring, 8, 2 );
+	$mm = substr($mysqlstring, 8, 2);
 
 	// MySQL string day.
-	$md = substr( $mysqlstring, 5, 2 );
+	$md = substr($mysqlstring, 5, 2);
 
 	// The timestamp for MySQL string day.
-	$day = mktime( 0, 0, 0, $md, $mm, $my );
+	$day = mktime(0, 0, 0, $md, $mm, $my);
 
 	// The day of the week from the timestamp.
-	$weekday = date( 'w', $day );
+	$weekday = date('w', $day);
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( ! is_numeric($start_of_week))
+		$start_of_week = get_option('start_of_week');
 
-	if ( $weekday < $start_of_week )
+	if ($weekday < $start_of_week)
 		$weekday += 7;
 
 	// The most recent week start day on or before $day.
-	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
+	$start = $day - DAY_IN_SECONDS * ($weekday - $start_of_week);
 
 	// $start + 7 days - 1 second.
 	$end = $start + 7 * DAY_IN_SECONDS - 1;
-	return compact( 'start', 'end' );
+	return compact('start', 'end');
 }
 
 /**
@@ -269,9 +269,9 @@ 
  * @param string $original Maybe unserialized original, if is needed.
  * @return mixed Unserialized data can be any type.
  */
-function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
-		return @unserialize( $original );
+function maybe_unserialize($original) {
+	if (is_serialized($original)) // don't attempt to unserialize data that wasn't serialized going in
+		return @unserialize($original);
 	return $original;
 }
 
@@ -287,57 +287,57 @@ 
  * @param bool   $strict Optional. Whether to be strict about the end of the string. Default true.
  * @return bool False if not serialized and true if it was.
  */
-function is_serialized( $data, $strict = true ) {
+function is_serialized($data, $strict = true) {
 	// if it isn't a string, it isn't serialized.
-	if ( ! is_string( $data ) ) {
+	if ( ! is_string($data)) {
 		return false;
 	}
-	$data = trim( $data );
- 	if ( 'N;' == $data ) {
+	$data = trim($data);
+ 	if ('N;' == $data) {
 		return true;
 	}
-	if ( strlen( $data ) < 4 ) {
+	if (strlen($data) < 4) {
 		return false;
 	}
-	if ( ':' !== $data[1] ) {
+	if (':' !== $data[1]) {
 		return false;
 	}
-	if ( $strict ) {
-		$lastc = substr( $data, -1 );
-		if ( ';' !== $lastc && '}' !== $lastc ) {
+	if ($strict) {
+		$lastc = substr($data, -1);
+		if (';' !== $lastc && '}' !== $lastc) {
 			return false;
 		}
 	} else {
-		$semicolon = strpos( $data, ';' );
-		$brace     = strpos( $data, '}' );
+		$semicolon = strpos($data, ';');
+		$brace     = strpos($data, '}');
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
+		if (false === $semicolon && false === $brace)
 			return false;
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
+		if (false !== $semicolon && $semicolon < 3)
 			return false;
-		if ( false !== $brace && $brace < 4 )
+		if (false !== $brace && $brace < 4)
 			return false;
 	}
 	$token = $data[0];
-	switch ( $token ) {
+	switch ($token) {
 		case 's' :
-			if ( $strict ) {
-				if ( '"' !== substr( $data, -2, 1 ) ) {
+			if ($strict) {
+				if ('"' !== substr($data, -2, 1)) {
 					return false;
 				}
-			} elseif ( false === strpos( $data, '"' ) ) {
+			} elseif (false === strpos($data, '"')) {
 				return false;
 			}
 			// or else fall through
 		case 'a' :
 		case 'O' :
-			return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
+			return (bool) preg_match("/^{$token}:[0-9]+:/s", $data);
 		case 'b' :
 		case 'i' :
 		case 'd' :
 			$end = $strict ? '$' : '';
-			return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
+			return (bool) preg_match("/^{$token}:[0-9.E-]+;$end/", $data);
 	}
 	return false;
 }
@@ -350,21 +350,21 @@ 
  * @param string $data Serialized data.
  * @return bool False if not a serialized string, true if it is.
  */
-function is_serialized_string( $data ) {
+function is_serialized_string($data) {
 	// if it isn't a string, it isn't a serialized string.
-	if ( ! is_string( $data ) ) {
+	if ( ! is_string($data)) {
 		return false;
 	}
-	$data = trim( $data );
-	if ( strlen( $data ) < 4 ) {
+	$data = trim($data);
+	if (strlen($data) < 4) {
 		return false;
-	} elseif ( ':' !== $data[1] ) {
+	} elseif (':' !== $data[1]) {
 		return false;
-	} elseif ( ';' !== substr( $data, -1 ) ) {
+	} elseif (';' !== substr($data, -1)) {
 		return false;
-	} elseif ( $data[0] !== 's' ) {
+	} elseif ($data[0] !== 's') {
 		return false;
-	} elseif ( '"' !== substr( $data, -2, 1 ) ) {
+	} elseif ('"' !== substr($data, -2, 1)) {
 		return false;
 	} else {
 		return true;
@@ -379,15 +379,15 @@ 
  * @param string|array|object $data Data that might be serialized.
  * @return mixed A scalar data
  */
-function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+function maybe_serialize($data) {
+	if (is_array($data) || is_object($data))
+		return serialize($data);
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if (is_serialized($data, false))
+		return serialize($data);
 
 	return $data;
 }
@@ -405,9 +405,9 @@ 
  * @param string $content XMLRPC XML Request content
  * @return string Post title
  */
-function xmlrpc_getposttitle( $content ) {
+function xmlrpc_getposttitle($content) {
 	global $post_default_title;
-	if ( preg_match( '/<title>(.+?)<\/title>/is', $content, $matchtitle ) ) {
+	if (preg_match('/<title>(.+?)<\/title>/is', $content, $matchtitle)) {
 		$post_title = $matchtitle[1];
 	} else {
 		$post_title = $post_default_title;
@@ -429,11 +429,11 @@ 
  * @param string $content XMLRPC XML Request content
  * @return string|array List of categories or category name.
  */
-function xmlrpc_getpostcategory( $content ) {
+function xmlrpc_getpostcategory($content) {
 	global $post_default_category;
-	if ( preg_match( '/<category>(.+?)<\/category>/is', $content, $matchcat ) ) {
-		$post_category = trim( $matchcat[1], ',' );
-		$post_category = explode( ',', $post_category );
+	if (preg_match('/<category>(.+?)<\/category>/is', $content, $matchcat)) {
+		$post_category = trim($matchcat[1], ',');
+		$post_category = explode(',', $post_category);
 	} else {
 		$post_category = $post_default_category;
 	}
@@ -448,10 +448,10 @@ 
  * @param string $content XML-RPC XML Request content.
  * @return string XMLRPC XML Request content without title and category elements.
  */
-function xmlrpc_removepostdata( $content ) {
-	$content = preg_replace( '/<title>(.+?)<\/title>/si', '', $content );
-	$content = preg_replace( '/<category>(.+?)<\/category>/si', '', $content );
-	$content = trim( $content );
+function xmlrpc_removepostdata($content) {
+	$content = preg_replace('/<title>(.+?)<\/title>/si', '', $content);
+	$content = preg_replace('/<category>(.+?)<\/category>/si', '', $content);
+	$content = trim($content);
 	return $content;
 }
 
@@ -463,7 +463,7 @@ 
  * @param string $content Content to extract URLs from.
  * @return array URLs found in passed string.
  */
-function wp_extract_urls( $content ) {
+function wp_extract_urls($content) {
 	preg_match_all(
 		"#([\"']?)("
 			. "(?:([\w-]+:)?//?)"
@@ -481,9 +481,9 @@ 
 		$post_links
 	);
 
-	$post_links = array_unique( array_map( 'html_entity_decode', $post_links[2] ) );
+	$post_links = array_unique(array_map('html_entity_decode', $post_links[2]));
 
-	return array_values( $post_links );
+	return array_values($post_links);
 }
 
 /**
@@ -500,54 +500,54 @@ 
  * @param string $content Post Content.
  * @param int    $post_ID Post ID.
  */
-function do_enclose( $content, $post_ID ) {
+function do_enclose($content, $post_ID) {
 	global $wpdb;
 
 	//TODO: Tidy this ghetto code up and make the debug code optional
-	include_once( ABSPATH . WPINC . '/class-IXR.php' );
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
 
 	$post_links = array();
 
-	$pung = get_enclosed( $post_ID );
+	$pung = get_enclosed($post_ID);
 
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
-	foreach ( $pung as $link_test ) {
-		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
-			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+	foreach ($pung as $link_test) {
+		if ( ! in_array($link_test, $post_links_temp)) { // link no longer in post
+			$mids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like($link_test).'%'));
+			foreach ($mids as $mid)
+				delete_metadata_by_mid('post', $mid);
 		}
 	}
 
-	foreach ( (array) $post_links_temp as $link_test ) {
-		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
-			$test = @parse_url( $link_test );
-			if ( false === $test )
+	foreach ((array) $post_links_temp as $link_test) {
+		if ( ! in_array($link_test, $pung)) { // If we haven't pung it already
+			$test = @parse_url($link_test);
+			if (false === $test)
 				continue;
-			if ( isset( $test['query'] ) )
+			if (isset($test['query']))
 				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
+			elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 				$post_links[] = $link_test;
 		}
 	}
 
-	foreach ( (array) $post_links as $url ) {
-		if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $url ) . '%' ) ) ) {
+	foreach ((array) $post_links as $url) {
+		if ($url != '' && ! $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like($url).'%'))) {
 
-			if ( $headers = wp_get_http_headers( $url) ) {
-				$len = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-				$type = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
-				$allowed_types = array( 'video', 'audio' );
+			if ($headers = wp_get_http_headers($url)) {
+				$len = isset($headers['content-length']) ? (int) $headers['content-length'] : 0;
+				$type = isset($headers['content-type']) ? $headers['content-type'] : '';
+				$allowed_types = array('video', 'audio');
 
 				// Check to see if we can figure out the mime type from
 				// the extension
-				$url_parts = @parse_url( $url );
-				if ( false !== $url_parts ) {
-					$extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
-					if ( !empty( $extension ) ) {
-						foreach ( wp_get_mime_types() as $exts => $mime ) {
-							if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
+				$url_parts = @parse_url($url);
+				if (false !== $url_parts) {
+					$extension = pathinfo($url_parts['path'], PATHINFO_EXTENSION);
+					if ( ! empty($extension)) {
+						foreach (wp_get_mime_types() as $exts => $mime) {
+							if (preg_match('!^('.$exts.')$!i', $extension)) {
 								$type = $mime;
 								break;
 							}
@@ -555,8 +555,8 @@ 
 					}
 				}
 
-				if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-					add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
+				if (in_array(substr($type, 0, strpos($type, "/")), $allowed_types)) {
+					add_post_meta($post_ID, 'enclosure', "$url\n$len\n$mime\n");
 				}
 			}
 		}
@@ -577,42 +577,42 @@ 
  *                               returns false. Default 1.
  * @return bool|string False on failure and string of headers if HEAD request.
  */
-function wp_get_http( $url, $file_path = false, $red = 1 ) {
-	@set_time_limit( 60 );
+function wp_get_http($url, $file_path = false, $red = 1) {
+	@set_time_limit(60);
 
-	if ( $red > 5 )
+	if ($red > 5)
 		return false;
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		$options['method'] = 'HEAD';
 	else
 		$options['method'] = 'GET';
 
-	$response = wp_safe_remote_request( $url, $options );
+	$response = wp_safe_remote_request($url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$headers = wp_remote_retrieve_headers( $response );
-	$headers['response'] = wp_remote_retrieve_response_code( $response );
+	$headers = wp_remote_retrieve_headers($response);
+	$headers['response'] = wp_remote_retrieve_response_code($response);
 
 	// WP_HTTP no longer follows redirects for HEAD requests.
-	if ( 'HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset( $headers['location'] ) ) {
-		return wp_get_http( $headers['location'], $file_path, ++$red );
+	if ('HEAD' == $options['method'] && in_array($headers['response'], array(301, 302)) && isset($headers['location'])) {
+		return wp_get_http($headers['location'], $file_path, ++$red);
 	}
 
-	if ( false == $file_path )
+	if (false == $file_path)
 		return $headers;
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
+	if ( ! $out_fp)
 		return $headers;
 
-	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
+	fwrite($out_fp, wp_remote_retrieve_body($response));
 	fclose($out_fp);
 	clearstatcache();
 
@@ -628,16 +628,16 @@ 
  * @param bool   $deprecated Not Used.
  * @return bool|string False on failure, headers on success.
  */
-function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+function wp_get_http_headers($url, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7');
 
-	$response = wp_safe_remote_head( $url );
+	$response = wp_safe_remote_head($url);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	return wp_remote_retrieve_headers( $response );
+	return wp_remote_retrieve_headers($response);
 }
 
 /**
@@ -653,7 +653,7 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
+	if ($currentday != $previousday)
 		return 1;
 	else
 		return 0;
@@ -674,8 +674,8 @@ 
  * @param array $data URL-encode key/value pairs.
  * @return string URL-encoded string.
  */
-function build_query( $data ) {
-	return _http_build_query( $data, null, '&', '', false );
+function build_query($data) {
+	return _http_build_query($data, null, '&', '', false);
 }
 
 /**
@@ -696,30 +696,30 @@ 
  *
  * @return string The query string.
  */
-function _http_build_query( $data, $prefix = null, $sep = null, $key = '', $urlencode = true ) {
+function _http_build_query($data, $prefix = null, $sep = null, $key = '', $urlencode = true) {
 	$ret = array();
 
-	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
+	foreach ((array) $data as $k => $v) {
+		if ($urlencode)
 			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
+		if (is_int($k) && $prefix != null)
 			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
+		if ( ! empty($key))
+			$k = $key.'%5B'.$k.'%5D';
+		if ($v === null)
 			continue;
-		elseif ( $v === false )
+		elseif ($v === false)
 			$v = '0';
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
+		if (is_array($v) || is_object($v))
+			array_push($ret, _http_build_query($v, '', $sep, $k, $urlencode));
+		elseif ($urlencode)
 			array_push($ret, $k.'='.urlencode($v));
 		else
 			array_push($ret, $k.'='.$v);
 	}
 
-	if ( null === $sep )
+	if (null === $sep)
 		$sep = ini_get('arg_separator.output');
 
 	return implode($sep, $ret);
@@ -745,64 +745,64 @@ 
  */
 function add_query_arg() {
 	$args = func_get_args();
-	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
+	if (is_array($args[0])) {
+		if (count($args) < 2 || false === $args[1])
 			$uri = $_SERVER['REQUEST_URI'];
 		else
 			$uri = $args[1];
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
+		if (count($args) < 3 || false === $args[2])
 			$uri = $_SERVER['REQUEST_URI'];
 		else
 			$uri = $args[2];
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
+	if ($frag = strstr($uri, '#'))
+		$uri = substr($uri, 0, -strlen($frag));
 	else
 		$frag = '';
 
-	if ( 0 === stripos( $uri, 'http://' ) ) {
+	if (0 === stripos($uri, 'http://')) {
 		$protocol = 'http://';
-		$uri = substr( $uri, 7 );
-	} elseif ( 0 === stripos( $uri, 'https://' ) ) {
+		$uri = substr($uri, 7);
+	} elseif (0 === stripos($uri, 'https://')) {
 		$protocol = 'https://';
-		$uri = substr( $uri, 8 );
+		$uri = substr($uri, 8);
 	} else {
 		$protocol = '';
 	}
 
-	if ( strpos( $uri, '?' ) !== false ) {
-		list( $base, $query ) = explode( '?', $uri, 2 );
+	if (strpos($uri, '?') !== false) {
+		list($base, $query) = explode('?', $uri, 2);
 		$base .= '?';
-	} elseif ( $protocol || strpos( $uri, '=' ) === false ) {
-		$base = $uri . '?';
+	} elseif ($protocol || strpos($uri, '=') === false) {
+		$base = $uri.'?';
 		$query = '';
 	} else {
 		$base = '';
 		$query = $uri;
 	}
 
-	wp_parse_str( $query, $qs );
-	$qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
-	if ( is_array( $args[0] ) ) {
-		foreach ( $args[0] as $k => $v ) {
-			$qs[ $k ] = $v;
+	wp_parse_str($query, $qs);
+	$qs = urlencode_deep($qs); // this re-URL-encodes things that were already in the query string
+	if (is_array($args[0])) {
+		foreach ($args[0] as $k => $v) {
+			$qs[$k] = $v;
 		}
 	} else {
-		$qs[ $args[0] ] = $args[1];
+		$qs[$args[0]] = $args[1];
 	}
 
-	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+	foreach ($qs as $k => $v) {
+		if ($v === false)
+			unset($qs[$k]);
 	}
 
-	$ret = build_query( $qs );
-	$ret = trim( $ret, '?' );
-	$ret = preg_replace( '#=(&|$)#', '$1', $ret );
-	$ret = $protocol . $base . $ret . $frag;
-	$ret = rtrim( $ret, '?' );
+	$ret = build_query($qs);
+	$ret = trim($ret, '?');
+	$ret = preg_replace('#=(&|$)#', '$1', $ret);
+	$ret = $protocol.$base.$ret.$frag;
+	$ret = rtrim($ret, '?');
 	return $ret;
 }
 
@@ -815,13 +815,13 @@ 
  * @param bool|string  $query Optional. When false uses the $_SERVER value. Default false.
  * @return string New URL query string.
  */
-function remove_query_arg( $key, $query = false ) {
-	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+function remove_query_arg($key, $query = false) {
+	if (is_array($key)) { // removing multiple keys
+		foreach ($key as $k)
+			$query = add_query_arg($k, false, $query);
 		return $query;
 	}
-	return add_query_arg( $key, false, $query );
+	return add_query_arg($key, false, $query);
 }
 
 /**
@@ -832,12 +832,12 @@ 
  * @param array $array Array to walk while sanitizing contents.
  * @return array Sanitized $array.
  */
-function add_magic_quotes( $array ) {
-	foreach ( (array) $array as $k => $v ) {
-		if ( is_array( $v ) ) {
-			$array[$k] = add_magic_quotes( $v );
+function add_magic_quotes($array) {
+	foreach ((array) $array as $k => $v) {
+		if (is_array($v)) {
+			$array[$k] = add_magic_quotes($v);
 		} else {
-			$array[$k] = addslashes( $v );
+			$array[$k] = addslashes($v);
 		}
 	}
 	return $array;
@@ -853,21 +853,21 @@ 
  * @param string $uri URI/URL of web page to retrieve.
  * @return false|string HTTP content. False on failure.
  */
-function wp_remote_fopen( $uri ) {
-	$parsed_url = @parse_url( $uri );
+function wp_remote_fopen($uri) {
+	$parsed_url = @parse_url($uri);
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
+	if ( ! $parsed_url || ! is_array($parsed_url))
 		return false;
 
 	$options = array();
 	$options['timeout'] = 10;
 
-	$response = wp_safe_remote_get( $uri, $options );
+	$response = wp_safe_remote_get($uri, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	return wp_remote_retrieve_body( $response );
+	return wp_remote_retrieve_body($response);
 }
 
 /**
@@ -881,11 +881,11 @@ 
  *
  * @param string|array $query_vars Default WP_Query arguments.
  */
-function wp( $query_vars = '' ) {
+function wp($query_vars = '') {
 	global $wp, $wp_query, $wp_the_query;
-	$wp->main( $query_vars );
+	$wp->main($query_vars);
 
-	if ( !isset($wp_the_query) )
+	if ( ! isset($wp_the_query))
 		$wp_the_query = $wp_query;
 }
 
@@ -899,12 +899,12 @@ 
  * @param int $code HTTP status code.
  * @return string Empty string if not found, or description if found.
  */
-function get_status_header_desc( $code ) {
+function get_status_header_desc($code) {
 	global $wp_header_to_desc;
 
-	$code = absint( $code );
+	$code = absint($code);
 
-	if ( !isset( $wp_header_to_desc ) ) {
+	if ( ! isset($wp_header_to_desc)) {
 		$wp_header_to_desc = array(
 			100 => 'Continue',
 			101 => 'Switching Protocols',
@@ -969,7 +969,7 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
+	if (isset($wp_header_to_desc[$code]))
 		return $wp_header_to_desc[$code];
 	else
 		return '';
@@ -984,17 +984,17 @@ 
  *
  * @param int $code HTTP status code.
  */
-function status_header( $code ) {
-	$description = get_status_header_desc( $code );
+function status_header($code) {
+	$description = get_status_header_desc($code);
 
-	if ( empty( $description ) )
+	if (empty($description))
 		return;
 
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
+	if ('HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol)
 		$protocol = 'HTTP/1.0';
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
+	if (function_exists('apply_filters'))
 
 		/**
 		 * Filter an HTTP status header.
@@ -1006,9 +1006,9 @@ 
 		 * @param string $description   Description for the status code.
 		 * @param string $protocol      Server protocol.
 		 */
-		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+		$status_header = apply_filters('status_header', $status_header, $code, $description, $protocol);
 
-	@header( $status_header, true, $code );
+	@header($status_header, true, $code);
 }
 
 /**
@@ -1028,7 +1028,7 @@ 
 		'Pragma' => 'no-cache',
 	);
 
-	if ( function_exists('apply_filters') ) {
+	if (function_exists('apply_filters')) {
 		/**
 		 * Filter the cache-controlling headers.
 		 *
@@ -1044,7 +1044,7 @@ 
 		 *     @type string $Pragma        Pragma header.
 		 * }
 		 */
-		$headers = (array) apply_filters( 'nocache_headers', $headers );
+		$headers = (array) apply_filters('nocache_headers', $headers);
 	}
 	$headers['Last-Modified'] = false;
 	return $headers;
@@ -1064,23 +1064,23 @@ 
 function nocache_headers() {
 	$headers = wp_get_nocache_headers();
 
-	unset( $headers['Last-Modified'] );
+	unset($headers['Last-Modified']);
 
 	// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-	if ( function_exists( 'header_remove' ) ) {
-		@header_remove( 'Last-Modified' );
+	if (function_exists('header_remove')) {
+		@header_remove('Last-Modified');
 	} else {
 		// In PHP 5.2, send an empty Last-Modified header, but only as a
 		// last resort to override a header already sent. #WP23021
-		foreach ( headers_list() as $header ) {
-			if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+		foreach (headers_list() as $header) {
+			if (0 === stripos($header, 'Last-Modified')) {
 				$headers['Last-Modified'] = '';
 				break;
 			}
 		}
 	}
 
-	foreach( $headers as $name => $field_value )
+	foreach ($headers as $name => $field_value)
 		@header("{$name}: {$field_value}");
 }
 
@@ -1092,9 +1092,9 @@ 
 function cache_javascript_headers() {
 	$expiresOffset = 10 * DAY_IN_SECONDS;
 
-	header( "Content-Type: text/javascript; charset=" . get_bloginfo( 'charset' ) );
-	header( "Vary: Accept-Encoding" ); // Handle proxies
-	header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . " GMT" );
+	header("Content-Type: text/javascript; charset=".get_bloginfo('charset'));
+	header("Vary: Accept-Encoding"); // Handle proxies
+	header("Expires: ".gmdate("D, d M Y H:i:s", time() + $expiresOffset)." GMT");
 }
 
 /**
@@ -1121,8 +1121,8 @@ 
  * @param string $yn Character string containing either 'y' (yes) or 'n' (no).
  * @return bool True if yes, false on anything else.
  */
-function bool_from_yn( $yn ) {
-	return ( strtolower( $yn ) == 'y' );
+function bool_from_yn($yn) {
+	return (strtolower($yn) == 'y');
 }
 
 /**
@@ -1140,17 +1140,17 @@ 
 function do_feed() {
 	global $wp_query;
 
-	$feed = get_query_var( 'feed' );
+	$feed = get_query_var('feed');
 
 	// Remove the pad, if present.
-	$feed = preg_replace( '/^_+/', '', $feed );
+	$feed = preg_replace('/^_+/', '', $feed);
 
-	if ( $feed == '' || $feed == 'feed' )
+	if ($feed == '' || $feed == 'feed')
 		$feed = get_default_feed();
 
-	$hook = 'do_feed_' . $feed;
-	if ( ! has_action( $hook ) )
-		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
+	$hook = 'do_feed_'.$feed;
+	if ( ! has_action($hook))
+		wp_die(__('ERROR: This is not a valid feed template.'), '', array('response' => 404));
 
 	/**
 	 * Fires once the given feed is loaded.
@@ -1161,7 +1161,7 @@ 
 	 *
 	 * @param bool $is_comment_feed Whether the feed is a comment feed.
 	 */
-	do_action( $hook, $wp_query->is_comment_feed );
+	do_action($hook, $wp_query->is_comment_feed);
 }
 
 /**
@@ -1172,7 +1172,7 @@ 
  * @see load_template()
  */
 function do_feed_rdf() {
-	load_template( ABSPATH . WPINC . '/feed-rdf.php' );
+	load_template(ABSPATH.WPINC.'/feed-rdf.php');
 }
 
 /**
@@ -1183,7 +1183,7 @@ 
  * @see load_template()
  */
 function do_feed_rss() {
-	load_template( ABSPATH . WPINC . '/feed-rss.php' );
+	load_template(ABSPATH.WPINC.'/feed-rss.php');
 }
 
 /**
@@ -1195,11 +1195,11 @@ 
  *
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
-function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+function do_feed_rss2($for_comments) {
+	if ($for_comments)
+		load_template(ABSPATH.WPINC.'/feed-rss2-comments.php');
 	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+		load_template(ABSPATH.WPINC.'/feed-rss2.php');
 }
 
 /**
@@ -1211,11 +1211,11 @@ 
  *
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
-function do_feed_atom( $for_comments ) {
+function do_feed_atom($for_comments) {
 	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+		load_template(ABSPATH.WPINC.'/feed-atom-comments.php');
 	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
+		load_template(ABSPATH.WPINC.'/feed-atom.php');
 }
 
 /**
@@ -1227,22 +1227,22 @@ 
  * @since 2.1.0
  */
 function do_robots() {
-	header( 'Content-Type: text/plain; charset=utf-8' );
+	header('Content-Type: text/plain; charset=utf-8');
 
 	/**
 	 * Fires when displaying the robots.txt file.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'do_robotstxt' );
+	do_action('do_robotstxt');
 
 	$output = "User-agent: *\n";
-	$public = get_option( 'blog_public' );
-	if ( '0' == $public ) {
+	$public = get_option('blog_public');
+	if ('0' == $public) {
 		$output .= "Disallow: /\n";
 	} else {
-		$site_url = parse_url( site_url() );
-		$path = ( !empty( $site_url['path'] ) ) ? $site_url['path'] : '';
+		$site_url = parse_url(site_url());
+		$path = ( ! empty($site_url['path'])) ? $site_url['path'] : '';
 		$output .= "Disallow: $path/wp-admin/\n";
 	}
 
@@ -1254,7 +1254,7 @@ 
 	 * @param string $output Robots.txt output.
 	 * @param bool   $public Whether the site is considered "public".
 	 */
-	echo apply_filters( 'robots_txt', $output, $public );
+	echo apply_filters('robots_txt', $output, $public);
 }
 
 /**
@@ -1279,28 +1279,28 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
+	if (wp_cache_get('is_blog_installed'))
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
-	if ( ! defined( 'WP_INSTALLING' ) ) {
+	if ( ! defined('WP_INSTALLING')) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	if ( ! isset($alloptions['siteurl']))
+		$installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
 	else
 		$installed = $alloptions['siteurl'];
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 
-	$installed = !empty( $installed );
-	wp_cache_set( 'is_blog_installed', $installed );
+	$installed = ! empty($installed);
+	wp_cache_set('is_blog_installed', $installed);
 
-	if ( $installed )
+	if ($installed)
 		return true;
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
+	if (defined('WP_REPAIRING'))
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
@@ -1311,14 +1311,14 @@ 
 	 * options table could not be accessed.
 	 */
 	$wp_tables = $wpdb->tables();
-	foreach ( $wp_tables as $table ) {
+	foreach ($wp_tables as $table) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
+		if (defined('CUSTOM_USER_TABLE') && CUSTOM_USER_TABLE == $table)
 			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
+		if (defined('CUSTOM_USER_META_TABLE') && CUSTOM_USER_META_TABLE == $table)
 			continue;
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
+		if ( ! $wpdb->get_results("DESCRIBE $table;"))
 			continue;
 
 		// One or more tables exist. We are insane.
@@ -1326,13 +1326,13 @@ 
 		wp_load_translations_early();
 
 		// Die with a DB error.
-		$wpdb->error = sprintf( __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ), 'maint/repair.php?referrer=is_blog_installed' );
+		$wpdb->error = sprintf(__('One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'), 'maint/repair.php?referrer=is_blog_installed');
 		dead_db();
 	}
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 
-	wp_cache_set( 'is_blog_installed', false );
+	wp_cache_set('is_blog_installed', false);
 
 	return false;
 }
@@ -1347,9 +1347,9 @@ 
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
-function wp_nonce_url( $actionurl, $action = -1, $name = '_wpnonce' ) {
-	$actionurl = str_replace( '&amp;', '&', $actionurl );
-	return esc_html( add_query_arg( $name, wp_create_nonce( $action ), $actionurl ) );
+function wp_nonce_url($actionurl, $action = -1, $name = '_wpnonce') {
+	$actionurl = str_replace('&amp;', '&', $actionurl);
+	return esc_html(add_query_arg($name, wp_create_nonce($action), $actionurl));
 }
 
 /**
@@ -1378,14 +1378,14 @@ 
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
  * @return string Nonce field HTML markup.
  */
-function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $echo = true ) {
-	$name = esc_attr( $name );
-	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
+function wp_nonce_field($action = -1, $name = "_wpnonce", $referer = true, $echo = true) {
+	$name = esc_attr($name);
+	$nonce_field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.wp_create_nonce($action).'" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ($referer)
+		$nonce_field .= wp_referer_field(false);
 
-	if ( $echo )
+	if ($echo)
 		echo $nonce_field;
 
 	return $nonce_field;
@@ -1402,10 +1402,10 @@ 
  * @param bool $echo Optional. Whether to echo or return the referer field. Default true.
  * @return string Referer field HTML markup.
  */
-function wp_referer_field( $echo = true ) {
-	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
+function wp_referer_field($echo = true) {
+	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'.esc_attr(wp_unslash($_SERVER['REQUEST_URI'])).'" />';
 
-	if ( $echo )
+	if ($echo)
 		echo $referer_field;
 	return $referer_field;
 }
@@ -1424,12 +1424,12 @@ 
  *                             Default 'current'.
  * @return string Original referer field.
  */
-function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
-	if ( ! $ref = wp_get_original_referer() ) {
-		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
+function wp_original_referer_field($echo = true, $jump_back_to = 'current') {
+	if ( ! $ref = wp_get_original_referer()) {
+		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash($_SERVER['REQUEST_URI']);
 	}
-	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
+	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="'.esc_attr($ref).'" />';
+	if ($echo)
 		echo $orig_referer_field;
 	return $orig_referer_field;
 }
@@ -1444,16 +1444,16 @@ 
  * @return false|string False on failure. Referer URL on success.
  */
 function wp_get_referer() {
-	if ( ! function_exists( 'wp_validate_redirect' ) )
+	if ( ! function_exists('wp_validate_redirect'))
 		return false;
 	$ref = false;
-	if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
-		$ref = wp_unslash( $_REQUEST['_wp_http_referer'] );
-	elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) )
-		$ref = wp_unslash( $_SERVER['HTTP_REFERER'] );
+	if ( ! empty($_REQUEST['_wp_http_referer']))
+		$ref = wp_unslash($_REQUEST['_wp_http_referer']);
+	elseif ( ! empty($_SERVER['HTTP_REFERER']))
+		$ref = wp_unslash($_SERVER['HTTP_REFERER']);
 
-	if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) )
-		return wp_validate_redirect( $ref, false );
+	if ($ref && $ref !== wp_unslash($_SERVER['REQUEST_URI']))
+		return wp_validate_redirect($ref, false);
 	return false;
 }
 
@@ -1465,8 +1465,8 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty($_REQUEST['_wp_original_http_referer']) && function_exists('wp_validate_redirect'))
+		return wp_validate_redirect(wp_unslash($_REQUEST['_wp_original_http_referer']), false);
 	return false;
 }
 
@@ -1480,20 +1480,20 @@ 
  * @param string $target Full path to attempt to create.
  * @return bool Whether the path was created. True if path already exists.
  */
-function wp_mkdir_p( $target ) {
+function wp_mkdir_p($target) {
 	$wrapper = null;
 
 	// Strip the protocol.
-	if ( wp_is_stream( $target ) ) {
-		list( $wrapper, $target ) = explode( '://', $target, 2 );
+	if (wp_is_stream($target)) {
+		list($wrapper, $target) = explode('://', $target, 2);
 	}
 
 	// From php.net/mkdir user contributed notes.
-	$target = str_replace( '//', '/', $target );
+	$target = str_replace('//', '/', $target);
 
 	// Put the wrapper back on the target.
-	if ( $wrapper !== null ) {
-		$target = $wrapper . '://' . $target;
+	if ($wrapper !== null) {
+		$target = $wrapper.'://'.$target;
 	}
 
 	/*
@@ -1501,35 +1501,35 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
+	if (empty($target))
 		$target = '/';
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if (file_exists($target))
+		return @is_dir($target);
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
-	$target_parent = dirname( $target );
-	while ( '.' != $target_parent && ! is_dir( $target_parent ) ) {
-		$target_parent = dirname( $target_parent );
+	$target_parent = dirname($target);
+	while ('.' != $target_parent && ! is_dir($target_parent)) {
+		$target_parent = dirname($target_parent);
 	}
 
 	// Get the permission bits.
-	if ( $stat = @stat( $target_parent ) ) {
+	if ($stat = @stat($target_parent)) {
 		$dir_perms = $stat['mode'] & 0007777;
 	} else {
 		$dir_perms = 0777;
 	}
 
-	if ( @mkdir( $target, $dir_perms, true ) ) {
+	if (@mkdir($target, $dir_perms, true)) {
 
 		/*
 		 * If a umask is set that modifies $dir_perms, we'll have to re-set
 		 * the $dir_perms correctly with chmod()
 		 */
-		if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
-			$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
-			for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
-				@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
+		if ($dir_perms != ($dir_perms & ~umask())) {
+			$folder_parts = explode('/', substr($target, strlen($target_parent) + 1));
+			for ($i = 1, $c = count($folder_parts); $i <= $c; $i++) {
+				@chmod($target_parent.'/'.implode('/', array_slice($folder_parts, 0, $i)), $dir_perms);
 			}
 		}
 
@@ -1549,23 +1549,23 @@ 
  * @param string $path File path.
  * @return bool True if path is absolute, false is not absolute.
  */
-function path_is_absolute( $path ) {
+function path_is_absolute($path) {
 	/*
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
+	if (realpath($path) == $path)
 		return true;
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
+	if (strlen($path) == 0 || $path[0] == '.')
 		return false;
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
+	if (preg_match('#^[a-zA-Z]:\\\\#', $path))
 		return true;
 
 	// A path starting with / or \ is absolute; anything else is relative.
-	return ( $path[0] == '/' || $path[0] == '\\' );
+	return ($path[0] == '/' || $path[0] == '\\');
 }
 
 /**
@@ -1580,11 +1580,11 @@ 
  * @param string $path Path relative to $base.
  * @return string The path with the base or absolute path.
  */
-function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
+function path_join($base, $path) {
+	if (path_is_absolute($path))
 		return $path;
 
-	return rtrim($base, '/') . '/' . ltrim($path, '/');
+	return rtrim($base, '/').'/'.ltrim($path, '/');
 }
 
 /**
@@ -1598,9 +1598,9 @@ 
  * @param string $path Path to normalize.
  * @return string Normalized path.
  */
-function wp_normalize_path( $path ) {
-	$path = str_replace( '\\', '/', $path );
-	$path = preg_replace( '|/+|','/', $path );
+function wp_normalize_path($path) {
+	$path = str_replace('\\', '/', $path);
+	$path = preg_replace('|/+|', '/', $path);
 	return $path;
 }
 
@@ -1622,24 +1622,24 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
+	if (defined('WP_TEMP_DIR'))
 		return trailingslashit(WP_TEMP_DIR);
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ($temp)
+		return trailingslashit($temp);
 
-	if ( function_exists('sys_get_temp_dir') ) {
+	if (function_exists('sys_get_temp_dir')) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if (@is_dir($temp) && wp_is_writable($temp))
+			return trailingslashit($temp);
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if (@is_dir($temp) && wp_is_writable($temp))
+		return trailingslashit($temp);
 
-	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
+	$temp = WP_CONTENT_DIR.'/';
+	if (is_dir($temp) && wp_is_writable($temp))
 		return $temp;
 
 	return '/tmp/';
@@ -1658,11 +1658,11 @@ 
  * @param string $path Path to check for write-ability.
  * @return bool Whether the path is writable.
  */
-function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
+function wp_is_writable($path) {
+	if ('WIN' === strtoupper(substr(PHP_OS, 0, 3)))
+		return win_is_writable($path);
 	else
-		return @is_writable( $path );
+		return @is_writable($path);
 }
 
 /**
@@ -1681,21 +1681,21 @@ 
  * @param string $path Windows path to check for write-ability.
  * @return bool Whether the path is writable.
  */
-function win_is_writable( $path ) {
+function win_is_writable($path) {
 
-	if ( $path[strlen( $path ) - 1] == '/' ) { // if it looks like a directory, check a random file within the directory
-		return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
-	} elseif ( is_dir( $path ) ) { // If it's a directory (and not a file) check a random file within the directory
-		return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+	if ($path[strlen($path) - 1] == '/') { // if it looks like a directory, check a random file within the directory
+		return win_is_writable($path.uniqid(mt_rand()).'.tmp');
+	} elseif (is_dir($path)) { // If it's a directory (and not a file) check a random file within the directory
+		return win_is_writable($path.'/'.uniqid(mt_rand()).'.tmp');
 	}
 	// check tmp file for read/write capabilities
-	$should_delete_tmp_file = !file_exists( $path );
-	$f = @fopen( $path, 'a' );
-	if ( $f === false )
+	$should_delete_tmp_file = ! file_exists($path);
+	$f = @fopen($path, 'a');
+	if ($f === false)
 		return false;
-	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	fclose($f);
+	if ($should_delete_tmp_file)
+		unlink($path);
 	return true;
 }
 
@@ -1731,39 +1731,39 @@ 
  * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null.
  * @return array See above for description.
  */
-function wp_upload_dir( $time = null ) {
-	$siteurl = get_option( 'siteurl' );
-	$upload_path = trim( get_option( 'upload_path' ) );
+function wp_upload_dir($time = null) {
+	$siteurl = get_option('siteurl');
+	$upload_path = trim(get_option('upload_path'));
 
-	if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
-		$dir = WP_CONTENT_DIR . '/uploads';
-	} elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
+	if (empty($upload_path) || 'wp-content/uploads' == $upload_path) {
+		$dir = WP_CONTENT_DIR.'/uploads';
+	} elseif (0 !== strpos($upload_path, ABSPATH)) {
 		// $dir is absolute, $upload_path is (maybe) relative to ABSPATH
-		$dir = path_join( ABSPATH, $upload_path );
+		$dir = path_join(ABSPATH, $upload_path);
 	} else {
 		$dir = $upload_path;
 	}
 
-	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
+	if ( ! $url = get_option('upload_url_path')) {
+		if (empty($upload_path) || ('wp-content/uploads' == $upload_path) || ($upload_path == $dir))
+			$url = WP_CONTENT_URL.'/uploads';
 		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+			$url = trailingslashit($siteurl).$upload_path;
 	}
 
 	/*
 	 * Honor the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
 	 * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
 	 */
-	if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
-		$dir = ABSPATH . UPLOADS;
-		$url = trailingslashit( $siteurl ) . UPLOADS;
+	if (defined('UPLOADS') && ! (is_multisite() && get_site_option('ms_files_rewriting'))) {
+		$dir = ABSPATH.UPLOADS;
+		$url = trailingslashit($siteurl).UPLOADS;
 	}
 
 	// If multisite (and if not the main site in a post-MU network)
-	if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
+	if (is_multisite() && ! (is_main_network() && is_main_site() && defined('MULTISITE'))) {
 
-		if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+		if ( ! get_site_option('ms_files_rewriting')) {
 			/*
 			 * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
 			 * straightforward: Append sites/%d if we're not on the main site (for post-MU
@@ -1773,15 +1773,15 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
+			if (defined('MULTISITE'))
+				$ms_dir = '/sites/'.get_current_blog_id();
 			else
-				$ms_dir = '/' . get_current_blog_id();
+				$ms_dir = '/'.get_current_blog_id();
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
 
-		} elseif ( defined( 'UPLOADS' ) && ! ms_is_switched() ) {
+		} elseif (defined('UPLOADS') && ! ms_is_switched()) {
 			/*
 			 * Handle the old-form ms-files.php rewriting if the network still has that enabled.
 			 * When ms-files rewriting is enabled, then we only listen to UPLOADS when:
@@ -1796,11 +1796,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
+			if (defined('BLOGUPLOADDIR'))
+				$dir = untrailingslashit(BLOGUPLOADDIR);
 			else
-				$dir = ABSPATH . UPLOADS;
-			$url = trailingslashit( $siteurl ) . 'files';
+				$dir = ABSPATH.UPLOADS;
+			$url = trailingslashit($siteurl).'files';
 		}
 	}
 
@@ -1808,12 +1808,12 @@ 
 	$baseurl = $url;
 
 	$subdir = '';
-	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
+	if (get_option('uploads_use_yearmonth_folders')) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
-		$y = substr( $time, 0, 4 );
-		$m = substr( $time, 5, 2 );
+		if ( ! $time)
+			$time = current_time('mysql');
+		$y = substr($time, 0, 4);
+		$m = substr($time, 5, 2);
 		$subdir = "/$y/$m";
 	}
 
@@ -1828,7 +1828,7 @@ 
 	 * @param array $uploads Array of upload directory data with keys of 'path',
 	 *                       'url', 'subdir, 'basedir', and 'error'.
 	 */
-	$uploads = apply_filters( 'upload_dir',
+	$uploads = apply_filters('upload_dir',
 		array(
 			'path'    => $dir,
 			'url'     => $url,
@@ -1836,16 +1836,16 @@ 
 			'basedir' => $basedir,
 			'baseurl' => $baseurl,
 			'error'   => false,
-		) );
+		));
 
 	// Make sure we have an uploads directory.
-	if ( ! wp_mkdir_p( $uploads['path'] ) ) {
-		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+	if ( ! wp_mkdir_p($uploads['path'])) {
+		if (0 === strpos($uploads['basedir'], ABSPATH))
+			$error_path = str_replace(ABSPATH, '', $uploads['basedir']).$uploads['subdir'];
 		else
-			$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+			$error_path = basename($uploads['basedir']).$uploads['subdir'];
 
-		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
+		$message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), $error_path);
 		$uploads['error'] = $message;
 	}
 
@@ -1869,48 +1869,48 @@ 
  * @param callback $unique_filename_callback Callback. Default null.
  * @return string New filename, if given wasn't unique.
  */
-function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) {
+function wp_unique_filename($dir, $filename, $unique_filename_callback = null) {
 	// Sanitize the file name before we begin processing.
 	$filename = sanitize_file_name($filename);
 
 	// Separate the filename into a name and extension.
 	$info = pathinfo($filename);
-	$ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
+	$ext = ! empty($info['extension']) ? '.'.$info['extension'] : '';
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
+	if ($name === $ext)
 		$name = '';
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
 	 * Use callback if supplied.
 	 */
-	if ( $unique_filename_callback && is_callable( $unique_filename_callback ) ) {
-		$filename = call_user_func( $unique_filename_callback, $dir, $name, $ext );
+	if ($unique_filename_callback && is_callable($unique_filename_callback)) {
+		$filename = call_user_func($unique_filename_callback, $dir, $name, $ext);
 	} else {
 		$number = '';
 
 		// Change '.ext' to lower case.
-		if ( $ext && strtolower($ext) != $ext ) {
+		if ($ext && strtolower($ext) != $ext) {
 			$ext2 = strtolower($ext);
-			$filename2 = preg_replace( '|' . preg_quote($ext) . '$|', $ext2, $filename );
+			$filename2 = preg_replace('|'.preg_quote($ext).'$|', $ext2, $filename);
 
 			// Check for both lower and upper case extension or image sub-sizes may be overwritten.
-			while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) {
+			while (file_exists($dir."/$filename") || file_exists($dir."/$filename2")) {
 				$new_number = $number + 1;
-				$filename = str_replace( "$number$ext", "$new_number$ext", $filename );
-				$filename2 = str_replace( "$number$ext2", "$new_number$ext2", $filename2 );
+				$filename = str_replace("$number$ext", "$new_number$ext", $filename);
+				$filename2 = str_replace("$number$ext2", "$new_number$ext2", $filename2);
 				$number = $new_number;
 			}
 			return $filename2;
 		}
 
-		while ( file_exists( $dir . "/$filename" ) ) {
-			if ( '' == "$number$ext" )
-				$filename = $filename . ++$number . $ext;
+		while (file_exists($dir."/$filename")) {
+			if ('' == "$number$ext")
+				$filename = $filename.++$number.$ext;
 			else
-				$filename = str_replace( "$number$ext", ++$number . $ext, $filename );
+				$filename = str_replace("$number$ext", ++$number.$ext, $filename);
 		}
 	}
 
@@ -1940,20 +1940,20 @@ 
  * @param string       $time       Optional. Time formatted in 'yyyy/mm'. Default null.
  * @return array
  */
-function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0' );
+function wp_upload_bits($name, $deprecated, $bits, $time = null) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.0');
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if (empty($name))
+		return array('error' => __('Empty filename'));
 
-	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	$wp_filetype = wp_check_filetype($name);
+	if ( ! $wp_filetype['ext'] && ! current_user_can('unfiltered_upload'))
+		return array('error' => __('Invalid file type'));
 
-	$upload = wp_upload_dir( $time );
+	$upload = wp_upload_dir($time);
 
-	if ( $upload['error'] !== false )
+	if ($upload['error'] !== false)
 		return $upload;
 
 	/**
@@ -1966,44 +1966,44 @@ 
 	 *
 	 * @param mixed $upload_bits_error An array of upload bits data, or a non-array error to return.
 	 */
-	$upload_bits_error = apply_filters( 'wp_upload_bits', array( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
-	if ( !is_array( $upload_bits_error ) ) {
-		$upload[ 'error' ] = $upload_bits_error;
+	$upload_bits_error = apply_filters('wp_upload_bits', array('name' => $name, 'bits' => $bits, 'time' => $time));
+	if ( ! is_array($upload_bits_error)) {
+		$upload['error'] = $upload_bits_error;
 		return $upload;
 	}
 
-	$filename = wp_unique_filename( $upload['path'], $name );
+	$filename = wp_unique_filename($upload['path'], $name);
 
-	$new_file = $upload['path'] . "/$filename";
-	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+	$new_file = $upload['path']."/$filename";
+	if ( ! wp_mkdir_p(dirname($new_file))) {
+		if (0 === strpos($upload['basedir'], ABSPATH))
+			$error_path = str_replace(ABSPATH, '', $upload['basedir']).$upload['subdir'];
 		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+			$error_path = basename($upload['basedir']).$upload['subdir'];
 
-		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
-		return array( 'error' => $message );
+		$message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), $error_path);
+		return array('error' => $message);
 	}
 
-	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	$ifp = @ fopen($new_file, 'wb');
+	if ( ! $ifp)
+		return array('error' => sprintf(__('Could not write file %s'), $new_file));
 
-	@fwrite( $ifp, $bits );
-	fclose( $ifp );
+	@fwrite($ifp, $bits);
+	fclose($ifp);
 	clearstatcache();
 
 	// Set correct file permissions
-	$stat = @ stat( dirname( $new_file ) );
+	$stat = @ stat(dirname($new_file));
 	$perms = $stat['mode'] & 0007777;
 	$perms = $perms & 0000666;
-	@ chmod( $new_file, $perms );
+	@ chmod($new_file, $perms);
 	clearstatcache();
 
 	// Compute the URL
-	$url = $upload['url'] . "/$filename";
+	$url = $upload['url']."/$filename";
 
-	return array( 'file' => $new_file, 'url' => $url, 'error' => false );
+	return array('file' => $new_file, 'url' => $url, 'error' => false);
 }
 
 /**
@@ -2014,8 +2014,8 @@ 
  * @param string $ext The extension to search.
  * @return string|void The file type, example: audio, video, document, spreadsheet, etc.
  */
-function wp_ext2type( $ext ) {
-	$ext = strtolower( $ext );
+function wp_ext2type($ext) {
+	$ext = strtolower($ext);
 
 	/**
 	 * Filter file type based on the extension name.
@@ -2027,20 +2027,20 @@ 
 	 * @param array $ext2type Multi-dimensional array with extensions for a default set
 	 *                        of file types.
 	 */
-	$ext2type = apply_filters( 'ext2type', array(
-		'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-		'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
-		'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),
-		'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
-		'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
-		'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-		'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
-		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
-	) );
-
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	$ext2type = apply_filters('ext2type', array(
+		'image'       => array('jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico'),
+		'audio'       => array('aac', 'ac3', 'aif', 'aiff', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma'),
+		'video'       => array('3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv'),
+		'document'    => array('doc', 'docx', 'docm', 'dotm', 'odt', 'pages', 'pdf', 'xps', 'oxps', 'rtf', 'wp', 'wpd', 'psd', 'xcf'),
+		'spreadsheet' => array('numbers', 'ods', 'xls', 'xlsx', 'xlsm', 'xlsb'),
+		'interactive' => array('swf', 'key', 'ppt', 'pptx', 'pptm', 'pps', 'ppsx', 'ppsm', 'sldx', 'sldm', 'odp'),
+		'text'        => array('asc', 'csv', 'tsv', 'txt'),
+		'archive'     => array('bz2', 'cab', 'dmg', 'gz', 'rar', 'sea', 'sit', 'sqx', 'tar', 'tgz', 'zip', '7z'),
+		'code'        => array('css', 'htm', 'html', 'php', 'js'),
+	));
+
+	foreach ($ext2type as $type => $exts)
+		if (in_array($ext, $exts))
 			return $type;
 }
 
@@ -2055,22 +2055,22 @@ 
  * @param array  $mimes    Optional. Key is the file extension with value as the mime type.
  * @return array Values with extension first and mime type.
  */
-function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
+function wp_check_filetype($filename, $mimes = null) {
+	if (empty($mimes))
 		$mimes = get_allowed_mime_types();
 	$type = false;
 	$ext = false;
 
-	foreach ( $mimes as $ext_preg => $mime_match ) {
-		$ext_preg = '!\.(' . $ext_preg . ')$!i';
-		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
+	foreach ($mimes as $ext_preg => $mime_match) {
+		$ext_preg = '!\.('.$ext_preg.')$!i';
+		if (preg_match($ext_preg, $filename, $ext_matches)) {
 			$type = $mime_match;
 			$ext = $ext_matches[1];
 			break;
 		}
 	}
 
-	return compact( 'ext', 'type' );
+	return compact('ext', 'type');
 }
 
 /**
@@ -2092,27 +2092,27 @@ 
  * @return array Values for the extension, MIME, and either a corrected filename or false
  *               if original $filename is valid.
  */
-function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
+function wp_check_filetype_and_ext($file, $filename, $mimes = null) {
 	$proper_filename = false;
 
 	// Do basic extension validation and MIME mapping
-	$wp_filetype = wp_check_filetype( $filename, $mimes );
+	$wp_filetype = wp_check_filetype($filename, $mimes);
 	$ext = $wp_filetype['ext'];
 	$type = $wp_filetype['type'];
 
 	// We can't do any further validation without a file to work with
-	if ( ! file_exists( $file ) ) {
-		return compact( 'ext', 'type', 'proper_filename' );
+	if ( ! file_exists($file)) {
+		return compact('ext', 'type', 'proper_filename');
 	}
 
 	// We're able to validate images using GD
-	if ( $type && 0 === strpos( $type, 'image/' ) && function_exists('getimagesize') ) {
+	if ($type && 0 === strpos($type, 'image/') && function_exists('getimagesize')) {
 
 		// Attempt to figure out what type of image it actually is
-		$imgstats = @getimagesize( $file );
+		$imgstats = @getimagesize($file);
 
 		// If getimagesize() knows what kind of image it really is and if the real MIME doesn't match the claimed MIME
-		if ( !empty($imgstats['mime']) && $imgstats['mime'] != $type ) {
+		if ( ! empty($imgstats['mime']) && $imgstats['mime'] != $type) {
 			/**
 			 * Filter the list mapping image mime types to their respective extensions.
 			 *
@@ -2120,26 +2120,26 @@ 
 			 *
 			 * @param  array $mime_to_ext Array of image mime types and their matching extensions.
 			 */
-			$mime_to_ext = apply_filters( 'getimagesize_mimes_to_exts', array(
+			$mime_to_ext = apply_filters('getimagesize_mimes_to_exts', array(
 				'image/jpeg' => 'jpg',
 				'image/png'  => 'png',
 				'image/gif'  => 'gif',
 				'image/bmp'  => 'bmp',
 				'image/tiff' => 'tif',
-			) );
+			));
 
 			// Replace whatever is after the last period in the filename with the correct extension
-			if ( ! empty( $mime_to_ext[ $imgstats['mime'] ] ) ) {
-				$filename_parts = explode( '.', $filename );
-				array_pop( $filename_parts );
-				$filename_parts[] = $mime_to_ext[ $imgstats['mime'] ];
-				$new_filename = implode( '.', $filename_parts );
+			if ( ! empty($mime_to_ext[$imgstats['mime']])) {
+				$filename_parts = explode('.', $filename);
+				array_pop($filename_parts);
+				$filename_parts[] = $mime_to_ext[$imgstats['mime']];
+				$new_filename = implode('.', $filename_parts);
 
-				if ( $new_filename != $filename ) {
+				if ($new_filename != $filename) {
 					$proper_filename = $new_filename; // Mark that it changed
 				}
 				// Redefine the extension / MIME
-				$wp_filetype = wp_check_filetype( $new_filename, $mimes );
+				$wp_filetype = wp_check_filetype($new_filename, $mimes);
 				$ext = $wp_filetype['ext'];
 				$type = $wp_filetype['type'];
 			}
@@ -2158,7 +2158,7 @@ 
 	 *                                          $file being in a tmp directory).
 	 * @param array  $mimes                     Key is the file extension with value as the mime type.
 	 */
-	return apply_filters( 'wp_check_filetype_and_ext', compact( 'ext', 'type', 'proper_filename' ), $file, $filename, $mimes );
+	return apply_filters('wp_check_filetype_and_ext', compact('ext', 'type', 'proper_filename'), $file, $filename, $mimes);
 }
 
 /**
@@ -2181,7 +2181,7 @@ 
 	 * @param array $wp_get_mime_types Mime types keyed by the file extension regex
 	 *                                 corresponding to those types.
 	 */
-	return apply_filters( 'mime_types', array(
+	return apply_filters('mime_types', array(
 	// Image formats.
 	'jpg|jpeg|jpe' => 'image/jpeg',
 	'gif' => 'image/gif',
@@ -2281,7 +2281,7 @@ 
 	'key' => 'application/vnd.apple.keynote',
 	'numbers' => 'application/vnd.apple.numbers',
 	'pages' => 'application/vnd.apple.pages',
-	) );
+	));
 }
 /**
  * Retrieve list of allowed mime types and file extensions.
@@ -2292,15 +2292,15 @@ 
  * @return array Array of mime types keyed by the file extension regex corresponding
  *               to those types.
  */
-function get_allowed_mime_types( $user = null ) {
+function get_allowed_mime_types($user = null) {
 	$t = wp_get_mime_types();
 
-	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	unset($t['swf'], $t['exe']);
+	if (function_exists('current_user_can'))
+		$unfiltered = $user ? user_can($user, 'unfiltered_html') : current_user_can('unfiltered_html');
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if (empty($unfiltered))
+		unset($t['htm|html']);
 
 	/**
 	 * Filter list of allowed mime types and file extensions.
@@ -2312,7 +2312,7 @@ 
 	 *                               removed depending on '$user' capabilities.
 	 * @param int|WP_User|null $user User ID, User object or null if not provided (indicates current user).
 	 */
-	return apply_filters( 'upload_mimes', $t, $user );
+	return apply_filters('upload_mimes', $t, $user);
 }
 
 /**
@@ -2325,18 +2325,18 @@ 
  *
  * @param string $action The nonce action.
  */
-function wp_nonce_ays( $action ) {
-	if ( 'log-out' == $action ) {
-		$html = sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'name' ) ) . '</p><p>';
-		$redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
+function wp_nonce_ays($action) {
+	if ('log-out' == $action) {
+		$html = sprintf(__('You are attempting to log out of %s'), get_bloginfo('name')).'</p><p>';
+		$redirect_to = isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
+		$html .= sprintf(__("Do you really want to <a href='%s'>log out</a>?"), wp_logout_url($redirect_to));
 	} else {
-		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		$html = __('Are you sure you want to do this?');
+		if (wp_get_referer())
+			$html .= "</p><p><a href='".esc_url(remove_query_arg('updated', wp_get_referer()))."'>".__('Please try again.')."</a>";
 	}
 
-	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
+	wp_die($html, __('WordPress Failure Notice'), 403);
 }
 
 /**
@@ -2372,16 +2372,16 @@ 
  *                                  Default is the value of {@see is_rtl()}.
  * }
  */
-function wp_die( $message = '', $title = '', $args = array() ) {
+function wp_die($message = '', $title = '', $args = array()) {
 
-	if ( is_int( $args ) ) {
-		$args = array( 'response' => $args );
-	} elseif ( is_int( $title ) ) {
-		$args  = array( 'response' => $title );
+	if (is_int($args)) {
+		$args = array('response' => $args);
+	} elseif (is_int($title)) {
+		$args  = array('response' => $title);
 		$title = '';
 	}
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+	if (defined('DOING_AJAX') && DOING_AJAX) {
 		/**
 		 * Filter callback for killing WordPress execution for AJAX requests.
 		 *
@@ -2389,8 +2389,8 @@ 
 		 *
 		 * @param callback $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
-	} elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
+		$function = apply_filters('wp_die_ajax_handler', '_ajax_wp_die_handler');
+	} elseif (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
 		/**
 		 * Filter callback for killing WordPress execution for XML-RPC requests.
 		 *
@@ -2398,7 +2398,7 @@ 
 		 *
 		 * @param callback $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+		$function = apply_filters('wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler');
 	} else {
 		/**
 		 * Filter callback for killing WordPress execution for all non-AJAX, non-XML-RPC requests.
@@ -2407,10 +2407,10 @@ 
 		 *
 		 * @param callback $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
+		$function = apply_filters('wp_die_handler', '_default_wp_die_handler');
 	}
 
-	call_user_func( $function, $message, $title, $args );
+	call_user_func($function, $message, $title, $args);
 }
 
 /**
@@ -2426,20 +2426,20 @@ 
  * @param string       $title   Optional. Error title. Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _default_wp_die_handler( $message, $title = '', $args = array() ) {
-	$defaults = array( 'response' => 500 );
+function _default_wp_die_handler($message, $title = '', $args = array()) {
+	$defaults = array('response' => 500);
 	$r = wp_parse_args($args, $defaults);
 
 	$have_gettext = function_exists('__');
 
-	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
-		if ( empty( $title ) ) {
+	if (function_exists('is_wp_error') && is_wp_error($message)) {
+		if (empty($title)) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
+			if (is_array($error_data) && isset($error_data['title']))
 				$title = $error_data['title'];
 		}
 		$errors = $message->get_error_messages();
-		switch ( count( $errors ) ) {
+		switch (count($errors)) {
 		case 0 :
 			$message = '';
 			break;
@@ -2447,38 +2447,38 @@ 
 			$message = "<p>{$errors[0]}</p>";
 			break;
 		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+			$message = "<ul>\n\t\t<li>".join("</li>\n\t\t<li>", $errors)."</li>\n\t</ul>";
 			break;
 		}
-	} elseif ( is_string( $message ) ) {
+	} elseif (is_string($message)) {
 		$message = "<p>$message</p>";
 	}
 
-	if ( isset( $r['back_link'] ) && $r['back_link'] ) {
-		$back_text = $have_gettext? __('&laquo; Back') : '&laquo; Back';
+	if (isset($r['back_link']) && $r['back_link']) {
+		$back_text = $have_gettext ? __('&laquo; Back') : '&laquo; Back';
 		$message .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
 	}
 
-	if ( ! did_action( 'admin_head' ) ) :
-		if ( !headers_sent() ) {
-			status_header( $r['response'] );
+	if ( ! did_action('admin_head')) :
+		if ( ! headers_sent()) {
+			status_header($r['response']);
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=utf-8' );
+			header('Content-Type: text/html; charset=utf-8');
 		}
 
-		if ( empty($title) )
+		if (empty($title))
 			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
+		if (isset($r['text_direction']) && 'rtl' == $r['text_direction'])
 			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
+		elseif (function_exists('is_rtl') && is_rtl())
 			$text_direction = 'rtl';
 ?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if (function_exists('language_attributes') && function_exists('is_rtl')) language_attributes(); else echo "dir='$text_direction'"; ?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2579,7 +2579,7 @@ 
 		 	box-shadow: inset 0 2px 5px -3px rgba( 0, 0, 0, 0.5 );
 		}
 
-		<?php if ( 'rtl' == $text_direction ) : ?>
+		<?php if ('rtl' == $text_direction) : ?>
 		body { font-family: Tahoma, Arial; }
 		<?php endif; ?>
 	</style>
@@ -2607,15 +2607,15 @@ 
  * @param string       $title   Optional. Error title. Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
+function _xmlrpc_wp_die_handler($message, $title = '', $args = array()) {
 	global $wp_xmlrpc_server;
-	$defaults = array( 'response' => 500 );
+	$defaults = array('response' => 500);
 
 	$r = wp_parse_args($args, $defaults);
 
-	if ( $wp_xmlrpc_server ) {
-		$error = new IXR_Error( $r['response'] , $message);
-		$wp_xmlrpc_server->output( $error->getXml() );
+	if ($wp_xmlrpc_server) {
+		$error = new IXR_Error($r['response'], $message);
+		$wp_xmlrpc_server->output($error->getXml());
 	}
 	die();
 }
@@ -2630,10 +2630,10 @@ 
  *
  * @param string $message Optional. Response to print. Default empty.
  */
-function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
-	die( '0' );
+function _ajax_wp_die_handler($message = '') {
+	if (is_scalar($message))
+		die((string) $message);
+	die('0');
 }
 
 /**
@@ -2646,9 +2646,9 @@ 
  *
  * @param string $message Optional. Response to print. Default empty.
  */
-function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+function _scalar_wp_die_handler($message = '') {
+	if (is_scalar($message))
+		die((string) $message);
 	die();
 }
 
@@ -2663,36 +2663,36 @@ 
  *                       greater than 0. Default 512.
  * @return string|false The JSON encoded string, or false if it cannot be encoded.
  */
-function wp_json_encode( $data, $options = 0, $depth = 512 ) {
+function wp_json_encode($data, $options = 0, $depth = 512) {
 	/*
 	 * json_encode() has had extra params added over the years.
 	 * $options was added in 5.3, and $depth in 5.5.
 	 * We need to make sure we call it with the correct arguments.
 	 */
-	if ( version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-		$args = array( $data, $options, $depth );
-	} elseif ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {
-		$args = array( $data, $options );
+	if (version_compare(PHP_VERSION, '5.5', '>=')) {
+		$args = array($data, $options, $depth);
+	} elseif (version_compare(PHP_VERSION, '5.3', '>=')) {
+		$args = array($data, $options);
 	} else {
-		$args = array( $data );
+		$args = array($data);
 	}
 
-	$json = call_user_func_array( 'json_encode', $args );
+	$json = call_user_func_array('json_encode', $args);
 
 	// If json_encode() was successful, no need to do more sanity checking.
 	// ... unless we're in an old version of PHP, and json_encode() returned
 	// a string containing 'null'. Then we need to do more sanity checking.
-	if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) )  {
+	if (false !== $json && (version_compare(PHP_VERSION, '5.5', '>=') || false === strpos($json, 'null'))) {
 		return $json;
 	}
 
 	try {
-		$args[0] = _wp_json_sanity_check( $data, $depth );
-	} catch ( Exception $e ) {
+		$args[0] = _wp_json_sanity_check($data, $depth);
+	} catch (Exception $e) {
 		return false;
 	}
 
-	return call_user_func_array( 'json_encode', $args );
+	return call_user_func_array('json_encode', $args);
 }
 
 /**
@@ -2708,49 +2708,49 @@ 
  * @param int   $depth Maximum depth to walk through $data. Must be greater than 0.
  * @return mixed The sanitized data that shall be encoded to JSON.
  */
-function _wp_json_sanity_check( $data, $depth ) {
-	if ( $depth < 0 ) {
-		throw new Exception( 'Reached depth limit' );
+function _wp_json_sanity_check($data, $depth) {
+	if ($depth < 0) {
+		throw new Exception('Reached depth limit');
 	}
 
-	if ( is_array( $data ) ) {
+	if (is_array($data)) {
 		$output = array();
-		foreach ( $data as $id => $el ) {
+		foreach ($data as $id => $el) {
 			// Don't forget to sanitize the ID!
-			if ( is_string( $id ) ) {
-				$clean_id = _wp_json_convert_string( $id );
+			if (is_string($id)) {
+				$clean_id = _wp_json_convert_string($id);
 			} else {
 				$clean_id = $id;
 			}
 
 			// Check the element type, so that we're only recursing if we really have to.
-			if ( is_array( $el ) || is_object( $el ) ) {
-				$output[ $clean_id ] = _wp_json_sanity_check( $el, $depth - 1 );
-			} elseif ( is_string( $el ) ) {
-				$output[ $clean_id ] = _wp_json_convert_string( $el );
+			if (is_array($el) || is_object($el)) {
+				$output[$clean_id] = _wp_json_sanity_check($el, $depth - 1);
+			} elseif (is_string($el)) {
+				$output[$clean_id] = _wp_json_convert_string($el);
 			} else {
-				$output[ $clean_id ] = $el;
+				$output[$clean_id] = $el;
 			}
 		}
-	} elseif ( is_object( $data ) ) {
+	} elseif (is_object($data)) {
 		$output = new stdClass;
-		foreach ( $data as $id => $el ) {
-			if ( is_string( $id ) ) {
-				$clean_id = _wp_json_convert_string( $id );
+		foreach ($data as $id => $el) {
+			if (is_string($id)) {
+				$clean_id = _wp_json_convert_string($id);
 			} else {
 				$clean_id = $id;
 			}
 
-			if ( is_array( $el ) || is_object( $el ) ) {
-				$output->$clean_id = _wp_json_sanity_check( $el, $depth - 1 );
-			} elseif ( is_string( $el ) ) {
-				$output->$clean_id = _wp_json_convert_string( $el );
+			if (is_array($el) || is_object($el)) {
+				$output->$clean_id = _wp_json_sanity_check($el, $depth - 1);
+			} elseif (is_string($el)) {
+				$output->$clean_id = _wp_json_convert_string($el);
 			} else {
 				$output->$clean_id = $el;
 			}
 		}
-	} elseif ( is_string( $data ) ) {
-		return _wp_json_convert_string( $data );
+	} elseif (is_string($data)) {
+		return _wp_json_convert_string($data);
 	} else {
 		return $data;
 	}
@@ -2772,21 +2772,21 @@ 
  * @param string $string The string which is to be converted.
  * @return string The checked string.
  */
-function _wp_json_convert_string( $string ) {
+function _wp_json_convert_string($string) {
 	static $use_mb = null;
-	if ( is_null( $use_mb ) ) {
-		$use_mb = function_exists( 'mb_convert_encoding' );
+	if (is_null($use_mb)) {
+		$use_mb = function_exists('mb_convert_encoding');
 	}
 
-	if ( $use_mb ) {
-		$encoding = mb_detect_encoding( $string, mb_detect_order(), true );
-		if ( $encoding ) {
-			return mb_convert_encoding( $string, 'UTF-8', $encoding );
+	if ($use_mb) {
+		$encoding = mb_detect_encoding($string, mb_detect_order(), true);
+		if ($encoding) {
+			return mb_convert_encoding($string, 'UTF-8', $encoding);
 		} else {
-			return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
+			return mb_convert_encoding($string, 'UTF-8', 'UTF-8');
 		}
 	} else {
-		return wp_check_invalid_utf8( $string, true );
+		return wp_check_invalid_utf8($string, true);
 	}
 }
 
@@ -2798,10 +2798,10 @@ 
  * @param mixed $response Variable (usually an array or object) to encode as JSON,
  *                        then print and die.
  */
-function wp_send_json( $response ) {
-	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+function wp_send_json($response) {
+	@header('Content-Type: application/json; charset='.get_option('blog_charset'));
+	echo wp_json_encode($response);
+	if (defined('DOING_AJAX') && DOING_AJAX)
 		wp_die();
 	else
 		die;
@@ -2814,13 +2814,13 @@ 
  *
  * @param mixed $data Data to encode as JSON, then print and die.
  */
-function wp_send_json_success( $data = null ) {
-	$response = array( 'success' => true );
+function wp_send_json_success($data = null) {
+	$response = array('success' => true);
 
-	if ( isset( $data ) )
+	if (isset($data))
 		$response['data'] = $data;
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -2837,15 +2837,15 @@ 
  *
  * @param mixed $data Data to encode as JSON, then print and die.
  */
-function wp_send_json_error( $data = null ) {
-	$response = array( 'success' => false );
+function wp_send_json_error($data = null) {
+	$response = array('success' => false);
 
-	if ( isset( $data ) ) {
-		if ( is_wp_error( $data ) ) {
+	if (isset($data)) {
+		if (is_wp_error($data)) {
 			$result = array();
-			foreach ( $data->errors as $code => $messages ) {
-				foreach ( $messages as $message ) {
-					$result[] = array( 'code' => $code, 'message' => $message );
+			foreach ($data->errors as $code => $messages) {
+				foreach ($messages as $message) {
+					$result[] = array('code' => $code, 'message' => $message);
 				}
 			}
 
@@ -2855,7 +2855,7 @@ 
 		}
 	}
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -2873,9 +2873,9 @@ 
  * @param string $url URL for the home location.
  * @return string Homepage location.
  */
-function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+function _config_wp_home($url = '') {
+	if (defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 	return $url;
 }
 
@@ -2894,9 +2894,9 @@ 
  * @param string $url URL to set the WordPress site location.
  * @return string The WordPress Site URL.
  */
-function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+function _config_wp_siteurl($url = '') {
+	if (defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 	return $url;
 }
 
@@ -2917,15 +2917,15 @@ 
  * @param array $input MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
-function _mce_set_direction( $input ) {
-	if ( is_rtl() ) {
+function _mce_set_direction($input) {
+	if (is_rtl()) {
 		$input['directionality'] = 'rtl';
 
-		if ( ! empty( $input['plugins'] ) && strpos( $input['plugins'], 'directionality' ) === false ) {
+		if ( ! empty($input['plugins']) && strpos($input['plugins'], 'directionality') === false) {
 			$input['plugins'] .= ',directionality';
 		}
 
-		if ( ! empty( $input['toolbar1'] ) && ! preg_match( '/\bltr\b/', $input['toolbar1'] ) ) {
+		if ( ! empty($input['toolbar1']) && ! preg_match('/\bltr\b/', $input['toolbar1'])) {
 			$input['toolbar1'] .= ',ltr';
 		}
 	}
@@ -2960,10 +2960,10 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
+	if ( ! get_option('use_smilies'))
 		return;
 
-	if ( !isset( $wpsmiliestrans ) ) {
+	if ( ! isset($wpsmiliestrans)) {
 		$wpsmiliestrans = array(
 		':mrgreen:' => 'mrgreen.png',
 		':neutral:' => "\xf0\x9f\x98\x90",
@@ -3027,28 +3027,28 @@ 
 	$spaces = wp_spaces_regexp();
 
 	// Begin first "subpattern"
-	$wp_smiliessearch = '/(?<=' . $spaces . '|^)';
+	$wp_smiliessearch = '/(?<='.$spaces.'|^)';
 
 	$subchar = '';
-	foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
+	foreach ((array) $wpsmiliestrans as $smiley => $img) {
 		$firstchar = substr($smiley, 0, 1);
 		$rest = substr($smiley, 1);
 
 		// new subpattern?
 		if ($firstchar != $subchar) {
 			if ($subchar != '') {
-				$wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"
-				$wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
+				$wp_smiliessearch .= ')(?='.$spaces.'|$)'; // End previous "subpattern"
+				$wp_smiliessearch .= '|(?<='.$spaces.'|^)'; // Begin another "subpattern"
 			}
 			$subchar = $firstchar;
-			$wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
+			$wp_smiliessearch .= preg_quote($firstchar, '/').'(?:';
 		} else {
 			$wp_smiliessearch .= '|';
 		}
 		$wp_smiliessearch .= preg_quote($rest, '/');
 	}
 
-	$wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
+	$wp_smiliessearch .= ')(?='.$spaces.'|$)/m';
 
 }
 
@@ -3064,16 +3064,16 @@ 
  * @param array        $defaults Optional. Array that serves as the defaults. Default empty.
  * @return array Merged user defined values with defaults.
  */
-function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
+function wp_parse_args($args, $defaults = '') {
+	if (is_object($args))
+		$r = get_object_vars($args);
+	elseif (is_array($args))
+		$r = & $args;
 	else
-		wp_parse_str( $args, $r );
+		wp_parse_str($args, $r);
 
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if (is_array($defaults))
+		return array_merge($defaults, $r);
 	return $r;
 }
 
@@ -3085,8 +3085,8 @@ 
  * @param array|string $list List of ids.
  * @return array Sanitized array of IDs.
  */
-function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
+function wp_parse_id_list($list) {
+	if ( ! is_array($list))
 		$list = preg_split('/[\s,]+/', $list);
 
 	return array_unique(array_map('absint', $list));
@@ -3101,11 +3101,11 @@ 
  * @param array $keys  The list of keys.
  * @return array The array slice.
  */
-function wp_array_slice_assoc( $array, $keys ) {
+function wp_array_slice_assoc($array, $keys) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
-			$slice[ $key ] = $array[ $key ];
+	foreach ($keys as $key)
+		if (isset($array[$key]))
+			$slice[$key] = $array[$key];
 
 	return $slice;
 }
@@ -3125,14 +3125,14 @@ 
  *                              Default false.
  * @return array A list of objects or object fields.
  */
-function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
+function wp_filter_object_list($list, $args = array(), $operator = 'and', $field = false) {
+	if ( ! is_array($list))
 		return array();
 
-	$list = wp_list_filter( $list, $args, $operator );
+	$list = wp_list_filter($list, $args, $operator);
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ($field)
+		$list = wp_list_pluck($list, $field);
 
 	return $list;
 }
@@ -3151,29 +3151,29 @@ 
  *                         match. Default 'AND'.
  * @return array Array of found values.
  */
-function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
+function wp_list_filter($list, $args = array(), $operator = 'AND') {
+	if ( ! is_array($list))
 		return array();
 
-	if ( empty( $args ) )
+	if (empty($args))
 		return $list;
 
-	$operator = strtoupper( $operator );
-	$count = count( $args );
+	$operator = strtoupper($operator);
+	$count = count($args);
 	$filtered = array();
 
-	foreach ( $list as $key => $obj ) {
+	foreach ($list as $key => $obj) {
 		$to_match = (array) $obj;
 
 		$matched = 0;
-		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
+		foreach ($args as $m_key => $m_value) {
+			if (array_key_exists($m_key, $to_match) && $m_value == $to_match[$m_key])
 				$matched++;
 		}
 
-		if ( ( 'AND' == $operator && $matched == $count )
-		  || ( 'OR' == $operator && $matched > 0 )
-		  || ( 'NOT' == $operator && 0 == $matched ) ) {
+		if (('AND' == $operator && $matched == $count)
+		  || ('OR' == $operator && $matched > 0)
+		  || ('NOT' == $operator && 0 == $matched)) {
 			$filtered[$key] = $obj;
 		}
 	}
@@ -3198,17 +3198,17 @@ 
  *               corresponding to `$index_key`. If `$index_key` is null, array keys from the original
  *               `$list` will be preserved in the results.
  */
-function wp_list_pluck( $list, $field, $index_key = null ) {
-	if ( ! $index_key ) {
+function wp_list_pluck($list, $field, $index_key = null) {
+	if ( ! $index_key) {
 		/*
 		 * This is simple. Could at some point wrap array_column()
 		 * if we knew we had an array of arrays.
 		 */
-		foreach ( $list as $key => $value ) {
-			if ( is_object( $value ) ) {
-				$list[ $key ] = $value->$field;
+		foreach ($list as $key => $value) {
+			if (is_object($value)) {
+				$list[$key] = $value->$field;
 			} else {
-				$list[ $key ] = $value[ $field ];
+				$list[$key] = $value[$field];
 			}
 		}
 		return $list;
@@ -3219,18 +3219,18 @@ 
 	 * to the end of the stack. This is how array_column() behaves.
 	 */
 	$newlist = array();
-	foreach ( $list as $value ) {
-		if ( is_object( $value ) ) {
-			if ( isset( $value->$index_key ) ) {
-				$newlist[ $value->$index_key ] = $value->$field;
+	foreach ($list as $value) {
+		if (is_object($value)) {
+			if (isset($value->$index_key)) {
+				$newlist[$value->$index_key] = $value->$field;
 			} else {
 				$newlist[] = $value->$field;
 			}
 		} else {
-			if ( isset( $value[ $index_key ] ) ) {
-				$newlist[ $value[ $index_key ] ] = $value[ $field ];
+			if (isset($value[$index_key])) {
+				$newlist[$value[$index_key]] = $value[$field];
 			} else {
-				$newlist[] = $value[ $field ];
+				$newlist[] = $value[$field];
 			}
 		}
 	}
@@ -3258,13 +3258,13 @@ 
 	 * @param bool $wp_maybe_load_widgets Whether to load the Widgets library.
 	 *                                    Default true.
 	 */
-	if ( ! apply_filters( 'load_default_widgets', true ) ) {
+	if ( ! apply_filters('load_default_widgets', true)) {
 		return;
 	}
 
-	require_once( ABSPATH . WPINC . '/default-widgets.php' );
+	require_once(ABSPATH.WPINC.'/default-widgets.php');
 
-	add_action( '_admin_menu', 'wp_widgets_add_menu' );
+	add_action('_admin_menu', 'wp_widgets_add_menu');
 }
 
 /**
@@ -3277,11 +3277,11 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
+	if ( ! current_theme_supports('widgets'))
 		return;
 
-	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
-	ksort( $submenu['themes.php'], SORT_NUMERIC );
+	$submenu['themes.php'][7] = array(__('Widgets'), 'edit_theme_options', 'widgets.php');
+	ksort($submenu['themes.php'], SORT_NUMERIC);
 }
 
 /**
@@ -3293,7 +3293,7 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
+	for ($i = 0; $i < $levels; $i++)
 		ob_end_flush();
 }
 
@@ -3321,29 +3321,29 @@ 
 	wp_load_translations_early();
 
 	// Load custom DB error template, if present.
-	if ( file_exists( WP_CONTENT_DIR . '/db-error.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/db-error.php' );
+	if (file_exists(WP_CONTENT_DIR.'/db-error.php')) {
+		require_once(WP_CONTENT_DIR.'/db-error.php');
 		die();
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( defined('WP_INSTALLING') || defined('WP_ADMIN') )
+	if (defined('WP_INSTALLING') || defined('WP_ADMIN'))
 		wp_die($wpdb->error);
 
 	// Otherwise, be terse.
-	status_header( 500 );
+	status_header(500);
 	nocache_headers();
-	header( 'Content-Type: text/html; charset=utf-8' );
+	header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php _e( 'Database Error' ); ?></title>
+	<title><?php _e('Database Error'); ?></title>
 
 </head>
 <body>
-	<h1><?php _e( 'Error establishing a database connection' ); ?></h1>
+	<h1><?php _e('Error establishing a database connection'); ?></h1>
 </body>
 </html>
 <?php
@@ -3358,8 +3358,8 @@ 
  * @param mixed $maybeint Data you wish to have converted to a non-negative integer.
  * @return int A non-negative integer.
  */
-function absint( $maybeint ) {
-	return abs( intval( $maybeint ) );
+function absint($maybeint) {
+	return abs(intval($maybeint));
 }
 
 /**
@@ -3380,7 +3380,7 @@ 
  * @param string $version     The version of WordPress that deprecated the function.
  * @param string $replacement Optional. The function that should have been called. Default null.
  */
-function _deprecated_function( $function, $version, $replacement = null ) {
+function _deprecated_function($function, $version, $replacement = null) {
 
 	/**
 	 * Fires when a deprecated function is called.
@@ -3391,7 +3391,7 @@ 
 	 * @param string $replacement The function that should have been called.
 	 * @param string $version     The version of WordPress that deprecated the function.
 	 */
-	do_action( 'deprecated_function_run', $function, $replacement, $version );
+	do_action('deprecated_function_run', $function, $replacement, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated functions.
@@ -3400,17 +3400,17 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+	if (WP_DEBUG && apply_filters('deprecated_function_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($replacement))
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement));
 			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version));
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			if ( ! is_null($replacement))
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement));
 			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version));
 		}
 	}
 }
@@ -3431,7 +3431,7 @@ 
  * @param string $class   The class containing the deprecated constructor.
  * @param string $version The version of WordPress that deprecated the function.
  */
-function _deprecated_constructor( $class, $version ) {
+function _deprecated_constructor($class, $version) {
 
 	/**
 	 * Fires when a deprecated constructor is called.
@@ -3441,7 +3441,7 @@ 
 	 * @param string $class   The class containing the deprecated constructor.
 	 * @param string $version The version of WordPress that deprecated the function.
 	 */
-	do_action( 'deprecated_constructor_run', $class, $version );
+	do_action('deprecated_constructor_run', $class, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated functions.
@@ -3452,11 +3452,11 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			trigger_error( sprintf( __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ), $class, $version, '<pre>__construct()</pre>' ) );
+	if (WP_DEBUG && apply_filters('deprecated_constructor_trigger_error', true)) {
+		if (function_exists('__')) {
+			trigger_error(sprintf(__('The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $class, $version, '<pre>__construct()</pre>'));
 		} else {
-			trigger_error( sprintf( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $class, $version, '<pre>__construct()</pre>' ) );
+			trigger_error(sprintf('The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $class, $version, '<pre>__construct()</pre>'));
 		}
 	}
 
@@ -3482,7 +3482,7 @@ 
  *                            Default null.
  * @param string $message     Optional. A message regarding the change. Default empty.
  */
-function _deprecated_file( $file, $version, $replacement = null, $message = '' ) {
+function _deprecated_file($file, $version, $replacement = null, $message = '') {
 
 	/**
 	 * Fires when a deprecated file is called.
@@ -3494,7 +3494,7 @@ 
 	 * @param string $version     The version of WordPress that deprecated the file.
 	 * @param string $message     A message regarding the change.
 	 */
-	do_action( 'deprecated_file_included', $file, $replacement, $version, $message );
+	do_action('deprecated_file_included', $file, $replacement, $version, $message);
 
 	/**
 	 * Filter whether to trigger an error for deprecated files.
@@ -3503,18 +3503,18 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated files. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
-		$message = empty( $message ) ? '' : ' ' . $message;
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+	if (WP_DEBUG && apply_filters('deprecated_file_trigger_error', true)) {
+		$message = empty($message) ? '' : ' '.$message;
+		if (function_exists('__')) {
+			if ( ! is_null($replacement))
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement).$message);
 			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version).$message);
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			if ( ! is_null($replacement))
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement).$message);
 			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version).$message);
 		}
 	}
 }
@@ -3544,7 +3544,7 @@ 
  * @param string $version  The version of WordPress that deprecated the argument used.
  * @param string $message  Optional. A message regarding the change. Default null.
  */
-function _deprecated_argument( $function, $version, $message = null ) {
+function _deprecated_argument($function, $version, $message = null) {
 
 	/**
 	 * Fires when a deprecated argument is called.
@@ -3555,7 +3555,7 @@ 
 	 * @param string $message  A message regarding the change.
 	 * @param string $version  The version of WordPress that deprecated the argument used.
 	 */
-	do_action( 'deprecated_argument_run', $function, $message, $version );
+	do_action('deprecated_argument_run', $function, $message, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated arguments.
@@ -3564,17 +3564,17 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated arguments. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+	if (WP_DEBUG && apply_filters('deprecated_argument_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($message))
+				trigger_error(sprintf(__('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message));
 			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error(sprintf(__('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version));
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			if ( ! is_null($message))
+				trigger_error(sprintf('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message));
 			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+				trigger_error(sprintf('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version));
 		}
 	}
 }
@@ -3595,7 +3595,7 @@ 
  * @param string $message  A message explaining what has been done incorrectly.
  * @param string $version  The version of WordPress where the message was added.
  */
-function _doing_it_wrong( $function, $message, $version ) {
+function _doing_it_wrong($function, $message, $version) {
 
 	/**
 	 * Fires when the given function is being used incorrectly.
@@ -3606,7 +3606,7 @@ 
 	 * @param string $message  A message explaining what has been done incorrectly.
 	 * @param string $version  The version of WordPress where the message was added.
 	 */
-	do_action( 'doing_it_wrong_run', $function, $message, $version );
+	do_action('doing_it_wrong_run', $function, $message, $version);
 
 	/**
 	 * Filter whether to trigger an error for _doing_it_wrong() calls.
@@ -3615,15 +3615,15 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for _doing_it_wrong() calls. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			$version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
-			$message .= ' ' . __( 'Please see <a href="https://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.' );
-			trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+	if (WP_DEBUG && apply_filters('doing_it_wrong_trigger_error', true)) {
+		if (function_exists('__')) {
+			$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s.)'), $version);
+			$message .= ' '.__('Please see <a href="https://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.');
+			trigger_error(sprintf(__('%1$s was called <strong>incorrectly</strong>. %2$s %3$s'), $function, $message, $version));
 		} else {
-			$version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $version );
+			$version = is_null($version) ? '' : sprintf('(This message was added in version %s.)', $version);
 			$message .= ' Please see <a href="https://codex.wordpress.org/Debugging_in_WordPress">Debugging in WordPress</a> for more information.';
-			trigger_error( sprintf( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version ) );
+			trigger_error(sprintf('%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version));
 		}
 	}
 }
@@ -3636,9 +3636,9 @@ 
  * @return bool Whether the server is running lighttpd < 1.5.0.
  */
 function is_lighttpd_before_150() {
-	$server_parts = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] )? $_SERVER['SERVER_SOFTWARE'] : '' );
-	$server_parts[1] = isset( $server_parts[1] )? $server_parts[1] : '';
-	return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
+	$server_parts = explode('/', isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '');
+	$server_parts[1] = isset($server_parts[1]) ? $server_parts[1] : '';
+	return  'lighttpd' == $server_parts[0] && -1 == version_compare($server_parts[1], '1.5.0');
 }
 
 /**
@@ -3655,18 +3655,18 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
+	if ( ! $is_apache)
 		return false;
 
-	if ( function_exists( 'apache_get_modules' ) ) {
+	if (function_exists('apache_get_modules')) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
+		if (in_array($mod, $mods))
 			return true;
-	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
+	} elseif (function_exists('phpinfo') && false === strpos(ini_get('disable_functions'), 'phpinfo')) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
+			if (false !== strpos($phpinfo, $mod))
 				return true;
 	}
 	return $default;
@@ -3685,7 +3685,7 @@ 
 	global $is_iis7;
 
 	$supports_permalinks = false;
-	if ( $is_iis7 ) {
+	if ($is_iis7) {
 		/* First we check if the DOMDocument class exists. If it does not exist, then we cannot
 		 * easily update the xml configuration file, hence we just bail out and tell user that
 		 * pretty permalinks cannot be used.
@@ -3695,7 +3695,7 @@ 
 		 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
 		 * via ISAPI then pretty permalinks will not work.
 		 */
-		$supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
+		$supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && (PHP_SAPI == 'cgi-fcgi');
 	}
 
 	/**
@@ -3705,7 +3705,7 @@ 
 	 *
 	 * @param bool $supports_permalinks Whether IIS7 supports permalinks. Default false.
 	 */
-	return apply_filters( 'iis7_supports_permalinks', $supports_permalinks );
+	return apply_filters('iis7_supports_permalinks', $supports_permalinks);
 }
 
 /**
@@ -3722,17 +3722,17 @@ 
  * @param array  $allowed_files List of allowed files.
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
-function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
+function validate_file($file, $allowed_files = '') {
+	if (false !== strpos($file, '..'))
 		return 1;
 
-	if ( false !== strpos( $file, './' ) )
+	if (false !== strpos($file, './'))
 		return 1;
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
+	if ( ! empty($allowed_files) && ! in_array($file, $allowed_files))
 		return 3;
 
-	if (':' == substr( $file, 1, 1 ) )
+	if (':' == substr($file, 1, 1))
 		return 2;
 
 	return 0;
@@ -3746,12 +3746,12 @@ 
  * @return bool True if SSL, false if not used.
  */
 function is_ssl() {
-	if ( isset($_SERVER['HTTPS']) ) {
-		if ( 'on' == strtolower($_SERVER['HTTPS']) )
+	if (isset($_SERVER['HTTPS'])) {
+		if ('on' == strtolower($_SERVER['HTTPS']))
 			return true;
-		if ( '1' == $_SERVER['HTTPS'] )
+		if ('1' == $_SERVER['HTTPS'])
 			return true;
-	} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
 		return true;
 	}
 	return false;
@@ -3767,8 +3767,8 @@ 
  * @param string|bool $force Optional Whether to force SSL login. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_login( $force = null ) {
-	return force_ssl_admin( $force );
+function force_ssl_login($force = null) {
+	return force_ssl_admin($force);
 }
 
 /**
@@ -3781,10 +3781,10 @@ 
  * @param string|bool $force Optional. Whether to force SSL in admin screens. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_admin( $force = null ) {
+function force_ssl_admin($force = null) {
 	static $forced = false;
 
-	if ( !is_null( $force ) ) {
+	if ( ! is_null($force)) {
 		$old_forced = $forced;
 		$forced = $force;
 		return $old_forced;
@@ -3804,39 +3804,39 @@ 
  * @return string The guessed URL.
  */
 function wp_guess_url() {
-	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+	if (defined('WP_SITEURL') && '' != WP_SITEURL) {
 		$url = WP_SITEURL;
 	} else {
-		$abspath_fix = str_replace( '\\', '/', ABSPATH );
-		$script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );
+		$abspath_fix = str_replace('\\', '/', ABSPATH);
+		$script_filename_dir = dirname($_SERVER['SCRIPT_FILENAME']);
 
 		// The request is for the admin
-		if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
-			$path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
+		if (strpos($_SERVER['REQUEST_URI'], 'wp-admin') !== false || strpos($_SERVER['REQUEST_URI'], 'wp-login.php') !== false) {
+			$path = preg_replace('#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI']);
 
 		// The request is for a file in ABSPATH
-		} elseif ( $script_filename_dir . '/' == $abspath_fix ) {
+		} elseif ($script_filename_dir.'/' == $abspath_fix) {
 			// Strip off any file/query params in the path
-			$path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
+			$path = preg_replace('#/[^/]*$#i', '', $_SERVER['PHP_SELF']);
 
 		} else {
-			if ( false !== strpos( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
+			if (false !== strpos($_SERVER['SCRIPT_FILENAME'], $abspath_fix)) {
 				// Request is hitting a file inside ABSPATH
-				$directory = str_replace( ABSPATH, '', $script_filename_dir );
+				$directory = str_replace(ABSPATH, '', $script_filename_dir);
 				// Strip off the sub directory, and any file/query params
-				$path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] );
-			} elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
+				$path = preg_replace('#/'.preg_quote($directory, '#').'/[^/]*$#i', '', $_SERVER['REQUEST_URI']);
+			} elseif (false !== strpos($abspath_fix, $script_filename_dir)) {
 				// Request is hitting a file above ABSPATH
-				$subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
+				$subdirectory = substr($abspath_fix, strpos($abspath_fix, $script_filename_dir) + strlen($script_filename_dir));
 				// Strip off any file/query params from the path, appending the sub directory to the install
-				$path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
+				$path = preg_replace('#/[^/]*$#i', '', $_SERVER['REQUEST_URI']).$subdirectory;
 			} else {
 				$path = $_SERVER['REQUEST_URI'];
 			}
 		}
 
 		$schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet
-		$url = $schema . $_SERVER['HTTP_HOST'] . $path;
+		$url = $schema.$_SERVER['HTTP_HOST'].$path;
 	}
 
 	return rtrim($url, '/');
@@ -3859,10 +3859,10 @@ 
  * @param bool $suspend Optional. Suspends additions if true, re-enables them if false.
  * @return bool The current suspend setting
  */
-function wp_suspend_cache_addition( $suspend = null ) {
+function wp_suspend_cache_addition($suspend = null) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
+	if (is_bool($suspend))
 		$_suspend = $suspend;
 
 	return $_suspend;
@@ -3882,7 +3882,7 @@ 
  * @param bool $suspend Optional. Whether to suspend or enable cache invalidation. Default true.
  * @return bool The current suspend setting.
  */
-function wp_suspend_cache_invalidation( $suspend = true ) {
+function wp_suspend_cache_invalidation($suspend = true) {
 	global $_wp_suspend_cache_invalidation;
 
 	$current_suspend = $_wp_suspend_cache_invalidation;
@@ -3902,14 +3902,14 @@ 
  * @return bool True if $site_id is the main site of the network, or if not
  *              running Multisite.
  */
-function is_main_site( $site_id = null ) {
+function is_main_site($site_id = null) {
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
+	if ( ! is_multisite())
 		return true;
 
-	if ( ! $site_id )
+	if ( ! $site_id)
 		$site_id = get_current_blog_id();
 
 	return (int) $site_id === (int) $current_site->blog_id;
@@ -3923,20 +3923,20 @@ 
  * @param int $network_id Optional. Network ID to test. Defaults to current network.
  * @return bool True if $network_id is the main network, or if not running Multisite.
  */
-function is_main_network( $network_id = null ) {
-	if ( ! is_multisite() ) {
+function is_main_network($network_id = null) {
+	if ( ! is_multisite()) {
 		return true;
 	}
 
 	$current_network_id = (int) get_current_site()->id;
 
-	if ( null === $network_id ) {
+	if (null === $network_id) {
 		$network_id = $current_network_id;
 	}
 
 	$network_id = (int) $network_id;
 
-	return ( $network_id === get_main_network_id() );
+	return ($network_id === get_main_network_id());
 }
 
 /**
@@ -3951,21 +3951,21 @@ 
 function get_main_network_id() {
 	global $wpdb;
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
-	if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
+	if (defined('PRIMARY_NETWORK_ID')) {
 		$main_network_id = PRIMARY_NETWORK_ID;
-	} elseif ( 1 === (int) get_current_site()->id ) {
+	} elseif (1 === (int) get_current_site()->id) {
 		// If the current network has an ID of 1, assume it is the main network.
 		$main_network_id = 1;
 	} else {
-		$main_network_id = wp_cache_get( 'primary_network_id', 'site-options' );
+		$main_network_id = wp_cache_get('primary_network_id', 'site-options');
 
-		if ( false === $main_network_id ) {
-			$main_network_id = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1" );
-			wp_cache_add( 'primary_network_id', $main_network_id, 'site-options' );
+		if (false === $main_network_id) {
+			$main_network_id = (int) $wpdb->get_var("SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1");
+			wp_cache_add('primary_network_id', $main_network_id, 'site-options');
 		}
 	}
 
@@ -3976,7 +3976,7 @@ 
 	 *
 	 * @param int $main_network_id The ID of the main network.
 	 */
-	return (int) apply_filters( 'get_main_network_id', $main_network_id );
+	return (int) apply_filters('get_main_network_id', $main_network_id);
 }
 
 /**
@@ -3989,11 +3989,11 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
+	if ( ! is_multisite())
 		return false;
 
 	static $global_terms = null;
-	if ( is_null( $global_terms ) ) {
+	if (is_null($global_terms)) {
 
 		/**
 		 * Filter whether global terms are enabled.
@@ -4005,11 +4005,11 @@ 
 		 *
 		 * @param null $enabled Whether global terms are enabled.
 		 */
-		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
+		$filter = apply_filters('global_terms_enabled', null);
+		if ( ! is_null($filter))
 			$global_terms = (bool) $filter;
 		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+			$global_terms = (bool) get_site_option('global_terms_enabled', false);
 	}
 	return $global_terms;
 }
@@ -4024,16 +4024,16 @@ 
  * @return float|false Timezone GMT offset, false otherwise.
  */
 function wp_timezone_override_offset() {
-	if ( !$timezone_string = get_option( 'timezone_string' ) ) {
+	if ( ! $timezone_string = get_option('timezone_string')) {
 		return false;
 	}
 
-	$timezone_object = timezone_open( $timezone_string );
+	$timezone_object = timezone_open($timezone_string);
 	$datetime_object = date_create();
-	if ( false === $timezone_object || false === $datetime_object ) {
+	if (false === $timezone_object || false === $datetime_object) {
 		return false;
 	}
-	return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
+	return round(timezone_offset_get($timezone_object, $datetime_object) / HOUR_IN_SECONDS, 2);
 }
 
 /**
@@ -4046,41 +4046,41 @@ 
  * @param array $b
  * @return int
  */
-function _wp_timezone_choice_usort_callback( $a, $b ) {
+function _wp_timezone_choice_usort_callback($a, $b) {
 	// Don't use translated versions of Etc
-	if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) {
+	if ('Etc' === $a['continent'] && 'Etc' === $b['continent']) {
 		// Make the order of these more like the old dropdown
-		if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) {
-			return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );
+		if ('GMT+' === substr($a['city'], 0, 4) && 'GMT+' === substr($b['city'], 0, 4)) {
+			return -1 * (strnatcasecmp($a['city'], $b['city']));
 		}
-		if ( 'UTC' === $a['city'] ) {
-			if ( 'GMT+' === substr( $b['city'], 0, 4 ) ) {
+		if ('UTC' === $a['city']) {
+			if ('GMT+' === substr($b['city'], 0, 4)) {
 				return 1;
 			}
 			return -1;
 		}
-		if ( 'UTC' === $b['city'] ) {
-			if ( 'GMT+' === substr( $a['city'], 0, 4 ) ) {
+		if ('UTC' === $b['city']) {
+			if ('GMT+' === substr($a['city'], 0, 4)) {
 				return -1;
 			}
 			return 1;
 		}
-		return strnatcasecmp( $a['city'], $b['city'] );
+		return strnatcasecmp($a['city'], $b['city']);
 	}
-	if ( $a['t_continent'] == $b['t_continent'] ) {
-		if ( $a['t_city'] == $b['t_city'] ) {
-			return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] );
+	if ($a['t_continent'] == $b['t_continent']) {
+		if ($a['t_city'] == $b['t_city']) {
+			return strnatcasecmp($a['t_subcity'], $b['t_subcity']);
 		}
-		return strnatcasecmp( $a['t_city'], $b['t_city'] );
+		return strnatcasecmp($a['t_city'], $b['t_city']);
 	} else {
 		// Force Etc to the bottom of the list
-		if ( 'Etc' === $a['continent'] ) {
+		if ('Etc' === $a['continent']) {
 			return 1;
 		}
-		if ( 'Etc' === $b['continent'] ) {
+		if ('Etc' === $b['continent']) {
 			return -1;
 		}
-		return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
+		return strnatcasecmp($a['t_continent'], $b['t_continent']);
 	}
 }
 
@@ -4094,125 +4094,125 @@ 
  * @param string $selected_zone Selected timezone.
  * @return string
  */
-function wp_timezone_choice( $selected_zone ) {
+function wp_timezone_choice($selected_zone) {
 	static $mo_loaded = false;
 
-	$continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
+	$continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
 
 	// Load translations for continents and cities
-	if ( !$mo_loaded ) {
+	if ( ! $mo_loaded) {
 		$locale = get_locale();
-		$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-		load_textdomain( 'continents-cities', $mofile );
+		$mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
+		load_textdomain('continents-cities', $mofile);
 		$mo_loaded = true;
 	}
 
 	$zonen = array();
-	foreach ( timezone_identifiers_list() as $zone ) {
-		$zone = explode( '/', $zone );
-		if ( !in_array( $zone[0], $continents ) ) {
+	foreach (timezone_identifiers_list() as $zone) {
+		$zone = explode('/', $zone);
+		if ( ! in_array($zone[0], $continents)) {
 			continue;
 		}
 
 		// This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
 		$exists = array(
-			0 => ( isset( $zone[0] ) && $zone[0] ),
-			1 => ( isset( $zone[1] ) && $zone[1] ),
-			2 => ( isset( $zone[2] ) && $zone[2] ),
+			0 => (isset($zone[0]) && $zone[0]),
+			1 => (isset($zone[1]) && $zone[1]),
+			2 => (isset($zone[2]) && $zone[2]),
 		);
-		$exists[3] = ( $exists[0] && 'Etc' !== $zone[0] );
-		$exists[4] = ( $exists[1] && $exists[3] );
-		$exists[5] = ( $exists[2] && $exists[3] );
+		$exists[3] = ($exists[0] && 'Etc' !== $zone[0]);
+		$exists[4] = ($exists[1] && $exists[3]);
+		$exists[5] = ($exists[2] && $exists[3]);
 
 		$zonen[] = array(
-			'continent'   => ( $exists[0] ? $zone[0] : '' ),
-			'city'        => ( $exists[1] ? $zone[1] : '' ),
-			'subcity'     => ( $exists[2] ? $zone[2] : '' ),
-			't_continent' => ( $exists[3] ? translate( str_replace( '_', ' ', $zone[0] ), 'continents-cities' ) : '' ),
-			't_city'      => ( $exists[4] ? translate( str_replace( '_', ' ', $zone[1] ), 'continents-cities' ) : '' ),
-			't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' )
+			'continent'   => ($exists[0] ? $zone[0] : ''),
+			'city'        => ($exists[1] ? $zone[1] : ''),
+			'subcity'     => ($exists[2] ? $zone[2] : ''),
+			't_continent' => ($exists[3] ? translate(str_replace('_', ' ', $zone[0]), 'continents-cities') : ''),
+			't_city'      => ($exists[4] ? translate(str_replace('_', ' ', $zone[1]), 'continents-cities') : ''),
+			't_subcity'   => ($exists[5] ? translate(str_replace('_', ' ', $zone[2]), 'continents-cities') : '')
 		);
 	}
-	usort( $zonen, '_wp_timezone_choice_usort_callback' );
+	usort($zonen, '_wp_timezone_choice_usort_callback');
 
 	$structure = array();
 
-	if ( empty( $selected_zone ) ) {
-		$structure[] = '<option selected="selected" value="">' . __( 'Select a city' ) . '</option>';
+	if (empty($selected_zone)) {
+		$structure[] = '<option selected="selected" value="">'.__('Select a city').'</option>';
 	}
 
-	foreach ( $zonen as $key => $zone ) {
+	foreach ($zonen as $key => $zone) {
 		// Build value in an array to join later
-		$value = array( $zone['continent'] );
+		$value = array($zone['continent']);
 
-		if ( empty( $zone['city'] ) ) {
+		if (empty($zone['city'])) {
 			// It's at the continent level (generally won't happen)
 			$display = $zone['t_continent'];
 		} else {
 			// It's inside a continent group
 
 			// Continent optgroup
-			if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
+			if ( ! isset($zonen[$key - 1]) || $zonen[$key - 1]['continent'] !== $zone['continent']) {
 				$label = $zone['t_continent'];
-				$structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
+				$structure[] = '<optgroup label="'.esc_attr($label).'">';
 			}
 
 			// Add the city to the value
 			$value[] = $zone['city'];
 
 			$display = $zone['t_city'];
-			if ( !empty( $zone['subcity'] ) ) {
+			if ( ! empty($zone['subcity'])) {
 				// Add the subcity to the value
 				$value[] = $zone['subcity'];
-				$display .= ' - ' . $zone['t_subcity'];
+				$display .= ' - '.$zone['t_subcity'];
 			}
 		}
 
 		// Build the value
-		$value = join( '/', $value );
+		$value = join('/', $value);
 		$selected = '';
-		if ( $value === $selected_zone ) {
+		if ($value === $selected_zone) {
 			$selected = 'selected="selected" ';
 		}
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
+		$structure[] = '<option '.$selected.'value="'.esc_attr($value).'">'.esc_html($display)."</option>";
 
 		// Close continent optgroup
-		if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
+		if ( ! empty($zone['city']) && ( ! isset($zonen[$key + 1]) || (isset($zonen[$key + 1]) && $zonen[$key + 1]['continent'] !== $zone['continent']))) {
 			$structure[] = '</optgroup>';
 		}
 	}
 
 	// Do UTC
-	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
+	$structure[] = '<optgroup label="'.esc_attr__('UTC').'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
+	if ('UTC' === $selected_zone)
 		$selected = 'selected="selected" ';
-	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
+	$structure[] = '<option '.$selected.'value="'.esc_attr('UTC').'">'.__('UTC').'</option>';
 	$structure[] = '</optgroup>';
 
 	// Do manual UTC offsets
-	$structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
-	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
+	$structure[] = '<optgroup label="'.esc_attr__('Manual Offsets').'">';
+	$offset_range = array(-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
-	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
+	foreach ($offset_range as $offset) {
+		if (0 <= $offset)
+			$offset_name = '+'.$offset;
 		else
 			$offset_name = (string) $offset;
 
 		$offset_value = $offset_name;
-		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
-		$offset_name = 'UTC' . $offset_name;
-		$offset_value = 'UTC' . $offset_value;
+		$offset_name = str_replace(array('.25', '.5', '.75'), array(':15', ':30', ':45'), $offset_name);
+		$offset_name = 'UTC'.$offset_name;
+		$offset_value = 'UTC'.$offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
+		if ($offset_value === $selected_zone)
 			$selected = 'selected="selected" ';
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+		$structure[] = '<option '.$selected.'value="'.esc_attr($offset_value).'">'.esc_html($offset_name)."</option>";
 
 	}
 	$structure[] = '</optgroup>';
 
-	return join( "\n", $structure );
+	return join("\n", $structure);
 }
 
 /**
@@ -4226,7 +4226,7 @@ 
  * @param string $str Header comment to clean up.
  * @return string
  */
-function _cleanup_header_comment( $str ) {
+function _cleanup_header_comment($str) {
 	return trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $str));
 }
 
@@ -4243,18 +4243,18 @@ 
 function wp_scheduled_delete() {
 	global $wpdb;
 
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	$posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
 
-	foreach ( (array) $posts_to_delete as $post ) {
+	foreach ((array) $posts_to_delete as $post) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
+		if ( ! $post_id)
 			continue;
 
 		$del_post = get_post($post_id);
 
-		if ( !$del_post || 'trash' != $del_post->post_status ) {
+		if ( ! $del_post || 'trash' != $del_post->post_status) {
 			delete_post_meta($post_id, '_wp_trash_meta_status');
 			delete_post_meta($post_id, '_wp_trash_meta_time');
 		} else {
@@ -4264,14 +4264,14 @@ 
 
 	$comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
 
-	foreach ( (array) $comments_to_delete as $comment ) {
+	foreach ((array) $comments_to_delete as $comment) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
+		if ( ! $comment_id)
 			continue;
 
 		$del_comment = get_comment($comment_id);
 
-		if ( !$del_comment || 'trash' != $del_comment->comment_approved ) {
+		if ( ! $del_comment || 'trash' != $del_comment->comment_approved) {
 			delete_comment_meta($comment_id, '_wp_trash_meta_time');
 			delete_comment_meta($comment_id, '_wp_trash_meta_status');
 		} else {
@@ -4300,18 +4300,18 @@ 
  *                                Default empty.
  * @return array Array of file headers in `HeaderKey => Header Value` format.
  */
-function get_file_data( $file, $default_headers, $context = '' ) {
+function get_file_data($file, $default_headers, $context = '') {
 	// We don't need to write to the file, so just open for reading.
-	$fp = fopen( $file, 'r' );
+	$fp = fopen($file, 'r');
 
 	// Pull only the first 8kiB of the file in.
-	$file_data = fread( $fp, 8192 );
+	$file_data = fread($fp, 8192);
 
 	// PHP will close file handle, but we are good citizens.
-	fclose( $fp );
+	fclose($fp);
 
 	// Make sure we catch CR-only line endings.
-	$file_data = str_replace( "\r", "\n", $file_data );
+	$file_data = str_replace("\r", "\n", $file_data);
 
 	/**
 	 * Filter extra file headers by context.
@@ -4323,18 +4323,18 @@ 
 	 *
 	 * @param array $extra_context_headers Empty array by default.
 	 */
-	if ( $context && $extra_headers = apply_filters( "extra_{$context}_headers", array() ) ) {
-		$extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values
-		$all_headers = array_merge( $extra_headers, (array) $default_headers );
+	if ($context && $extra_headers = apply_filters("extra_{$context}_headers", array())) {
+		$extra_headers = array_combine($extra_headers, $extra_headers); // keys equal values
+		$all_headers = array_merge($extra_headers, (array) $default_headers);
 	} else {
 		$all_headers = $default_headers;
 	}
 
-	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+	foreach ($all_headers as $field => $regex) {
+		if (preg_match('/^[ \t\/*#@]*'.preg_quote($regex, '/').':(.*)$/mi', $file_data, $match) && $match[1])
+			$all_headers[$field] = _cleanup_header_comment($match[1]);
 		else
-			$all_headers[ $field ] = '';
+			$all_headers[$field] = '';
 	}
 
 	return $all_headers;
@@ -4433,7 +4433,7 @@ 
  * @see http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
  */
 function send_nosniff_header() {
-	@header( 'X-Content-Type-Options: nosniff' );
+	@header('X-Content-Type-Options: nosniff');
 }
 
 /**
@@ -4445,8 +4445,8 @@ 
  * @param string $column Database column.
  * @return string SQL clause.
  */
-function _wp_mysql_week( $column ) {
-	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
+function _wp_mysql_week($column) {
+	switch ($start_of_week = (int) get_option('start_of_week')) {
 	case 1 :
 		return "WEEK( $column, 1 )";
 	case 2 :
@@ -4474,13 +4474,13 @@ 
  * @param array    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
-function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
-	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
+function wp_find_hierarchy_loop($callback, $start, $start_parent, $callback_args = array()) {
+	$override = is_null($start_parent) ? array() : array($start => $start_parent);
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
+	if ( ! $arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare($callback, $start, $override, $callback_args))
 		return array();
 
-	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
+	return wp_find_hierarchy_loop_tortoise_hare($callback, $arbitrary_loop_member, $override, $callback_args, true);
 }
 
 /**
@@ -4503,7 +4503,7 @@ 
  * @return mixed Scalar ID of some arbitrary member of the loop, or array of IDs of all members of loop if
  *               $_return_loop
  */
-function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = array(), $callback_args = array(), $_return_loop = false ) {
+function wp_find_hierarchy_loop_tortoise_hare($callback, $start, $override = array(), $callback_args = array(), $_return_loop = false) {
 	$tortoise = $hare = $evanescent_hare = $start;
 	$return = array();
 
@@ -4512,19 +4512,19 @@ 
 	while (
 		$tortoise
 	&&
-		( $evanescent_hare = isset( $override[$hare] ) ? $override[$hare] : call_user_func_array( $callback, array_merge( array( $hare ), $callback_args ) ) )
+		($evanescent_hare = isset($override[$hare]) ? $override[$hare] : call_user_func_array($callback, array_merge(array($hare), $callback_args)))
 	&&
-		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
+		($hare = isset($override[$evanescent_hare]) ? $override[$evanescent_hare] : call_user_func_array($callback, array_merge(array($evanescent_hare), $callback_args)))
 	) {
-		if ( $_return_loop )
+		if ($_return_loop)
 			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
+		if ($tortoise == $evanescent_hare || $tortoise == $hare)
 			return $_return_loop ? $return : $tortoise;
 
 		// Increment tortoise by one step
-		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
+		$tortoise = isset($override[$tortoise]) ? $override[$tortoise] : call_user_func_array($callback, array_merge(array($tortoise), $callback_args));
 	}
 
 	return false;
@@ -4538,7 +4538,7 @@ 
  * @see https://developer.mozilla.org/en/the_x-frame-options_response_header
  */
 function send_frame_options_header() {
-	@header( 'X-Frame-Options: SAMEORIGIN' );
+	@header('X-Frame-Options: SAMEORIGIN');
 }
 
 /**
@@ -4559,8 +4559,8 @@ 
 function wp_allowed_protocols() {
 	static $protocols = array();
 
-	if ( empty( $protocols ) ) {
-		$protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal' );
+	if (empty($protocols)) {
+		$protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal');
 
 		/**
 		 * Filter the list of protocols allowed in HTML attributes.
@@ -4569,7 +4569,7 @@ 
 		 *
 		 * @param array $protocols Array of allowed protocols e.g. 'http', 'ftp', 'tel', and more.
 		 */
-		$protocols = apply_filters( 'kses_allowed_protocols', $protocols );
+		$protocols = apply_filters('kses_allowed_protocols', $protocols);
 	}
 
 	return $protocols;
@@ -4592,36 +4592,36 @@ 
  * @return string|array Either a string containing a reversed comma separated trace or an array
  *                      of individual calls.
  */
-function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
+function wp_debug_backtrace_summary($ignore_class = null, $skip_frames = 0, $pretty = true) {
+	if (version_compare(PHP_VERSION, '5.2.5', '>='))
+		$trace = debug_backtrace(false);
 	else
 		$trace = debug_backtrace();
 
 	$caller = array();
-	$check_class = ! is_null( $ignore_class );
+	$check_class = ! is_null($ignore_class);
 	$skip_frames++; // skip this function
 
-	foreach ( $trace as $call ) {
-		if ( $skip_frames > 0 ) {
+	foreach ($trace as $call) {
+		if ($skip_frames > 0) {
 			$skip_frames--;
-		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
+		} elseif (isset($call['class'])) {
+			if ($check_class && $ignore_class == $call['class'])
 				continue; // Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
-			if ( in_array( $call['function'], array( 'do_action', 'apply_filters' ) ) ) {
+			if (in_array($call['function'], array('do_action', 'apply_filters'))) {
 				$caller[] = "{$call['function']}('{$call['args'][0]}')";
-			} elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
-				$caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+			} elseif (in_array($call['function'], array('include', 'include_once', 'require', 'require_once'))) {
+				$caller[] = $call['function']."('".str_replace(array(WP_CONTENT_DIR, ABSPATH), '', $call['args'][0])."')";
 			} else {
 				$caller[] = $call['function'];
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
+	if ($pretty)
+		return join(', ', array_reverse($caller));
 	else
 		return $caller;
 }
@@ -4637,11 +4637,11 @@ 
  *
  * @return array List of ids not present in the cache.
  */
-function _get_non_cached_ids( $object_ids, $cache_key ) {
+function _get_non_cached_ids($object_ids, $cache_key) {
 	$clean = array();
-	foreach ( $object_ids as $id ) {
+	foreach ($object_ids as $id) {
 		$id = (int) $id;
-		if ( !wp_cache_get( $id, $cache_key ) ) {
+		if ( ! wp_cache_get($id, $cache_key)) {
 			$clean[] = $id;
 		}
 	}
@@ -4658,15 +4658,15 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
+	if ( ! wp_is_mobile())
 		return true;
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
-	if ( strpos($ua, 'iPhone') !== false
+	if (strpos($ua, 'iPhone') !== false
 		|| strpos($ua, 'iPad') !== false
-		|| strpos($ua, 'iPod') !== false ) {
-			return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
+		|| strpos($ua, 'iPod') !== false) {
+			return preg_match('#OS ([\d_]+) like Mac OS X#', $ua, $version) && version_compare($version[1], '6', '>=');
 	}
 
 	return true;
@@ -4678,11 +4678,11 @@ 
  * @param string $path The resource path or URL.
  * @return bool True if the path is a stream URL.
  */
-function wp_is_stream( $path ) {
+function wp_is_stream($path) {
 	$wrappers = stream_get_wrappers();
-	$wrappers_re = '(' . join('|', $wrappers) . ')';
+	$wrappers_re = '('.join('|', $wrappers).')';
 
-	return preg_match( "!^$wrappers_re://!", $path ) === 1;
+	return preg_match("!^$wrappers_re://!", $path) === 1;
 }
 
 /**
@@ -4698,7 +4698,7 @@ 
  * @param  string $source_date The date to filter.
  * @return bool True if valid date, false if not valid date.
  */
-function wp_checkdate( $month, $day, $year, $source_date ) {
+function wp_checkdate($month, $day, $year, $source_date) {
 	/**
 	 * Filter whether the given date is valid for the Gregorian calendar.
 	 *
@@ -4707,7 +4707,7 @@ 
 	 * @param bool   $checkdate   Whether the given date is valid.
 	 * @param string $source_date Date to check.
 	 */
-	return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
+	return apply_filters('wp_checkdate', checkdate($month, $day, $year), $source_date);
 }
 
 /**
@@ -4722,15 +4722,15 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
+	if ( ! is_admin() && ! is_user_logged_in())
 		return;
 
-	if ( defined( 'IFRAME_REQUEST' ) )
+	if (defined('IFRAME_REQUEST'))
 		return;
 
 	$screen = get_current_screen();
-	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
-	$show = ! in_array( $screen->id, $hidden );
+	$hidden = array('update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network');
+	$show = ! in_array($screen->id, $hidden);
 
 	/**
 	 * Filter whether to load the authentication check.
@@ -4743,12 +4743,12 @@ 
 	 * @param bool      $show   Whether to load the authentication check.
 	 * @param WP_Screen $screen The current screen object.
 	 */
-	if ( apply_filters( 'wp_auth_check_load', $show, $screen ) ) {
-		wp_enqueue_style( 'wp-auth-check' );
-		wp_enqueue_script( 'wp-auth-check' );
+	if (apply_filters('wp_auth_check_load', $show, $screen)) {
+		wp_enqueue_style('wp-auth-check');
+		wp_enqueue_script('wp-auth-check');
 
-		add_action( 'admin_print_footer_scripts', 'wp_auth_check_html', 5 );
-		add_action( 'wp_print_footer_scripts', 'wp_auth_check_html', 5 );
+		add_action('admin_print_footer_scripts', 'wp_auth_check_html', 5);
+		add_action('wp_print_footer_scripts', 'wp_auth_check_html', 5);
 	}
 }
 
@@ -4759,8 +4759,8 @@ 
  */
 function wp_auth_check_html() {
 	$login_url = wp_login_url();
-	$current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
-	$same_domain = ( strpos( $login_url, $current_domain ) === 0 );
+	$current_domain = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'];
+	$same_domain = (strpos($login_url, $current_domain) === 0);
 
 	/**
 	 * Filter whether the authentication check originated at the same domain.
@@ -4769,7 +4769,7 @@ 
 	 *
 	 * @param bool $same_domain Whether the authentication check originated at the same domain.
 	 */
-	$same_domain = apply_filters( 'wp_auth_check_same_domain', $same_domain );
+	$same_domain = apply_filters('wp_auth_check_same_domain', $same_domain);
 	$wrap_class = $same_domain ? 'hidden' : 'hidden fallback';
 
 	?>
@@ -4779,16 +4779,16 @@ 
 	<div class="wp-auth-check-close" tabindex="0" title="<?php esc_attr_e('Close'); ?>"></div>
 	<?php
 
-	if ( $same_domain ) {
+	if ($same_domain) {
 		?>
-		<div id="wp-auth-check-form" data-src="<?php echo esc_url( add_query_arg( array( 'interim-login' => 1 ), $login_url ) ); ?>"></div>
+		<div id="wp-auth-check-form" data-src="<?php echo esc_url(add_query_arg(array('interim-login' => 1), $login_url)); ?>"></div>
 		<?php
 	}
 
 	?>
 	<div class="wp-auth-fallback">
 		<p><b class="wp-auth-fallback-expired" tabindex="0"><?php _e('Session expired'); ?></b></p>
-		<p><a href="<?php echo esc_url( $login_url ); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
+		<p><a href="<?php echo esc_url($login_url); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
 		<?php _e('The login page will open in a new window. After logging in you can close it and return to this page.'); ?></p>
 	</div>
 	</div>
@@ -4809,8 +4809,8 @@ 
  * @param array $response  The Heartbeat response.
  * @return array $response The Heartbeat response with 'wp-auth-check' value set.
  */
-function wp_auth_check( $response ) {
-	$response['wp-auth-check'] = is_user_logged_in() && empty( $GLOBALS['login_grace_period'] );
+function wp_auth_check($response) {
+	$response['wp-auth-check'] = is_user_logged_in() && empty($GLOBALS['login_grace_period']);
 	return $response;
 }
 
@@ -4830,10 +4830,10 @@ 
  * @param string $tag An HTML tag name. Example: 'video'.
  * @return string Tag RegEx.
  */
-function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
+function get_tag_regex($tag) {
+	if (empty($tag))
 		return;
-	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
+	return sprintf('<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape($tag));
 }
 
 /**
@@ -4848,13 +4848,13 @@ 
  * @param string $charset A charset name.
  * @return string The canonical form of the charset.
  */
-function _canonical_charset( $charset ) {
-	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
+function _canonical_charset($charset) {
+	if ('UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
+		'UTF8' === $charset)
 		return 'UTF-8';
 
-	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
+	if ('ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset)
 		return 'ISO-8859-1';
 
 	return $charset;
@@ -4886,25 +4886,25 @@ 
  * @param bool $reset Optional. Whether to reset the encoding back to a previously-set encoding.
  *                    Default false.
  */
-function mbstring_binary_safe_encoding( $reset = false ) {
+function mbstring_binary_safe_encoding($reset = false) {
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if (is_null($overloaded))
+		$overloaded = function_exists('mb_internal_encoding') && (ini_get('mbstring.func_overload') & 2);
 
-	if ( false === $overloaded )
+	if (false === $overloaded)
 		return;
 
-	if ( ! $reset ) {
+	if ( ! $reset) {
 		$encoding = mb_internal_encoding();
-		array_push( $encodings, $encoding );
-		mb_internal_encoding( 'ISO-8859-1' );
+		array_push($encodings, $encoding);
+		mb_internal_encoding('ISO-8859-1');
 	}
 
-	if ( $reset && $encodings ) {
-		$encoding = array_pop( $encodings );
-		mb_internal_encoding( $encoding );
+	if ($reset && $encodings) {
+		$encoding = array_pop($encodings);
+		mb_internal_encoding($encoding);
 	}
 }
 
@@ -4916,7 +4916,7 @@ 
  * @since 3.7.0
  */
 function reset_mbstring_encoding() {
-	mbstring_binary_safe_encoding( true );
+	mbstring_binary_safe_encoding(true);
 }
 
 /**
@@ -4929,12 +4929,12 @@ 
  * @param mixed $var Boolean value to validate.
  * @return bool Whether the value is validated.
  */
-function wp_validate_boolean( $var ) {
-	if ( is_bool( $var ) ) {
+function wp_validate_boolean($var) {
+	if (is_bool($var)) {
 		return $var;
 	}
 
-	if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
+	if (is_string($var) && 'false' === strtolower($var)) {
 		return false;
 	}
 
@@ -4948,7 +4948,7 @@ 
  *
  * @param string $file The path to the file to delete.
  */
-function wp_delete_file( $file ) {
+function wp_delete_file($file) {
 	/**
 	 * Filter the path of the file to delete.
 	 *
@@ -4956,9 +4956,9 @@ 
 	 *
 	 * @param string $medium Path to the file to delete.
 	 */
-	$delete = apply_filters( 'wp_delete_file', $file );
-	if ( ! empty( $delete ) ) {
-		@unlink( $delete );
+	$delete = apply_filters('wp_delete_file', $file);
+	if ( ! empty($delete)) {
+		@unlink($delete);
 	}
 }
 
@@ -4972,12 +4972,12 @@ 
 function wp_post_preview_js() {
 	global $post;
 
-	if ( ! is_preview() || empty( $post ) ) {
+	if ( ! is_preview() || empty($post)) {
 		return;
 	}
 
 	// Has to match the window name used in post_submit_meta_box()
-	$name = 'wp-preview-' . (int) $post->ID;
+	$name = 'wp-preview-'.(int) $post->ID;
 
 	?>
 	<script>

Braces +569 added lines, -403 removed lines

@@ -24,22 +24,26 @@ 
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
 function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
-		return false;
+	if ( empty( $date ) ) {
+			return false;
+	}
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ( 'G' == $format ) {
+			return strtotime( $date . ' +0000' );
+	}
 
 	$i = strtotime( $date );
 
-	if ( 'U' == $format )
-		return $i;
+	if ( 'U' == $format ) {
+			return $i;
+	}
 
-	if ( $translate )
-		return date_i18n( $format, $i );
-	else
-		return date( $format, $i );
-}
+	if ( $translate ) {
+			return date_i18n( $format, $i );
+	} else {
+			return date( $format, $i );
+	}
+	}
 
 /**
  * Retrieve the current time based on specified type.
@@ -91,10 +95,11 @@ 
 	$i = $unixtimestamp;
 
 	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
-		else
-			$i = time();
+		if ( ! $gmt ) {
+					$i = current_time( 'timestamp' );
+		} else {
+					$i = time();
+		}
 		// we should not let date() interfere with our
 		// specially computed timestamp
 		$gmt = true;
@@ -247,11 +252,13 @@ 
 	// The day of the week from the timestamp.
 	$weekday = date( 'w', $day );
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( !is_numeric($start_of_week) ) {
+			$start_of_week = get_option( 'start_of_week' );
+	}
 
-	if ( $weekday < $start_of_week )
-		$weekday += 7;
+	if ( $weekday < $start_of_week ) {
+			$weekday += 7;
+	}
 
 	// The most recent week start day on or before $day.
 	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
@@ -270,8 +277,10 @@ 
  * @return mixed Unserialized data can be any type.
  */
 function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
+	if ( is_serialized( $original ) ) {
+		// don't attempt to unserialize data that wasn't serialized going in
 		return @unserialize( $original );
+	}
 	return $original;
 }
 
@@ -311,13 +320,16 @@ 
 		$semicolon = strpos( $data, ';' );
 		$brace     = strpos( $data, '}' );
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
-			return false;
+		if ( false === $semicolon && false === $brace ) {
+					return false;
+		}
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
-			return false;
-		if ( false !== $brace && $brace < 4 )
-			return false;
+		if ( false !== $semicolon && $semicolon < 3 ) {
+					return false;
+		}
+		if ( false !== $brace && $brace < 4 ) {
+					return false;
+		}
 	}
 	$token = $data[0];
 	switch ( $token ) {
@@ -380,14 +392,16 @@ 
  * @return mixed A scalar data
  */
 function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+	if ( is_array( $data ) || is_object( $data ) ) {
+			return serialize( $data );
+	}
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if ( is_serialized( $data, false ) ) {
+			return serialize( $data );
+	}
 
 	return $data;
 }
@@ -515,20 +529,23 @@ 
 	foreach ( $pung as $link_test ) {
 		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
 			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+			foreach ( $mids as $mid ) {
+							delete_metadata_by_mid( 'post', $mid );
+			}
 		}
 	}
 
 	foreach ( (array) $post_links_temp as $link_test ) {
 		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
 			$test = @parse_url( $link_test );
-			if ( false === $test )
-				continue;
-			if ( isset( $test['query'] ) )
-				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
-				$post_links[] = $link_test;
+			if ( false === $test ) {
+							continue;
+			}
+			if ( isset( $test['query'] ) ) {
+							$post_links[] = $link_test;
+			} elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) ) {
+							$post_links[] = $link_test;
+			}
 		}
 	}
 
@@ -580,21 +597,24 @@ 
 function wp_get_http( $url, $file_path = false, $red = 1 ) {
 	@set_time_limit( 60 );
 
-	if ( $red > 5 )
-		return false;
+	if ( $red > 5 ) {
+			return false;
+	}
 
 	$options = array();
 	$options['redirection'] = 5;
 
-	if ( false == $file_path )
-		$options['method'] = 'HEAD';
-	else
-		$options['method'] = 'GET';
+	if ( false == $file_path ) {
+			$options['method'] = 'HEAD';
+	} else {
+			$options['method'] = 'GET';
+	}
 
 	$response = wp_safe_remote_request( $url, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$headers = wp_remote_retrieve_headers( $response );
 	$headers['response'] = wp_remote_retrieve_response_code( $response );
@@ -604,13 +624,15 @@ 
 		return wp_get_http( $headers['location'], $file_path, ++$red );
 	}
 
-	if ( false == $file_path )
-		return $headers;
+	if ( false == $file_path ) {
+			return $headers;
+	}
 
 	// GET request - write it to the supplied filename
 	$out_fp = fopen($file_path, 'w');
-	if ( !$out_fp )
-		return $headers;
+	if ( !$out_fp ) {
+			return $headers;
+	}
 
 	fwrite( $out_fp,  wp_remote_retrieve_body( $response ) );
 	fclose($out_fp);
@@ -629,13 +651,15 @@ 
  * @return bool|string False on failure, headers on success.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7' );
+	}
 
 	$response = wp_safe_remote_head( $url );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_headers( $response );
 }
@@ -653,11 +677,12 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
-		return 1;
-	else
-		return 0;
-}
+	if ( $currentday != $previousday ) {
+			return 1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Build URL query based on an associative and, or indexed array.
@@ -700,27 +725,33 @@ 
 	$ret = array();
 
 	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
-			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
-			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
-			continue;
-		elseif ( $v === false )
-			$v = '0';
+		if ( $urlencode) {
+					$k = urlencode($k);
+		}
+		if ( is_int($k) && $prefix != null ) {
+					$k = $prefix.$k;
+		}
+		if ( !empty($key) ) {
+					$k = $key . '%5B' . $k . '%5D';
+		}
+		if ( $v === null ) {
+					continue;
+		} elseif ( $v === false ) {
+					$v = '0';
+		}
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
-			array_push($ret, $k.'='.urlencode($v));
-		else
-			array_push($ret, $k.'='.$v);
+		if ( is_array($v) || is_object($v) ) {
+					array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
+		} elseif ( $urlencode ) {
+					array_push($ret, $k.'='.urlencode($v));
+		} else {
+					array_push($ret, $k.'='.$v);
+		}
 	}
 
-	if ( null === $sep )
-		$sep = ini_get('arg_separator.output');
+	if ( null === $sep ) {
+			$sep = ini_get('arg_separator.output');
+	}
 
 	return implode($sep, $ret);
 }
@@ -746,21 +777,24 @@ 
 function add_query_arg() {
 	$args = func_get_args();
 	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[1];
+		if ( count( $args ) < 2 || false === $args[1] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[1];
+		}
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[2];
+		if ( count( $args ) < 3 || false === $args[2] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[2];
+		}
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
-	else
-		$frag = '';
+	if ( $frag = strstr( $uri, '#' ) ) {
+			$uri = substr( $uri, 0, -strlen( $frag ) );
+	} else {
+			$frag = '';
+	}
 
 	if ( 0 === stripos( $uri, 'http://' ) ) {
 		$protocol = 'http://';
@@ -794,8 +828,9 @@ 
 	}
 
 	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+		if ( $v === false ) {
+					unset( $qs[$k] );
+		}
 	}
 
 	$ret = build_query( $qs );
@@ -817,8 +852,9 @@ 
  */
 function remove_query_arg( $key, $query = false ) {
 	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+		foreach ( $key as $k ) {
+					$query = add_query_arg( $k, false, $query );
+		}
 		return $query;
 	}
 	return add_query_arg( $key, false, $query );
@@ -856,16 +892,18 @@ 
 function wp_remote_fopen( $uri ) {
 	$parsed_url = @parse_url( $uri );
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
-		return false;
+	if ( !$parsed_url || !is_array( $parsed_url ) ) {
+			return false;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
 
 	$response = wp_safe_remote_get( $uri, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_body( $response );
 }
@@ -885,9 +923,10 @@ 
 	global $wp, $wp_query, $wp_the_query;
 	$wp->main( $query_vars );
 
-	if ( !isset($wp_the_query) )
-		$wp_the_query = $wp_query;
-}
+	if ( !isset($wp_the_query) ) {
+			$wp_the_query = $wp_query;
+	}
+	}
 
 /**
  * Retrieve the description for the HTTP status.
@@ -969,11 +1008,12 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
-		return $wp_header_to_desc[$code];
-	else
-		return '';
-}
+	if ( isset( $wp_header_to_desc[$code] ) ) {
+			return $wp_header_to_desc[$code];
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Set HTTP status header.
@@ -987,15 +1027,17 @@ 
 function status_header( $code ) {
 	$description = get_status_header_desc( $code );
 
-	if ( empty( $description ) )
-		return;
+	if ( empty( $description ) ) {
+			return;
+	}
 
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
-		$protocol = 'HTTP/1.0';
+	if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol ) {
+			$protocol = 'HTTP/1.0';
+	}
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
-
+	if ( function_exists( 'apply_filters' ) ) {
+	
 		/**
 		 * Filter an HTTP status header.
 		 *
@@ -1007,6 +1049,7 @@ 
 		 * @param string $protocol      Server protocol.
 		 */
 		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+	}
 
 	@header( $status_header, true, $code );
 }
@@ -1080,9 +1123,10 @@ 
 		}
 	}
 
-	foreach( $headers as $name => $field_value )
-		@header("{$name}: {$field_value}");
-}
+	foreach( $headers as $name => $field_value ) {
+			@header("{$name}: {$field_value}");
+	}
+	}
 
 /**
  * Set the headers for caching for 10 days with JavaScript content type.
@@ -1145,12 +1189,14 @@ 
 	// Remove the pad, if present.
 	$feed = preg_replace( '/^_+/', '', $feed );
 
-	if ( $feed == '' || $feed == 'feed' )
-		$feed = get_default_feed();
+	if ( $feed == '' || $feed == 'feed' ) {
+			$feed = get_default_feed();
+	}
 
 	$hook = 'do_feed_' . $feed;
-	if ( ! has_action( $hook ) )
-		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
+	if ( ! has_action( $hook ) ) {
+			wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
+	}
 
 	/**
 	 * Fires once the given feed is loaded.
@@ -1196,11 +1242,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
-	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
-}
+	if ( $for_comments ) {
+			load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+	}
+	}
 
 /**
  * Load either Atom comment feed or Atom posts feed.
@@ -1212,11 +1259,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_atom( $for_comments ) {
-	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
-	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
-}
+	if ($for_comments) {
+			load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-atom.php' );
+	}
+	}
 
 /**
  * Display the robots.txt file content.
@@ -1279,29 +1327,33 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
-		return true;
+	if ( wp_cache_get( 'is_blog_installed' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 	if ( ! defined( 'WP_INSTALLING' ) ) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-	else
-		$installed = $alloptions['siteurl'];
+	if ( !isset( $alloptions['siteurl'] ) ) {
+			$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	} else {
+			$installed = $alloptions['siteurl'];
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$installed = !empty( $installed );
 	wp_cache_set( 'is_blog_installed', $installed );
 
-	if ( $installed )
-		return true;
+	if ( $installed ) {
+			return true;
+	}
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
-		return true;
+	if ( defined( 'WP_REPAIRING' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 
@@ -1313,13 +1365,16 @@ 
 	$wp_tables = $wpdb->tables();
 	foreach ( $wp_tables as $table ) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
-			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-			continue;
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
+					continue;
+		}
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
+					continue;
+		}
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
-			continue;
+		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
+					continue;
+		}
 
 		// One or more tables exist. We are insane.
 
@@ -1382,11 +1437,13 @@ 
 	$name = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ( $referer ) {
+			$nonce_field .= wp_referer_field( false );
+	}
 
-	if ( $echo )
-		echo $nonce_field;
+	if ( $echo ) {
+			echo $nonce_field;
+	}
 
 	return $nonce_field;
 }
@@ -1405,8 +1462,9 @@ 
 function wp_referer_field( $echo = true ) {
 	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 
-	if ( $echo )
-		echo $referer_field;
+	if ( $echo ) {
+			echo $referer_field;
+	}
 	return $referer_field;
 }
 
@@ -1429,8 +1487,9 @@ 
 		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
 	}
 	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
-		echo $orig_referer_field;
+	if ( $echo ) {
+			echo $orig_referer_field;
+	}
 	return $orig_referer_field;
 }
 
@@ -1444,16 +1503,19 @@ 
  * @return false|string False on failure. Referer URL on success.
  */
 function wp_get_referer() {
-	if ( ! function_exists( 'wp_validate_redirect' ) )
-		return false;
+	if ( ! function_exists( 'wp_validate_redirect' ) ) {
+			return false;
+	}
 	$ref = false;
-	if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
-		$ref = wp_unslash( $_REQUEST['_wp_http_referer'] );
-	elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) )
-		$ref = wp_unslash( $_SERVER['HTTP_REFERER'] );
+	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
+			$ref = wp_unslash( $_REQUEST['_wp_http_referer'] );
+	} elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
+			$ref = wp_unslash( $_SERVER['HTTP_REFERER'] );
+	}
 
-	if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) )
-		return wp_validate_redirect( $ref, false );
+	if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) ) {
+			return wp_validate_redirect( $ref, false );
+	}
 	return false;
 }
 
@@ -1465,8 +1527,9 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
+			return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	}
 	return false;
 }
 
@@ -1501,11 +1564,13 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
-		$target = '/';
+	if ( empty($target) ) {
+			$target = '/';
+	}
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if ( file_exists( $target ) ) {
+			return @is_dir( $target );
+	}
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
 	$target_parent = dirname( $target );
@@ -1554,15 +1619,18 @@ 
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
-		return true;
+	if ( realpath($path) == $path ) {
+			return true;
+	}
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
-		return false;
+	if ( strlen($path) == 0 || $path[0] == '.' ) {
+			return false;
+	}
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
-		return true;
+	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) ) {
+			return true;
+	}
 
 	// A path starting with / or \ is absolute; anything else is relative.
 	return ( $path[0] == '/' || $path[0] == '\\' );
@@ -1581,8 +1649,9 @@ 
  * @return string The path with the base or absolute path.
  */
 function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
-		return $path;
+	if ( path_is_absolute($path) ) {
+			return $path;
+	}
 
 	return rtrim($base, '/') . '/' . ltrim($path, '/');
 }
@@ -1622,25 +1691,30 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
-		return trailingslashit(WP_TEMP_DIR);
+	if ( defined('WP_TEMP_DIR') ) {
+			return trailingslashit(WP_TEMP_DIR);
+	}
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ( $temp ) {
+			return trailingslashit( $temp );
+	}
 
 	if ( function_exists('sys_get_temp_dir') ) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+					return trailingslashit( $temp );
+		}
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return trailingslashit( $temp );
+	}
 
 	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
-		return $temp;
+	if ( is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return $temp;
+	}
 
 	return '/tmp/';
 }
@@ -1659,11 +1733,12 @@ 
  * @return bool Whether the path is writable.
  */
 function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
-	else
-		return @is_writable( $path );
-}
+	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {
+			return win_is_writable( $path );
+	} else {
+			return @is_writable( $path );
+	}
+	}
 
 /**
  * Workaround for Windows bug in is_writable() function
@@ -1691,11 +1766,13 @@ 
 	// check tmp file for read/write capabilities
 	$should_delete_tmp_file = !file_exists( $path );
 	$f = @fopen( $path, 'a' );
-	if ( $f === false )
-		return false;
+	if ( $f === false ) {
+			return false;
+	}
 	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	if ( $should_delete_tmp_file ) {
+			unlink( $path );
+	}
 	return true;
 }
 
@@ -1745,10 +1822,11 @@ 
 	}
 
 	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
-		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) {
+					$url = WP_CONTENT_URL . '/uploads';
+		} else {
+					$url = trailingslashit( $siteurl ) . $upload_path;
+		}
 	}
 
 	/*
@@ -1773,10 +1851,11 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
-			else
-				$ms_dir = '/' . get_current_blog_id();
+			if ( defined( 'MULTISITE' ) ) {
+							$ms_dir = '/sites/' . get_current_blog_id();
+			} else {
+							$ms_dir = '/' . get_current_blog_id();
+			}
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
@@ -1796,10 +1875,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
-			else
-				$dir = ABSPATH . UPLOADS;
+			if ( defined( 'BLOGUPLOADDIR' ) ) {
+							$dir = untrailingslashit( BLOGUPLOADDIR );
+			} else {
+							$dir = ABSPATH . UPLOADS;
+			}
 			$url = trailingslashit( $siteurl ) . 'files';
 		}
 	}
@@ -1810,8 +1890,9 @@ 
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
+		if ( !$time ) {
+					$time = current_time( 'mysql' );
+		}
 		$y = substr( $time, 0, 4 );
 		$m = substr( $time, 5, 2 );
 		$subdir = "/$y/$m";
@@ -1840,10 +1921,11 @@ 
 
 	// Make sure we have an uploads directory.
 	if ( ! wp_mkdir_p( $uploads['path'] ) ) {
-		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
-		else
-			$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
+					$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+		} else {
+					$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+		}
 
 		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		$uploads['error'] = $message;
@@ -1879,8 +1961,9 @@ 
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
-		$name = '';
+	if ( $name === $ext ) {
+			$name = '';
+	}
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
@@ -1907,10 +1990,11 @@ 
 		}
 
 		while ( file_exists( $dir . "/$filename" ) ) {
-			if ( '' == "$number$ext" )
-				$filename = $filename . ++$number . $ext;
-			else
-				$filename = str_replace( "$number$ext", ++$number . $ext, $filename );
+			if ( '' == "$number$ext" ) {
+							$filename = $filename . ++$number . $ext;
+			} else {
+							$filename = str_replace( "$number$ext", ++$number . $ext, $filename );
+			}
 		}
 	}
 
@@ -1941,20 +2025,24 @@ 
  * @return array
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.0' );
+	}
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if ( empty( $name ) ) {
+			return array( 'error' => __( 'Empty filename' ) );
+	}
 
 	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) {
+			return array( 'error' => __( 'Invalid file type' ) );
+	}
 
 	$upload = wp_upload_dir( $time );
 
-	if ( $upload['error'] !== false )
-		return $upload;
+	if ( $upload['error'] !== false ) {
+			return $upload;
+	}
 
 	/**
 	 * Filter whether to treat the upload bits as an error.
@@ -1976,18 +2064,20 @@ 
 
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
-		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
+					$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+		} else {
+					$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		}
 
 		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		return array( 'error' => $message );
 	}
 
 	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	if ( ! $ifp ) {
+			return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	}
 
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
@@ -2039,10 +2129,11 @@ 
 		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
 	) );
 
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	foreach ( $ext2type as $type => $exts ) {
+			if ( in_array( $ext, $exts ) )
 			return $type;
-}
+	}
+	}
 
 /**
  * Retrieve the file type from the file name.
@@ -2056,8 +2147,9 @@ 
  * @return array Values with extension first and mime type.
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
-		$mimes = get_allowed_mime_types();
+	if ( empty($mimes) ) {
+			$mimes = get_allowed_mime_types();
+	}
 	$type = false;
 	$ext = false;
 
@@ -2296,11 +2388,13 @@ 
 	$t = wp_get_mime_types();
 
 	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	if ( function_exists( 'current_user_can' ) ) {
+			$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	}
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if ( empty( $unfiltered ) ) {
+			unset( $t['htm|html'] );
+	}
 
 	/**
 	 * Filter list of allowed mime types and file extensions.
@@ -2332,8 +2426,9 @@ 
 		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
 	} else {
 		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		if ( wp_get_referer() ) {
+					$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		}
 	}
 
 	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
@@ -2435,8 +2530,9 @@ 
 	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty( $title ) ) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
-				$title = $error_data['title'];
+			if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
+							$title = $error_data['title'];
+			}
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
@@ -2466,19 +2562,26 @@ 
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
 
-		if ( empty($title) )
-			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		if ( empty($title) ) {
+					$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		}
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
-			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
-			$text_direction = 'rtl';
-?>
+		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] ) {
+					$text_direction = 'rtl';
+		} elseif ( function_exists( 'is_rtl' ) && is_rtl() ) {
+					$text_direction = 'rtl';
+		}
+		?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
+	language_attributes();
+} else {
+	echo "dir='$text_direction'";
+}
+?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2631,8 +2734,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die( '0' );
 }
 
@@ -2647,8 +2751,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die();
 }
 
@@ -2801,11 +2906,12 @@ 
 function wp_send_json( $response ) {
 	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
 	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-		wp_die();
-	else
-		die;
-}
+	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+			wp_die();
+	} else {
+			die;
+	}
+	}
 
 /**
  * Send a JSON response back to an Ajax request, indicating success.
@@ -2817,8 +2923,9 @@ 
 function wp_send_json_success( $data = null ) {
 	$response = array( 'success' => true );
 
-	if ( isset( $data ) )
-		$response['data'] = $data;
+	if ( isset( $data ) ) {
+			$response['data'] = $data;
+	}
 
 	wp_send_json( $response );
 }
@@ -2874,8 +2981,9 @@ 
  * @return string Homepage location.
  */
 function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 	return $url;
 }
 
@@ -2895,8 +3003,9 @@ 
  * @return string The WordPress Site URL.
  */
 function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 	return $url;
 }
 
@@ -2960,8 +3069,9 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
-		return;
+	if ( !get_option( 'use_smilies' ) ) {
+			return;
+	}
 
 	if ( !isset( $wpsmiliestrans ) ) {
 		$wpsmiliestrans = array(
@@ -3065,15 +3175,17 @@ 
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
-	else
-		wp_parse_str( $args, $r );
-
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if ( is_object( $args ) ) {
+			$r = get_object_vars( $args );
+	} elseif ( is_array( $args ) ) {
+			$r =& $args;
+	} else {
+			wp_parse_str( $args, $r );
+	}
+
+	if ( is_array( $defaults ) ) {
+			return array_merge( $defaults, $r );
+	}
 	return $r;
 }
 
@@ -3086,8 +3198,9 @@ 
  * @return array Sanitized array of IDs.
  */
 function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
-		$list = preg_split('/[\s,]+/', $list);
+	if ( !is_array($list) ) {
+			$list = preg_split('/[\s,]+/', $list);
+	}
 
 	return array_unique(array_map('absint', $list));
 }
@@ -3103,9 +3216,10 @@ 
  */
 function wp_array_slice_assoc( $array, $keys ) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
+	foreach ( $keys as $key ) {
+			if ( isset( $array[ $key ] ) )
 			$slice[ $key ] = $array[ $key ];
+	}
 
 	return $slice;
 }
@@ -3126,13 +3240,15 @@ 
  * @return array A list of objects or object fields.
  */
 function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
 	$list = wp_list_filter( $list, $args, $operator );
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ( $field ) {
+			$list = wp_list_pluck( $list, $field );
+	}
 
 	return $list;
 }
@@ -3152,11 +3268,13 @@ 
  * @return array Array of found values.
  */
 function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
-	if ( empty( $args ) )
-		return $list;
+	if ( empty( $args ) ) {
+			return $list;
+	}
 
 	$operator = strtoupper( $operator );
 	$count = count( $args );
@@ -3167,8 +3285,9 @@ 
 
 		$matched = 0;
 		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
-				$matched++;
+			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] ) {
+							$matched++;
+			}
 		}
 
 		if ( ( 'AND' == $operator && $matched == $count )
@@ -3277,8 +3396,9 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
-		return;
+	if ( ! current_theme_supports( 'widgets' ) ) {
+			return;
+	}
 
 	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
 	ksort( $submenu['themes.php'], SORT_NUMERIC );
@@ -3293,9 +3413,10 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
-		ob_end_flush();
-}
+	for ($i=0; $i<$levels; $i++) {
+			ob_end_flush();
+	}
+	}
 
 /**
  * Load custom DB error or display WordPress DB error.
@@ -3327,8 +3448,9 @@ 
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( defined('WP_INSTALLING') || defined('WP_ADMIN') )
-		wp_die($wpdb->error);
+	if ( defined('WP_INSTALLING') || defined('WP_ADMIN') ) {
+			wp_die($wpdb->error);
+	}
 
 	// Otherwise, be terse.
 	status_header( 500 );
@@ -3336,7 +3458,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php _e( 'Database Error' ); ?></title>
@@ -3402,15 +3527,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3506,15 +3633,17 @@ 
 	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			}
 		}
 	}
 }
@@ -3566,15 +3695,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
-			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3655,19 +3786,22 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
-		return false;
+	if ( !$is_apache ) {
+			return false;
+	}
 
 	if ( function_exists( 'apache_get_modules' ) ) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
-			return true;
+		if ( in_array($mod, $mods) ) {
+					return true;
+		}
 	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
-				return true;
+			if ( false !== strpos($phpinfo, $mod) ) {
+							return true;
+			}
 	}
 	return $default;
 }
@@ -3723,17 +3857,21 @@ 
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
 function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
-		return 1;
+	if ( false !== strpos( $file, '..' ) ) {
+			return 1;
+	}
 
-	if ( false !== strpos( $file, './' ) )
-		return 1;
+	if ( false !== strpos( $file, './' ) ) {
+			return 1;
+	}
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
-		return 3;
+	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
+			return 3;
+	}
 
-	if (':' == substr( $file, 1, 1 ) )
-		return 2;
+	if (':' == substr( $file, 1, 1 ) ) {
+			return 2;
+	}
 
 	return 0;
 }
@@ -3747,10 +3885,12 @@ 
  */
 function is_ssl() {
 	if ( isset($_SERVER['HTTPS']) ) {
-		if ( 'on' == strtolower($_SERVER['HTTPS']) )
-			return true;
-		if ( '1' == $_SERVER['HTTPS'] )
-			return true;
+		if ( 'on' == strtolower($_SERVER['HTTPS']) ) {
+					return true;
+		}
+		if ( '1' == $_SERVER['HTTPS'] ) {
+					return true;
+		}
 	} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
 		return true;
 	}
@@ -3862,8 +4002,9 @@ 
 function wp_suspend_cache_addition( $suspend = null ) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
-		$_suspend = $suspend;
+	if ( is_bool( $suspend ) ) {
+			$_suspend = $suspend;
+	}
 
 	return $_suspend;
 }
@@ -3906,11 +4047,13 @@ 
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
-		return true;
+	if ( ! is_multisite() ) {
+			return true;
+	}
 
-	if ( ! $site_id )
-		$site_id = get_current_blog_id();
+	if ( ! $site_id ) {
+			$site_id = get_current_blog_id();
+	}
 
 	return (int) $site_id === (int) $current_site->blog_id;
 }
@@ -3989,8 +4132,9 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
-		return false;
+	if ( ! is_multisite() ) {
+			return false;
+	}
 
 	static $global_terms = null;
 	if ( is_null( $global_terms ) ) {
@@ -4006,10 +4150,11 @@ 
 		 * @param null $enabled Whether global terms are enabled.
 		 */
 		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
-			$global_terms = (bool) $filter;
-		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		if ( ! is_null( $filter ) ) {
+					$global_terms = (bool) $filter;
+		} else {
+					$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		}
 	}
 	return $global_terms;
 }
@@ -4185,8 +4330,9 @@ 
 	// Do UTC
 	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
-		$selected = 'selected="selected" ';
+	if ( 'UTC' === $selected_zone ) {
+			$selected = 'selected="selected" ';
+	}
 	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
 	$structure[] = '</optgroup>';
 
@@ -4195,18 +4341,20 @@ 
 	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
 	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
-		else
-			$offset_name = (string) $offset;
+		if ( 0 <= $offset ) {
+					$offset_name = '+' . $offset;
+		} else {
+					$offset_name = (string) $offset;
+		}
 
 		$offset_value = $offset_name;
 		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
 		$offset_name = 'UTC' . $offset_name;
 		$offset_value = 'UTC' . $offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
-			$selected = 'selected="selected" ';
+		if ( $offset_value === $selected_zone ) {
+					$selected = 'selected="selected" ';
+		}
 		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
 
 	}
@@ -4249,8 +4397,9 @@ 
 
 	foreach ( (array) $posts_to_delete as $post ) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
-			continue;
+		if ( !$post_id ) {
+					continue;
+		}
 
 		$del_post = get_post($post_id);
 
@@ -4266,8 +4415,9 @@ 
 
 	foreach ( (array) $comments_to_delete as $comment ) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
-			continue;
+		if ( !$comment_id ) {
+					continue;
+		}
 
 		$del_comment = get_comment($comment_id);
 
@@ -4331,10 +4481,11 @@ 
 	}
 
 	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
-		else
-			$all_headers[ $field ] = '';
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] ) {
+					$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+		} else {
+					$all_headers[ $field ] = '';
+		}
 	}
 
 	return $all_headers;
@@ -4477,8 +4628,9 @@ 
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
 	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
-		return array();
+	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) ) {
+			return array();
+	}
 
 	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
 }
@@ -4516,12 +4668,14 @@ 
 	&&
 		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
 	) {
-		if ( $_return_loop )
-			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		if ( $_return_loop ) {
+					$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		}
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
-			return $_return_loop ? $return : $tortoise;
+		if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
+					return $_return_loop ? $return : $tortoise;
+		}
 
 		// Increment tortoise by one step
 		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
@@ -4593,10 +4747,11 @@ 
  *                      of individual calls.
  */
 function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
-	else
-		$trace = debug_backtrace();
+	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
+			$trace = debug_backtrace( false );
+	} else {
+			$trace = debug_backtrace();
+	}
 
 	$caller = array();
 	$check_class = ! is_null( $ignore_class );
@@ -4606,8 +4761,10 @@ 
 		if ( $skip_frames > 0 ) {
 			$skip_frames--;
 		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
-				continue; // Filter out calls
+			if ( $check_class && $ignore_class == $call['class'] ) {
+							continue;
+			}
+			// Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
@@ -4620,11 +4777,12 @@ 
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
-	else
-		return $caller;
-}
+	if ( $pretty ) {
+			return join( ', ', array_reverse( $caller ) );
+	} else {
+			return $caller;
+	}
+	}
 
 /**
  * Retrieve ids that are not already present in the cache.
@@ -4658,8 +4816,9 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
-		return true;
+	if ( ! wp_is_mobile() ) {
+			return true;
+	}
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
@@ -4722,11 +4881,13 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
-		return;
+	if ( ! is_admin() && ! is_user_logged_in() ) {
+			return;
+	}
 
-	if ( defined( 'IFRAME_REQUEST' ) )
-		return;
+	if ( defined( 'IFRAME_REQUEST' ) ) {
+			return;
+	}
 
 	$screen = get_current_screen();
 	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
@@ -4831,8 +4992,9 @@ 
  * @return string Tag RegEx.
  */
 function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
-		return;
+	if ( empty( $tag ) ) {
+			return;
+	}
 	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
 }
 
@@ -4850,12 +5012,14 @@ 
  */
 function _canonical_charset( $charset ) {
 	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
-		return 'UTF-8';
+		'UTF8' === $charset ) {
+			return 'UTF-8';
+	}
 
 	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
-		return 'ISO-8859-1';
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset ) {
+			return 'ISO-8859-1';
+	}
 
 	return $charset;
 }
@@ -4890,11 +5054,13 @@ 
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if ( is_null( $overloaded ) ) {
+			$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	}
 
-	if ( false === $overloaded )
-		return;
+	if ( false === $overloaded ) {
+			return;
+	}
 
 	if ( ! $reset ) {
 		$encoding = mb_internal_encoding();