ntwb / wordpress

src/wp-admin/includes/misc.php

Doc Comments +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
  *
  * @global WP_Rewrite $wp_rewrite
  *
- * @return bool True if web.config was updated successfully
+ * @return null|boolean True if web.config was updated successfully
  */
 function iis7_save_url_rewrite_rules(){
 	if ( is_multisite() )
@@ -275,7 +275,7 @@ 
  *
  * @since 2.0.0
  *
- * @param array $vars An array of globals to reset.
+ * @param string[] $vars An array of globals to reset.
  */
 function wp_reset_vars( $vars ) {
 	foreach ( $vars as $var ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Misc WordPress Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Misc WordPress Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Returns whether the server is running Apache with the mod_rewrite module loaded.

Spacing +182 added lines, -182 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param bool $got_rewrite Whether Apache and mod_rewrite are present.
 	 */
-	return apply_filters( 'got_rewrite', $got_rewrite );
+	return apply_filters('got_rewrite', $got_rewrite);
 }
 
 /**
@@ -43,7 +43,7 @@ 
  * @return bool Whether the server supports URL rewriting.
  */
 function got_url_rewrite() {
-	$got_url_rewrite = ( got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks() );
+	$got_url_rewrite = (got_mod_rewrite() || $GLOBALS['is_nginx'] || iis7_supports_permalinks());
 
 	/**
 	 * Filter whether URL rewriting is available.
@@ -52,7 +52,7 @@ 
 	 *
 	 * @param bool $got_url_rewrite Whether URL rewriting is available.
 	 */
-	return apply_filters( 'got_url_rewrite', $got_url_rewrite );
+	return apply_filters('got_url_rewrite', $got_url_rewrite);
 }
 
 /**
@@ -64,22 +64,22 @@ 
  * @param string $marker
  * @return array An array of strings from a file (.htaccess ) from between BEGIN and END markers.
  */
-function extract_from_markers( $filename, $marker ) {
-	$result = array ();
+function extract_from_markers($filename, $marker) {
+	$result = array();
 
-	if (!file_exists( $filename ) ) {
+	if ( ! file_exists($filename)) {
 		return $result;
 	}
 
-	if ( $markerdata = explode( "\n", implode( '', file( $filename ) ) ));
+	if ($markerdata = explode("\n", implode('', file($filename))));
 	{
 		$state = false;
-		foreach ( $markerdata as $markerline ) {
-			if (strpos($markerline, '# END ' . $marker) !== false)
+		foreach ($markerdata as $markerline) {
+			if (strpos($markerline, '# END '.$marker) !== false)
 				$state = false;
-			if ( $state )
+			if ($state)
 				$result[] = $markerline;
-			if (strpos($markerline, '# BEGIN ' . $marker) !== false)
+			if (strpos($markerline, '# BEGIN '.$marker) !== false)
 				$state = true;
 		}
 	}
@@ -101,47 +101,47 @@ 
  * @param array  $insertion
  * @return bool True on write success, false on failure.
  */
-function insert_with_markers( $filename, $marker, $insertion ) {
-	if (!file_exists( $filename ) || is_writeable( $filename ) ) {
-		if (!file_exists( $filename ) ) {
+function insert_with_markers($filename, $marker, $insertion) {
+	if ( ! file_exists($filename) || is_writeable($filename)) {
+		if ( ! file_exists($filename)) {
 			$markerdata = '';
 		} else {
-			$markerdata = explode( "\n", implode( '', file( $filename ) ) );
+			$markerdata = explode("\n", implode('', file($filename)));
 		}
 
-		if ( !$f = @fopen( $filename, 'w' ) )
+		if ( ! $f = @fopen($filename, 'w'))
 			return false;
 
 		$foundit = false;
-		if ( $markerdata ) {
+		if ($markerdata) {
 			$state = true;
-			foreach ( $markerdata as $n => $markerline ) {
-				if (strpos($markerline, '# BEGIN ' . $marker) !== false)
+			foreach ($markerdata as $n => $markerline) {
+				if (strpos($markerline, '# BEGIN '.$marker) !== false)
 					$state = false;
-				if ( $state ) {
-					if ( $n + 1 < count( $markerdata ) )
-						fwrite( $f, "{$markerline}\n" );
+				if ($state) {
+					if ($n + 1 < count($markerdata))
+						fwrite($f, "{$markerline}\n");
 					else
-						fwrite( $f, "{$markerline}" );
+						fwrite($f, "{$markerline}");
 				}
-				if (strpos($markerline, '# END ' . $marker) !== false) {
-					fwrite( $f, "# BEGIN {$marker}\n" );
-					if ( is_array( $insertion ))
-						foreach ( $insertion as $insertline )
-							fwrite( $f, "{$insertline}\n" );
-					fwrite( $f, "# END {$marker}\n" );
+				if (strpos($markerline, '# END '.$marker) !== false) {
+					fwrite($f, "# BEGIN {$marker}\n");
+					if (is_array($insertion))
+						foreach ($insertion as $insertline)
+							fwrite($f, "{$insertline}\n");
+					fwrite($f, "# END {$marker}\n");
 					$state = true;
 					$foundit = true;
 				}
 			}
 		}
-		if (!$foundit) {
-			fwrite( $f, "\n# BEGIN {$marker}\n" );
-			foreach ( $insertion as $insertline )
-				fwrite( $f, "{$insertline}\n" );
-			fwrite( $f, "# END {$marker}\n" );
+		if ( ! $foundit) {
+			fwrite($f, "\n# BEGIN {$marker}\n");
+			foreach ($insertion as $insertline)
+				fwrite($f, "{$insertline}\n");
+			fwrite($f, "# END {$marker}\n");
 		}
-		fclose( $f );
+		fclose($f);
 		return true;
 	} else {
 		return false;
@@ -159,7 +159,7 @@ 
  * @global WP_Rewrite $wp_rewrite
  */
 function save_mod_rewrite_rules() {
-	if ( is_multisite() )
+	if (is_multisite())
 		return;
 
 	global $wp_rewrite;
@@ -171,10 +171,10 @@ 
 	 * If the file doesn't already exist check for write access to the directory
 	 * and whether we have some rules. Else check for write access to the file.
 	 */
-	if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
-		if ( got_mod_rewrite() ) {
-			$rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
-			return insert_with_markers( $htaccess_file, 'WordPress', $rules );
+	if (( ! file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
+		if (got_mod_rewrite()) {
+			$rules = explode("\n", $wp_rewrite->mod_rewrite_rules());
+			return insert_with_markers($htaccess_file, 'WordPress', $rules);
 		}
 	}
 
@@ -191,19 +191,19 @@ 
  *
  * @return bool True if web.config was updated successfully
  */
-function iis7_save_url_rewrite_rules(){
-	if ( is_multisite() )
+function iis7_save_url_rewrite_rules() {
+	if (is_multisite())
 		return;
 
 	global $wp_rewrite;
 
 	$home_path = get_home_path();
-	$web_config_file = $home_path . 'web.config';
+	$web_config_file = $home_path.'web.config';
 
 	// Using win_is_writable() instead of is_writable() because of a bug in Windows PHP
-	if ( iis7_supports_permalinks() && ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) ) {
+	if (iis7_supports_permalinks() && (( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || win_is_writable($web_config_file))) {
 		$rule = $wp_rewrite->iis7_url_rewrite_rules(false, '', '');
-		if ( ! empty($rule) ) {
+		if ( ! empty($rule)) {
 			return iis7_add_rewrite_rule($web_config_file, $rule);
 		} else {
 			return iis7_delete_rewrite_rule($web_config_file);
@@ -219,19 +219,19 @@ 
  *
  * @param string $file
  */
-function update_recently_edited( $file ) {
-	$oldfiles = (array ) get_option( 'recently_edited' );
-	if ( $oldfiles ) {
-		$oldfiles = array_reverse( $oldfiles );
+function update_recently_edited($file) {
+	$oldfiles = (array) get_option('recently_edited');
+	if ($oldfiles) {
+		$oldfiles = array_reverse($oldfiles);
 		$oldfiles[] = $file;
-		$oldfiles = array_reverse( $oldfiles );
-		$oldfiles = array_unique( $oldfiles );
-		if ( 5 < count( $oldfiles ))
-			array_pop( $oldfiles );
+		$oldfiles = array_reverse($oldfiles);
+		$oldfiles = array_unique($oldfiles);
+		if (5 < count($oldfiles))
+			array_pop($oldfiles);
 	} else {
 		$oldfiles[] = $file;
 	}
-	update_option( 'recently_edited', $oldfiles );
+	update_option('recently_edited', $oldfiles);
 }
 
 /**
@@ -242,8 +242,8 @@ 
  * @param string $old_value
  * @param string $value
  */
-function update_home_siteurl( $old_value, $value ) {
-	if ( defined( "WP_INSTALLING" ) )
+function update_home_siteurl($old_value, $value) {
+	if (defined("WP_INSTALLING"))
 		return;
 
 	// If home changed, write rewrite rules to new location.
@@ -258,11 +258,11 @@ 
  * @param string $url
  * @return string
  */
-function url_shorten( $url ) {
-	$short_url = str_replace( array( 'http://', 'www.' ), '', $url );
-	$short_url = untrailingslashit( $short_url );
-	if ( strlen( $short_url ) > 35 )
-		$short_url = substr( $short_url, 0, 32 ) . '&hellip;';
+function url_shorten($url) {
+	$short_url = str_replace(array('http://', 'www.'), '', $url);
+	$short_url = untrailingslashit($short_url);
+	if (strlen($short_url) > 35)
+		$short_url = substr($short_url, 0, 32).'&hellip;';
 	return $short_url;
 }
 
@@ -277,16 +277,16 @@ 
  *
  * @param array $vars An array of globals to reset.
  */
-function wp_reset_vars( $vars ) {
-	foreach ( $vars as $var ) {
-		if ( empty( $_POST[ $var ] ) ) {
-			if ( empty( $_GET[ $var ] ) ) {
-				$GLOBALS[ $var ] = '';
+function wp_reset_vars($vars) {
+	foreach ($vars as $var) {
+		if (empty($_POST[$var])) {
+			if (empty($_GET[$var])) {
+				$GLOBALS[$var] = '';
 			} else {
-				$GLOBALS[ $var ] = $_GET[ $var ];
+				$GLOBALS[$var] = $_GET[$var];
 			}
 		} else {
-			$GLOBALS[ $var ] = $_POST[ $var ];
+			$GLOBALS[$var] = $_POST[$var];
 		}
 	}
 }
@@ -299,9 +299,9 @@ 
  * @param string|WP_Error $message
  */
 function show_message($message) {
-	if ( is_wp_error($message) ){
-		if ( $message->get_error_data() && is_string( $message->get_error_data() ) )
-			$message = $message->get_error_message() . ': ' . $message->get_error_data();
+	if (is_wp_error($message)) {
+		if ($message->get_error_data() && is_string($message->get_error_data()))
+			$message = $message->get_error_message().': '.$message->get_error_data();
 		else
 			$message = $message->get_error_message();
 	}
@@ -316,25 +316,25 @@ 
  * @param string $content
  * @return array
  */
-function wp_doc_link_parse( $content ) {
-	if ( !is_string( $content ) || empty( $content ) )
+function wp_doc_link_parse($content) {
+	if ( ! is_string($content) || empty($content))
 		return array();
 
-	if ( !function_exists('token_get_all') )
+	if ( ! function_exists('token_get_all'))
 		return array();
 
-	$tokens = token_get_all( $content );
-	$count = count( $tokens );
+	$tokens = token_get_all($content);
+	$count = count($tokens);
 	$functions = array();
 	$ignore_functions = array();
-	for ( $t = 0; $t < $count - 2; $t++ ) {
-		if ( ! is_array( $tokens[ $t ] ) ) {
+	for ($t = 0; $t < $count - 2; $t++) {
+		if ( ! is_array($tokens[$t])) {
 			continue;
 		}
 
-		if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
+		if (T_STRING == $tokens[$t][0] && ('(' == $tokens[$t + 1] || '(' == $tokens[$t + 2])) {
 			// If it's a function or class defined locally, there's not going to be any docs available
-			if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) {
+			if ((isset($tokens[$t - 2][1]) && in_array($tokens[$t - 2][1], array('function', 'class'))) || (isset($tokens[$t - 2][0]) && T_OBJECT_OPERATOR == $tokens[$t - 1][0])) {
 				$ignore_functions[] = $tokens[$t][1];
 			}
 			// Add this to our stack of unique references
@@ -342,8 +342,8 @@ 
 		}
 	}
 
-	$functions = array_unique( $functions );
-	sort( $functions );
+	$functions = array_unique($functions);
+	sort($functions);
 
 	/**
 	 * Filter the list of functions and classes to be ignored from the documentation lookup.
@@ -352,13 +352,13 @@ 
 	 *
 	 * @param array $ignore_functions Functions and classes to be ignored.
 	 */
-	$ignore_functions = apply_filters( 'documentation_ignore_functions', $ignore_functions );
+	$ignore_functions = apply_filters('documentation_ignore_functions', $ignore_functions);
 
-	$ignore_functions = array_unique( $ignore_functions );
+	$ignore_functions = array_unique($ignore_functions);
 
 	$out = array();
-	foreach ( $functions as $function ) {
-		if ( in_array( $function, $ignore_functions ) )
+	foreach ($functions as $function) {
+		if (in_array($function, $ignore_functions))
 			continue;
 		$out[] = $function;
 	}
@@ -373,28 +373,28 @@ 
  */
 function set_screen_options() {
 
-	if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
-		check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
+	if (isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options'])) {
+		check_admin_referer('screen-options-nonce', 'screenoptionnonce');
 
-		if ( !$user = wp_get_current_user() )
+		if ( ! $user = wp_get_current_user())
 			return;
 		$option = $_POST['wp_screen_options']['option'];
 		$value = $_POST['wp_screen_options']['value'];
 
-		if ( $option != sanitize_key( $option ) )
+		if ($option != sanitize_key($option))
 			return;
 
 		$map_option = $option;
 		$type = str_replace('edit_', '', $map_option);
 		$type = str_replace('_per_page', '', $type);
-		if ( in_array( $type, get_taxonomies() ) )
+		if (in_array($type, get_taxonomies()))
 			$map_option = 'edit_tags_per_page';
-		elseif ( in_array( $type, get_post_types() ) )
+		elseif (in_array($type, get_post_types()))
 			$map_option = 'edit_per_page';
 		else
 			$option = str_replace('-', '_', $option);
 
-		switch ( $map_option ) {
+		switch ($map_option) {
 			case 'edit_per_page':
 			case 'users_per_page':
 			case 'edit_comments_per_page':
@@ -409,7 +409,7 @@ 
 			case 'themes_network_per_page':
 			case 'site_themes_network_per_page':
 				$value = (int) $value;
-				if ( $value < 1 || $value > 999 )
+				if ($value < 1 || $value > 999)
 					return;
 				break;
 			default:
@@ -430,15 +430,15 @@ 
 				 * @param string   $option The option name.
 				 * @param int      $value  The number of rows to use.
 				 */
-				$value = apply_filters( 'set-screen-option', false, $option, $value );
+				$value = apply_filters('set-screen-option', false, $option, $value);
 
-				if ( false === $value )
+				if (false === $value)
 					return;
 				break;
 		}
 
 		update_user_meta($user->ID, $option, $value);
-		wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+		wp_safe_redirect(remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer()));
 		exit;
 	}
 }
@@ -452,17 +452,17 @@ 
  * @param string $filename The file path to the configuration file
  */
 function iis7_rewrite_rule_exists($filename) {
-	if ( ! file_exists($filename) )
+	if ( ! file_exists($filename))
 		return false;
-	if ( ! class_exists('DOMDocument') )
+	if ( ! class_exists('DOMDocument'))
 		return false;
 
 	$doc = new DOMDocument();
-	if ( $doc->load($filename) === false )
+	if ($doc->load($filename) === false)
 		return false;
 	$xpath = new DOMXPath($doc);
 	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
-	if ( $rules->length == 0 )
+	if ($rules->length == 0)
 		return false;
 	else
 		return true;
@@ -478,20 +478,20 @@ 
  */
 function iis7_delete_rewrite_rule($filename) {
 	// If configuration file does not exist then rules also do not exist so there is nothing to delete
-	if ( ! file_exists($filename) )
+	if ( ! file_exists($filename))
 		return true;
 
-	if ( ! class_exists('DOMDocument') )
+	if ( ! class_exists('DOMDocument'))
 		return false;
 
 	$doc = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc -> load($filename) === false )
+	if ($doc -> load($filename) === false)
 		return false;
 	$xpath = new DOMXPath($doc);
 	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
-	if ( $rules->length > 0 ) {
+	if ($rules->length > 0) {
 		$child = $rules->item(0);
 		$parent = $child->parentNode;
 		$parent->removeChild($child);
@@ -511,12 +511,12 @@ 
  * @return bool
  */
 function iis7_add_rewrite_rule($filename, $rewrite_rule) {
-	if ( ! class_exists('DOMDocument') )
+	if ( ! class_exists('DOMDocument'))
 		return false;
 
 	// If configuration file does not exist then we create one.
-	if ( ! file_exists($filename) ) {
-		$fp = fopen( $filename, 'w');
+	if ( ! file_exists($filename)) {
+		$fp = fopen($filename, 'w');
 		fwrite($fp, '<configuration/>');
 		fclose($fp);
 	}
@@ -524,25 +524,25 @@ 
 	$doc = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc->load($filename) === false )
+	if ($doc->load($filename) === false)
 		return false;
 
 	$xpath = new DOMXPath($doc);
 
 	// First check if the rule already exists as in that case there is no need to re-add it
 	$wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
-	if ( $wordpress_rules->length > 0 )
+	if ($wordpress_rules->length > 0)
 		return true;
 
 	// Check the XPath to the rewrite rule and create XML nodes if they do not exist
 	$xmlnodes = $xpath->query('/configuration/system.webServer/rewrite/rules');
-	if ( $xmlnodes->length > 0 ) {
+	if ($xmlnodes->length > 0) {
 		$rules_node = $xmlnodes->item(0);
 	} else {
 		$rules_node = $doc->createElement('rules');
 
 		$xmlnodes = $xpath->query('/configuration/system.webServer/rewrite');
-		if ( $xmlnodes->length > 0 ) {
+		if ($xmlnodes->length > 0) {
 			$rewrite_node = $xmlnodes->item(0);
 			$rewrite_node->appendChild($rules_node);
 		} else {
@@ -550,7 +550,7 @@ 
 			$rewrite_node->appendChild($rules_node);
 
 			$xmlnodes = $xpath->query('/configuration/system.webServer');
-			if ( $xmlnodes->length > 0 ) {
+			if ($xmlnodes->length > 0) {
 				$system_webServer_node = $xmlnodes->item(0);
 				$system_webServer_node->appendChild($rewrite_node);
 			} else {
@@ -558,7 +558,7 @@ 
 				$system_webServer_node->appendChild($rewrite_node);
 
 				$xmlnodes = $xpath->query('/configuration');
-				if ( $xmlnodes->length > 0 ) {
+				if ($xmlnodes->length > 0) {
 					$config_node = $xmlnodes->item(0);
 					$config_node->appendChild($system_webServer_node);
 				} else {
@@ -604,42 +604,42 @@ 
  *
  * @global array $_wp_admin_css_colors
  */
-function admin_color_scheme_picker( $user_id ) {
+function admin_color_scheme_picker($user_id) {
 	global $_wp_admin_css_colors;
 
-	ksort( $_wp_admin_css_colors );
+	ksort($_wp_admin_css_colors);
 
-	if ( isset( $_wp_admin_css_colors['fresh'] ) ) {
+	if (isset($_wp_admin_css_colors['fresh'])) {
 		// Set Default ('fresh') and Light should go first.
-		$_wp_admin_css_colors = array_filter( array_merge( array( 'fresh' => '', 'light' => '' ), $_wp_admin_css_colors ) );
+		$_wp_admin_css_colors = array_filter(array_merge(array('fresh' => '', 'light' => ''), $_wp_admin_css_colors));
 	}
 
-	$current_color = get_user_option( 'admin_color', $user_id );
+	$current_color = get_user_option('admin_color', $user_id);
 
-	if ( empty( $current_color ) || ! isset( $_wp_admin_css_colors[ $current_color ] ) ) {
+	if (empty($current_color) || ! isset($_wp_admin_css_colors[$current_color])) {
 		$current_color = 'fresh';
 	}
 
 	?>
 	<fieldset id="color-picker" class="scheme-list">
-		<legend class="screen-reader-text"><span><?php _e( 'Admin Color Scheme' ); ?></span></legend>
+		<legend class="screen-reader-text"><span><?php _e('Admin Color Scheme'); ?></span></legend>
 		<?php
-		wp_nonce_field( 'save-color-scheme', 'color-nonce', false );
-		foreach ( $_wp_admin_css_colors as $color => $color_info ) :
+		wp_nonce_field('save-color-scheme', 'color-nonce', false);
+		foreach ($_wp_admin_css_colors as $color => $color_info) :
 
 			?>
-			<div class="color-option <?php echo ( $color == $current_color ) ? 'selected' : ''; ?>">
-				<input name="admin_color" id="admin_color_<?php echo esc_attr( $color ); ?>" type="radio" value="<?php echo esc_attr( $color ); ?>" class="tog" <?php checked( $color, $current_color ); ?> />
-				<input type="hidden" class="css_url" value="<?php echo esc_url( $color_info->url ); ?>" />
-				<input type="hidden" class="icon_colors" value="<?php echo esc_attr( wp_json_encode( array( 'icons' => $color_info->icon_colors ) ) ); ?>" />
-				<label for="admin_color_<?php echo esc_attr( $color ); ?>"><?php echo esc_html( $color_info->name ); ?></label>
+			<div class="color-option <?php echo ($color == $current_color) ? 'selected' : ''; ?>">
+				<input name="admin_color" id="admin_color_<?php echo esc_attr($color); ?>" type="radio" value="<?php echo esc_attr($color); ?>" class="tog" <?php checked($color, $current_color); ?> />
+				<input type="hidden" class="css_url" value="<?php echo esc_url($color_info->url); ?>" />
+				<input type="hidden" class="icon_colors" value="<?php echo esc_attr(wp_json_encode(array('icons' => $color_info->icon_colors))); ?>" />
+				<label for="admin_color_<?php echo esc_attr($color); ?>"><?php echo esc_html($color_info->name); ?></label>
 				<table class="color-palette">
 					<tr>
 					<?php
 
-					foreach ( $color_info->colors as $html_color ) {
+					foreach ($color_info->colors as $html_color) {
 						?>
-						<td style="background-color: <?php echo esc_attr( $html_color ); ?>">&nbsp;</td>
+						<td style="background-color: <?php echo esc_attr($html_color); ?>">&nbsp;</td>
 						<?php
 					}
 
@@ -663,30 +663,30 @@ 
 function wp_color_scheme_settings() {
 	global $_wp_admin_css_colors;
 
-	$color_scheme = get_user_option( 'admin_color' );
+	$color_scheme = get_user_option('admin_color');
 
 	// It's possible to have a color scheme set that is no longer registered.
-	if ( empty( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+	if (empty($_wp_admin_css_colors[$color_scheme])) {
 		$color_scheme = 'fresh';
 	}
 
-	if ( ! empty( $_wp_admin_css_colors[ $color_scheme ]->icon_colors ) ) {
-		$icon_colors = $_wp_admin_css_colors[ $color_scheme ]->icon_colors;
-	} elseif ( ! empty( $_wp_admin_css_colors['fresh']->icon_colors ) ) {
+	if ( ! empty($_wp_admin_css_colors[$color_scheme]->icon_colors)) {
+		$icon_colors = $_wp_admin_css_colors[$color_scheme]->icon_colors;
+	} elseif ( ! empty($_wp_admin_css_colors['fresh']->icon_colors)) {
 		$icon_colors = $_wp_admin_css_colors['fresh']->icon_colors;
 	} else {
 		// Fall back to the default set of icon colors if the default scheme is missing.
-		$icon_colors = array( 'base' => '#999', 'focus' => '#00a0d2', 'current' => '#fff' );
+		$icon_colors = array('base' => '#999', 'focus' => '#00a0d2', 'current' => '#fff');
 	}
 
-	echo '<script type="text/javascript">var _wpColorScheme = ' . wp_json_encode( array( 'icons' => $icon_colors ) ) . ";</script>\n";
+	echo '<script type="text/javascript">var _wpColorScheme = '.wp_json_encode(array('icons' => $icon_colors)).";</script>\n";
 }
 
 /**
  * @since 3.3.0
  */
 function _ipad_meta() {
-	if ( wp_is_mobile() ) {
+	if (wp_is_mobile()) {
 		?>
 		<meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1">
 		<?php
@@ -698,18 +698,18 @@ 
  *
  * @since 3.6.0
  */
-function wp_check_locked_posts( $response, $data, $screen_id ) {
+function wp_check_locked_posts($response, $data, $screen_id) {
 	$checked = array();
 
-	if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
-		foreach ( $data['wp-check-locked-posts'] as $key ) {
-			if ( ! $post_id = absint( substr( $key, 5 ) ) )
+	if (array_key_exists('wp-check-locked-posts', $data) && is_array($data['wp-check-locked-posts'])) {
+		foreach ($data['wp-check-locked-posts'] as $key) {
+			if ( ! $post_id = absint(substr($key, 5)))
 				continue;
 
-			if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
-				$send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
+			if (($user_id = wp_check_post_lock($post_id)) && ($user = get_userdata($user_id)) && current_user_can('edit_post', $post_id)) {
+				$send = array('text' => sprintf(__('%s is currently editing'), $user->display_name));
 
-				if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+				if (($avatar = get_avatar($user->ID, 18)) && preg_match("|src='([^']+)'|", $avatar, $matches))
 					$send['avatar_src'] = $matches[1];
 
 				$checked[$key] = $send;
@@ -717,7 +717,7 @@ 
 		}
 	}
 
-	if ( ! empty( $checked ) )
+	if ( ! empty($checked))
 		$response['wp-check-locked-posts'] = $checked;
 
 	return $response;
@@ -728,31 +728,31 @@ 
  *
  * @since 3.6.0
  */
-function wp_refresh_post_lock( $response, $data, $screen_id ) {
-	if ( array_key_exists( 'wp-refresh-post-lock', $data ) ) {
+function wp_refresh_post_lock($response, $data, $screen_id) {
+	if (array_key_exists('wp-refresh-post-lock', $data)) {
 		$received = $data['wp-refresh-post-lock'];
 		$send = array();
 
-		if ( ! $post_id = absint( $received['post_id'] ) )
+		if ( ! $post_id = absint($received['post_id']))
 			return $response;
 
-		if ( ! current_user_can('edit_post', $post_id) )
+		if ( ! current_user_can('edit_post', $post_id))
 			return $response;
 
-		if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
+		if (($user_id = wp_check_post_lock($post_id)) && ($user = get_userdata($user_id))) {
 			$error = array(
-				'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_name )
+				'text' => sprintf(__('%s has taken over and is currently editing.'), $user->display_name)
 			);
 
-			if ( $avatar = get_avatar( $user->ID, 64 ) ) {
-				if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
+			if ($avatar = get_avatar($user->ID, 64)) {
+				if (preg_match("|src='([^']+)'|", $avatar, $matches))
 					$error['avatar_src'] = $matches[1];
 			}
 
 			$send['lock_error'] = $error;
 		} else {
-			if ( $new_lock = wp_set_post_lock( $post_id ) )
-				$send['new_lock'] = implode( ':', $new_lock );
+			if ($new_lock = wp_set_post_lock($post_id))
+				$send['new_lock'] = implode(':', $new_lock);
 		}
 
 		$response['wp-refresh-post-lock'] = $send;
@@ -766,16 +766,16 @@ 
  *
  * @since 3.6.0
  */
-function wp_refresh_post_nonces( $response, $data, $screen_id ) {
-	if ( array_key_exists( 'wp-refresh-post-nonces', $data ) ) {
+function wp_refresh_post_nonces($response, $data, $screen_id) {
+	if (array_key_exists('wp-refresh-post-nonces', $data)) {
 		$received = $data['wp-refresh-post-nonces'];
-		$response['wp-refresh-post-nonces'] = array( 'check' => 1 );
+		$response['wp-refresh-post-nonces'] = array('check' => 1);
 
-		if ( ! $post_id = absint( $received['post_id'] ) ) {
+		if ( ! $post_id = absint($received['post_id'])) {
 			return $response;
 		}
 
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+		if ( ! current_user_can('edit_post', $post_id)) {
 			return $response;
 		}
 
@@ -784,10 +784,10 @@ 
 				'getpermalinknonce' => wp_create_nonce('getpermalink'),
 				'samplepermalinknonce' => wp_create_nonce('samplepermalink'),
 				'closedpostboxesnonce' => wp_create_nonce('closedpostboxes'),
-				'_ajax_linking_nonce' => wp_create_nonce( 'internal-linking' ),
-				'_wpnonce' => wp_create_nonce( 'update-post_' . $post_id ),
+				'_ajax_linking_nonce' => wp_create_nonce('internal-linking'),
+				'_wpnonce' => wp_create_nonce('update-post_'.$post_id),
 			),
-			'heartbeatNonce' => wp_create_nonce( 'heartbeat-nonce' ),
+			'heartbeatNonce' => wp_create_nonce('heartbeat-nonce'),
 		);
 	}
 
@@ -804,10 +804,10 @@ 
  * @param array $settings An array of Heartbeat settings.
  * @return array Filtered Heartbeat settings.
  */
-function wp_heartbeat_set_suspension( $settings ) {
+function wp_heartbeat_set_suspension($settings) {
 	global $pagenow;
 
-	if ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) {
+	if ('post.php' === $pagenow || 'post-new.php' === $pagenow) {
 		$settings['suspension'] = 'disable';
 	}
 
@@ -819,19 +819,19 @@ 
  *
  * @since 3.9.0
  */
-function heartbeat_autosave( $response, $data ) {
-	if ( ! empty( $data['wp_autosave'] ) ) {
-		$saved = wp_autosave( $data['wp_autosave'] );
-
-		if ( is_wp_error( $saved ) ) {
-			$response['wp_autosave'] = array( 'success' => false, 'message' => $saved->get_error_message() );
-		} elseif ( empty( $saved ) ) {
-			$response['wp_autosave'] = array( 'success' => false, 'message' => __( 'Error while saving.' ) );
+function heartbeat_autosave($response, $data) {
+	if ( ! empty($data['wp_autosave'])) {
+		$saved = wp_autosave($data['wp_autosave']);
+
+		if (is_wp_error($saved)) {
+			$response['wp_autosave'] = array('success' => false, 'message' => $saved->get_error_message());
+		} elseif (empty($saved)) {
+			$response['wp_autosave'] = array('success' => false, 'message' => __('Error while saving.'));
 		} else {
 			/* translators: draft saved date format, see http://php.net/date */
-			$draft_saved_date_format = __( 'g:i:s a' );
+			$draft_saved_date_format = __('g:i:s a');
 			/* translators: %s: date and time */
-			$response['wp_autosave'] = array( 'success' => true, 'message' => sprintf( __( 'Draft saved at %s.' ), date_i18n( $draft_saved_date_format ) ) );
+			$response['wp_autosave'] = array('success' => true, 'message' => sprintf(__('Draft saved at %s.'), date_i18n($draft_saved_date_format)));
 		}
 	}
 
@@ -851,7 +851,7 @@ 
 function post_form_autocomplete_off() {
 	global $is_safari, $is_chrome;
 
-	if ( $is_safari || $is_chrome ) {
+	if ($is_safari || $is_chrome) {
 		echo ' autocomplete="off"';
 	}
 }
@@ -881,17 +881,17 @@ 
 	 *
 	 * @param array $removable_query_args An array of parameters to remove from the URL.
 	 */
-	$removable_query_args = apply_filters( 'removable_query_args', $removable_query_args );
+	$removable_query_args = apply_filters('removable_query_args', $removable_query_args);
 
-	if ( empty( $removable_query_args ) ) {
+	if (empty($removable_query_args)) {
 		return;
 	}
 
 	// Ensure we're using an absolute URL.
-	$current_url  = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
-	$filtered_url = remove_query_arg( $removable_query_args, $current_url );
+	$current_url  = set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+	$filtered_url = remove_query_arg($removable_query_args, $current_url);
 	?>
-	<link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url( $filtered_url ); ?>" />
+	<link id="wp-admin-canonical" rel="canonical" href="<?php echo esc_url($filtered_url); ?>" />
 	<script>
 		if ( window.history.replaceState ) {
 			window.history.replaceState( null, null, document.getElementById( 'wp-admin-canonical' ).href + window.location.hash );

Braces +128 added lines, -89 removed lines

@@ -75,12 +75,15 @@ 
 	{
 		$state = false;
 		foreach ( $markerdata as $markerline ) {
-			if (strpos($markerline, '# END ' . $marker) !== false)
-				$state = false;
-			if ( $state )
-				$result[] = $markerline;
-			if (strpos($markerline, '# BEGIN ' . $marker) !== false)
-				$state = true;
+			if (strpos($markerline, '# END ' . $marker) !== false) {
+							$state = false;
+			}
+			if ( $state ) {
+							$result[] = $markerline;
+			}
+			if (strpos($markerline, '# BEGIN ' . $marker) !== false) {
+							$state = true;
+			}
 		}
 	}
 
@@ -109,26 +112,30 @@ 
 			$markerdata = explode( "\n", implode( '', file( $filename ) ) );
 		}
 
-		if ( !$f = @fopen( $filename, 'w' ) )
-			return false;
+		if ( !$f = @fopen( $filename, 'w' ) ) {
+					return false;
+		}
 
 		$foundit = false;
 		if ( $markerdata ) {
 			$state = true;
 			foreach ( $markerdata as $n => $markerline ) {
-				if (strpos($markerline, '# BEGIN ' . $marker) !== false)
-					$state = false;
+				if (strpos($markerline, '# BEGIN ' . $marker) !== false) {
+									$state = false;
+				}
 				if ( $state ) {
-					if ( $n + 1 < count( $markerdata ) )
-						fwrite( $f, "{$markerline}\n" );
-					else
-						fwrite( $f, "{$markerline}" );
+					if ( $n + 1 < count( $markerdata ) ) {
+											fwrite( $f, "{$markerline}\n" );
+					} else {
+											fwrite( $f, "{$markerline}" );
+					}
 				}
 				if (strpos($markerline, '# END ' . $marker) !== false) {
 					fwrite( $f, "# BEGIN {$marker}\n" );
-					if ( is_array( $insertion ))
-						foreach ( $insertion as $insertline )
+					if ( is_array( $insertion )) {
+											foreach ( $insertion as $insertline )
 							fwrite( $f, "{$insertline}\n" );
+					}
 					fwrite( $f, "# END {$marker}\n" );
 					$state = true;
 					$foundit = true;
@@ -137,8 +144,9 @@ 
 		}
 		if (!$foundit) {
 			fwrite( $f, "\n# BEGIN {$marker}\n" );
-			foreach ( $insertion as $insertline )
-				fwrite( $f, "{$insertline}\n" );
+			foreach ( $insertion as $insertline ) {
+							fwrite( $f, "{$insertline}\n" );
+			}
 			fwrite( $f, "# END {$marker}\n" );
 		}
 		fclose( $f );
@@ -159,8 +167,9 @@ 
  * @global WP_Rewrite $wp_rewrite
  */
 function save_mod_rewrite_rules() {
-	if ( is_multisite() )
-		return;
+	if ( is_multisite() ) {
+			return;
+	}
 
 	global $wp_rewrite;
 
@@ -192,8 +201,9 @@ 
  * @return bool True if web.config was updated successfully
  */
 function iis7_save_url_rewrite_rules(){
-	if ( is_multisite() )
-		return;
+	if ( is_multisite() ) {
+			return;
+	}
 
 	global $wp_rewrite;
 
@@ -226,8 +236,9 @@ 
 		$oldfiles[] = $file;
 		$oldfiles = array_reverse( $oldfiles );
 		$oldfiles = array_unique( $oldfiles );
-		if ( 5 < count( $oldfiles ))
-			array_pop( $oldfiles );
+		if ( 5 < count( $oldfiles )) {
+					array_pop( $oldfiles );
+		}
 	} else {
 		$oldfiles[] = $file;
 	}
@@ -243,8 +254,9 @@ 
  * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-	if ( defined( "WP_INSTALLING" ) )
-		return;
+	if ( defined( "WP_INSTALLING" ) ) {
+			return;
+	}
 
 	// If home changed, write rewrite rules to new location.
 	flush_rewrite_rules();
@@ -261,8 +273,9 @@ 
 function url_shorten( $url ) {
 	$short_url = str_replace( array( 'http://', 'www.' ), '', $url );
 	$short_url = untrailingslashit( $short_url );
-	if ( strlen( $short_url ) > 35 )
-		$short_url = substr( $short_url, 0, 32 ) . '&hellip;';
+	if ( strlen( $short_url ) > 35 ) {
+			$short_url = substr( $short_url, 0, 32 ) . '&hellip;';
+	}
 	return $short_url;
 }
 
@@ -300,10 +313,11 @@ 
  */
 function show_message($message) {
 	if ( is_wp_error($message) ){
-		if ( $message->get_error_data() && is_string( $message->get_error_data() ) )
-			$message = $message->get_error_message() . ': ' . $message->get_error_data();
-		else
-			$message = $message->get_error_message();
+		if ( $message->get_error_data() && is_string( $message->get_error_data() ) ) {
+					$message = $message->get_error_message() . ': ' . $message->get_error_data();
+		} else {
+					$message = $message->get_error_message();
+		}
 	}
 	echo "<p>$message</p>\n";
 	wp_ob_end_flush_all();
@@ -317,11 +331,13 @@ 
  * @return array
  */
 function wp_doc_link_parse( $content ) {
-	if ( !is_string( $content ) || empty( $content ) )
-		return array();
+	if ( !is_string( $content ) || empty( $content ) ) {
+			return array();
+	}
 
-	if ( !function_exists('token_get_all') )
-		return array();
+	if ( !function_exists('token_get_all') ) {
+			return array();
+	}
 
 	$tokens = token_get_all( $content );
 	$count = count( $tokens );
@@ -358,8 +374,9 @@ 
 
 	$out = array();
 	foreach ( $functions as $function ) {
-		if ( in_array( $function, $ignore_functions ) )
-			continue;
+		if ( in_array( $function, $ignore_functions ) ) {
+					continue;
+		}
 		$out[] = $function;
 	}
 
@@ -376,23 +393,26 @@ 
 	if ( isset($_POST['wp_screen_options']) && is_array($_POST['wp_screen_options']) ) {
 		check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
 
-		if ( !$user = wp_get_current_user() )
-			return;
+		if ( !$user = wp_get_current_user() ) {
+					return;
+		}
 		$option = $_POST['wp_screen_options']['option'];
 		$value = $_POST['wp_screen_options']['value'];
 
-		if ( $option != sanitize_key( $option ) )
-			return;
+		if ( $option != sanitize_key( $option ) ) {
+					return;
+		}
 
 		$map_option = $option;
 		$type = str_replace('edit_', '', $map_option);
 		$type = str_replace('_per_page', '', $type);
-		if ( in_array( $type, get_taxonomies() ) )
-			$map_option = 'edit_tags_per_page';
-		elseif ( in_array( $type, get_post_types() ) )
-			$map_option = 'edit_per_page';
-		else
-			$option = str_replace('-', '_', $option);
+		if ( in_array( $type, get_taxonomies() ) ) {
+					$map_option = 'edit_tags_per_page';
+		} elseif ( in_array( $type, get_post_types() ) ) {
+					$map_option = 'edit_per_page';
+		} else {
+					$option = str_replace('-', '_', $option);
+		}
 
 		switch ( $map_option ) {
 			case 'edit_per_page':
@@ -409,8 +429,9 @@ 
 			case 'themes_network_per_page':
 			case 'site_themes_network_per_page':
 				$value = (int) $value;
-				if ( $value < 1 || $value > 999 )
-					return;
+				if ( $value < 1 || $value > 999 ) {
+									return;
+				}
 				break;
 			default:
 
@@ -432,8 +453,9 @@ 
 				 */
 				$value = apply_filters( 'set-screen-option', false, $option, $value );
 
-				if ( false === $value )
-					return;
+				if ( false === $value ) {
+									return;
+				}
 				break;
 		}
 
@@ -452,21 +474,25 @@ 
  * @param string $filename The file path to the configuration file
  */
 function iis7_rewrite_rule_exists($filename) {
-	if ( ! file_exists($filename) )
-		return false;
-	if ( ! class_exists('DOMDocument') )
-		return false;
+	if ( ! file_exists($filename) ) {
+			return false;
+	}
+	if ( ! class_exists('DOMDocument') ) {
+			return false;
+	}
 
 	$doc = new DOMDocument();
-	if ( $doc->load($filename) === false )
-		return false;
+	if ( $doc->load($filename) === false ) {
+			return false;
+	}
 	$xpath = new DOMXPath($doc);
 	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
-	if ( $rules->length == 0 )
-		return false;
-	else
-		return true;
-}
+	if ( $rules->length == 0 ) {
+			return false;
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Delete WordPress rewrite rule from web.config file if it exists there
@@ -478,17 +504,20 @@ 
  */
 function iis7_delete_rewrite_rule($filename) {
 	// If configuration file does not exist then rules also do not exist so there is nothing to delete
-	if ( ! file_exists($filename) )
-		return true;
+	if ( ! file_exists($filename) ) {
+			return true;
+	}
 
-	if ( ! class_exists('DOMDocument') )
-		return false;
+	if ( ! class_exists('DOMDocument') ) {
+			return false;
+	}
 
 	$doc = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc -> load($filename) === false )
-		return false;
+	if ( $doc -> load($filename) === false ) {
+			return false;
+	}
 	$xpath = new DOMXPath($doc);
 	$rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
 	if ( $rules->length > 0 ) {
@@ -511,8 +540,9 @@ 
  * @return bool
  */
 function iis7_add_rewrite_rule($filename, $rewrite_rule) {
-	if ( ! class_exists('DOMDocument') )
-		return false;
+	if ( ! class_exists('DOMDocument') ) {
+			return false;
+	}
 
 	// If configuration file does not exist then we create one.
 	if ( ! file_exists($filename) ) {
@@ -524,15 +554,17 @@ 
 	$doc = new DOMDocument();
 	$doc->preserveWhiteSpace = false;
 
-	if ( $doc->load($filename) === false )
-		return false;
+	if ( $doc->load($filename) === false ) {
+			return false;
+	}
 
 	$xpath = new DOMXPath($doc);
 
 	// First check if the rule already exists as in that case there is no need to re-add it
 	$wordpress_rules = $xpath->query('/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')]');
-	if ( $wordpress_rules->length > 0 )
-		return true;
+	if ( $wordpress_rules->length > 0 ) {
+			return true;
+	}
 
 	// Check the XPath to the rewrite rule and create XML nodes if they do not exist
 	$xmlnodes = $xpath->query('/configuration/system.webServer/rewrite/rules');
@@ -703,22 +735,25 @@ 
 
 	if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
 		foreach ( $data['wp-check-locked-posts'] as $key ) {
-			if ( ! $post_id = absint( substr( $key, 5 ) ) )
-				continue;
+			if ( ! $post_id = absint( substr( $key, 5 ) ) ) {
+							continue;
+			}
 
 			if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
 				$send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
 
-				if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) )
-					$send['avatar_src'] = $matches[1];
+				if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
+									$send['avatar_src'] = $matches[1];
+				}
 
 				$checked[$key] = $send;
 			}
 		}
 	}
 
-	if ( ! empty( $checked ) )
-		$response['wp-check-locked-posts'] = $checked;
+	if ( ! empty( $checked ) ) {
+			$response['wp-check-locked-posts'] = $checked;
+	}
 
 	return $response;
 }
@@ -733,11 +768,13 @@ 
 		$received = $data['wp-refresh-post-lock'];
 		$send = array();
 
-		if ( ! $post_id = absint( $received['post_id'] ) )
-			return $response;
+		if ( ! $post_id = absint( $received['post_id'] ) ) {
+					return $response;
+		}
 
-		if ( ! current_user_can('edit_post', $post_id) )
-			return $response;
+		if ( ! current_user_can('edit_post', $post_id) ) {
+					return $response;
+		}
 
 		if ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
 			$error = array(
@@ -745,14 +782,16 @@ 
 			);
 
 			if ( $avatar = get_avatar( $user->ID, 64 ) ) {
-				if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) )
-					$error['avatar_src'] = $matches[1];
+				if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
+									$error['avatar_src'] = $matches[1];
+				}
 			}
 
 			$send['lock_error'] = $error;
 		} else {
-			if ( $new_lock = wp_set_post_lock( $post_id ) )
-				$send['new_lock'] = implode( ':', $new_lock );
+			if ( $new_lock = wp_set_post_lock( $post_id ) ) {
+							$send['new_lock'] = implode( ':', $new_lock );
+			}
 		}
 
 		$response['wp-refresh-post-lock'] = $send;

src/wp-admin/includes/ms.php

Doc Comments +1 added lines, -1 removed lines

@@ -736,7 +736,7 @@
  *
  * @global int $wp_db_version The version number of the database.
  *
- * @return false False if the current user is not a super admin.
+ * @return false|null False if the current user is not a super admin.
  */
 function site_admin_notice() {
 	global $wp_db_version;

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite administration functions.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite administration functions.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 /**
  * Determine if uploaded file exceeds space quota.

Spacing +234 added lines, -234 removed lines

@@ -15,28 +15,28 @@ 
  * @param array $file $_FILES array for a given file.
  * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
  */
-function check_upload_size( $file ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+function check_upload_size($file) {
+	if (get_site_option('upload_space_check_disabled'))
 		return $file;
 
-	if ( $file['error'] != '0' ) // there's already an error
+	if ($file['error'] != '0') // there's already an error
 		return $file;
 
-	if ( defined( 'WP_IMPORTING' ) )
+	if (defined('WP_IMPORTING'))
 		return $file;
 
 	$space_left = get_upload_space_available();
 
-	$file_size = filesize( $file['tmp_name'] );
-	if ( $space_left < $file_size )
-		$file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
-	if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-		$file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
-	if ( upload_is_user_over_quota( false ) ) {
-		$file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
+	$file_size = filesize($file['tmp_name']);
+	if ($space_left < $file_size)
+		$file['error'] = sprintf(__('Not enough space to upload. %1$s KB needed.'), number_format(($file_size - $space_left) / 1024));
+	if ($file_size > (1024 * get_site_option('fileupload_maxk', 1500)))
+		$file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option('fileupload_maxk', 1500));
+	if (upload_is_user_over_quota(false)) {
+		$file['error'] = __('You have used your space quota. Please delete files before uploading.');
 	}
-	if ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
-		wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
+	if ($file['error'] != '0' && ! isset($_POST['html-upload']) && ( ! defined('DOING_AJAX') || ! DOING_AJAX)) {
+		wp_die($file['error'].' <a href="javascript:history.go(-1)">'.__('Back').'</a>');
 	}
 
 	return $file;
@@ -52,16 +52,16 @@ 
  * @param int  $blog_id Blog ID.
  * @param bool $drop    True if blog's table should be dropped. Default is false.
  */
-function wpmu_delete_blog( $blog_id, $drop = false ) {
+function wpmu_delete_blog($blog_id, $drop = false) {
 	global $wpdb;
 
 	$switch = false;
-	if ( get_current_blog_id() != $blog_id ) {
+	if (get_current_blog_id() != $blog_id) {
 		$switch = true;
-		switch_to_blog( $blog_id );
+		switch_to_blog($blog_id);
 	}
 
-	$blog = get_blog_details( $blog_id );
+	$blog = get_blog_details($blog_id);
 	/**
 	 * Fires before a blog is deleted.
 	 *
@@ -70,42 +70,42 @@ 
 	 * @param int  $blog_id The blog ID.
 	 * @param bool $drop    True if blog's table should be dropped. Default is false.
 	 */
-	do_action( 'delete_blog', $blog_id, $drop );
+	do_action('delete_blog', $blog_id, $drop);
 
-	$users = get_users( array( 'blog_id' => $blog_id, 'fields' => 'ids' ) );
+	$users = get_users(array('blog_id' => $blog_id, 'fields' => 'ids'));
 
 	// Remove users from this blog.
-	if ( ! empty( $users ) ) {
-		foreach ( $users as $user_id ) {
-			remove_user_from_blog( $user_id, $blog_id );
+	if ( ! empty($users)) {
+		foreach ($users as $user_id) {
+			remove_user_from_blog($user_id, $blog_id);
 		}
 	}
 
-	update_blog_status( $blog_id, 'deleted', 1 );
+	update_blog_status($blog_id, 'deleted', 1);
 
 	$current_site = get_current_site();
 
 	// If a full blog object is not available, do not destroy anything.
-	if ( $drop && ! $blog ) {
+	if ($drop && ! $blog) {
 		$drop = false;
 	}
 
 	// Don't destroy the initial, main, or root blog.
-	if ( $drop && ( 1 == $blog_id || is_main_site( $blog_id ) || ( $blog->path == $current_site->path && $blog->domain == $current_site->domain ) ) ) {
+	if ($drop && (1 == $blog_id || is_main_site($blog_id) || ($blog->path == $current_site->path && $blog->domain == $current_site->domain))) {
 		$drop = false;
 	}
 
-	$upload_path = trim( get_option( 'upload_path' ) );
+	$upload_path = trim(get_option('upload_path'));
 
 	// If ms_files_rewriting is enabled and upload_path is empty, wp_upload_dir is not reliable.
-	if ( $drop && get_site_option( 'ms_files_rewriting' ) && empty( $upload_path ) ) {
+	if ($drop && get_site_option('ms_files_rewriting') && empty($upload_path)) {
 		$drop = false;
 	}
 
-	if ( $drop ) {
+	if ($drop) {
 		$uploads = wp_upload_dir();
 
-		$tables = $wpdb->tables( 'blog' );
+		$tables = $wpdb->tables('blog');
 		/**
 		 * Filter the tables to drop when the blog is deleted.
 		 *
@@ -114,13 +114,13 @@ 
 		 * @param array $tables  The blog tables to be dropped.
 		 * @param int   $blog_id The ID of the blog to drop tables for.
 		 */
-		$drop_tables = apply_filters( 'wpmu_drop_tables', $tables, $blog_id );
+		$drop_tables = apply_filters('wpmu_drop_tables', $tables, $blog_id);
 
-		foreach ( (array) $drop_tables as $table ) {
-			$wpdb->query( "DROP TABLE IF EXISTS `$table`" );
+		foreach ((array) $drop_tables as $table) {
+			$wpdb->query("DROP TABLE IF EXISTS `$table`");
 		}
 
-		$wpdb->delete( $wpdb->blogs, array( 'blog_id' => $blog_id ) );
+		$wpdb->delete($wpdb->blogs, array('blog_id' => $blog_id));
 
 		/**
 		 * Filter the upload base directory to delete when the blog is deleted.
@@ -130,43 +130,43 @@ 
 		 * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
 		 * @param int    $blog_id            The blog ID.
 		 */
-		$dir = apply_filters( 'wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id );
-		$dir = rtrim( $dir, DIRECTORY_SEPARATOR );
+		$dir = apply_filters('wpmu_delete_blog_upload_dir', $uploads['basedir'], $blog_id);
+		$dir = rtrim($dir, DIRECTORY_SEPARATOR);
 		$top_dir = $dir;
 		$stack = array($dir);
 		$index = 0;
 
-		while ( $index < count( $stack ) ) {
+		while ($index < count($stack)) {
 			// Get indexed directory from stack
 			$dir = $stack[$index];
 
-			$dh = @opendir( $dir );
-			if ( $dh ) {
-				while ( ( $file = @readdir( $dh ) ) !== false ) {
-					if ( $file == '.' || $file == '..' )
+			$dh = @opendir($dir);
+			if ($dh) {
+				while (($file = @readdir($dh)) !== false) {
+					if ($file == '.' || $file == '..')
 						continue;
 
-					if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
-						$stack[] = $dir . DIRECTORY_SEPARATOR . $file;
-					} elseif ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) ) {
-						@unlink( $dir . DIRECTORY_SEPARATOR . $file );
+					if (@is_dir($dir.DIRECTORY_SEPARATOR.$file)) {
+						$stack[] = $dir.DIRECTORY_SEPARATOR.$file;
+					} elseif (@is_file($dir.DIRECTORY_SEPARATOR.$file)) {
+						@unlink($dir.DIRECTORY_SEPARATOR.$file);
 					}
 				}
-				@closedir( $dh );
+				@closedir($dh);
 			}
 			$index++;
 		}
 
-		$stack = array_reverse( $stack ); // Last added dirs are deepest
-		foreach( (array) $stack as $dir ) {
-			if ( $dir != $top_dir)
-			@rmdir( $dir );
+		$stack = array_reverse($stack); // Last added dirs are deepest
+		foreach ((array) $stack as $dir) {
+			if ($dir != $top_dir)
+			@rmdir($dir);
 		}
 
-		clean_blog_cache( $blog );
+		clean_blog_cache($blog);
 	}
 
-	if ( $switch )
+	if ($switch)
 		restore_current_blog();
 }
 
@@ -182,18 +182,18 @@ 
  * @param int $id The user ID.
  * @return bool True if the user was deleted, otherwise false.
  */
-function wpmu_delete_user( $id ) {
+function wpmu_delete_user($id) {
 	global $wpdb;
 
 	$id = (int) $id;
-	$user = new WP_User( $id );
+	$user = new WP_User($id);
 
-	if ( !$user->exists() )
+	if ( ! $user->exists())
 		return false;
 
 	// Global super-administrators are protected, and cannot be deleted.
 	$_super_admins = get_super_admins();
-	if ( in_array( $user->user_login, $_super_admins, true ) ) {
+	if (in_array($user->user_login, $_super_admins, true)) {
 		return false;
 	}
 
@@ -204,42 +204,42 @@ 
 	 *
 	 * @param int $id ID of the user about to be deleted from the network.
 	 */
-	do_action( 'wpmu_delete_user', $id );
+	do_action('wpmu_delete_user', $id);
 
-	$blogs = get_blogs_of_user( $id );
+	$blogs = get_blogs_of_user($id);
 
-	if ( ! empty( $blogs ) ) {
-		foreach ( $blogs as $blog ) {
-			switch_to_blog( $blog->userblog_id );
-			remove_user_from_blog( $id, $blog->userblog_id );
+	if ( ! empty($blogs)) {
+		foreach ($blogs as $blog) {
+			switch_to_blog($blog->userblog_id);
+			remove_user_from_blog($id, $blog->userblog_id);
 
-			$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-			foreach ( (array) $post_ids as $post_id ) {
-				wp_delete_post( $post_id );
+			$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id));
+			foreach ((array) $post_ids as $post_id) {
+				wp_delete_post($post_id);
 			}
 
 			// Clean links
-			$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
+			$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
 
-			if ( $link_ids ) {
-				foreach ( $link_ids as $link_id )
-					wp_delete_link( $link_id );
+			if ($link_ids) {
+				foreach ($link_ids as $link_id)
+					wp_delete_link($link_id);
 			}
 
 			restore_current_blog();
 		}
 	}
 
-	$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-	foreach ( $meta as $mid )
-		delete_metadata_by_mid( 'user', $mid );
+	$meta = $wpdb->get_col($wpdb->prepare("SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id));
+	foreach ($meta as $mid)
+		delete_metadata_by_mid('user', $mid);
 
-	$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+	$wpdb->delete($wpdb->users, array('ID' => $id));
 
-	clean_user_cache( $user );
+	clean_user_cache($user);
 
 	/** This action is documented in wp-admin/includes/user.php */
-	do_action( 'deleted_user', $id );
+	do_action('deleted_user', $id);
 
 	return true;
 }
@@ -252,19 +252,19 @@ 
  * @param string $old_value The old email address. Not currently used.
  * @param string $value     The new email address.
  */
-function update_option_new_admin_email( $old_value, $value ) {
-	if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
+function update_option_new_admin_email($old_value, $value) {
+	if ($value == get_option('admin_email') || ! is_email($value))
 		return;
 
-	$hash = md5( $value. time() .mt_rand() );
+	$hash = md5($value.time().mt_rand());
 	$new_admin_email = array(
 		'hash' => $hash,
 		'newemail' => $value
 	);
-	update_option( 'adminhash', $new_admin_email );
+	update_option('adminhash', $new_admin_email);
 
 	/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-	$email_text = __( 'Howdy ###USERNAME###,
+	$email_text = __('Howdy ###USERNAME###,
 
 You recently requested to have the administration email address on
 your site changed.
@@ -296,16 +296,16 @@ 
 	 * @param string $email_text      Text in the email.
 	 * @param string $new_admin_email New admin email that the current administration email was changed to.
 	 */
-	$content = apply_filters( 'new_admin_email_content', $email_text, $new_admin_email );
+	$content = apply_filters('new_admin_email_content', $email_text, $new_admin_email);
 
 	$current_user = wp_get_current_user();
-	$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-	$content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'options.php?adminhash='.$hash ) ), $content );
-	$content = str_replace( '###EMAIL###', $value, $content );
-	$content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
-	$content = str_replace( '###SITEURL###', network_home_url(), $content );
+	$content = str_replace('###USERNAME###', $current_user->user_login, $content);
+	$content = str_replace('###ADMIN_URL###', esc_url(admin_url('options.php?adminhash='.$hash)), $content);
+	$content = str_replace('###EMAIL###', $value, $content);
+	$content = str_replace('###SITENAME###', get_site_option('site_name'), $content);
+	$content = str_replace('###SITEURL###', network_home_url(), $content);
 
-	wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
+	wp_mail($value, sprintf(__('[%s] New Admin Email Address'), wp_specialchars_decode(get_option('blogname'))), $content);
 }
 
 /**
@@ -319,33 +319,33 @@ 
 function send_confirmation_on_profile_email() {
 	global $errors, $wpdb;
 	$current_user = wp_get_current_user();
-	if ( ! is_object($errors) )
+	if ( ! is_object($errors))
 		$errors = new WP_Error();
 
-	if ( $current_user->ID != $_POST['user_id'] )
+	if ($current_user->ID != $_POST['user_id'])
 		return false;
 
-	if ( $current_user->user_email != $_POST['email'] ) {
-		if ( !is_email( $_POST['email'] ) ) {
-			$errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address isn&#8217;t correct." ), array( 'form-field' => 'email' ) );
+	if ($current_user->user_email != $_POST['email']) {
+		if ( ! is_email($_POST['email'])) {
+			$errors->add('user_email', __("<strong>ERROR</strong>: The email address isn&#8217;t correct."), array('form-field' => 'email'));
 			return;
 		}
 
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
-			$errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
-			delete_option( $current_user->ID . '_new_email' );
+		if ($wpdb->get_var($wpdb->prepare("SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email']))) {
+			$errors->add('user_email', __("<strong>ERROR</strong>: The email address is already used."), array('form-field' => 'email'));
+			delete_option($current_user->ID.'_new_email');
 			return;
 		}
 
-		$hash = md5( $_POST['email'] . time() . mt_rand() );
+		$hash = md5($_POST['email'].time().mt_rand());
 		$new_user_email = array(
 				'hash' => $hash,
 				'newemail' => $_POST['email']
 				);
-		update_option( $current_user->ID . '_new_email', $new_user_email );
+		update_option($current_user->ID.'_new_email', $new_user_email);
 
 		/* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-		$email_text = __( 'Howdy ###USERNAME###,
+		$email_text = __('Howdy ###USERNAME###,
 
 You recently requested to have the email address on your account changed.
 
@@ -376,15 +376,15 @@ 
 		 * @param string $email_text     Text in the email.
 		 * @param string $new_user_email New user email that the current user has changed to.
 		 */
-		$content = apply_filters( 'new_user_email_content', $email_text, $new_user_email );
+		$content = apply_filters('new_user_email_content', $email_text, $new_user_email);
 
-		$content = str_replace( '###USERNAME###', $current_user->user_login, $content );
-		$content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail='.$hash ) ), $content );
-		$content = str_replace( '###EMAIL###', $_POST['email'], $content);
-		$content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content );
-		$content = str_replace( '###SITEURL###', network_home_url(), $content );
+		$content = str_replace('###USERNAME###', $current_user->user_login, $content);
+		$content = str_replace('###ADMIN_URL###', esc_url(admin_url('profile.php?newuseremail='.$hash)), $content);
+		$content = str_replace('###EMAIL###', $_POST['email'], $content);
+		$content = str_replace('###SITENAME###', get_site_option('site_name'), $content);
+		$content = str_replace('###SITEURL###', network_home_url(), $content);
 
-		wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
+		wp_mail($_POST['email'], sprintf(__('[%s] New Email Address'), wp_specialchars_decode(get_option('blogname'))), $content);
 		$_POST['email'] = $current_user->user_email;
 	}
 }
@@ -396,8 +396,8 @@ 
  * @since 3.0.0
  */
 function new_user_email_admin_notice() {
-	if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) )
-		echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
+	if (strpos($_SERVER['PHP_SELF'], 'profile.php') && isset($_GET['updated']) && $email = get_option(get_current_user_id().'_new_email'))
+		echo "<div class='update-nag'>".sprintf(__("Your email address has not been updated yet. Please check your inbox at %s for a confirmation email."), $email['newemail'])."</div>";
 }
 
 /**
@@ -408,19 +408,19 @@ 
  * @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true.
  * @return bool True if user is over upload space quota, otherwise false.
  */
-function upload_is_user_over_quota( $echo = true ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+function upload_is_user_over_quota($echo = true) {
+	if (get_site_option('upload_space_check_disabled'))
 		return false;
 
 	$space_allowed = get_space_allowed();
-	if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
+	if (empty($space_allowed) || ! is_numeric($space_allowed))
 		$space_allowed = 10; // Default space allowed is 10 MB
 
 	$space_used = get_space_used();
 
-	if ( ( $space_allowed - $space_used ) < 0 ) {
-		if ( $echo )
-			_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+	if (($space_allowed - $space_used) < 0) {
+		if ($echo)
+			_e('Sorry, you have used your space allocation. Please delete some files to upload more files.');
 		return true;
 	} else {
 		return false;
@@ -436,19 +436,19 @@ 
 	$space_allowed = get_space_allowed();
 	$space_used = get_space_used();
 
-	$percent_used = ( $space_used / $space_allowed ) * 100;
+	$percent_used = ($space_used / $space_allowed) * 100;
 
-	if ( $space_allowed > 1000 ) {
-		$space = number_format( $space_allowed / 1024 );
+	if ($space_allowed > 1000) {
+		$space = number_format($space_allowed / 1024);
 		/* translators: Gigabytes */
-		$space .= __( 'GB' );
+		$space .= __('GB');
 	} else {
-		$space = number_format( $space_allowed );
+		$space = number_format($space_allowed);
 		/* translators: Megabytes */
-		$space .= __( 'MB' );
+		$space .= __('MB');
 	}
 	?>
-	<strong><?php printf( __( 'Used: %1$s%% of %2$s' ), number_format( $percent_used ), $space ); ?></strong>
+	<strong><?php printf(__('Used: %1$s%% of %2$s'), number_format($percent_used), $space); ?></strong>
 	<?php
 }
 
@@ -460,12 +460,12 @@ 
  * @param int $size Current max size in bytes
  * @return int Max size in bytes
  */
-function fix_import_form_size( $size ) {
-	if ( upload_is_user_over_quota( false ) ) {
+function fix_import_form_size($size) {
+	if (upload_is_user_over_quota(false)) {
 		return 0;
 	}
 	$available = get_upload_space_available();
-	return min( $size, $available );
+	return min($size, $available);
 }
 
 /**
@@ -475,20 +475,20 @@ 
  *
  * @param int $id The ID of the blog to display the setting for.
  */
-function upload_space_setting( $id ) {
-	switch_to_blog( $id );
-	$quota = get_option( 'blog_upload_space' );
+function upload_space_setting($id) {
+	switch_to_blog($id);
+	$quota = get_option('blog_upload_space');
 	restore_current_blog();
 
-	if ( !$quota )
+	if ( ! $quota)
 		$quota = '';
 
 	?>
 	<tr>
-		<th><label for="blog-upload-space-number"><?php _e( 'Site Upload Space Quota' ); ?></label></th>
+		<th><label for="blog-upload-space-number"><?php _e('Site Upload Space Quota'); ?></label></th>
 		<td>
 			<input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" id="blog-upload-space-number" aria-describedby="blog-upload-space-desc" value="<?php echo $quota; ?>" />
-			<span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e( 'Size in megabytes' ); ?></span> <?php _e( 'MB (Leave blank for network default)' ); ?></span>
+			<span id="blog-upload-space-desc"><span class="screen-reader-text"><?php _e('Size in megabytes'); ?></span> <?php _e('MB (Leave blank for network default)'); ?></span>
 		</td>
 	</tr>
 	<?php
@@ -510,19 +510,19 @@ 
  * @param null   $deprecated Deprecated as of 3.0.2 and should not be used.
  * @return int   The initially passed $value.
  */
-function update_user_status( $id, $pref, $value, $deprecated = null ) {
+function update_user_status($id, $pref, $value, $deprecated = null) {
 	global $wpdb;
 
-	if ( null !== $deprecated )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if (null !== $deprecated)
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
+	$wpdb->update($wpdb->users, array(sanitize_key($pref) => $value), array('ID' => $id));
 
-	$user = new WP_User( $id );
-	clean_user_cache( $user );
+	$user = new WP_User($id);
+	clean_user_cache($user);
 
-	if ( $pref == 'spam' ) {
-		if ( $value == 1 ) {
+	if ($pref == 'spam') {
+		if ($value == 1) {
 			/**
 			 * Fires after the user is marked as a SPAM user.
 			 *
@@ -530,7 +530,7 @@ 
 			 *
 			 * @param int $id ID of the user marked as SPAM.
 			 */
-			do_action( 'make_spam_user', $id );
+			do_action('make_spam_user', $id);
 		} else {
 			/**
 			 * Fires after the user is marked as a HAM user. Opposite of SPAM.
@@ -539,7 +539,7 @@ 
 			 *
 			 * @param int $id ID of the user marked as HAM.
 			 */
-			do_action( 'make_ham_user', $id );
+			do_action('make_ham_user', $id);
 		}
 	}
 
@@ -554,13 +554,13 @@ 
  * @param int $id The user ID.
  * @return bool|int The ID of the refreshed user or false if the user does not exist.
  */
-function refresh_user_details( $id ) {
+function refresh_user_details($id) {
 	$id = (int) $id;
 
-	if ( !$user = get_userdata( $id ) )
+	if ( ! $user = get_userdata($id))
 		return false;
 
-	clean_user_cache( $user );
+	clean_user_cache($user);
 
 	return $id;
 }
@@ -574,8 +574,8 @@ 
  * @return string The language corresponding to $code if it exists. If it does not exist,
  *                then the first two letters of $code is returned.
  */
-function format_code_lang( $code = '' ) {
-	$code = strtolower( substr( $code, 0, 2 ) );
+function format_code_lang($code = '') {
+	$code = strtolower(substr($code, 0, 2));
 	$lang_codes = array(
 		'aa' => 'Afar', 'ab' => 'Abkhazian', 'af' => 'Afrikaans', 'ak' => 'Akan', 'sq' => 'Albanian', 'am' => 'Amharic', 'ar' => 'Arabic', 'an' => 'Aragonese', 'hy' => 'Armenian', 'as' => 'Assamese', 'av' => 'Avaric', 'ae' => 'Avestan', 'ay' => 'Aymara', 'az' => 'Azerbaijani', 'ba' => 'Bashkir', 'bm' => 'Bambara', 'eu' => 'Basque', 'be' => 'Belarusian', 'bn' => 'Bengali',
 		'bh' => 'Bihari', 'bi' => 'Bislama', 'bs' => 'Bosnian', 'br' => 'Breton', 'bg' => 'Bulgarian', 'my' => 'Burmese', 'ca' => 'Catalan; Valencian', 'ch' => 'Chamorro', 'ce' => 'Chechen', 'zh' => 'Chinese', 'cu' => 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', 'cv' => 'Chuvash', 'kw' => 'Cornish', 'co' => 'Corsican', 'cr' => 'Cree',
@@ -587,7 +587,7 @@ 
 		'no' => 'Norwegian', 'ny' => 'Chichewa; Chewa; Nyanja', 'oc' => 'Occitan, Provençal', 'oj' => 'Ojibwa', 'or' => 'Oriya', 'om' => 'Oromo', 'os' => 'Ossetian; Ossetic', 'pa' => 'Panjabi; Punjabi', 'fa' => 'Persian', 'pi' => 'Pali', 'pl' => 'Polish', 'pt' => 'Portuguese', 'ps' => 'Pushto', 'qu' => 'Quechua', 'rm' => 'Romansh', 'ro' => 'Romanian', 'rn' => 'Rundi', 'ru' => 'Russian',
 		'sg' => 'Sango', 'sa' => 'Sanskrit', 'sr' => 'Serbian', 'hr' => 'Croatian', 'si' => 'Sinhala; Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho, Southern', 'es' => 'Spanish; Castilian', 'sc' => 'Sardinian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili',
 		'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'bo' => 'Tibetan', 'ti' => 'Tigrinya', 'to' => 'Tonga (Tonga Islands)', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur; Uyghur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek',
-		've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh','wa' => 'Walloon','wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
+		've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh', 'wa' => 'Walloon', 'wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
 
 	/**
 	 * Filter the language codes.
@@ -597,8 +597,8 @@ 
 	 * @param array  $lang_codes Key/value pair of language codes where key is the short version.
 	 * @param string $code       A two-letter designation of the language.
 	 */
-	$lang_codes = apply_filters( 'lang_codes', $lang_codes, $code );
-	return strtr( $code, $lang_codes );
+	$lang_codes = apply_filters('lang_codes', $lang_codes, $code);
+	return strtr($code, $lang_codes);
 }
 
 /**
@@ -613,12 +613,12 @@ 
  * @return object|array Returns `$term`, after filtering the 'slug' field with {@see sanitize_title()}
  *                      if $taxonomy is 'category' or 'post_tag'.
  */
-function sync_category_tag_slugs( $term, $taxonomy ) {
-	if ( global_terms_enabled() && ( $taxonomy == 'category' || $taxonomy == 'post_tag' ) ) {
-		if ( is_object( $term ) ) {
-			$term->slug = sanitize_title( $term->name );
+function sync_category_tag_slugs($term, $taxonomy) {
+	if (global_terms_enabled() && ($taxonomy == 'category' || $taxonomy == 'post_tag')) {
+		if (is_object($term)) {
+			$term->slug = sanitize_title($term->name);
 		} else {
-			$term['slug'] = sanitize_title( $term['name'] );
+			$term['slug'] = sanitize_title($term['name']);
 		}
 	}
 	return $term;
@@ -632,36 +632,36 @@ 
  * @access private
  */
 function _access_denied_splash() {
-	if ( ! is_user_logged_in() || is_network_admin() )
+	if ( ! is_user_logged_in() || is_network_admin())
 		return;
 
-	$blogs = get_blogs_of_user( get_current_user_id() );
+	$blogs = get_blogs_of_user(get_current_user_id());
 
-	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) )
+	if (wp_list_filter($blogs, array('userblog_id' => get_current_blog_id())))
 		return;
 
-	$blog_name = get_bloginfo( 'name' );
+	$blog_name = get_bloginfo('name');
 
-	if ( empty( $blogs ) )
-		wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	if (empty($blogs))
+		wp_die(sprintf(__('You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.'), $blog_name), 403);
 
-	$output = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
-	$output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
+	$output = '<p>'.sprintf(__('You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.'), $blog_name).'</p>';
+	$output .= '<p>'.__('If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.').'</p>';
 
-	$output .= '<h3>' . __('Your Sites') . '</h3>';
+	$output .= '<h3>'.__('Your Sites').'</h3>';
 	$output .= '<table>';
 
-	foreach ( $blogs as $blog ) {
+	foreach ($blogs as $blog) {
 		$output .= '<tr>';
 		$output .= "<td>{$blog->blogname}</td>";
-		$output .= '<td><a href="' . esc_url( get_admin_url( $blog->userblog_id ) ) . '">' . __( 'Visit Dashboard' ) . '</a> | ' .
-			'<a href="' . esc_url( get_home_url( $blog->userblog_id ) ). '">' . __( 'View Site' ) . '</a></td>';
+		$output .= '<td><a href="'.esc_url(get_admin_url($blog->userblog_id)).'">'.__('Visit Dashboard').'</a> | '.
+			'<a href="'.esc_url(get_home_url($blog->userblog_id)).'">'.__('View Site').'</a></td>';
 		$output .= '</tr>';
 	}
 
 	$output .= '</table>';
 
-	wp_die( $output, 403 );
+	wp_die($output, 403);
 }
 
 /**
@@ -672,8 +672,8 @@ 
  * @param string $permission A permission to be checked. Currently not used.
  * @return bool True if the user has proper permissions, false if they do not.
  */
-function check_import_new_users( $permission ) {
-	if ( !is_super_admin() )
+function check_import_new_users($permission) {
+	if ( ! is_super_admin())
 		return false;
 	return true;
 }
@@ -687,33 +687,33 @@ 
  * @param array  $lang_files Optional. An array of the language files. Default empty array.
  * @param string $current    Optional. The current language code. Default empty.
  */
-function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
+function mu_dropdown_languages($lang_files = array(), $current = '') {
 	$flag = false;
 	$output = array();
 
-	foreach ( (array) $lang_files as $val ) {
-		$code_lang = basename( $val, '.mo' );
+	foreach ((array) $lang_files as $val) {
+		$code_lang = basename($val, '.mo');
 
-		if ( $code_lang == 'en_US' ) { // American English
+		if ($code_lang == 'en_US') { // American English
 			$flag = true;
-			$ae = __( 'American English' );
-			$output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
-		} elseif ( $code_lang == 'en_GB' ) { // British English
+			$ae = __('American English');
+			$output[$ae] = '<option value="'.esc_attr($code_lang).'"'.selected($current, $code_lang, false).'> '.$ae.'</option>';
+		} elseif ($code_lang == 'en_GB') { // British English
 			$flag = true;
-			$be = __( 'British English' );
-			$output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
+			$be = __('British English');
+			$output[$be] = '<option value="'.esc_attr($code_lang).'"'.selected($current, $code_lang, false).'> '.$be.'</option>';
 		} else {
-			$translated = format_code_lang( $code_lang );
-			$output[$translated] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
+			$translated = format_code_lang($code_lang);
+			$output[$translated] = '<option value="'.esc_attr($code_lang).'"'.selected($current, $code_lang, false).'> '.esc_html($translated).'</option>';
 		}
 
 	}
 
-	if ( $flag === false ) // WordPress english
-		$output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
+	if ($flag === false) // WordPress english
+		$output[] = '<option value=""'.selected($current, '', false).'>'.__('English')."</option>";
 
 	// Order by name
-	uksort( $output, 'strnatcasecmp' );
+	uksort($output, 'strnatcasecmp');
 
 	/**
 	 * Filter the languages available in the dropdown.
@@ -724,9 +724,9 @@ 
 	 * @param array $lang_files Available language files.
 	 * @param string $current   The current language code.
 	 */
-	$output = apply_filters( 'mu_dropdown_languages', $output, $lang_files, $current );
+	$output = apply_filters('mu_dropdown_languages', $output, $lang_files, $current);
 
-	echo implode( "\n\t", $output );
+	echo implode("\n\t", $output);
 }
 
 /**
@@ -740,10 +740,10 @@ 
  */
 function site_admin_notice() {
 	global $wp_db_version;
-	if ( !is_super_admin() )
+	if ( ! is_super_admin())
 		return false;
-	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
-		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
+	if (get_site_option('wpmu_upgrade_site') != $wp_db_version)
+		echo "<div class='update-nag'>".sprintf(__('Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.'), esc_url(network_admin_url('upgrade.php')))."</div>";
 }
 
 /**
@@ -758,23 +758,23 @@ 
  * @param array $postarr An array of posts. Not currently used.
  * @return array The new array of post data after checking for collisions.
  */
-function avoid_blog_page_permalink_collision( $data, $postarr ) {
-	if ( is_subdomain_install() )
+function avoid_blog_page_permalink_collision($data, $postarr) {
+	if (is_subdomain_install())
 		return $data;
-	if ( $data['post_type'] != 'page' )
+	if ($data['post_type'] != 'page')
 		return $data;
-	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' )
+	if ( ! isset($data['post_name']) || $data['post_name'] == '')
 		return $data;
-	if ( !is_main_site() )
+	if ( ! is_main_site())
 		return $data;
 
 	$post_name = $data['post_name'];
 	$c = 0;
-	while( $c < 10 && get_id_from_blogname( $post_name ) ) {
-		$post_name .= mt_rand( 1, 10 );
-		$c ++;
+	while ($c < 10 && get_id_from_blogname($post_name)) {
+		$post_name .= mt_rand(1, 10);
+		$c++;
 	}
-	if ( $post_name != $data['post_name'] ) {
+	if ($post_name != $data['post_name']) {
 		$data['post_name'] = $post_name;
 	}
 	return $data;
@@ -793,45 +793,45 @@ 
 	<table class="form-table">
 	<tr>
 	<?php /* translators: My sites label */ ?>
-		<th scope="row"><label for="primary_blog"><?php _e( 'Primary Site' ); ?></label></th>
+		<th scope="row"><label for="primary_blog"><?php _e('Primary Site'); ?></label></th>
 		<td>
 		<?php
-		$all_blogs = get_blogs_of_user( get_current_user_id() );
-		$primary_blog = get_user_meta( get_current_user_id(), 'primary_blog', true );
-		if ( count( $all_blogs ) > 1 ) {
+		$all_blogs = get_blogs_of_user(get_current_user_id());
+		$primary_blog = get_user_meta(get_current_user_id(), 'primary_blog', true);
+		if (count($all_blogs) > 1) {
 			$found = false;
 			?>
 			<select name="primary_blog" id="primary_blog">
-				<?php foreach( (array) $all_blogs as $blog ) {
-					if ( $primary_blog == $blog->userblog_id )
+				<?php foreach ((array) $all_blogs as $blog) {
+					if ($primary_blog == $blog->userblog_id)
 						$found = true;
-					?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
+					?><option value="<?php echo $blog->userblog_id ?>"<?php selected($primary_blog, $blog->userblog_id); ?>><?php echo esc_url(get_home_url($blog->userblog_id)) ?></option><?php
 				} ?>
 			</select>
 			<?php
-			if ( !$found ) {
-				$blog = reset( $all_blogs );
-				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+			if ( ! $found) {
+				$blog = reset($all_blogs);
+				update_user_meta(get_current_user_id(), 'primary_blog', $blog->userblog_id);
 			}
-		} elseif ( count( $all_blogs ) == 1 ) {
-			$blog = reset( $all_blogs );
-			echo esc_url( get_home_url( $blog->userblog_id ) );
-			if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
-				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+		} elseif (count($all_blogs) == 1) {
+			$blog = reset($all_blogs);
+			echo esc_url(get_home_url($blog->userblog_id));
+			if ($primary_blog != $blog->userblog_id) // Set the primary blog again if it's out of sync with blog list.
+				update_user_meta(get_current_user_id(), 'primary_blog', $blog->userblog_id);
 		} else {
 			echo "N/A";
 		}
 		?>
 		</td>
 	</tr>
-	<?php if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) : ?>
+	<?php if (in_array(get_site_option('registration'), array('all', 'blog'))) : ?>
 		<tr>
 			<th scope="row" colspan="2" class="th-full">
 				<?php
 				/** This filter is documented in wp-login.php */
-				$sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
+				$sign_up_url = apply_filters('wp_signup_location', network_site_url('wp-signup.php'));
 				?>
-				<a href="<?php echo esc_url( $sign_up_url ); ?>"><?php _e( 'Create a New Site' ); ?></a>
+				<a href="<?php echo esc_url($sign_up_url); ?>"><?php _e('Create a New Site'); ?></a>
 			</th>
 		</tr>
 	<?php endif; ?>
@@ -850,9 +850,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user is
  *              already a super admin or when the `$super_admins` global is defined.
  */
-function grant_super_admin( $user_id ) {
+function grant_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) ) {
+	if (isset($GLOBALS['super_admins'])) {
 		return false;
 	}
 
@@ -863,15 +863,15 @@ 
 	 *
 	 * @param int $user_id ID of the user that is about to be granted Super Admin privileges.
 	 */
-	do_action( 'grant_super_admin', $user_id );
+	do_action('grant_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
+	$user = get_userdata($user_id);
+	if ($user && ! in_array($user->user_login, $super_admins)) {
 		$super_admins[] = $user->user_login;
-		update_site_option( 'site_admins' , $super_admins );
+		update_site_option('site_admins', $super_admins);
 
 		/**
 		 * Fires after the user is granted Super Admin privileges.
@@ -880,7 +880,7 @@ 
 		 *
 		 * @param int $user_id ID of the user that was granted Super Admin privileges.
 		 */
-		do_action( 'granted_super_admin', $user_id );
+		do_action('granted_super_admin', $user_id);
 		return true;
 	}
 	return false;
@@ -897,9 +897,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user's email
  *              is the network admin email or when the `$super_admins` global is defined.
  */
-function revoke_super_admin( $user_id ) {
+function revoke_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) ) {
+	if (isset($GLOBALS['super_admins'])) {
 		return false;
 	}
 
@@ -910,16 +910,16 @@ 
 	 *
 	 * @param int $user_id ID of the user Super Admin privileges are being revoked from.
 	 */
-	do_action( 'revoke_super_admin', $user_id );
+	do_action('revoke_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
-		if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
-			unset( $super_admins[$key] );
-			update_site_option( 'site_admins', $super_admins );
+	$user = get_userdata($user_id);
+	if ($user && 0 !== strcasecmp($user->user_email, get_site_option('admin_email'))) {
+		if (false !== ($key = array_search($user->user_login, $super_admins))) {
+			unset($super_admins[$key]);
+			update_site_option('site_admins', $super_admins);
 
 			/**
 			 * Fires after the user's Super Admin privileges are revoked.
@@ -928,7 +928,7 @@ 
 			 *
 			 * @param int $user_id ID of the user Super Admin privileges were revoked from.
 			 */
-			do_action( 'revoked_super_admin', $user_id );
+			do_action('revoked_super_admin', $user_id);
 			return true;
 		}
 	}
@@ -948,10 +948,10 @@ 
  * @param int $site_id The network/site ID to check.
  * @return bool True if network can be edited, otherwise false.
  */
-function can_edit_network( $site_id ) {
+function can_edit_network($site_id) {
 	global $wpdb;
 
-	if ( $site_id == $wpdb->siteid )
+	if ($site_id == $wpdb->siteid)
 		$result = true;
 	else
 		$result = false;
@@ -964,7 +964,7 @@ 
 	 * @param bool $result  Whether the network can be edited from this page.
 	 * @param int  $site_id The network/site ID to check.
 	 */
-	return apply_filters( 'can_edit_network', $result, $site_id );
+	return apply_filters('can_edit_network', $result, $site_id);
 }
 
 /**
@@ -977,7 +977,7 @@ 
 function _thickbox_path_admin_subfolder() {
 ?>
 <script type="text/javascript">
-var tb_pathToImage = "<?php echo includes_url( 'js/thickbox/loadingAnimation.gif', 'relative' ); ?>";
+var tb_pathToImage = "<?php echo includes_url('js/thickbox/loadingAnimation.gif', 'relative'); ?>";
 </script>
 <?php
 }

Braces +111 added lines, -72 removed lines

@@ -16,22 +16,28 @@ 
  * @return array $_FILES array with 'error' key set if file exceeds quota. 'error' is empty otherwise.
  */
 function check_upload_size( $file ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $file;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $file;
+	}
 
-	if ( $file['error'] != '0' ) // there's already an error
+	if ( $file['error'] != '0' ) {
+		// there's already an error
 		return $file;
+	}
 
-	if ( defined( 'WP_IMPORTING' ) )
-		return $file;
+	if ( defined( 'WP_IMPORTING' ) ) {
+			return $file;
+	}
 
 	$space_left = get_upload_space_available();
 
 	$file_size = filesize( $file['tmp_name'] );
-	if ( $space_left < $file_size )
-		$file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
-	if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
-		$file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
+	if ( $space_left < $file_size ) {
+			$file['error'] = sprintf( __( 'Not enough space to upload. %1$s KB needed.' ), number_format( ($file_size - $space_left) /1024 ) );
+	}
+	if ( $file_size > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
+			$file['error'] = sprintf(__('This file is too big. Files must be less than %1$s KB in size.'), get_site_option( 'fileupload_maxk', 1500 ) );
+	}
 	if ( upload_is_user_over_quota( false ) ) {
 		$file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
 	}
@@ -143,8 +149,9 @@ 
 			$dh = @opendir( $dir );
 			if ( $dh ) {
 				while ( ( $file = @readdir( $dh ) ) !== false ) {
-					if ( $file == '.' || $file == '..' )
-						continue;
+					if ( $file == '.' || $file == '..' ) {
+											continue;
+					}
 
 					if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
 						$stack[] = $dir . DIRECTORY_SEPARATOR . $file;
@@ -159,16 +166,18 @@ 
 
 		$stack = array_reverse( $stack ); // Last added dirs are deepest
 		foreach( (array) $stack as $dir ) {
-			if ( $dir != $top_dir)
-			@rmdir( $dir );
+			if ( $dir != $top_dir) {
+						@rmdir( $dir );
+			}
 		}
 
 		clean_blog_cache( $blog );
 	}
 
-	if ( $switch )
-		restore_current_blog();
-}
+	if ( $switch ) {
+			restore_current_blog();
+	}
+	}
 
 /**
  * Delete a user from the network and remove from all sites.
@@ -188,8 +197,9 @@ 
 	$id = (int) $id;
 	$user = new WP_User( $id );
 
-	if ( !$user->exists() )
-		return false;
+	if ( !$user->exists() ) {
+			return false;
+	}
 
 	// Global super-administrators are protected, and cannot be deleted.
 	$_super_admins = get_super_admins();
@@ -222,8 +232,9 @@ 
 			$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id ) );
 
 			if ( $link_ids ) {
-				foreach ( $link_ids as $link_id )
-					wp_delete_link( $link_id );
+				foreach ( $link_ids as $link_id ) {
+									wp_delete_link( $link_id );
+				}
 			}
 
 			restore_current_blog();
@@ -231,8 +242,9 @@ 
 	}
 
 	$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-	foreach ( $meta as $mid )
-		delete_metadata_by_mid( 'user', $mid );
+	foreach ( $meta as $mid ) {
+			delete_metadata_by_mid( 'user', $mid );
+	}
 
 	$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 
@@ -253,8 +265,9 @@ 
  * @param string $value     The new email address.
  */
 function update_option_new_admin_email( $old_value, $value ) {
-	if ( $value == get_option( 'admin_email' ) || !is_email( $value ) )
-		return;
+	if ( $value == get_option( 'admin_email' ) || !is_email( $value ) ) {
+			return;
+	}
 
 	$hash = md5( $value. time() .mt_rand() );
 	$new_admin_email = array(
@@ -319,11 +332,13 @@ 
 function send_confirmation_on_profile_email() {
 	global $errors, $wpdb;
 	$current_user = wp_get_current_user();
-	if ( ! is_object($errors) )
-		$errors = new WP_Error();
+	if ( ! is_object($errors) ) {
+			$errors = new WP_Error();
+	}
 
-	if ( $current_user->ID != $_POST['user_id'] )
-		return false;
+	if ( $current_user->ID != $_POST['user_id'] ) {
+			return false;
+	}
 
 	if ( $current_user->user_email != $_POST['email'] ) {
 		if ( !is_email( $_POST['email'] ) ) {
@@ -396,9 +411,10 @@ 
  * @since 3.0.0
  */
 function new_user_email_admin_notice() {
-	if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) )
-		echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
-}
+	if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) {
+			echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>";
+	}
+	}
 
 /**
  * Check whether a blog has used its allotted upload space.
@@ -409,18 +425,22 @@ 
  * @return bool True if user is over upload space quota, otherwise false.
  */
 function upload_is_user_over_quota( $echo = true ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return false;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return false;
+	}
 
 	$space_allowed = get_space_allowed();
-	if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) )
-		$space_allowed = 10; // Default space allowed is 10 MB
+	if ( empty( $space_allowed ) || !is_numeric( $space_allowed ) ) {
+			$space_allowed = 10;
+	}
+	// Default space allowed is 10 MB
 
 	$space_used = get_space_used();
 
 	if ( ( $space_allowed - $space_used ) < 0 ) {
-		if ( $echo )
-			_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+		if ( $echo ) {
+					_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' );
+		}
 		return true;
 	} else {
 		return false;
@@ -480,8 +500,9 @@ 
 	$quota = get_option( 'blog_upload_space' );
 	restore_current_blog();
 
-	if ( !$quota )
-		$quota = '';
+	if ( !$quota ) {
+			$quota = '';
+	}
 
 	?>
 	<tr>
@@ -513,8 +534,9 @@ 
 function update_user_status( $id, $pref, $value, $deprecated = null ) {
 	global $wpdb;
 
-	if ( null !== $deprecated )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( null !== $deprecated ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
 	$wpdb->update( $wpdb->users, array( sanitize_key( $pref ) => $value ), array( 'ID' => $id ) );
 
@@ -557,8 +579,9 @@ 
 function refresh_user_details( $id ) {
 	$id = (int) $id;
 
-	if ( !$user = get_userdata( $id ) )
-		return false;
+	if ( !$user = get_userdata( $id ) ) {
+			return false;
+	}
 
 	clean_user_cache( $user );
 
@@ -632,18 +655,21 @@ 
  * @access private
  */
 function _access_denied_splash() {
-	if ( ! is_user_logged_in() || is_network_admin() )
-		return;
+	if ( ! is_user_logged_in() || is_network_admin() ) {
+			return;
+	}
 
 	$blogs = get_blogs_of_user( get_current_user_id() );
 
-	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) )
-		return;
+	if ( wp_list_filter( $blogs, array( 'userblog_id' => get_current_blog_id() ) ) ) {
+			return;
+	}
 
 	$blog_name = get_bloginfo( 'name' );
 
-	if ( empty( $blogs ) )
-		wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	if ( empty( $blogs ) ) {
+			wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 );
+	}
 
 	$output = '<p>' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '</p>';
 	$output .= '<p>' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '</p>';
@@ -673,8 +699,9 @@ 
  * @return bool True if the user has proper permissions, false if they do not.
  */
 function check_import_new_users( $permission ) {
-	if ( !is_super_admin() )
-		return false;
+	if ( !is_super_admin() ) {
+			return false;
+	}
 	return true;
 }
 // See "import_allow_fetch_attachments" and "import_attachment_size_limit" filters too.
@@ -709,8 +736,10 @@ 
 
 	}
 
-	if ( $flag === false ) // WordPress english
+	if ( $flag === false ) {
+		// WordPress english
 		$output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
+	}
 
 	// Order by name
 	uksort( $output, 'strnatcasecmp' );
@@ -740,11 +769,13 @@ 
  */
 function site_admin_notice() {
 	global $wp_db_version;
-	if ( !is_super_admin() )
-		return false;
-	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
-		echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
-}
+	if ( !is_super_admin() ) {
+			return false;
+	}
+	if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
+			echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
+	}
+	}
 
 /**
  * Avoids a collision between a site slug and a permalink slug.
@@ -759,14 +790,18 @@ 
  * @return array The new array of post data after checking for collisions.
  */
 function avoid_blog_page_permalink_collision( $data, $postarr ) {
-	if ( is_subdomain_install() )
-		return $data;
-	if ( $data['post_type'] != 'page' )
-		return $data;
-	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' )
-		return $data;
-	if ( !is_main_site() )
-		return $data;
+	if ( is_subdomain_install() ) {
+			return $data;
+	}
+	if ( $data['post_type'] != 'page' ) {
+			return $data;
+	}
+	if ( !isset( $data['post_name'] ) || $data['post_name'] == '' ) {
+			return $data;
+	}
+	if ( !is_main_site() ) {
+			return $data;
+	}
 
 	$post_name = $data['post_name'];
 	$c = 0;
@@ -803,8 +838,9 @@ 
 			?>
 			<select name="primary_blog" id="primary_blog">
 				<?php foreach( (array) $all_blogs as $blog ) {
-					if ( $primary_blog == $blog->userblog_id )
-						$found = true;
+					if ( $primary_blog == $blog->userblog_id ) {
+											$found = true;
+					}
 					?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
 				} ?>
 			</select>
@@ -816,8 +852,10 @@ 
 		} elseif ( count( $all_blogs ) == 1 ) {
 			$blog = reset( $all_blogs );
 			echo esc_url( get_home_url( $blog->userblog_id ) );
-			if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
+			if ( $primary_blog != $blog->userblog_id ) {
+				// Set the primary blog again if it's out of sync with blog list.
 				update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
+			}
 		} else {
 			echo "N/A";
 		}
@@ -951,10 +989,11 @@ 
 function can_edit_network( $site_id ) {
 	global $wpdb;
 
-	if ( $site_id == $wpdb->siteid )
-		$result = true;
-	else
-		$result = false;
+	if ( $site_id == $wpdb->siteid ) {
+			$result = true;
+	} else {
+			$result = false;
+	}
 
 	/**
 	 * Filter whether this network can be edited from this page.

src/wp-admin/includes/nav-menu.php

Doc Comments +1 added lines, -1 removed lines

@@ -1282,7 +1282,7 @@
  *
  * @param int|string $nav_menu_selected_id (id, slug, or name ) of the currently-selected menu
  * @param string $nav_menu_selected_title Title of the currently-selected menu
- * @return array $messages The menu updated message
+ * @return string[] $messages The menu updated message
  */
 function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
 	$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );

Spacing +331 added lines, -331 removed lines

@@ -19,7 +19,7 @@ 
 	 * @param int    $depth  Depth of menu item. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function start_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Ends the list of after the elements are added.
@@ -32,7 +32,7 @@ 
 	 * @param int    $depth  Depth of menu item. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function end_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Start the element output.
@@ -48,12 +48,12 @@ 
 	 * @param array  $args   Not used.
 	 * @param int    $id     Not used.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
 		global $_wp_nav_menu_max_depth;
 		$_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
 
 		ob_start();
-		$item_id = esc_attr( $item->ID );
+		$item_id = esc_attr($item->ID);
 		$removed_args = array(
 			'action',
 			'customlink-tab',
@@ -64,46 +64,46 @@ 
 		);
 
 		$original_title = '';
-		if ( 'taxonomy' == $item->type ) {
-			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
+		if ('taxonomy' == $item->type) {
+			$original_title = get_term_field('name', $item->object_id, $item->object, 'raw');
+			if (is_wp_error($original_title))
 				$original_title = false;
-		} elseif ( 'post_type' == $item->type ) {
-			$original_object = get_post( $item->object_id );
-			$original_title = get_the_title( $original_object->ID );
+		} elseif ('post_type' == $item->type) {
+			$original_object = get_post($item->object_id);
+			$original_title = get_the_title($original_object->ID);
 		}
 
 		$classes = array(
-			'menu-item menu-item-depth-' . $depth,
-			'menu-item-' . esc_attr( $item->object ),
-			'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
+			'menu-item menu-item-depth-'.$depth,
+			'menu-item-'.esc_attr($item->object),
+			'menu-item-edit-'.((isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item']) ? 'active' : 'inactive'),
 		);
 
 		$title = $item->title;
 
-		if ( ! empty( $item->_invalid ) ) {
+		if ( ! empty($item->_invalid)) {
 			$classes[] = 'menu-item-invalid';
 			/* translators: %s: title of menu item which is invalid */
-			$title = sprintf( __( '%s (Invalid)' ), $item->title );
-		} elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
+			$title = sprintf(__('%s (Invalid)'), $item->title);
+		} elseif (isset($item->post_status) && 'draft' == $item->post_status) {
 			$classes[] = 'pending';
 			/* translators: %s: title of menu item in draft status */
-			$title = sprintf( __('%s (Pending)'), $item->title );
+			$title = sprintf(__('%s (Pending)'), $item->title);
 		}
 
-		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
+		$title = ( ! isset($item->label) || '' == $item->label) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
+		if (0 == $depth)
 			$submenu_text = 'style="display: none;"';
 
 		?>
-		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
+		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes); ?>">
 			<div class="menu-item-bar">
 				<div class="menu-item-handle">
-					<span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
+					<span class="item-title"><span class="menu-item-title"><?php echo esc_html($title); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e('sub item'); ?></span></span>
 					<span class="item-controls">
-						<span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
+						<span class="item-type"><?php echo esc_html($item->type_label); ?></span>
 						<span class="item-order hide-if-js">
 							<a href="<?php
 								echo wp_nonce_url(
@@ -112,7 +112,7 @@ 
 											'action' => 'move-up-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg($removed_args, admin_url('nav-menus.php'))
 									),
 									'move-menu_item'
 								);
@@ -125,81 +125,81 @@ 
 											'action' => 'move-down-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg($removed_args, admin_url('nav-menus.php'))
 									),
 									'move-menu_item'
 								);
 							?>" class="item-move-down"><abbr title="<?php esc_attr_e('Move down'); ?>">&#8595;</abbr></a>
 						</span>
 						<a class="item-edit" id="edit-<?php echo $item_id; ?>" title="<?php esc_attr_e('Edit Menu Item'); ?>" href="<?php
-							echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
-						?>"><?php _e( 'Edit Menu Item' ); ?></a>
+							echo (isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item']) ? admin_url('nav-menus.php') : add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url('nav-menus.php#menu-item-settings-'.$item_id)));
+						?>"><?php _e('Edit Menu Item'); ?></a>
 					</span>
 				</div>
 			</div>
 
 			<div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
-				<?php if ( 'custom' == $item->type ) : ?>
+				<?php if ('custom' == $item->type) : ?>
 					<p class="field-url description description-wide">
 						<label for="edit-menu-item-url-<?php echo $item_id; ?>">
-							<?php _e( 'URL' ); ?><br />
-							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
+							<?php _e('URL'); ?><br />
+							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->url); ?>" />
 						</label>
 					</p>
 				<?php endif; ?>
 				<p class="description description-wide">
 					<label for="edit-menu-item-title-<?php echo $item_id; ?>">
-						<?php _e( 'Navigation Label' ); ?><br />
-						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
+						<?php _e('Navigation Label'); ?><br />
+						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->title); ?>" />
 					</label>
 				</p>
 				<p class="field-title-attribute description description-wide">
 					<label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
-						<?php _e( 'Title Attribute' ); ?><br />
-						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
+						<?php _e('Title Attribute'); ?><br />
+						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->post_excerpt); ?>" />
 					</label>
 				</p>
 				<p class="field-link-target description">
 					<label for="edit-menu-item-target-<?php echo $item_id; ?>">
-						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
-						<?php _e( 'Open link in a new window/tab' ); ?>
+						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked($item->target, '_blank'); ?> />
+						<?php _e('Open link in a new window/tab'); ?>
 					</label>
 				</p>
 				<p class="field-css-classes description description-thin">
 					<label for="edit-menu-item-classes-<?php echo $item_id; ?>">
-						<?php _e( 'CSS Classes (optional)' ); ?><br />
-						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
+						<?php _e('CSS Classes (optional)'); ?><br />
+						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr(implode(' ', $item->classes)); ?>" />
 					</label>
 				</p>
 				<p class="field-xfn description description-thin">
 					<label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
-						<?php _e( 'Link Relationship (XFN)' ); ?><br />
-						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
+						<?php _e('Link Relationship (XFN)'); ?><br />
+						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->xfn); ?>" />
 					</label>
 				</p>
 				<p class="field-description description description-wide">
 					<label for="edit-menu-item-description-<?php echo $item_id; ?>">
-						<?php _e( 'Description' ); ?><br />
-						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
+						<?php _e('Description'); ?><br />
+						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html($item->description); // textarea_escaped ?></textarea>
 						<span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
 					</label>
 				</p>
 
 				<p class="field-move hide-if-no-js description description-wide">
 					<label>
-						<span><?php _e( 'Move' ); ?></span>
-						<a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></a>
-						<a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></a>
+						<span><?php _e('Move'); ?></span>
+						<a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e('Up one'); ?></a>
+						<a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e('Down one'); ?></a>
 						<a href="#" class="menus-move menus-move-left" data-dir="left"></a>
 						<a href="#" class="menus-move menus-move-right" data-dir="right"></a>
-						<a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></a>
+						<a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e('To the top'); ?></a>
 					</label>
 				</p>
 
 				<div class="menu-item-actions description-wide submitbox">
-					<?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
+					<?php if ('custom' != $item->type && $original_title !== false) : ?>
 						<p class="link-to-original">
-							<?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
+							<?php printf(__('Original: %s'), '<a href="'.esc_attr($item->url).'">'.esc_html($original_title).'</a>'); ?>
 						</p>
 					<?php endif; ?>
 					<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
@@ -209,19 +209,19 @@ 
 								'action' => 'delete-menu-item',
 								'menu-item' => $item_id,
 							),
-							admin_url( 'nav-menus.php' )
+							admin_url('nav-menus.php')
 						),
-						'delete-menu_item_' . $item_id
-					); ?>"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
+						'delete-menu_item_'.$item_id
+					); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url(add_query_arg(array('edit-menu-item' => $item_id, 'cancel' => time()), admin_url('nav-menus.php')));
 						?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
 				</div>
 
 				<input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
-				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
-				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
-				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
-				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
+				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->object_id); ?>" />
+				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->object); ?>" />
+				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->menu_item_parent); ?>" />
+				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->menu_order); ?>" />
+				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->type); ?>" />
 			</div><!-- .menu-item-settings-->
 			<ul class="menu-item-transport"></ul>
 		<?php
@@ -241,8 +241,8 @@ 
 	 *
 	 * @param array $fields
 	 */
-	public function __construct( $fields = false ) {
-		if ( $fields ) {
+	public function __construct($fields = false) {
+		if ($fields) {
 			$this->db_fields = $fields;
 		}
 	}
@@ -258,8 +258,8 @@ 
 	 * @param int    $depth  Depth of page. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
+		$indent = str_repeat("\t", $depth);
 		$output .= "\n$indent<ul class='children'>\n";
 	}
 
@@ -274,8 +274,8 @@ 
 	 * @param int    $depth  Depth of page. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
-		$indent = str_repeat( "\t", $depth );
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
+		$indent = str_repeat("\t", $depth);
 		$output .= "\n$indent</ul>";
 	}
 
@@ -294,47 +294,47 @@ 
 	 * @param array  $args   Not used.
 	 * @param int    $id     Not used.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
 		global $_nav_menu_placeholder;
 
-		$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-		$possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
-		$possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
+		$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+		$possible_object_id = isset($item->post_type) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
+		$possible_db_id = ( ! empty($item->ID)) && (0 < $possible_object_id) ? (int) $item->ID : 0;
 
-		$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
+		$indent = ($depth) ? str_repeat("\t", $depth) : '';
 
-		$output .= $indent . '<li>';
+		$output .= $indent.'<li>';
 		$output .= '<label class="menu-item-title">';
 		$output .= '<input type="checkbox" class="menu-item-checkbox';
 
-		if ( ! empty( $item->front_or_home ) )
+		if ( ! empty($item->front_or_home))
 			$output .= ' add-to-top';
 
-		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
+		$output .= '" name="menu-item['.$possible_object_id.'][menu-item-object-id]" value="'.esc_attr($item->object_id).'" /> ';
 
-		if ( ! empty( $item->label ) ) {
+		if ( ! empty($item->label)) {
 			$title = $item->label;
-		} elseif ( isset( $item->post_type ) ) {
+		} elseif (isset($item->post_type)) {
 			/** This filter is documented in wp-includes/post-template.php */
-			$title = apply_filters( 'the_title', $item->post_title, $item->ID );
-			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
-				$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			$title = apply_filters('the_title', $item->post_title, $item->ID);
+			if ( ! empty($item->front_or_home) && _x('Home', 'nav menu home label') !== $title)
+				$title = sprintf(_x('Home: %s', 'nav menu front page title'), $title);
 		}
 
-		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
+		$output .= isset($title) ? esc_html($title) : esc_html($item->title);
  		$output .= '</label>';
 
 		// Menu item hidden fields
-		$output .= '<input type="hidden" class="menu-item-db-id" name="menu-item[' . $possible_object_id . '][menu-item-db-id]" value="' . $possible_db_id . '" />';
-		$output .= '<input type="hidden" class="menu-item-object" name="menu-item[' . $possible_object_id . '][menu-item-object]" value="'. esc_attr( $item->object ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item[' . $possible_object_id . '][menu-item-parent-id]" value="'. esc_attr( $item->menu_item_parent ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-type" name="menu-item[' . $possible_object_id . '][menu-item-type]" value="'. esc_attr( $item->type ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-title" name="menu-item[' . $possible_object_id . '][menu-item-title]" value="'. esc_attr( $item->title ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-url" name="menu-item[' . $possible_object_id . '][menu-item-url]" value="'. esc_attr( $item->url ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-target" name="menu-item[' . $possible_object_id . '][menu-item-target]" value="'. esc_attr( $item->target ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item[' . $possible_object_id . '][menu-item-attr_title]" value="'. esc_attr( $item->attr_title ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item[' . $possible_object_id . '][menu-item-classes]" value="'. esc_attr( implode( ' ', $item->classes ) ) .'" />';
-		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item[' . $possible_object_id . '][menu-item-xfn]" value="'. esc_attr( $item->xfn ) .'" />';
+		$output .= '<input type="hidden" class="menu-item-db-id" name="menu-item['.$possible_object_id.'][menu-item-db-id]" value="'.$possible_db_id.'" />';
+		$output .= '<input type="hidden" class="menu-item-object" name="menu-item['.$possible_object_id.'][menu-item-object]" value="'.esc_attr($item->object).'" />';
+		$output .= '<input type="hidden" class="menu-item-parent-id" name="menu-item['.$possible_object_id.'][menu-item-parent-id]" value="'.esc_attr($item->menu_item_parent).'" />';
+		$output .= '<input type="hidden" class="menu-item-type" name="menu-item['.$possible_object_id.'][menu-item-type]" value="'.esc_attr($item->type).'" />';
+		$output .= '<input type="hidden" class="menu-item-title" name="menu-item['.$possible_object_id.'][menu-item-title]" value="'.esc_attr($item->title).'" />';
+		$output .= '<input type="hidden" class="menu-item-url" name="menu-item['.$possible_object_id.'][menu-item-url]" value="'.esc_attr($item->url).'" />';
+		$output .= '<input type="hidden" class="menu-item-target" name="menu-item['.$possible_object_id.'][menu-item-target]" value="'.esc_attr($item->target).'" />';
+		$output .= '<input type="hidden" class="menu-item-attr_title" name="menu-item['.$possible_object_id.'][menu-item-attr_title]" value="'.esc_attr($item->attr_title).'" />';
+		$output .= '<input type="hidden" class="menu-item-classes" name="menu-item['.$possible_object_id.'][menu-item-classes]" value="'.esc_attr(implode(' ', $item->classes)).'" />';
+		$output .= '<input type="hidden" class="menu-item-xfn" name="menu-item['.$possible_object_id.'][menu-item-xfn]" value="'.esc_attr($item->xfn).'" />';
 	}
 
 } // Walker_Nav_Menu_Checklist
@@ -346,41 +346,41 @@ 
  *
  * @param array $request The unsanitized request values.
  */
-function _wp_ajax_menu_quick_search( $request = array() ) {
+function _wp_ajax_menu_quick_search($request = array()) {
 	$args = array();
-	$type = isset( $request['type'] ) ? $request['type'] : '';
-	$object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
-	$query = isset( $request['q'] ) ? $request['q'] : '';
-	$response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
+	$type = isset($request['type']) ? $request['type'] : '';
+	$object_type = isset($request['object_type']) ? $request['object_type'] : '';
+	$query = isset($request['q']) ? $request['q'] : '';
+	$response_format = isset($request['response-format']) && in_array($request['response-format'], array('json', 'markup')) ? $request['response-format'] : 'json';
 
-	if ( 'markup' == $response_format ) {
+	if ('markup' == $response_format) {
 		$args['walker'] = new Walker_Nav_Menu_Checklist;
 	}
 
-	if ( 'get-post-item' == $type ) {
-		if ( post_type_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+	if ('get-post-item' == $type) {
+		if (post_type_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($object_id))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
-							'post_title' => get_the_title( $object_id ),
-							'post_type' => get_post_type( $object_id ),
+							'post_title' => get_the_title($object_id),
+							'post_type' => get_post_type($object_id),
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( taxonomy_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+		} elseif (taxonomy_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
-					$post_obj = get_term( $object_id, $object_type );
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_term($object_id, $object_type))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
+					$post_obj = get_term($object_id, $object_type);
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
@@ -394,21 +394,21 @@ 
 
 		}
 
-	} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
-		if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
+	} elseif (preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches)) {
+		if ('posttype' == $matches[1] && get_post_type_object($matches[2])) {
 			query_posts(array(
 				'posts_per_page' => 10,
 				'post_type' => $matches[2],
 				's' => $query,
 			));
-			if ( ! have_posts() )
+			if ( ! have_posts())
 				return;
-			while ( have_posts() ) {
+			while (have_posts()) {
 				the_post();
-				if ( 'markup' == $response_format ) {
+				if ('markup' == $response_format) {
 					$var_by_ref = get_the_ID();
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($var_by_ref))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => get_the_ID(),
@@ -419,17 +419,17 @@ 
 					echo "\n";
 				}
 			}
-		} elseif ( 'taxonomy' == $matches[1] ) {
-			$terms = get_terms( $matches[2], array(
+		} elseif ('taxonomy' == $matches[1]) {
+			$terms = get_terms($matches[2], array(
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
+			if (empty($terms) || is_wp_error($terms))
 				return;
-			foreach( (array) $terms as $term ) {
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+			foreach ((array) $terms as $term) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array($term)), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $term->term_id,
@@ -452,17 +452,17 @@ 
 function wp_nav_menu_setup() {
 	// Register meta boxes
 	wp_nav_menu_post_type_meta_boxes();
-	add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+	add_meta_box('add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default');
 	wp_nav_menu_taxonomy_meta_boxes();
 
 	// Register advanced menu items (columns)
-	add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
+	add_filter('manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
 
 	// If first time editing, disable advanced items by default.
-	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
+	if (false === get_user_option('managenav-menuscolumnshidden')) {
 		$user = wp_get_current_user();
 		update_user_option($user->ID, 'managenav-menuscolumnshidden',
-			array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
+			array(0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute',),
 			true);
 	}
 }
@@ -477,17 +477,17 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
+	if (get_user_option('metaboxhidden_nav-menus') !== false || ! is_array($wp_meta_boxes))
 		return;
 
-	$initial_meta_boxes = array( 'add-page', 'add-post', 'add-custom-links', 'add-category' );
+	$initial_meta_boxes = array('add-page', 'add-post', 'add-custom-links', 'add-category');
 	$hidden_meta_boxes = array();
 
-	foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-		foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-			foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-				if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-					unset( $box['id'] );
+	foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+		foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+			foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+				if (in_array($box['id'], $initial_meta_boxes)) {
+					unset($box['id']);
 				} else {
 					$hidden_meta_boxes[] = $box['id'];
 				}
@@ -496,7 +496,7 @@ 
 	}
 
 	$user = wp_get_current_user();
-	update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+	update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
 }
 
 /**
@@ -505,12 +505,12 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_post_type_meta_boxes() {
-	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+	$post_types = get_post_types(array('show_in_nav_menus' => true), 'object');
 
-	if ( ! $post_types )
+	if ( ! $post_types)
 		return;
 
-	foreach ( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		/**
 		 * Filter whether a menu items meta box will be added for the current
 		 * object type.
@@ -523,12 +523,12 @@ 
 		 * @param object $meta_box_object The current object to add a menu items
 		 *                                meta box for.
 		 */
-		$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
-		if ( $post_type ) {
+		$post_type = apply_filters('nav_menu_meta_box_object', $post_type);
+		if ($post_type) {
 			$id = $post_type->name;
 			// Give pages a higher priority.
-			$priority = ( 'page' == $post_type->name ? 'core' : 'default' );
-			add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
+			$priority = ('page' == $post_type->name ? 'core' : 'default');
+			add_meta_box("add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type);
 		}
 	}
 }
@@ -539,17 +539,17 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
+	$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'object');
 
-	if ( !$taxonomies )
+	if ( ! $taxonomies)
 		return;
 
-	foreach ( $taxonomies as $tax ) {
+	foreach ($taxonomies as $tax) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
-		$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
-		if ( $tax ) {
+		$tax = apply_filters('nav_menu_meta_box_object', $tax);
+		if ($tax) {
 			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+			add_meta_box("add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax);
 		}
 	}
 }
@@ -564,13 +564,13 @@ 
  * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
  * @return string Disabled attribute if at least one menu exists, false if not
 */
-function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+function wp_nav_menu_disabled_check($nav_menu_selected_id) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
+	if ($one_theme_location_no_menus)
 		return false;
 
-	return disabled( $nav_menu_selected_id, 0 );
+	return disabled($nav_menu_selected_id, 0);
 }
 
 /**
@@ -598,14 +598,14 @@ 
 
 		<p id="menu-item-name-wrap">
 			<label class="howto" for="custom-menu-item-name">
-				<span><?php _e( 'Link Text' ); ?></span>
+				<span><?php _e('Link Text'); ?></span>
 				<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Menu Item'); ?>" />
 			</label>
 		</p>
 
 		<p class="button-controls">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -625,15 +625,15 @@ 
  * @param string $object Not used.
  * @param string $post_type The post type object.
  */
-function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
+function wp_nav_menu_item_post_type_meta_box($object, $post_type) {
 	global $_nav_menu_placeholder, $nav_menu_selected_id;
 
 	$post_type_name = $post_type['args']->name;
 
 	// Paginate browsing for large numbers of post objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$post_type_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'offset' => $offset,
@@ -646,23 +646,23 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $post_type['args']->_default_query ) )
-		$args = array_merge($args, (array) $post_type['args']->_default_query );
+	if (isset($post_type['args']->_default_query))
+		$args = array_merge($args, (array) $post_type['args']->_default_query);
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
-	$posts = $get_posts->query( $args );
-	if ( ! $get_posts->post_count ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	$posts = $get_posts->query($args);
+	if ( ! $get_posts->post_count) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
 	$num_pages = $get_posts->max_num_pages;
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$post_type_name . '-tab' => 'all',
+				$post_type_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'post_type',
 				'item-object' => $post_type_name,
@@ -676,18 +676,18 @@ 
 	));
 
 	$db_fields = false;
-	if ( is_post_type_hierarchical( $post_type_name ) ) {
-		$db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	if (is_post_type_hierarchical($post_type_name)) {
+		$db_fields = array('parent' => 'post_parent', 'id' => 'ID');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-recent';
-	if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) {
-		$current_tab = $_REQUEST[$post_type_name . '-tab'];
+	if (isset($_REQUEST[$post_type_name.'-tab']) && in_array($_REQUEST[$post_type_name.'-tab'], array('all', 'search'))) {
+		$current_tab = $_REQUEST[$post_type_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-posttype-'.$post_type_name])) {
 		$current_tab = 'search';
 	}
 
@@ -703,30 +703,30 @@ 
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
-					<?php _e( 'Most Recent' ); ?>
+			<li <?php echo ('most-recent' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-most-recent" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+					<?php _e('Most Recent'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="<?php echo esc_attr($post_type_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
-					<?php _e( 'Search'); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-search" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
 		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php
-			echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
-				$most_recent = $get_posts->query( $recent_args );
+				$recent_args = array_merge($args, array('orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15));
+				$most_recent = $get_posts->query($recent_args);
 				$args['walker'] = $walker;
 
 				/**
@@ -741,20 +741,20 @@ 
 				 * @param array  $args        An array of WP_Query arguments.
 				 * @param object $post_type   The current post type object for this menu item meta box.
 				 */
-				$most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type );
+				$most_recent = apply_filters("nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type);
 
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 			<?php
-			if ( isset( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-posttype-' . $post_type_name] );
-				$search_results = get_posts( array( 's' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) );
+			if (isset($_REQUEST['quick-search-posttype-'.$post_type_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-posttype-'.$post_type_name]);
+				$search_results = get_posts(array('s' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC',));
 			} else {
 				$searched = '';
 				$search_results = array();
@@ -763,27 +763,27 @@ 
 			<p class="quick-search-wrap">
 				<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php submit_button(__('Search'), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array('id' => 'submit-quick-search-posttype-'.$post_type_name)); ?>
 			</p>
 
 			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -796,15 +796,15 @@ 
 				 * If we're dealing with pages, let's put a checkbox for the front
 				 * page at the top of the list.
 				 */
-				if ( 'page' == $post_type_name ) {
-					$front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
-					if ( ! empty( $front_page ) ) {
-						$front_page_obj = get_post( $front_page );
+				if ('page' == $post_type_name) {
+					$front_page = 'page' == get_option('show_on_front') ? (int) get_option('page_on_front') : 0;
+					if ( ! empty($front_page)) {
+						$front_page_obj = get_post($front_page);
 						$front_page_obj->front_or_home = true;
-						array_unshift( $posts, $front_page_obj );
+						array_unshift($posts, $front_page_obj);
 					} else {
-						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-						array_unshift( $posts, (object) array(
+						$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+						array_unshift($posts, (object) array(
 							'front_or_home' => true,
 							'ID' => 0,
 							'object_id' => $_nav_menu_placeholder,
@@ -815,7 +815,7 @@ 
 							'post_type' => 'nav_menu_item',
 							'type' => 'custom',
 							'url' => home_url('/'),
-						) );
+						));
 					}
 				}
 
@@ -834,10 +834,10 @@ 
 				 * @param array  $args      An array of WP_Query arguments.
 				 * @param object $post_type The current post type object for this menu item meta box.
 				 */
-				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
-				$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
+				$posts = apply_filters("nav_menu_items_{$post_type_name}", $posts, $args, $post_type);
+				$checkbox_items = walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args);
 
-				if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
+				if ('all' == $current_tab && ! empty($_REQUEST['selectall'])) {
 					$checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items);
 
 				}
@@ -845,7 +845,7 @@ 
 				echo $checkbox_items;
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -855,18 +855,18 @@ 
 		<p class="button-controls">
 			<span class="list-controls">
 				<a href="<?php
-					echo esc_url( add_query_arg(
+					echo esc_url(add_query_arg(
 						array(
-							$post_type_name . '-tab' => 'all',
+							$post_type_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
-						remove_query_arg( $removed_args )
+						remove_query_arg($removed_args)
 					));
 				?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr('submit-posttype-'.$post_type_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -885,14 +885,14 @@ 
  * @param string $object Not used.
  * @param string $taxonomy The taxonomy object.
  */
-function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
+function wp_nav_menu_item_taxonomy_meta_box($object, $taxonomy) {
 	global $nav_menu_selected_id;
 	$taxonomy_name = $taxonomy['args']->name;
 
 	// Paginate browsing for large numbers of objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$taxonomy_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'child_of' => 0,
@@ -907,19 +907,19 @@ 
 		'pad_counts' => false,
 	);
 
-	$terms = get_terms( $taxonomy_name, $args );
+	$terms = get_terms($taxonomy_name, $args);
 
-	if ( ! $terms || is_wp_error($terms) ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	if ( ! $terms || is_wp_error($terms)) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
-	$num_pages = ceil( wp_count_terms( $taxonomy_name , array_merge( $args, array('number' => '', 'offset' => '') ) ) / $per_page );
+	$num_pages = ceil(wp_count_terms($taxonomy_name, array_merge($args, array('number' => '', 'offset' => ''))) / $per_page);
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$taxonomy_name . '-tab' => 'all',
+				$taxonomy_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'taxonomy',
 				'item-object' => $taxonomy_name,
@@ -933,18 +933,18 @@ 
 	));
 
 	$db_fields = false;
-	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-		$db_fields = array( 'parent' => 'parent', 'id' => 'term_id' );
+	if (is_taxonomy_hierarchical($taxonomy_name)) {
+		$db_fields = array('parent' => 'parent', 'id' => 'term_id');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-used';
-	if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) {
-		$current_tab = $_REQUEST[$taxonomy_name . '-tab'];
+	if (isset($_REQUEST[$taxonomy_name.'-tab']) && in_array($_REQUEST[$taxonomy_name.'-tab'], array('all', 'most-used', 'search'))) {
+		$current_tab = $_REQUEST[$taxonomy_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
 		$current_tab = 'search';
 	}
 
@@ -960,39 +960,39 @@ 
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
-					<?php _e( 'Most Used' ); ?>
+			<li <?php echo ('most-used' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-pop" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+					<?php _e('Most Used'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
-					<?php _e( 'Search' ); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr($taxonomy_name); ?>" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
-			echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
-				$popular_terms = get_terms( $taxonomy_name, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+				$popular_terms = get_terms($taxonomy_name, array('orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -1000,10 +1000,10 @@ 
 			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args);
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -1011,12 +1011,12 @@ 
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 			<?php
-			if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
-				$search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
+			if (isset($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-taxonomy-'.$taxonomy_name]);
+				$search_results = get_terms($taxonomy_name, array('name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false));
 			} else {
 				$searched = '';
 				$search_results = array();
@@ -1025,18 +1025,18 @@ 
 			<p class="quick-search-wrap">
 				<input type="search" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php submit_button(__('Search'), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array('id' => 'submit-quick-search-taxonomy-'.$taxonomy_name)); ?>
 			</p>
 
 			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
@@ -1047,7 +1047,7 @@ 
 				<a href="<?php
 					echo esc_url(add_query_arg(
 						array(
-							$taxonomy_name . '-tab' => 'all',
+							$taxonomy_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
 						remove_query_arg($removed_args)
@@ -1056,7 +1056,7 @@ 
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr('submit-taxonomy-'.$taxonomy_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -1074,25 +1074,25 @@ 
  * @param array $menu_data The unsanitized posted menu item data.
  * @return array The database IDs of the items saved
  */
-function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
+function wp_save_nav_menu_items($menu_id = 0, $menu_data = array()) {
 	$menu_id = (int) $menu_id;
 	$items_saved = array();
 
-	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+	if (0 == $menu_id || is_nav_menu($menu_id)) {
 
 		// Loop through all the menu items' POST values.
-		foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
+		foreach ((array) $menu_data as $_possible_db_id => $_item_object_data) {
 			if (
 				// Checkbox is not checked.
-				empty( $_item_object_data['menu-item-object-id'] ) &&
+				empty($_item_object_data['menu-item-object-id']) &&
 				(
 					// And item type either isn't set.
-					! isset( $_item_object_data['menu-item-type'] ) ||
+					! isset($_item_object_data['menu-item-type']) ||
 					// Or URL is the default.
-					in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
-					! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
+					in_array($_item_object_data['menu-item-url'], array('http://', '')) ||
+					! ('custom' == $_item_object_data['menu-item-type'] && ! isset($_item_object_data['menu-item-db-id'])) || // or it's not a custom menu item (but not the custom home page)
 					// Or it *is* a custom menu item that already exists.
-					! empty( $_item_object_data['menu-item-db-id'] )
+					! empty($_item_object_data['menu-item-db-id'])
 				)
 			) {
 				// Then this potential menu item is not getting added to this menu.
@@ -1101,8 +1101,8 @@ 
 
 			// If this possible menu item doesn't actually have a menu database ID yet.
 			if (
-				empty( $_item_object_data['menu-item-db-id'] ) ||
-				( 0 > $_possible_db_id ) ||
+				empty($_item_object_data['menu-item-db-id']) ||
+				(0 > $_possible_db_id) ||
 				$_possible_db_id != $_item_object_data['menu-item-db-id']
 			) {
 				$_actual_db_id = 0;
@@ -1111,22 +1111,22 @@ 
 			}
 
 			$args = array(
-				'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
-				'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
-				'menu-item-object' => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
-				'menu-item-parent-id' => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
-				'menu-item-position' => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
-				'menu-item-type' => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
-				'menu-item-title' => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
-				'menu-item-url' => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
-				'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ),
-				'menu-item-attr-title' => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
-				'menu-item-target' => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
-				'menu-item-classes' => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
-				'menu-item-xfn' => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
+				'menu-item-db-id' => (isset($_item_object_data['menu-item-db-id']) ? $_item_object_data['menu-item-db-id'] : ''),
+				'menu-item-object-id' => (isset($_item_object_data['menu-item-object-id']) ? $_item_object_data['menu-item-object-id'] : ''),
+				'menu-item-object' => (isset($_item_object_data['menu-item-object']) ? $_item_object_data['menu-item-object'] : ''),
+				'menu-item-parent-id' => (isset($_item_object_data['menu-item-parent-id']) ? $_item_object_data['menu-item-parent-id'] : ''),
+				'menu-item-position' => (isset($_item_object_data['menu-item-position']) ? $_item_object_data['menu-item-position'] : ''),
+				'menu-item-type' => (isset($_item_object_data['menu-item-type']) ? $_item_object_data['menu-item-type'] : ''),
+				'menu-item-title' => (isset($_item_object_data['menu-item-title']) ? $_item_object_data['menu-item-title'] : ''),
+				'menu-item-url' => (isset($_item_object_data['menu-item-url']) ? $_item_object_data['menu-item-url'] : ''),
+				'menu-item-description' => (isset($_item_object_data['menu-item-description']) ? $_item_object_data['menu-item-description'] : ''),
+				'menu-item-attr-title' => (isset($_item_object_data['menu-item-attr-title']) ? $_item_object_data['menu-item-attr-title'] : ''),
+				'menu-item-target' => (isset($_item_object_data['menu-item-target']) ? $_item_object_data['menu-item-target'] : ''),
+				'menu-item-classes' => (isset($_item_object_data['menu-item-classes']) ? $_item_object_data['menu-item-classes'] : ''),
+				'menu-item-xfn' => (isset($_item_object_data['menu-item-xfn']) ? $_item_object_data['menu-item-xfn'] : ''),
 			);
 
-			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
+			$items_saved[] = wp_update_nav_menu_item($menu_id, $_actual_db_id, $args);
 
 		}
 	}
@@ -1143,23 +1143,23 @@ 
  * @param object $object The post type or taxonomy meta-object.
  * @return object The post type of taxonomy object.
  */
-function _wp_nav_menu_meta_box_object( $object = null ) {
-	if ( isset( $object->name ) ) {
+function _wp_nav_menu_meta_box_object($object = null) {
+	if (isset($object->name)) {
 
-		if ( 'page' == $object->name ) {
+		if ('page' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'menu_order title',
 				'post_status' => 'publish',
 			);
 
 		// Posts should show only published items.
-		} elseif ( 'post' == $object->name ) {
+		} elseif ('post' == $object->name) {
 			$object->_default_query = array(
 				'post_status' => 'publish',
 			);
 
 		// Categories should be in reverse chronological order.
-		} elseif ( 'category' == $object->name ) {
+		} elseif ('category' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'id',
 				'order' => 'DESC',
@@ -1184,19 +1184,19 @@ 
  * @param int $menu_id Optional. The ID of the menu to format. Default 0.
  * @return string|WP_Error $output The menu formatted to edit or error object on failure.
  */
-function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
-	$menu = wp_get_nav_menu_object( $menu_id );
+function wp_get_nav_menu_to_edit($menu_id = 0) {
+	$menu = wp_get_nav_menu_object($menu_id);
 
 	// If the menu exists, get its items.
-	if ( is_nav_menu( $menu ) ) {
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') );
+	if (is_nav_menu($menu)) {
+		$menu_items = wp_get_nav_menu_items($menu->term_id, array('post_status' => 'any'));
 		$result = '<div id="menu-instructions" class="post-body-plain';
-		$result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
-		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
+		$result .= ( ! empty($menu_items)) ? ' menu-instructions-inactive">' : '">';
+		$result .= '<p>'.__('Add menu items from the column on the left.').'</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if (empty($menu_items))
+			return $result.' <ul class="menu" id="menu-to-edit"> </ul>';
 
 		/**
 		 * Filter the Walker class used when adding nav menu items.
@@ -1206,32 +1206,32 @@ 
 		 * @param string $class   The walker class to use. Default 'Walker_Nav_Menu_Edit'.
 		 * @param int    $menu_id ID of the menu being rendered.
 		 */
-		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
+		$walker_class_name = apply_filters('wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id);
 
-		if ( class_exists( $walker_class_name ) )
+		if (class_exists($walker_class_name))
 			$walker = new $walker_class_name;
 		else
-			return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) );
+			return new WP_Error('menu_walker_not_exist', sprintf(__('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name));
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
-		foreach( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
+		foreach ((array) $menu_items as $menu_item) {
+			if (isset($menu_item->post_status) && 'draft' == $menu_item->post_status)
 				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
+			if ( ! empty($menu_item->_invalid))
 				$some_invalid_menu_items = true;
 		}
 
-		if ( $some_pending_menu_items )
-			$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		if ($some_pending_menu_items)
+			$result .= '<div class="updated inline"><p>'.__('Click Save Menu to make pending menu items public.').'</p></div>';
 
-		if ( $some_invalid_menu_items )
-			$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		if ($some_invalid_menu_items)
+			$result .= '<div class="error inline"><p>'.__('There are some invalid menu items. Please check or delete them.').'</p></div>';
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
+		$result .= walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker));
 		$result .= ' </ul> ';
 		return $result;
-	} elseif ( is_wp_error( $menu ) ) {
+	} elseif (is_wp_error($menu)) {
 		return $menu;
 	}
 
@@ -1266,13 +1266,13 @@ 
  */
 function _wp_delete_orphaned_draft_menu_items() {
 	global $wpdb;
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp));
 
-	foreach( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_items_to_delete as $menu_item_id)
+		wp_delete_post($menu_item_id, true);
 }
 
 /**
@@ -1284,12 +1284,12 @@ 
  * @param string $nav_menu_selected_title Title of the currently-selected menu
  * @return array $messages The menu updated message
  */
-function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
-	$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
+function wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title) {
+	$unsorted_menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish'));
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
+	foreach ($unsorted_menu_items as $_item)
 		$menu_items[$_item->db_id] = $_item;
 
 	$post_fields = array(
@@ -1299,61 +1299,61 @@ 
 		'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
 	);
 
-	wp_defer_term_counting( true );
+	wp_defer_term_counting(true);
 	// Loop through all the menu items' POST variables
-	if ( ! empty( $_POST['menu-item-db-id'] ) ) {
-		foreach( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+	if ( ! empty($_POST['menu-item-db-id'])) {
+		foreach ((array) $_POST['menu-item-db-id'] as $_key => $k) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+			if ( ! isset($_POST['menu-item-title'][$_key]) || '' == $_POST['menu-item-title'][$_key])
 				continue;
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ($post_fields as $field)
+				$args[$field] = isset($_POST[$field][$_key]) ? $_POST[$field][$_key] : '';
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item($nav_menu_selected_id, ($_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key), $args);
 
-			if ( is_wp_error( $menu_item_db_id ) ) {
-				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+			if (is_wp_error($menu_item_db_id)) {
+				$messages[] = '<div id="message" class="error"><p>'.$menu_item_db_id->get_error_message().'</p></div>';
 			} else {
-				unset( $menu_items[ $menu_item_db_id ] );
+				unset($menu_items[$menu_item_db_id]);
 			}
 		}
 	}
 
 	// Remove menu items from the menu that weren't in $_POST
-	if ( ! empty( $menu_items ) ) {
-		foreach ( array_keys( $menu_items ) as $menu_item_id ) {
-			if ( is_nav_menu_item( $menu_item_id ) ) {
-				wp_delete_post( $menu_item_id );
+	if ( ! empty($menu_items)) {
+		foreach (array_keys($menu_items) as $menu_item_id) {
+			if (is_nav_menu_item($menu_item_id)) {
+				wp_delete_post($menu_item_id);
 			}
 		}
 	}
 
 	// Store 'auto-add' pages.
-	$auto_add = ! empty( $_POST['auto-add-pages'] );
-	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
+	$auto_add = ! empty($_POST['auto-add-pages']);
+	$nav_menu_option = (array) get_option('nav_menu_options');
+	if ( ! isset($nav_menu_option['auto_add']))
 		$nav_menu_option['auto_add'] = array();
-	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
+	if ($auto_add) {
+		if ( ! in_array($nav_menu_selected_id, $nav_menu_option['auto_add']))
 			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if (false !== ($key = array_search($nav_menu_selected_id, $nav_menu_option['auto_add'])))
+			unset($nav_menu_option['auto_add'][$key]);
 	}
 	// Remove nonexistent/deleted menus
-	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
-	update_option( 'nav_menu_options', $nav_menu_option );
+	$nav_menu_option['auto_add'] = array_intersect($nav_menu_option['auto_add'], wp_get_nav_menus(array('fields' => 'ids')));
+	update_option('nav_menu_options', $nav_menu_option);
 
-	wp_defer_term_counting( false );
+	wp_defer_term_counting(false);
 
 	/** This action is documented in wp-includes/nav-menu.php */
-	do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
+	do_action('wp_update_nav_menu', $nav_menu_selected_id);
 
-	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( __( '<strong>%1$s</strong> has been updated.' ), $nav_menu_selected_title ) . '</p></div>';
-	unset( $menu_items, $unsorted_menu_items );
+	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.sprintf(__('<strong>%1$s</strong> has been updated.'), $nav_menu_selected_title).'</p></div>';
+	unset($menu_items, $unsorted_menu_items);
 
 	return $messages;
 }

Braces +99 added lines, -57 removed lines

@@ -66,8 +66,9 @@ 
 		$original_title = '';
 		if ( 'taxonomy' == $item->type ) {
 			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
-				$original_title = false;
+			if ( is_wp_error( $original_title ) ) {
+							$original_title = false;
+			}
 		} elseif ( 'post_type' == $item->type ) {
 			$original_object = get_post( $item->object_id );
 			$original_title = get_the_title( $original_object->ID );
@@ -94,8 +95,9 @@ 
 		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
-			$submenu_text = 'style="display: none;"';
+		if ( 0 == $depth ) {
+					$submenu_text = 'style="display: none;"';
+		}
 
 		?>
 		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
@@ -307,8 +309,9 @@ 
 		$output .= '<label class="menu-item-title">';
 		$output .= '<input type="checkbox" class="menu-item-checkbox';
 
-		if ( ! empty( $item->front_or_home ) )
-			$output .= ' add-to-top';
+		if ( ! empty( $item->front_or_home ) ) {
+					$output .= ' add-to-top';
+		}
 
 		$output .= '" name="menu-item[' . $possible_object_id . '][menu-item-object-id]" value="'. esc_attr( $item->object_id ) .'" /> ';
 
@@ -317,8 +320,9 @@ 
 		} elseif ( isset( $item->post_type ) ) {
 			/** This filter is documented in wp-includes/post-template.php */
 			$title = apply_filters( 'the_title', $item->post_title, $item->ID );
-			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title )
-				$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			if ( ! empty( $item->front_or_home ) && _x( 'Home', 'nav menu home label' ) !== $title ) {
+							$title = sprintf( _x( 'Home: %s', 'nav menu front page title' ), $title );
+			}
 		}
 
 		$output .= isset( $title ) ? esc_html( $title ) : esc_html( $item->title );
@@ -401,8 +405,9 @@ 
 				'post_type' => $matches[2],
 				's' => $query,
 			));
-			if ( ! have_posts() )
-				return;
+			if ( ! have_posts() ) {
+							return;
+			}
 			while ( have_posts() ) {
 				the_post();
 				if ( 'markup' == $response_format ) {
@@ -424,8 +429,9 @@ 
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
-				return;
+			if ( empty( $terms ) || is_wp_error( $terms ) ) {
+							return;
+			}
 			foreach( (array) $terms as $term ) {
 				if ( 'markup' == $response_format ) {
 					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
@@ -477,8 +483,9 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
-		return;
+	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) {
+			return;
+	}
 
 	$initial_meta_boxes = array( 'add-page', 'add-post', 'add-custom-links', 'add-category' );
 	$hidden_meta_boxes = array();
@@ -507,8 +514,9 @@ 
 function wp_nav_menu_post_type_meta_boxes() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( ! $post_types )
-		return;
+	if ( ! $post_types ) {
+			return;
+	}
 
 	foreach ( $post_types as $post_type ) {
 		/**
@@ -541,8 +549,9 @@ 
 function wp_nav_menu_taxonomy_meta_boxes() {
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( !$taxonomies )
-		return;
+	if ( !$taxonomies ) {
+			return;
+	}
 
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
@@ -567,8 +576,9 @@ 
 function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
-		return false;
+	if ( $one_theme_location_no_menus ) {
+			return false;
+	}
 
 	return disabled( $nav_menu_selected_id, 0 );
 }
@@ -646,8 +656,9 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $post_type['args']->_default_query ) )
-		$args = array_merge($args, (array) $post_type['args']->_default_query );
+	if ( isset( $post_type['args']->_default_query ) ) {
+			$args = array_merge($args, (array) $post_type['args']->_default_query );
+	}
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
@@ -704,17 +715,26 @@ 
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
 					<?php _e( 'Most Recent' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#<?php echo $post_type_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 					<?php _e( 'Search'); ?>
 				</a>
 			</li>
@@ -961,17 +981,26 @@ 
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
 					<?php _e( 'Most Used' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
@@ -1195,8 +1224,9 @@ 
 		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if ( empty($menu_items) ) {
+					return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		}
 
 		/**
 		 * Filter the Walker class used when adding nav menu items.
@@ -1208,24 +1238,29 @@ 
 		 */
 		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
 
-		if ( class_exists( $walker_class_name ) )
-			$walker = new $walker_class_name;
-		else
-			return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) );
+		if ( class_exists( $walker_class_name ) ) {
+					$walker = new $walker_class_name;
+		} else {
+					return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) );
+		}
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
 		foreach( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
-				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
-				$some_invalid_menu_items = true;
+			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
+							$some_pending_menu_items = true;
+			}
+			if ( ! empty( $menu_item->_invalid ) ) {
+							$some_invalid_menu_items = true;
+			}
 		}
 
-		if ( $some_pending_menu_items )
-			$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		if ( $some_pending_menu_items ) {
+					$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		}
 
-		if ( $some_invalid_menu_items )
-			$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		if ( $some_invalid_menu_items ) {
+					$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
 		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
@@ -1271,9 +1306,10 @@ 
 	// Delete orphaned draft menu items.
 	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
-	foreach( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
-}
+	foreach( (array) $menu_items_to_delete as $menu_item_id ) {
+			wp_delete_post( $menu_item_id, true );
+	}
+	}
 
 /**
  * Saves nav menu items
@@ -1289,8 +1325,9 @@ 
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
-		$menu_items[$_item->db_id] = $_item;
+	foreach ( $unsorted_menu_items as $_item ) {
+			$menu_items[$_item->db_id] = $_item;
+	}
 
 	$post_fields = array(
 		'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
@@ -1305,12 +1342,14 @@ 
 		foreach( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
-				continue;
+			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
+							continue;
+			}
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ( $post_fields as $field ) {
+							$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			}
 
 			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
@@ -1334,14 +1373,17 @@ 
 	// Store 'auto-add' pages.
 	$auto_add = ! empty( $_POST['auto-add-pages'] );
 	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
-		$nav_menu_option['auto_add'] = array();
+	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
+			$nav_menu_option['auto_add'] = array();
+	}
 	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
-			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+					$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		}
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+					unset( $nav_menu_option['auto_add'][$key] );
+		}
 	}
 	// Remove nonexistent/deleted menus
 	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );

src/wp-admin/includes/plugin.php

Doc Comments +4 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
  * @param string $plugin_file Path to the plugin file
  * @param bool $markup Optional. If the returned data should have HTML markup applied. Defaults to true.
  * @param bool $translate Optional. If the returned data should be translated. Defaults to true.
- * @return array See above for description.
+ * @return string See above for description.
  */
 function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
 
@@ -180,7 +180,7 @@ 
  * @since 2.8.0
  *
  * @param string $plugin Plugin ID
- * @return array List of files relative to the plugin root.
+ * @return string[] List of files relative to the plugin root.
  */
 function get_plugin_files($plugin) {
 	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
@@ -948,7 +948,7 @@ 
  * @since 2.7.0
  *
  * @param string $plugin Relative plugin path from Plugin Directory.
- * @return true True if a plugin's uninstall.php file has been found and included.
+ * @return boolean|null True if a plugin's uninstall.php file has been found and included.
  */
 function uninstall_plugin($plugin) {
 	$file = plugin_basename($plugin);
@@ -1521,6 +1521,7 @@ 
  * @global string $_wp_real_parent_file
  * @global array $_wp_menu_nopriv
  * @global array $_wp_submenu_nopriv
+ * @return string
  */
 function get_admin_page_parent( $parent = '' ) {
 	global $parent_file, $menu, $submenu, $pagenow, $typenow,

Indentation +21 added lines, -21 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Plugin Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Plugin Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Parse the plugin contents to retrieve plugin's metadata.
@@ -1297,22 +1297,22 @@ 
 	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
 }
 /**
- * Add sub menu page to the Dashboard main menu.
- *
- * This function takes a capability which will be used to determine whether
- * or not a page is included in the menu.
- *
- * The function which is hooked in to handle the output of the page must check
- * that the user has the required capability as well.
- *
- * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
- * @param string $menu_title The text to be used for the menu
- * @param string $capability The capability required for this menu to be displayed to the user.
- * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
- * @param callback $function The function to be called to output the content for this page.
- *
- * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
- */
+	 * Add sub menu page to the Dashboard main menu.
+	 *
+	 * This function takes a capability which will be used to determine whether
+	 * or not a page is included in the menu.
+	 *
+	 * The function which is hooked in to handle the output of the page must check
+	 * that the user has the required capability as well.
+	 *
+	 * @param string $page_title The text to be displayed in the title tags of the page when the menu is selected
+	 * @param string $menu_title The text to be used for the menu
+	 * @param string $capability The capability required for this menu to be displayed to the user.
+	 * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
+	 * @param callback $function The function to be called to output the content for this page.
+	 *
+	 * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
+	 */
 function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
 	return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function );
 }

Spacing +422 added lines, -422 removed lines

@@ -69,7 +69,7 @@ 
  * @param bool $translate Optional. If the returned data should be translated. Defaults to true.
  * @return array See above for description.
  */
-function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
+function get_plugin_data($plugin_file, $markup = true, $translate = true) {
 
 	$default_headers = array(
 		'Name' => 'Plugin Name',
@@ -85,18 +85,18 @@ 
 		'_sitewide' => 'Site Wide Only',
 	);
 
-	$plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
+	$plugin_data = get_file_data($plugin_file, $default_headers, 'plugin');
 
 	// Site Wide Only is the old header for Network
-	if ( ! $plugin_data['Network'] && $plugin_data['_sitewide'] ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The <code>%1$s</code> plugin header is deprecated. Use <code>%2$s</code> instead.' ), 'Site Wide Only: true', 'Network: true' ) );
+	if ( ! $plugin_data['Network'] && $plugin_data['_sitewide']) {
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The <code>%1$s</code> plugin header is deprecated. Use <code>%2$s</code> instead.'), 'Site Wide Only: true', 'Network: true'));
 		$plugin_data['Network'] = $plugin_data['_sitewide'];
 	}
-	$plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) );
-	unset( $plugin_data['_sitewide'] );
+	$plugin_data['Network'] = ('true' == strtolower($plugin_data['Network']));
+	unset($plugin_data['_sitewide']);
 
-	if ( $markup || $translate ) {
-		$plugin_data = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup, $translate );
+	if ($markup || $translate) {
+		$plugin_data = _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup, $translate);
 	} else {
 		$plugin_data['Title']      = $plugin_data['Name'];
 		$plugin_data['AuthorName'] = $plugin_data['Author'];
@@ -112,63 +112,63 @@ 
  * @access private
  * @see get_plugin_data()
  */
-function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup = true, $translate = true ) {
+function _get_plugin_data_markup_translate($plugin_file, $plugin_data, $markup = true, $translate = true) {
 
 	// Sanitize the plugin filename to a WP_PLUGIN_DIR relative path
-	$plugin_file = plugin_basename( $plugin_file );
+	$plugin_file = plugin_basename($plugin_file);
 
 	// Translate fields
-	if ( $translate ) {
-		if ( $textdomain = $plugin_data['TextDomain'] ) {
-			if ( $plugin_data['DomainPath'] )
-				load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] );
+	if ($translate) {
+		if ($textdomain = $plugin_data['TextDomain']) {
+			if ($plugin_data['DomainPath'])
+				load_plugin_textdomain($textdomain, false, dirname($plugin_file).$plugin_data['DomainPath']);
 			else
-				load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
-		} elseif ( in_array( basename( $plugin_file ), array( 'hello.php', 'akismet.php' ) ) ) {
+				load_plugin_textdomain($textdomain, false, dirname($plugin_file));
+		} elseif (in_array(basename($plugin_file), array('hello.php', 'akismet.php'))) {
 			$textdomain = 'default';
 		}
-		if ( $textdomain ) {
-			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field )
-				$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+		if ($textdomain) {
+			foreach (array('Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version') as $field)
+				$plugin_data[$field] = translate($plugin_data[$field], $textdomain);
 		}
 	}
 
 	// Sanitize fields
 	$allowed_tags = $allowed_tags_in_links = array(
-		'abbr'    => array( 'title' => true ),
-		'acronym' => array( 'title' => true ),
+		'abbr'    => array('title' => true),
+		'acronym' => array('title' => true),
 		'code'    => true,
 		'em'      => true,
 		'strong'  => true,
 	);
-	$allowed_tags['a'] = array( 'href' => true, 'title' => true );
+	$allowed_tags['a'] = array('href' => true, 'title' => true);
 
 	// Name is marked up inside <a> tags. Don't allow these.
 	// Author is too, but some plugins have used <a> here (omitting Author URI).
-	$plugin_data['Name']        = wp_kses( $plugin_data['Name'],        $allowed_tags_in_links );
-	$plugin_data['Author']      = wp_kses( $plugin_data['Author'],      $allowed_tags );
+	$plugin_data['Name']        = wp_kses($plugin_data['Name'], $allowed_tags_in_links);
+	$plugin_data['Author']      = wp_kses($plugin_data['Author'], $allowed_tags);
 
-	$plugin_data['Description'] = wp_kses( $plugin_data['Description'], $allowed_tags );
-	$plugin_data['Version']     = wp_kses( $plugin_data['Version'],     $allowed_tags );
+	$plugin_data['Description'] = wp_kses($plugin_data['Description'], $allowed_tags);
+	$plugin_data['Version']     = wp_kses($plugin_data['Version'], $allowed_tags);
 
-	$plugin_data['PluginURI']   = esc_url( $plugin_data['PluginURI'] );
-	$plugin_data['AuthorURI']   = esc_url( $plugin_data['AuthorURI'] );
+	$plugin_data['PluginURI']   = esc_url($plugin_data['PluginURI']);
+	$plugin_data['AuthorURI']   = esc_url($plugin_data['AuthorURI']);
 
 	$plugin_data['Title']      = $plugin_data['Name'];
 	$plugin_data['AuthorName'] = $plugin_data['Author'];
 
 	// Apply markup
-	if ( $markup ) {
-		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] )
-			$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+	if ($markup) {
+		if ($plugin_data['PluginURI'] && $plugin_data['Name'])
+			$plugin_data['Title'] = '<a href="'.$plugin_data['PluginURI'].'">'.$plugin_data['Name'].'</a>';
 
-		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] )
-			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		if ($plugin_data['AuthorURI'] && $plugin_data['Author'])
+			$plugin_data['Author'] = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
 
-		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
+		$plugin_data['Description'] = wptexturize($plugin_data['Description']);
 
-		if ( $plugin_data['Author'] )
-			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		if ($plugin_data['Author'])
+			$plugin_data['Description'] .= ' <cite>'.sprintf(__('By %s.'), $plugin_data['Author']).'</cite>';
 	}
 
 	return $plugin_data;
@@ -183,31 +183,31 @@ 
  * @return array List of files relative to the plugin root.
  */
 function get_plugin_files($plugin) {
-	$plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
+	$plugin_file = WP_PLUGIN_DIR.'/'.$plugin;
 	$dir = dirname($plugin_file);
 	$plugin_files = array($plugin);
-	if ( is_dir($dir) && $dir != WP_PLUGIN_DIR ) {
-		$plugins_dir = @ opendir( $dir );
-		if ( $plugins_dir ) {
-			while (($file = readdir( $plugins_dir ) ) !== false ) {
-				if ( substr($file, 0, 1) == '.' )
+	if (is_dir($dir) && $dir != WP_PLUGIN_DIR) {
+		$plugins_dir = @ opendir($dir);
+		if ($plugins_dir) {
+			while (($file = readdir($plugins_dir)) !== false) {
+				if (substr($file, 0, 1) == '.')
 					continue;
-				if ( is_dir( $dir . '/' . $file ) ) {
-					$plugins_subdir = @ opendir( $dir . '/' . $file );
-					if ( $plugins_subdir ) {
-						while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-							if ( substr($subfile, 0, 1) == '.' )
+				if (is_dir($dir.'/'.$file)) {
+					$plugins_subdir = @ opendir($dir.'/'.$file);
+					if ($plugins_subdir) {
+						while (($subfile = readdir($plugins_subdir)) !== false) {
+							if (substr($subfile, 0, 1) == '.')
 								continue;
 							$plugin_files[] = plugin_basename("$dir/$file/$subfile");
 						}
-						@closedir( $plugins_subdir );
+						@closedir($plugins_subdir);
 					}
 				} else {
-					if ( plugin_basename("$dir/$file") != $plugin )
+					if (plugin_basename("$dir/$file") != $plugin)
 						$plugin_files[] = plugin_basename("$dir/$file");
 				}
 			}
-			@closedir( $plugins_dir );
+			@closedir($plugins_dir);
 		}
 	}
 
@@ -236,61 +236,61 @@ 
  */
 function get_plugins($plugin_folder = '') {
 
-	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
+	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins'))
 		$cache_plugins = array();
 
-	if ( isset($cache_plugins[ $plugin_folder ]) )
-		return $cache_plugins[ $plugin_folder ];
+	if (isset($cache_plugins[$plugin_folder]))
+		return $cache_plugins[$plugin_folder];
 
-	$wp_plugins = array ();
+	$wp_plugins = array();
 	$plugin_root = WP_PLUGIN_DIR;
-	if ( !empty($plugin_folder) )
+	if ( ! empty($plugin_folder))
 		$plugin_root .= $plugin_folder;
 
 	// Files in wp-content/plugins directory
-	$plugins_dir = @ opendir( $plugin_root);
+	$plugins_dir = @ opendir($plugin_root);
 	$plugin_files = array();
-	if ( $plugins_dir ) {
-		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
+	if ($plugins_dir) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (substr($file, 0, 1) == '.')
 				continue;
-			if ( is_dir( $plugin_root.'/'.$file ) ) {
-				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
-				if ( $plugins_subdir ) {
-					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
+			if (is_dir($plugin_root.'/'.$file)) {
+				$plugins_subdir = @ opendir($plugin_root.'/'.$file);
+				if ($plugins_subdir) {
+					while (($subfile = readdir($plugins_subdir)) !== false) {
+						if (substr($subfile, 0, 1) == '.')
 							continue;
-						if ( substr($subfile, -4) == '.php' )
+						if (substr($subfile, -4) == '.php')
 							$plugin_files[] = "$file/$subfile";
 					}
-					closedir( $plugins_subdir );
+					closedir($plugins_subdir);
 				}
 			} else {
-				if ( substr($file, -4) == '.php' )
+				if (substr($file, -4) == '.php')
 					$plugin_files[] = $file;
 			}
 		}
-		closedir( $plugins_dir );
+		closedir($plugins_dir);
 	}
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $wp_plugins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable("$plugin_root/$plugin_file"))
 			continue;
 
-		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+		$plugin_data = get_plugin_data("$plugin_root/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if (empty ($plugin_data['Name']))
 			continue;
 
-		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
+		$wp_plugins[plugin_basename($plugin_file)] = $plugin_data;
 	}
 
-	uasort( $wp_plugins, '_sort_uname_callback' );
+	uasort($wp_plugins, '_sort_uname_callback');
 
-	$cache_plugins[ $plugin_folder ] = $wp_plugins;
+	$cache_plugins[$plugin_folder] = $wp_plugins;
 	wp_cache_set('plugins', $cache_plugins, 'plugins');
 
 	return $wp_plugins;
@@ -309,38 +309,38 @@ 
 	// Files in wp-content/mu-plugins directory
 	$plugin_files = array();
 
-	if ( ! is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $wp_plugins;
-	if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
-		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr( $file, -4 ) == '.php' )
+	if ($plugins_dir = @ opendir(WPMU_PLUGIN_DIR)) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (substr($file, -4) == '.php')
 				$plugin_files[] = $file;
 		}
 	} else {
 		return $wp_plugins;
 	}
 
-	@closedir( $plugins_dir );
+	@closedir($plugins_dir);
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $wp_plugins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable(WPMU_PLUGIN_DIR."/$plugin_file"))
 			continue;
 
-		$plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
+		$plugin_data = get_plugin_data(WPMU_PLUGIN_DIR."/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
+		if (empty ($plugin_data['Name']))
 			$plugin_data['Name'] = $plugin_file;
 
-		$wp_plugins[ $plugin_file ] = $plugin_data;
+		$wp_plugins[$plugin_file] = $plugin_data;
 	}
 
-	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden
-		unset( $wp_plugins['index.php'] );
+	if (isset($wp_plugins['index.php']) && filesize(WPMU_PLUGIN_DIR.'/index.php') <= 30) // silence is golden
+		unset($wp_plugins['index.php']);
 
-	uasort( $wp_plugins, '_sort_uname_callback' );
+	uasort($wp_plugins, '_sort_uname_callback');
 
 	return $wp_plugins;
 }
@@ -351,8 +351,8 @@ 
  * @since 3.1.0
  * @access private
  */
-function _sort_uname_callback( $a, $b ) {
-	return strnatcasecmp( $a['Name'], $b['Name'] );
+function _sort_uname_callback($a, $b) {
+	return strnatcasecmp($a['Name'], $b['Name']);
 }
 
 /**
@@ -368,30 +368,30 @@ 
 	$_dropins = _get_dropins();
 
 	// These exist in the wp-content directory
-	if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
-		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( isset( $_dropins[ $file ] ) )
+	if ($plugins_dir = @ opendir(WP_CONTENT_DIR)) {
+		while (($file = readdir($plugins_dir)) !== false) {
+			if (isset($_dropins[$file]))
 				$plugin_files[] = $file;
 		}
 	} else {
 		return $dropins;
 	}
 
-	@closedir( $plugins_dir );
+	@closedir($plugins_dir);
 
-	if ( empty($plugin_files) )
+	if (empty($plugin_files))
 		return $dropins;
 
-	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
+	foreach ($plugin_files as $plugin_file) {
+		if ( ! is_readable(WP_CONTENT_DIR."/$plugin_file"))
 			continue;
-		$plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-		if ( empty( $plugin_data['Name'] ) )
+		$plugin_data = get_plugin_data(WP_CONTENT_DIR."/$plugin_file", false, false); //Do not apply markup/translate as it'll be cached.
+		if (empty($plugin_data['Name']))
 			$plugin_data['Name'] = $plugin_file;
-		$dropins[ $plugin_file ] = $plugin_data;
+		$dropins[$plugin_file] = $plugin_data;
 	}
 
-	uksort( $dropins, 'strnatcasecmp' );
+	uksort($dropins, 'strnatcasecmp');
 
 	return $dropins;
 }
@@ -408,19 +408,19 @@ 
  */
 function _get_dropins() {
 	$dropins = array(
-		'advanced-cache.php' => array( __( 'Advanced caching plugin.'       ), 'WP_CACHE' ), // WP_CACHE
-		'db.php'             => array( __( 'Custom database class.'         ), true ), // auto on load
-		'db-error.php'       => array( __( 'Custom database error message.' ), true ), // auto on error
-		'install.php'        => array( __( 'Custom install script.'         ), true ), // auto on install
-		'maintenance.php'    => array( __( 'Custom maintenance message.'    ), true ), // auto on maintenance
-		'object-cache.php'   => array( __( 'External object cache.'         ), true ), // auto on load
+		'advanced-cache.php' => array(__('Advanced caching plugin.'), 'WP_CACHE'), // WP_CACHE
+		'db.php'             => array(__('Custom database class.'), true), // auto on load
+		'db-error.php'       => array(__('Custom database error message.'), true), // auto on error
+		'install.php'        => array(__('Custom install script.'), true), // auto on install
+		'maintenance.php'    => array(__('Custom maintenance message.'), true), // auto on maintenance
+		'object-cache.php'   => array(__('External object cache.'), true), // auto on load
 	);
 
-	if ( is_multisite() ) {
-		$dropins['sunrise.php'       ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
-		$dropins['blog-deleted.php'  ] = array( __( 'Custom site deleted message.'   ), true ); // auto on deleted blog
-		$dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.'  ), true ); // auto on inactive blog
-		$dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
+	if (is_multisite()) {
+		$dropins['sunrise.php'] = array(__('Executed before Multisite is loaded.'), 'SUNRISE'); // SUNRISE
+		$dropins['blog-deleted.php'] = array(__('Custom site deleted message.'), true); // auto on deleted blog
+		$dropins['blog-inactive.php'] = array(__('Custom site inactive message.'), true); // auto on inactive blog
+		$dropins['blog-suspended.php'] = array(__('Custom site suspended message.'), true); // auto on archived or spammed blog
 	}
 
 	return $dropins;
@@ -434,8 +434,8 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if in the active plugins list. False, not in the list.
  */
-function is_plugin_active( $plugin ) {
-	return in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) || is_plugin_active_for_network( $plugin );
+function is_plugin_active($plugin) {
+	return in_array($plugin, (array) get_option('active_plugins', array())) || is_plugin_active_for_network($plugin);
 }
 
 /**
@@ -449,8 +449,8 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True if inactive. False if active.
  */
-function is_plugin_inactive( $plugin ) {
-	return ! is_plugin_active( $plugin );
+function is_plugin_inactive($plugin) {
+	return ! is_plugin_active($plugin);
 }
 
 /**
@@ -461,12 +461,12 @@ 
  * @param string $plugin Base plugin path from plugins directory.
  * @return bool True, if active for the network, otherwise false.
  */
-function is_plugin_active_for_network( $plugin ) {
-	if ( !is_multisite() )
+function is_plugin_active_for_network($plugin) {
+	if ( ! is_multisite())
 		return false;
 
-	$plugins = get_site_option( 'active_sitewide_plugins');
-	if ( isset($plugins[$plugin]) )
+	$plugins = get_site_option('active_sitewide_plugins');
+	if (isset($plugins[$plugin]))
 		return true;
 
 	return false;
@@ -484,9 +484,9 @@ 
  * @param string $plugin Plugin to check
  * @return bool True if plugin is network only, false otherwise.
  */
-function is_network_only_plugin( $plugin ) {
-	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data )
+function is_network_only_plugin($plugin) {
+	$plugin_data = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
+	if ($plugin_data)
 		return $plugin_data['Network'];
 	return false;
 }
@@ -518,31 +518,31 @@ 
  * @param bool $silent Prevent calling activation hooks. Optional, default is false.
  * @return WP_Error|null WP_Error on invalid file or null on success.
  */
-function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silent = false ) {
-	$plugin = plugin_basename( trim( $plugin ) );
+function activate_plugin($plugin, $redirect = '', $network_wide = false, $silent = false) {
+	$plugin = plugin_basename(trim($plugin));
 
-	if ( is_multisite() && ( $network_wide || is_network_only_plugin($plugin) ) ) {
+	if (is_multisite() && ($network_wide || is_network_only_plugin($plugin))) {
 		$network_wide = true;
-		$current = get_site_option( 'active_sitewide_plugins', array() );
+		$current = get_site_option('active_sitewide_plugins', array());
 		$_GET['networkwide'] = 1; // Back compat for plugins looking for this value.
 	} else {
-		$current = get_option( 'active_plugins', array() );
+		$current = get_option('active_plugins', array());
 	}
 
 	$valid = validate_plugin($plugin);
-	if ( is_wp_error($valid) )
+	if (is_wp_error($valid))
 		return $valid;
 
-	if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
-		if ( !empty($redirect) )
-			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
+	if (($network_wide && ! isset($current[$plugin])) || ( ! $network_wide && ! in_array($plugin, $current))) {
+		if ( ! empty($redirect))
+			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_'.$plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
 		ob_start();
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$plugin);
 		$_wp_plugin_file = $plugin;
-		include_once( WP_PLUGIN_DIR . '/' . $plugin );
+		include_once(WP_PLUGIN_DIR.'/'.$plugin);
 		$plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires before a plugin is activated.
 			 *
@@ -555,7 +555,7 @@ 
 			 * @param bool   $network_wide Whether to enable the plugin for all sites in the network
 			 *                             or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activate_plugin', $plugin, $network_wide );
+			do_action('activate_plugin', $plugin, $network_wide);
 
 			/**
 			 * Fires as a specific plugin is being activated.
@@ -572,21 +572,21 @@ 
 			 * @param bool $network_wide Whether to enable the plugin for all sites in the network
 			 *                           or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activate_' . $plugin, $network_wide );
+			do_action('activate_'.$plugin, $network_wide);
 		}
 
-		if ( $network_wide ) {
-			$current = get_site_option( 'active_sitewide_plugins', array() );
+		if ($network_wide) {
+			$current = get_site_option('active_sitewide_plugins', array());
 			$current[$plugin] = time();
-			update_site_option( 'active_sitewide_plugins', $current );
+			update_site_option('active_sitewide_plugins', $current);
 		} else {
-			$current = get_option( 'active_plugins', array() );
+			$current = get_option('active_plugins', array());
 			$current[] = $plugin;
 			sort($current);
 			update_option('active_plugins', $current);
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires after a plugin has been activated.
 			 *
@@ -599,10 +599,10 @@ 
 			 * @param bool   $network_wide Whether to enable the plugin for all sites in the network
 			 *                             or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'activated_plugin', $plugin, $network_wide );
+			do_action('activated_plugin', $plugin, $network_wide);
 		}
 
-		if ( ob_get_length() > 0 ) {
+		if (ob_get_length() > 0) {
 			$output = ob_get_clean();
 			return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
 		}
@@ -625,20 +625,20 @@ 
  * @param mixed $network_wide Whether to deactivate the plugin for all sites in the network.
  * 	A value of null (the default) will deactivate plugins for both the site and the network.
  */
-function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
-	if ( is_multisite() )
-		$network_current = get_site_option( 'active_sitewide_plugins', array() );
-	$current = get_option( 'active_plugins', array() );
+function deactivate_plugins($plugins, $silent = false, $network_wide = null) {
+	if (is_multisite())
+		$network_current = get_site_option('active_sitewide_plugins', array());
+	$current = get_option('active_plugins', array());
 	$do_blog = $do_network = false;
 
-	foreach ( (array) $plugins as $plugin ) {
-		$plugin = plugin_basename( trim( $plugin ) );
-		if ( ! is_plugin_active($plugin) )
+	foreach ((array) $plugins as $plugin) {
+		$plugin = plugin_basename(trim($plugin));
+		if ( ! is_plugin_active($plugin))
 			continue;
 
-		$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
+		$network_deactivating = false !== $network_wide && is_plugin_active_for_network($plugin);
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires before a plugin is deactivated.
 			 *
@@ -651,27 +651,27 @@ 
 			 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'deactivate_plugin', $plugin, $network_deactivating );
+			do_action('deactivate_plugin', $plugin, $network_deactivating);
 		}
 
-		if ( false !== $network_wide ) {
-			if ( is_plugin_active_for_network( $plugin ) ) {
+		if (false !== $network_wide) {
+			if (is_plugin_active_for_network($plugin)) {
 				$do_network = true;
-				unset( $network_current[ $plugin ] );
-			} elseif ( $network_wide ) {
+				unset($network_current[$plugin]);
+			} elseif ($network_wide) {
 				continue;
 			}
 		}
 
-		if ( true !== $network_wide ) {
-			$key = array_search( $plugin, $current );
-			if ( false !== $key ) {
+		if (true !== $network_wide) {
+			$key = array_search($plugin, $current);
+			if (false !== $key) {
 				$do_blog = true;
-				unset( $current[ $key ] );
+				unset($current[$key]);
 			}
 		}
 
-		if ( ! $silent ) {
+		if ( ! $silent) {
 			/**
 			 * Fires as a specific plugin is being deactivated.
 			 *
@@ -687,7 +687,7 @@ 
 			 * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                   or just the current site. Multisite only. Default is false.
 			 */
-			do_action( 'deactivate_' . $plugin, $network_deactivating );
+			do_action('deactivate_'.$plugin, $network_deactivating);
 
 			/**
 			 * Fires after a plugin is deactivated.
@@ -701,14 +701,14 @@ 
 			 * @param bool   $network_deactivating Whether the plugin is deactivated for all sites in the network
 			 *                                     or just the current site. Multisite only. Default false.
 			 */
-			do_action( 'deactivated_plugin', $plugin, $network_deactivating );
+			do_action('deactivated_plugin', $plugin, $network_deactivating);
 		}
 	}
 
-	if ( $do_blog )
+	if ($do_blog)
 		update_option('active_plugins', $current);
-	if ( $do_network )
-		update_site_option( 'active_sitewide_plugins', $network_current );
+	if ($do_network)
+		update_site_option('active_sitewide_plugins', $network_current);
 }
 
 /**
@@ -727,20 +727,20 @@ 
  * @param bool $silent Prevent calling activation hooks. Default is false.
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
-function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
-	if ( !is_array($plugins) )
+function activate_plugins($plugins, $redirect = '', $network_wide = false, $silent = false) {
+	if ( ! is_array($plugins))
 		$plugins = array($plugins);
 
 	$errors = array();
-	foreach ( $plugins as $plugin ) {
-		if ( !empty($redirect) )
+	foreach ($plugins as $plugin) {
+		if ( ! empty($redirect))
 			$redirect = add_query_arg('plugin', $plugin, $redirect);
 		$result = activate_plugin($plugin, $redirect, $network_wide, $silent);
-		if ( is_wp_error($result) )
+		if (is_wp_error($result))
 			$errors[$plugin] = $result;
 	}
 
-	if ( !empty($errors) )
+	if ( ! empty($errors))
 		return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
 
 	return true;
@@ -758,106 +758,106 @@ 
  * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure.
  *                            Null if filesystem credentials are required to proceed.
  */
-function delete_plugins( $plugins, $deprecated = '' ) {
+function delete_plugins($plugins, $deprecated = '') {
 	global $wp_filesystem;
 
-	if ( empty($plugins) )
+	if (empty($plugins))
 		return false;
 
 	$checked = array();
-	foreach( $plugins as $plugin )
-		$checked[] = 'checked[]=' . $plugin;
+	foreach ($plugins as $plugin)
+		$checked[] = 'checked[]='.$plugin;
 
 	ob_start();
-	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
-	if ( false === ($credentials = request_filesystem_credentials($url)) ) {
+	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&'.implode('&', $checked), 'bulk-plugins');
+	if (false === ($credentials = request_filesystem_credentials($url))) {
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! WP_Filesystem($credentials) ) {
+	if ( ! WP_Filesystem($credentials)) {
 		request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
+	if ( ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 
 	// Get the base plugin folder.
 	$plugins_dir = $wp_filesystem->wp_plugins_dir();
-	if ( empty( $plugins_dir ) ) {
-		return new WP_Error( 'fs_no_plugins_dir', __( 'Unable to locate WordPress Plugin directory.' ) );
+	if (empty($plugins_dir)) {
+		return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
 	}
 
-	$plugins_dir = trailingslashit( $plugins_dir );
+	$plugins_dir = trailingslashit($plugins_dir);
 
-	$plugin_translations = wp_get_installed_translations( 'plugins' );
+	$plugin_translations = wp_get_installed_translations('plugins');
 
 	$errors = array();
 
-	foreach( $plugins as $plugin_file ) {
+	foreach ($plugins as $plugin_file) {
 		// Run Uninstall hook.
-		if ( is_uninstallable_plugin( $plugin_file ) ) {
+		if (is_uninstallable_plugin($plugin_file)) {
 			uninstall_plugin($plugin_file);
 		}
 
-		$this_plugin_dir = trailingslashit( dirname( $plugins_dir . $plugin_file ) );
+		$this_plugin_dir = trailingslashit(dirname($plugins_dir.$plugin_file));
 		// If plugin is in its own directory, recursively delete the directory.
-		if ( strpos( $plugin_file, '/' ) && $this_plugin_dir != $plugins_dir ) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
-			$deleted = $wp_filesystem->delete( $this_plugin_dir, true );
+		if (strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir) { //base check on if plugin includes directory separator AND that it's not the root plugin folder
+			$deleted = $wp_filesystem->delete($this_plugin_dir, true);
 		} else {
-			$deleted = $wp_filesystem->delete( $plugins_dir . $plugin_file );
+			$deleted = $wp_filesystem->delete($plugins_dir.$plugin_file);
 		}
 
-		if ( ! $deleted ) {
+		if ( ! $deleted) {
 			$errors[] = $plugin_file;
 			continue;
 		}
 
 		// Remove language files, silently.
-		$plugin_slug = dirname( $plugin_file );
-		if ( '.' !== $plugin_slug && ! empty( $plugin_translations[ $plugin_slug ] ) ) {
-			$translations = $plugin_translations[ $plugin_slug ];
+		$plugin_slug = dirname($plugin_file);
+		if ('.' !== $plugin_slug && ! empty($plugin_translations[$plugin_slug])) {
+			$translations = $plugin_translations[$plugin_slug];
 
-			foreach ( $translations as $translation => $data ) {
-				$wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.po' );
-				$wp_filesystem->delete( WP_LANG_DIR . '/plugins/' . $plugin_slug . '-' . $translation . '.mo' );
+			foreach ($translations as $translation => $data) {
+				$wp_filesystem->delete(WP_LANG_DIR.'/plugins/'.$plugin_slug.'-'.$translation.'.po');
+				$wp_filesystem->delete(WP_LANG_DIR.'/plugins/'.$plugin_slug.'-'.$translation.'.mo');
 			}
 		}
 	}
 
 	// Remove deleted plugins from the plugin updates list.
-	if ( $current = get_site_transient('update_plugins') ) {
+	if ($current = get_site_transient('update_plugins')) {
 		// Don't remove the plugins that weren't deleted.
-		$deleted = array_diff( $plugins, $errors );
+		$deleted = array_diff($plugins, $errors);
 
-		foreach ( $deleted as $plugin_file ) {
-			unset( $current->response[ $plugin_file ] );
+		foreach ($deleted as $plugin_file) {
+			unset($current->response[$plugin_file]);
 		}
 
-		set_site_transient( 'update_plugins', $current );
+		set_site_transient('update_plugins', $current);
 	}
 
-	if ( ! empty($errors) )
-		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	if ( ! empty($errors))
+		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)));
 
 	return true;
 }
@@ -872,29 +872,29 @@ 
  * @return array invalid plugins, plugin as key, error as value
  */
 function validate_active_plugins() {
-	$plugins = get_option( 'active_plugins', array() );
+	$plugins = get_option('active_plugins', array());
 	// Validate vartype: array.
-	if ( ! is_array( $plugins ) ) {
-		update_option( 'active_plugins', array() );
+	if ( ! is_array($plugins)) {
+		update_option('active_plugins', array());
 		$plugins = array();
 	}
 
-	if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-		$network_plugins = (array) get_site_option( 'active_sitewide_plugins', array() );
-		$plugins = array_merge( $plugins, array_keys( $network_plugins ) );
+	if (is_multisite() && current_user_can('manage_network_plugins')) {
+		$network_plugins = (array) get_site_option('active_sitewide_plugins', array());
+		$plugins = array_merge($plugins, array_keys($network_plugins));
 	}
 
-	if ( empty( $plugins ) )
+	if (empty($plugins))
 		return array();
 
 	$invalid = array();
 
 	// Invalid plugins get deactivated.
-	foreach ( $plugins as $plugin ) {
-		$result = validate_plugin( $plugin );
-		if ( is_wp_error( $result ) ) {
+	foreach ($plugins as $plugin) {
+		$result = validate_plugin($plugin);
+		if (is_wp_error($result)) {
 			$invalid[$plugin] = $result;
-			deactivate_plugins( $plugin, true );
+			deactivate_plugins($plugin, true);
 		}
 	}
 	return $invalid;
@@ -911,13 +911,13 @@ 
  * @return WP_Error|int 0 on success, WP_Error on failure.
  */
 function validate_plugin($plugin) {
-	if ( validate_file($plugin) )
+	if (validate_file($plugin))
 		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
-	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
+	if ( ! file_exists(WP_PLUGIN_DIR.'/'.$plugin))
 		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
 
 	$installed_plugins = get_plugins();
-	if ( ! isset($installed_plugins[$plugin]) )
+	if ( ! isset($installed_plugins[$plugin]))
 		return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
 	return 0;
 }
@@ -934,7 +934,7 @@ 
 	$file = plugin_basename($plugin);
 
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
+	if (isset($uninstallable_plugins[$file]) || file_exists(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php'))
 		return true;
 
 	return false;
@@ -954,30 +954,30 @@ 
 	$file = plugin_basename($plugin);
 
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
-		if ( isset( $uninstallable_plugins[$file] ) ) {
+	if (file_exists(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php')) {
+		if (isset($uninstallable_plugins[$file])) {
 			unset($uninstallable_plugins[$file]);
 			update_option('uninstall_plugins', $uninstallable_plugins);
 		}
 		unset($uninstallable_plugins);
 
 		define('WP_UNINSTALL_PLUGIN', $file);
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . dirname( $file ) );
-		include( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.dirname($file));
+		include(WP_PLUGIN_DIR.'/'.dirname($file).'/uninstall.php');
 
 		return true;
 	}
 
-	if ( isset( $uninstallable_plugins[$file] ) ) {
+	if (isset($uninstallable_plugins[$file])) {
 		$callable = $uninstallable_plugins[$file];
 		unset($uninstallable_plugins[$file]);
 		update_option('uninstall_plugins', $uninstallable_plugins);
 		unset($uninstallable_plugins);
 
-		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-		include( WP_PLUGIN_DIR . '/' . $file );
+		wp_register_plugin_realpath(WP_PLUGIN_DIR.'/'.$file);
+		include(WP_PLUGIN_DIR.'/'.$file);
 
-		add_action( 'uninstall_' . $file, $callable );
+		add_action('uninstall_'.$file, $callable);
 
 		/**
 		 * Fires in uninstall_plugin() once the plugin has been uninstalled.
@@ -987,7 +987,7 @@ 
 		 *
 		 * @since 2.7.0
 		 */
-		do_action( 'uninstall_' . $file );
+		do_action('uninstall_'.$file);
 	}
 }
 
@@ -1023,29 +1023,29 @@ 
  *
  * @return string The resulting page's hook_suffix
  */
-function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null ) {
+function add_menu_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '', $position = null) {
 	global $menu, $admin_page_hooks, $_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
+	$menu_slug = plugin_basename($menu_slug);
 
-	$admin_page_hooks[$menu_slug] = sanitize_title( $menu_title );
+	$admin_page_hooks[$menu_slug] = sanitize_title($menu_title);
 
-	$hookname = get_plugin_page_hookname( $menu_slug, '' );
+	$hookname = get_plugin_page_hookname($menu_slug, '');
 
-	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
-		add_action( $hookname, $function );
+	if ( ! empty($function) && ! empty($hookname) && current_user_can($capability))
+		add_action($hookname, $function);
 
-	if ( empty($icon_url) ) {
+	if (empty($icon_url)) {
 		$icon_url = 'dashicons-admin-generic';
 		$icon_class = 'menu-icon-generic ';
 	} else {
-		$icon_url = set_url_scheme( $icon_url );
+		$icon_url = set_url_scheme($icon_url);
 		$icon_class = '';
 	}
 
-	$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
+	$new_menu = array($menu_title, $capability, $menu_slug, $page_title, 'menu-top '.$icon_class.$hookname, $hookname, $icon_url);
 
-	if ( null === $position )
+	if (null === $position)
 		$menu[] = $new_menu;
 	else
 		$menu[$position] = $new_menu;
@@ -1078,7 +1078,7 @@ 
  *
  * @return string The resulting page's hook_suffix
  */
-function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
+function add_object_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
 	global $_wp_last_object_menu;
 
 	$_wp_last_object_menu++;
@@ -1106,7 +1106,7 @@ 
  *
  * @return string The resulting page's hook_suffix
  */
-function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
+function add_utility_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
 	global $_wp_last_utility_menu;
 
 	$_wp_last_utility_menu++;
@@ -1139,17 +1139,17 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
+function add_submenu_page($parent_slug, $page_title, $menu_title, $capability, $menu_slug, $function = '') {
 	global $submenu, $menu, $_wp_real_parent_file, $_wp_submenu_nopriv,
 		$_registered_pages, $_parent_pages;
 
-	$menu_slug = plugin_basename( $menu_slug );
-	$parent_slug = plugin_basename( $parent_slug);
+	$menu_slug = plugin_basename($menu_slug);
+	$parent_slug = plugin_basename($parent_slug);
 
-	if ( isset( $_wp_real_parent_file[$parent_slug] ) )
+	if (isset($_wp_real_parent_file[$parent_slug]))
 		$parent_slug = $_wp_real_parent_file[$parent_slug];
 
-	if ( !current_user_can( $capability ) ) {
+	if ( ! current_user_can($capability)) {
 		$_wp_submenu_nopriv[$parent_slug][$menu_slug] = true;
 		return false;
 	}
@@ -1160,18 +1160,18 @@ 
 	 * parent file someone is trying to link back to the parent manually. In
 	 * this case, don't automatically add a link back to avoid duplication.
 	 */
-	if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+	if ( ! isset($submenu[$parent_slug]) && $menu_slug != $parent_slug) {
+		foreach ((array) $menu as $parent_menu) {
+			if ($parent_menu[2] == $parent_slug && current_user_can($parent_menu[1]))
+				$submenu[$parent_slug][] = array_slice($parent_menu, 0, 4);
 		}
 	}
 
-	$submenu[$parent_slug][] = array ( $menu_title, $capability, $menu_slug, $page_title );
+	$submenu[$parent_slug][] = array($menu_title, $capability, $menu_slug, $page_title);
 
-	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug);
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
+	$hookname = get_plugin_page_hookname($menu_slug, $parent_slug);
+	if ( ! empty ($function) && ! empty ($hookname))
+		add_action($hookname, $function);
 
 	$_registered_pages[$hookname] = true;
 
@@ -1179,8 +1179,8 @@ 
 	 * Backward-compatibility for plugins using add_management page.
 	 * See wp-admin/admin.php for redirect from edit.php to tools.php
 	 */
-	if ( 'tools.php' == $parent_slug )
-		$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	if ('tools.php' == $parent_slug)
+		$_registered_pages[get_plugin_page_hookname($menu_slug, 'edit.php')] = true;
 
 	// No parent as top level.
 	$_parent_pages[$menu_slug] = $parent_slug;
@@ -1205,8 +1205,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_management_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'tools.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_management_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('tools.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1226,8 +1226,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_options_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_options_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('options-general.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1247,8 +1247,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_theme_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'themes.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_theme_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('themes.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1268,8 +1268,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_plugins_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_plugins_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('plugins.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1289,12 +1289,12 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	if ( current_user_can('edit_users') )
+function add_users_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	if (current_user_can('edit_users'))
 		$parent = 'users.php';
 	else
 		$parent = 'profile.php';
-	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
+	return add_submenu_page($parent, $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 /**
  * Add sub menu page to the Dashboard main menu.
@@ -1313,8 +1313,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_dashboard_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'index.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_dashboard_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('index.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1334,8 +1334,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_posts_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_posts_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1355,8 +1355,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_media_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'upload.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_media_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('upload.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1376,8 +1376,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
-function add_links_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_links_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('link-manager.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1397,8 +1397,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
 */
-function add_pages_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_pages_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit.php?post_type=page', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1418,8 +1418,8 @@ 
  *
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
 */
-function add_comments_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	return add_submenu_page( 'edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function );
+function add_comments_page($page_title, $menu_title, $capability, $menu_slug, $function = '') {
+	return add_submenu_page('edit-comments.php', $page_title, $menu_title, $capability, $menu_slug, $function);
 }
 
 /**
@@ -1432,12 +1432,12 @@ 
  * @param string $menu_slug The slug of the menu
  * @return array|bool The removed menu on success, False if not found
  */
-function remove_menu_page( $menu_slug ) {
+function remove_menu_page($menu_slug) {
 	global $menu;
 
-	foreach ( $menu as $i => $item ) {
-		if ( $menu_slug == $item[2] ) {
-			unset( $menu[$i] );
+	foreach ($menu as $i => $item) {
+		if ($menu_slug == $item[2]) {
+			unset($menu[$i]);
 			return $item;
 		}
 	}
@@ -1456,15 +1456,15 @@ 
  * @param string $submenu_slug The slug of the submenu
  * @return array|bool The removed submenu on success, False if not found
  */
-function remove_submenu_page( $menu_slug, $submenu_slug ) {
+function remove_submenu_page($menu_slug, $submenu_slug) {
 	global $submenu;
 
-	if ( !isset( $submenu[$menu_slug] ) )
+	if ( ! isset($submenu[$menu_slug]))
 		return false;
 
-	foreach ( $submenu[$menu_slug] as $i => $item ) {
-		if ( $submenu_slug == $item[2] ) {
-			unset( $submenu[$menu_slug][$i] );
+	foreach ($submenu[$menu_slug] as $i => $item) {
+		if ($submenu_slug == $item[2]) {
+			unset($submenu[$menu_slug][$i]);
 			return $item;
 		}
 	}
@@ -1488,12 +1488,12 @@ 
 function menu_page_url($menu_slug, $echo = true) {
 	global $_parent_pages;
 
-	if ( isset( $_parent_pages[$menu_slug] ) ) {
+	if (isset($_parent_pages[$menu_slug])) {
 		$parent_slug = $_parent_pages[$menu_slug];
-		if ( $parent_slug && ! isset( $_parent_pages[$parent_slug] ) ) {
-			$url = admin_url( add_query_arg( 'page', $menu_slug, $parent_slug ) );
+		if ($parent_slug && ! isset($_parent_pages[$parent_slug])) {
+			$url = admin_url(add_query_arg('page', $menu_slug, $parent_slug));
 		} else {
-			$url = admin_url( 'admin.php?page=' . $menu_slug );
+			$url = admin_url('admin.php?page='.$menu_slug);
 		}
 	} else {
 		$url = '';
@@ -1501,7 +1501,7 @@ 
 
 	$url = esc_url($url);
 
-	if ( $echo )
+	if ($echo)
 		echo $url;
 
 	return $url;
@@ -1522,58 +1522,58 @@ 
  * @global array $_wp_menu_nopriv
  * @global array $_wp_submenu_nopriv
  */
-function get_admin_page_parent( $parent = '' ) {
+function get_admin_page_parent($parent = '') {
 	global $parent_file, $menu, $submenu, $pagenow, $typenow,
 		$plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
 
-	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
-		if ( isset( $_wp_real_parent_file[$parent] ) )
+	if ( ! empty ($parent) && 'admin.php' != $parent) {
+		if (isset($_wp_real_parent_file[$parent]))
 			$parent = $_wp_real_parent_file[$parent];
 		return $parent;
 	}
 
-	if ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
-		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $plugin_page ) {
+	if ($pagenow == 'admin.php' && isset($plugin_page)) {
+		foreach ((array) $menu as $parent_menu) {
+			if ($parent_menu[2] == $plugin_page) {
 				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
+				if (isset($_wp_real_parent_file[$parent_file]))
 					$parent_file = $_wp_real_parent_file[$parent_file];
 				return $parent_file;
 			}
 		}
-		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+		if (isset($_wp_menu_nopriv[$plugin_page])) {
 			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
+			if (isset($_wp_real_parent_file[$parent_file]))
 					$parent_file = $_wp_real_parent_file[$parent_file];
 			return $parent_file;
 		}
 	}
 
-	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+	if (isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page])) {
 		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
+		if (isset($_wp_real_parent_file[$parent_file]))
 			$parent_file = $_wp_real_parent_file[$parent_file];
 		return $parent_file;
 	}
 
-	foreach (array_keys( (array)$submenu ) as $parent) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
+	foreach (array_keys((array) $submenu) as $parent) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if (isset($_wp_real_parent_file[$parent]))
 				$parent = $_wp_real_parent_file[$parent];
-			if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
+			if ( ! empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow")) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( $submenu_array[2] == $pagenow && empty($typenow) && ( empty($parent_file) || false === strpos($parent_file, '?') ) ) {
+			} elseif ($submenu_array[2] == $pagenow && empty($typenow) && (empty($parent_file) || false === strpos($parent_file, '?'))) {
 				$parent_file = $parent;
 				return $parent;
-			} elseif ( isset( $plugin_page ) && ($plugin_page == $submenu_array[2] ) ) {
+			} elseif (isset($plugin_page) && ($plugin_page == $submenu_array[2])) {
 				$parent_file = $parent;
 				return $parent;
 			}
 		}
 	}
 
-	if ( empty($parent_file) )
+	if (empty($parent_file))
 		$parent_file = '';
 	return '';
 }
@@ -1590,20 +1590,20 @@ 
 function get_admin_page_title() {
 	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
 
-	if ( ! empty ( $title ) )
+	if ( ! empty ($title))
 		return $title;
 
-	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
+	$hook = get_plugin_page_hook($plugin_page, $pagenow);
 
 	$parent = $parent1 = get_admin_page_parent();
 
-	if ( empty ( $parent) ) {
-		foreach ( (array)$menu as $menu_array ) {
-			if ( isset( $menu_array[3] ) ) {
-				if ( $menu_array[2] == $pagenow ) {
+	if (empty ($parent)) {
+		foreach ((array) $menu as $menu_array) {
+			if (isset($menu_array[3])) {
+				if ($menu_array[2] == $pagenow) {
 					$title = $menu_array[3];
 					return $menu_array[3];
-				} elseif ( isset( $plugin_page ) && ($plugin_page == $menu_array[2] ) && ($hook == $menu_array[3] ) ) {
+				} elseif (isset($plugin_page) && ($plugin_page == $menu_array[2]) && ($hook == $menu_array[3])) {
 					$title = $menu_array[3];
 					return $menu_array[3];
 				}
@@ -1613,26 +1613,26 @@ 
 			}
 		}
 	} else {
-		foreach ( array_keys( $submenu ) as $parent ) {
-			foreach ( $submenu[$parent] as $submenu_array ) {
-				if ( isset( $plugin_page ) &&
-					( $plugin_page == $submenu_array[2] ) &&
+		foreach (array_keys($submenu) as $parent) {
+			foreach ($submenu[$parent] as $submenu_array) {
+				if (isset($plugin_page) &&
+					($plugin_page == $submenu_array[2]) &&
 					(
-						( $parent == $pagenow ) ||
-						( $parent == $plugin_page ) ||
-						( $plugin_page == $hook ) ||
-						( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
-						( !empty($typenow) && $parent == $pagenow . '?post_type=' . $typenow)
+						($parent == $pagenow) ||
+						($parent == $plugin_page) ||
+						($plugin_page == $hook) ||
+						($pagenow == 'admin.php' && $parent1 != $submenu_array[2]) ||
+						( ! empty($typenow) && $parent == $pagenow.'?post_type='.$typenow)
 					)
 					) {
 						$title = $submenu_array[3];
 						return $submenu_array[3];
 					}
 
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+				if ($submenu_array[2] != $pagenow || isset($_GET['page'])) // not the current page
 					continue;
 
-				if ( isset( $submenu_array[3] ) ) {
+				if (isset($submenu_array[3])) {
 					$title = $submenu_array[3];
 					return $submenu_array[3];
 				} else {
@@ -1641,12 +1641,12 @@ 
 				}
 			}
 		}
-		if ( empty ( $title ) ) {
-			foreach ( $menu as $menu_array ) {
-				if ( isset( $plugin_page ) &&
-					( $plugin_page == $menu_array[2] ) &&
-					( $pagenow == 'admin.php' ) &&
-					( $parent1 == $menu_array[2] ) )
+		if (empty ($title)) {
+			foreach ($menu as $menu_array) {
+				if (isset($plugin_page) &&
+					($plugin_page == $menu_array[2]) &&
+					($pagenow == 'admin.php') &&
+					($parent1 == $menu_array[2]))
 					{
 						$title = $menu_array[3];
 						return $menu_array[3];
@@ -1665,9 +1665,9 @@ 
  * @param string $parent_page
  * @return string|null
  */
-function get_plugin_page_hook( $plugin_page, $parent_page ) {
-	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( has_action($hook) )
+function get_plugin_page_hook($plugin_page, $parent_page) {
+	$hook = get_plugin_page_hookname($plugin_page, $parent_page);
+	if (has_action($hook))
 		return $hook;
 	else
 		return null;
@@ -1679,25 +1679,25 @@ 
  * @param string $plugin_page
  * @param string $parent_page
  */
-function get_plugin_page_hookname( $plugin_page, $parent_page ) {
+function get_plugin_page_hookname($plugin_page, $parent_page) {
 	global $admin_page_hooks;
 
-	$parent = get_admin_page_parent( $parent_page );
+	$parent = get_admin_page_parent($parent_page);
 
 	$page_type = 'admin';
-	if ( empty ( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[$plugin_page] ) ) {
-		if ( isset( $admin_page_hooks[$plugin_page] ) ) {
+	if (empty ($parent_page) || 'admin.php' == $parent_page || isset($admin_page_hooks[$plugin_page])) {
+		if (isset($admin_page_hooks[$plugin_page])) {
 			$page_type = 'toplevel';
-		} elseif ( isset( $admin_page_hooks[$parent] )) {
+		} elseif (isset($admin_page_hooks[$parent])) {
 			$page_type = $admin_page_hooks[$parent];
 		}
-	} elseif ( isset( $admin_page_hooks[$parent] ) ) {
+	} elseif (isset($admin_page_hooks[$parent])) {
 		$page_type = $admin_page_hooks[$parent];
 	}
 
-	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );
+	$plugin_name = preg_replace('!\.php!', '', $plugin_page);
 
-	return $page_type . '_page_' . $plugin_name;
+	return $page_type.'_page_'.$plugin_name;
 }
 
 /**
@@ -1716,49 +1716,49 @@ 
 
 	$parent = get_admin_page_parent();
 
-	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
+	if ( ! isset($plugin_page) && isset($_wp_submenu_nopriv[$parent][$pagenow]))
 		return false;
 
-	if ( isset( $plugin_page ) ) {
-		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
+	if (isset($plugin_page)) {
+		if (isset($_wp_submenu_nopriv[$parent][$plugin_page]))
 			return false;
 
 		$hookname = get_plugin_page_hookname($plugin_page, $parent);
 
-		if ( !isset($_registered_pages[$hookname]) )
+		if ( ! isset($_registered_pages[$hookname]))
 			return false;
 	}
 
-	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
+	if (empty($parent)) {
+		if (isset($_wp_menu_nopriv[$pagenow]))
 			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
+		if (isset($_wp_submenu_nopriv[$pagenow][$pagenow]))
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
+		if (isset($plugin_page) && isset($_wp_submenu_nopriv[$pagenow][$plugin_page]))
 			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+		if (isset($plugin_page) && isset($_wp_menu_nopriv[$plugin_page]))
 			return false;
-		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
+		foreach (array_keys($_wp_submenu_nopriv) as $key) {
+			if (isset($_wp_submenu_nopriv[$key][$pagenow]))
 				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
+			if (isset($plugin_page) && isset($_wp_submenu_nopriv[$key][$plugin_page]))
 			return false;
 		}
 		return true;
 	}
 
-	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
+	if (isset($plugin_page) && ($plugin_page == $parent) && isset($_wp_menu_nopriv[$plugin_page]))
 		return false;
 
-	if ( isset( $submenu[$parent] ) ) {
-		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
+	if (isset($submenu[$parent])) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if (isset($plugin_page) && ($submenu_array[2] == $plugin_page)) {
+				if (current_user_can($submenu_array[1]))
 					return true;
 				else
 					return false;
-			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
+			} elseif ($submenu_array[2] == $pagenow) {
+				if (current_user_can($submenu_array[1]))
 					return true;
 				else
 					return false;
@@ -1766,9 +1766,9 @@ 
 		}
 	}
 
-	foreach ( $menu as $menu_array ) {
-		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
+	foreach ($menu as $menu_array) {
+		if ($menu_array[2] == $parent) {
+			if (current_user_can($menu_array[1]))
 				return true;
 			else
 				return false;
@@ -1792,22 +1792,22 @@ 
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
-function register_setting( $option_group, $option_name, $sanitize_callback = '' ) {
+function register_setting($option_group, $option_name, $sanitize_callback = '') {
 	global $new_whitelist_options;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$option_group = 'reading';
 	}
 
-	$new_whitelist_options[ $option_group ][] = $option_name;
-	if ( $sanitize_callback != '' )
-		add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	$new_whitelist_options[$option_group][] = $option_name;
+	if ($sanitize_callback != '')
+		add_filter("sanitize_option_{$option_name}", $sanitize_callback);
 }
 
 /**
@@ -1821,24 +1821,24 @@ 
  * @param string   $option_name
  * @param callable $sanitize_callback
  */
-function unregister_setting( $option_group, $option_name, $sanitize_callback = '' ) {
+function unregister_setting($option_group, $option_name, $sanitize_callback = '') {
 	global $new_whitelist_options;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$option_group = 'reading';
 	}
 
-	$pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
-	if ( $pos !== false )
-		unset( $new_whitelist_options[ $option_group ][ $pos ] );
-	if ( $sanitize_callback != '' )
-		remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	$pos = array_search($option_name, (array) $new_whitelist_options[$option_group]);
+	if ($pos !== false)
+		unset($new_whitelist_options[$option_group][$pos]);
+	if ($sanitize_callback != '')
+		remove_filter("sanitize_option_{$option_name}", $sanitize_callback);
 }
 
 /**
@@ -1851,11 +1851,11 @@ 
  * @param array $options
  * @return array
  */
-function option_update_filter( $options ) {
+function option_update_filter($options) {
 	global $new_whitelist_options;
 
-	if ( is_array( $new_whitelist_options ) )
-		$options = add_option_whitelist( $new_whitelist_options, $options );
+	if (is_array($new_whitelist_options))
+		$options = add_option_whitelist($new_whitelist_options, $options);
 
 	return $options;
 }
@@ -1871,21 +1871,21 @@ 
  * @param string|array $options
  * @return array
  */
-function add_option_whitelist( $new_options, $options = '' ) {
-	if ( $options == '' )
+function add_option_whitelist($new_options, $options = '') {
+	if ($options == '')
 		global $whitelist_options;
 	else
 		$whitelist_options = $options;
 
-	foreach ( $new_options as $page => $keys ) {
-		foreach ( $keys as $key ) {
-			if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) {
-				$whitelist_options[ $page ] = array();
-				$whitelist_options[ $page ][] = $key;
+	foreach ($new_options as $page => $keys) {
+		foreach ($keys as $key) {
+			if ( ! isset($whitelist_options[$page]) || ! is_array($whitelist_options[$page])) {
+				$whitelist_options[$page] = array();
+				$whitelist_options[$page][] = $key;
 			} else {
-				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos === false )
-					$whitelist_options[ $page ][] = $key;
+				$pos = array_search($key, $whitelist_options[$page]);
+				if ($pos === false)
+					$whitelist_options[$page][] = $key;
 			}
 		}
 	}
@@ -1904,18 +1904,18 @@ 
  * @param string|array $options
  * @return array
  */
-function remove_option_whitelist( $del_options, $options = '' ) {
-	if ( $options == '' )
+function remove_option_whitelist($del_options, $options = '') {
+	if ($options == '')
 		global $whitelist_options;
 	else
 		$whitelist_options = $options;
 
-	foreach ( $del_options as $page => $keys ) {
-		foreach ( $keys as $key ) {
-			if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
-				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos !== false )
-					unset( $whitelist_options[ $page ][ $pos ] );
+	foreach ($del_options as $page => $keys) {
+		foreach ($keys as $key) {
+			if (isset($whitelist_options[$page]) && is_array($whitelist_options[$page])) {
+				$pos = array_search($key, $whitelist_options[$page]);
+				if ($pos !== false)
+					unset($whitelist_options[$page][$pos]);
 			}
 		}
 	}
@@ -1931,7 +1931,7 @@ 
  * @param string $option_group A settings group name. This should match the group name used in register_setting().
  */
 function settings_fields($option_group) {
-	echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";
+	echo "<input type='hidden' name='option_page' value='".esc_attr($option_group)."' />";
 	echo '<input type="hidden" name="action" value="update" />';
 	wp_nonce_field("$option_group-options");
 }
@@ -1943,8 +1943,8 @@ 
  *
  * @param bool $clear_update_cache Whether to clear the Plugin updates cache
  */
-function wp_clean_plugins_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_plugins' );
-	wp_cache_delete( 'plugins', 'plugins' );
+function wp_clean_plugins_cache($clear_update_cache = true) {
+	if ($clear_update_cache)
+		delete_site_transient('update_plugins');
+	wp_cache_delete('plugins', 'plugins');
 }

Braces +296 added lines, -202 removed lines

@@ -120,16 +120,18 @@ 
 	// Translate fields
 	if ( $translate ) {
 		if ( $textdomain = $plugin_data['TextDomain'] ) {
-			if ( $plugin_data['DomainPath'] )
-				load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] );
-			else
-				load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
+			if ( $plugin_data['DomainPath'] ) {
+							load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] );
+			} else {
+							load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) );
+			}
 		} elseif ( in_array( basename( $plugin_file ), array( 'hello.php', 'akismet.php' ) ) ) {
 			$textdomain = 'default';
 		}
 		if ( $textdomain ) {
-			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field )
-				$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+			foreach ( array( 'Name', 'PluginURI', 'Description', 'Author', 'AuthorURI', 'Version' ) as $field ) {
+							$plugin_data[ $field ] = translate( $plugin_data[ $field ], $textdomain );
+			}
 		}
 	}
 
@@ -159,16 +161,19 @@ 
 
 	// Apply markup
 	if ( $markup ) {
-		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] )
-			$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+		if ( $plugin_data['PluginURI'] && $plugin_data['Name'] ) {
+					$plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '">' . $plugin_data['Name'] . '</a>';
+		}
 
-		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] )
-			$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		if ( $plugin_data['AuthorURI'] && $plugin_data['Author'] ) {
+					$plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+		}
 
 		$plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
 
-		if ( $plugin_data['Author'] )
-			$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		if ( $plugin_data['Author'] ) {
+					$plugin_data['Description'] .= ' <cite>' . sprintf( __('By %s.'), $plugin_data['Author'] ) . '</cite>';
+		}
 	}
 
 	return $plugin_data;
@@ -190,21 +195,24 @@ 
 		$plugins_dir = @ opendir( $dir );
 		if ( $plugins_dir ) {
 			while (($file = readdir( $plugins_dir ) ) !== false ) {
-				if ( substr($file, 0, 1) == '.' )
-					continue;
+				if ( substr($file, 0, 1) == '.' ) {
+									continue;
+				}
 				if ( is_dir( $dir . '/' . $file ) ) {
 					$plugins_subdir = @ opendir( $dir . '/' . $file );
 					if ( $plugins_subdir ) {
 						while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-							if ( substr($subfile, 0, 1) == '.' )
-								continue;
+							if ( substr($subfile, 0, 1) == '.' ) {
+															continue;
+							}
 							$plugin_files[] = plugin_basename("$dir/$file/$subfile");
 						}
 						@closedir( $plugins_subdir );
 					}
 				} else {
-					if ( plugin_basename("$dir/$file") != $plugin )
-						$plugin_files[] = plugin_basename("$dir/$file");
+					if ( plugin_basename("$dir/$file") != $plugin ) {
+											$plugin_files[] = plugin_basename("$dir/$file");
+					}
 				}
 			}
 			@closedir( $plugins_dir );
@@ -236,54 +244,64 @@ 
  */
 function get_plugins($plugin_folder = '') {
 
-	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
-		$cache_plugins = array();
+	if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') ) {
+			$cache_plugins = array();
+	}
 
-	if ( isset($cache_plugins[ $plugin_folder ]) )
-		return $cache_plugins[ $plugin_folder ];
+	if ( isset($cache_plugins[ $plugin_folder ]) ) {
+			return $cache_plugins[ $plugin_folder ];
+	}
 
 	$wp_plugins = array ();
 	$plugin_root = WP_PLUGIN_DIR;
-	if ( !empty($plugin_folder) )
-		$plugin_root .= $plugin_folder;
+	if ( !empty($plugin_folder) ) {
+			$plugin_root .= $plugin_folder;
+	}
 
 	// Files in wp-content/plugins directory
 	$plugins_dir = @ opendir( $plugin_root);
 	$plugin_files = array();
 	if ( $plugins_dir ) {
 		while (($file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr($file, 0, 1) == '.' )
-				continue;
+			if ( substr($file, 0, 1) == '.' ) {
+							continue;
+			}
 			if ( is_dir( $plugin_root.'/'.$file ) ) {
 				$plugins_subdir = @ opendir( $plugin_root.'/'.$file );
 				if ( $plugins_subdir ) {
 					while (($subfile = readdir( $plugins_subdir ) ) !== false ) {
-						if ( substr($subfile, 0, 1) == '.' )
-							continue;
-						if ( substr($subfile, -4) == '.php' )
-							$plugin_files[] = "$file/$subfile";
+						if ( substr($subfile, 0, 1) == '.' ) {
+													continue;
+						}
+						if ( substr($subfile, -4) == '.php' ) {
+													$plugin_files[] = "$file/$subfile";
+						}
 					}
 					closedir( $plugins_subdir );
 				}
 			} else {
-				if ( substr($file, -4) == '.php' )
-					$plugin_files[] = $file;
+				if ( substr($file, -4) == '.php' ) {
+									$plugin_files[] = $file;
+				}
 			}
 		}
 		closedir( $plugins_dir );
 	}
 
-	if ( empty($plugin_files) )
-		return $wp_plugins;
+	if ( empty($plugin_files) ) {
+			return $wp_plugins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( "$plugin_root/$plugin_file" ) )
-			continue;
+		if ( !is_readable( "$plugin_root/$plugin_file" ) ) {
+					continue;
+		}
 
 		$plugin_data = get_plugin_data( "$plugin_root/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
-			continue;
+		if ( empty ( $plugin_data['Name'] ) ) {
+					continue;
+		}
 
 		$wp_plugins[plugin_basename( $plugin_file )] = $plugin_data;
 	}
@@ -309,12 +327,14 @@ 
 	// Files in wp-content/mu-plugins directory
 	$plugin_files = array();
 
-	if ( ! is_dir( WPMU_PLUGIN_DIR ) )
-		return $wp_plugins;
+	if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
+			return $wp_plugins;
+	}
 	if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( substr( $file, -4 ) == '.php' )
-				$plugin_files[] = $file;
+			if ( substr( $file, -4 ) == '.php' ) {
+							$plugin_files[] = $file;
+			}
 		}
 	} else {
 		return $wp_plugins;
@@ -322,23 +342,28 @@ 
 
 	@closedir( $plugins_dir );
 
-	if ( empty($plugin_files) )
-		return $wp_plugins;
+	if ( empty($plugin_files) ) {
+			return $wp_plugins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) )
-			continue;
+		if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) ) {
+					continue;
+		}
 
 		$plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
 
-		if ( empty ( $plugin_data['Name'] ) )
-			$plugin_data['Name'] = $plugin_file;
+		if ( empty ( $plugin_data['Name'] ) ) {
+					$plugin_data['Name'] = $plugin_file;
+		}
 
 		$wp_plugins[ $plugin_file ] = $plugin_data;
 	}
 
-	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden
+	if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) {
+		// silence is golden
 		unset( $wp_plugins['index.php'] );
+	}
 
 	uasort( $wp_plugins, '_sort_uname_callback' );
 
@@ -370,8 +395,9 @@ 
 	// These exist in the wp-content directory
 	if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
 		while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
-			if ( isset( $_dropins[ $file ] ) )
-				$plugin_files[] = $file;
+			if ( isset( $_dropins[ $file ] ) ) {
+							$plugin_files[] = $file;
+			}
 		}
 	} else {
 		return $dropins;
@@ -379,15 +405,18 @@ 
 
 	@closedir( $plugins_dir );
 
-	if ( empty($plugin_files) )
-		return $dropins;
+	if ( empty($plugin_files) ) {
+			return $dropins;
+	}
 
 	foreach ( $plugin_files as $plugin_file ) {
-		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) )
-			continue;
+		if ( !is_readable( WP_CONTENT_DIR . "/$plugin_file" ) ) {
+					continue;
+		}
 		$plugin_data = get_plugin_data( WP_CONTENT_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached.
-		if ( empty( $plugin_data['Name'] ) )
-			$plugin_data['Name'] = $plugin_file;
+		if ( empty( $plugin_data['Name'] ) ) {
+					$plugin_data['Name'] = $plugin_file;
+		}
 		$dropins[ $plugin_file ] = $plugin_data;
 	}
 
@@ -462,12 +491,14 @@ 
  * @return bool True, if active for the network, otherwise false.
  */
 function is_plugin_active_for_network( $plugin ) {
-	if ( !is_multisite() )
-		return false;
+	if ( !is_multisite() ) {
+			return false;
+	}
 
 	$plugins = get_site_option( 'active_sitewide_plugins');
-	if ( isset($plugins[$plugin]) )
-		return true;
+	if ( isset($plugins[$plugin]) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -486,8 +517,9 @@ 
  */
 function is_network_only_plugin( $plugin ) {
 	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data )
-		return $plugin_data['Network'];
+	if ( $plugin_data ) {
+			return $plugin_data['Network'];
+	}
 	return false;
 }
 
@@ -530,12 +562,15 @@ 
 	}
 
 	$valid = validate_plugin($plugin);
-	if ( is_wp_error($valid) )
-		return $valid;
+	if ( is_wp_error($valid) ) {
+			return $valid;
+	}
 
 	if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
-		if ( !empty($redirect) )
-			wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
+		if ( !empty($redirect) ) {
+					wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+		}
+		// we'll override this later if the plugin can be included without fatal error
 		ob_start();
 		wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
 		$_wp_plugin_file = $plugin;
@@ -626,15 +661,17 @@ 
  * 	A value of null (the default) will deactivate plugins for both the site and the network.
  */
 function deactivate_plugins( $plugins, $silent = false, $network_wide = null ) {
-	if ( is_multisite() )
-		$network_current = get_site_option( 'active_sitewide_plugins', array() );
+	if ( is_multisite() ) {
+			$network_current = get_site_option( 'active_sitewide_plugins', array() );
+	}
 	$current = get_option( 'active_plugins', array() );
 	$do_blog = $do_network = false;
 
 	foreach ( (array) $plugins as $plugin ) {
 		$plugin = plugin_basename( trim( $plugin ) );
-		if ( ! is_plugin_active($plugin) )
-			continue;
+		if ( ! is_plugin_active($plugin) ) {
+					continue;
+		}
 
 		$network_deactivating = false !== $network_wide && is_plugin_active_for_network( $plugin );
 
@@ -705,11 +742,13 @@ 
 		}
 	}
 
-	if ( $do_blog )
-		update_option('active_plugins', $current);
-	if ( $do_network )
-		update_site_option( 'active_sitewide_plugins', $network_current );
-}
+	if ( $do_blog ) {
+			update_option('active_plugins', $current);
+	}
+	if ( $do_network ) {
+			update_site_option( 'active_sitewide_plugins', $network_current );
+	}
+	}
 
 /**
  * Activate multiple plugins.
@@ -728,20 +767,24 @@ 
  * @return bool|WP_Error True when finished or WP_Error if there were errors during a plugin activation.
  */
 function activate_plugins( $plugins, $redirect = '', $network_wide = false, $silent = false ) {
-	if ( !is_array($plugins) )
-		$plugins = array($plugins);
+	if ( !is_array($plugins) ) {
+			$plugins = array($plugins);
+	}
 
 	$errors = array();
 	foreach ( $plugins as $plugin ) {
-		if ( !empty($redirect) )
-			$redirect = add_query_arg('plugin', $plugin, $redirect);
+		if ( !empty($redirect) ) {
+					$redirect = add_query_arg('plugin', $plugin, $redirect);
+		}
 		$result = activate_plugin($plugin, $redirect, $network_wide, $silent);
-		if ( is_wp_error($result) )
-			$errors[$plugin] = $result;
+		if ( is_wp_error($result) ) {
+					$errors[$plugin] = $result;
+		}
 	}
 
-	if ( !empty($errors) )
-		return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
+	if ( !empty($errors) ) {
+			return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
+	}
 
 	return true;
 }
@@ -761,12 +804,14 @@ 
 function delete_plugins( $plugins, $deprecated = '' ) {
 	global $wp_filesystem;
 
-	if ( empty($plugins) )
-		return false;
+	if ( empty($plugins) ) {
+			return false;
+	}
 
 	$checked = array();
-	foreach( $plugins as $plugin )
-		$checked[] = 'checked[]=' . $plugin;
+	foreach( $plugins as $plugin ) {
+			$checked[] = 'checked[]=' . $plugin;
+	}
 
 	ob_start();
 	$url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
@@ -795,11 +840,13 @@ 
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	}
 
 	// Get the base plugin folder.
 	$plugins_dir = $wp_filesystem->wp_plugins_dir();
@@ -856,8 +903,9 @@ 
 		set_site_transient( 'update_plugins', $current );
 	}
 
-	if ( ! empty($errors) )
-		return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	if ( ! empty($errors) ) {
+			return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+	}
 
 	return true;
 }
@@ -884,8 +932,9 @@ 
 		$plugins = array_merge( $plugins, array_keys( $network_plugins ) );
 	}
 
-	if ( empty( $plugins ) )
-		return array();
+	if ( empty( $plugins ) ) {
+			return array();
+	}
 
 	$invalid = array();
 
@@ -911,14 +960,17 @@ 
  * @return WP_Error|int 0 on success, WP_Error on failure.
  */
 function validate_plugin($plugin) {
-	if ( validate_file($plugin) )
-		return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
-	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
-		return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
+	if ( validate_file($plugin) ) {
+			return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
+	}
+	if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) ) {
+			return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
+	}
 
 	$installed_plugins = get_plugins();
-	if ( ! isset($installed_plugins[$plugin]) )
-		return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
+	if ( ! isset($installed_plugins[$plugin]) ) {
+			return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
+	}
 	return 0;
 }
 
@@ -934,8 +986,9 @@ 
 	$file = plugin_basename($plugin);
 
 	$uninstallable_plugins = (array) get_option('uninstall_plugins');
-	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) )
-		return true;
+	if ( isset( $uninstallable_plugins[$file] ) || file_exists( WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php' ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -1032,8 +1085,9 @@ 
 
 	$hookname = get_plugin_page_hookname( $menu_slug, '' );
 
-	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) )
-		add_action( $hookname, $function );
+	if ( !empty( $function ) && !empty( $hookname ) && current_user_can( $capability ) ) {
+			add_action( $hookname, $function );
+	}
 
 	if ( empty($icon_url) ) {
 		$icon_url = 'dashicons-admin-generic';
@@ -1045,10 +1099,11 @@ 
 
 	$new_menu = array( $menu_title, $capability, $menu_slug, $page_title, 'menu-top ' . $icon_class . $hookname, $hookname, $icon_url );
 
-	if ( null === $position )
-		$menu[] = $new_menu;
-	else
-		$menu[$position] = $new_menu;
+	if ( null === $position ) {
+			$menu[] = $new_menu;
+	} else {
+			$menu[$position] = $new_menu;
+	}
 
 	$_registered_pages[$hookname] = true;
 
@@ -1146,8 +1201,9 @@ 
 	$menu_slug = plugin_basename( $menu_slug );
 	$parent_slug = plugin_basename( $parent_slug);
 
-	if ( isset( $_wp_real_parent_file[$parent_slug] ) )
-		$parent_slug = $_wp_real_parent_file[$parent_slug];
+	if ( isset( $_wp_real_parent_file[$parent_slug] ) ) {
+			$parent_slug = $_wp_real_parent_file[$parent_slug];
+	}
 
 	if ( !current_user_can( $capability ) ) {
 		$_wp_submenu_nopriv[$parent_slug][$menu_slug] = true;
@@ -1162,16 +1218,18 @@ 
 	 */
 	if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
 		foreach ( (array)$menu as $parent_menu ) {
-			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
-				$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+			if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) ) {
+							$submenu[$parent_slug][] = array_slice( $parent_menu, 0, 4 );
+			}
 		}
 	}
 
 	$submenu[$parent_slug][] = array ( $menu_title, $capability, $menu_slug, $page_title );
 
 	$hookname = get_plugin_page_hookname( $menu_slug, $parent_slug);
-	if (!empty ( $function ) && !empty ( $hookname ))
-		add_action( $hookname, $function );
+	if (!empty ( $function ) && !empty ( $hookname )) {
+			add_action( $hookname, $function );
+	}
 
 	$_registered_pages[$hookname] = true;
 
@@ -1179,8 +1237,9 @@ 
 	 * Backward-compatibility for plugins using add_management page.
 	 * See wp-admin/admin.php for redirect from edit.php to tools.php
 	 */
-	if ( 'tools.php' == $parent_slug )
-		$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	if ( 'tools.php' == $parent_slug ) {
+			$_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
+	}
 
 	// No parent as top level.
 	$_parent_pages[$menu_slug] = $parent_slug;
@@ -1290,10 +1349,11 @@ 
  * @return false|string The resulting page's hook_suffix, or false if the user does not have the capability required.
  */
 function add_users_page( $page_title, $menu_title, $capability, $menu_slug, $function = '' ) {
-	if ( current_user_can('edit_users') )
-		$parent = 'users.php';
-	else
-		$parent = 'profile.php';
+	if ( current_user_can('edit_users') ) {
+			$parent = 'users.php';
+	} else {
+			$parent = 'profile.php';
+	}
 	return add_submenu_page( $parent, $page_title, $menu_title, $capability, $menu_slug, $function );
 }
 /**
@@ -1459,8 +1519,9 @@ 
 function remove_submenu_page( $menu_slug, $submenu_slug ) {
 	global $submenu;
 
-	if ( !isset( $submenu[$menu_slug] ) )
-		return false;
+	if ( !isset( $submenu[$menu_slug] ) ) {
+			return false;
+	}
 
 	foreach ( $submenu[$menu_slug] as $i => $item ) {
 		if ( $submenu_slug == $item[2] ) {
@@ -1501,8 +1562,9 @@ 
 
 	$url = esc_url($url);
 
-	if ( $echo )
-		echo $url;
+	if ( $echo ) {
+			echo $url;
+	}
 
 	return $url;
 }
@@ -1527,8 +1589,9 @@ 
 		$plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
 
 	if ( !empty ( $parent ) && 'admin.php' != $parent ) {
-		if ( isset( $_wp_real_parent_file[$parent] ) )
-			$parent = $_wp_real_parent_file[$parent];
+		if ( isset( $_wp_real_parent_file[$parent] ) ) {
+					$parent = $_wp_real_parent_file[$parent];
+		}
 		return $parent;
 	}
 
@@ -1536,30 +1599,34 @@ 
 		foreach ( (array)$menu as $parent_menu ) {
 			if ( $parent_menu[2] == $plugin_page ) {
 				$parent_file = $plugin_page;
-				if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
+				if ( isset( $_wp_real_parent_file[$parent_file] ) ) {
+									$parent_file = $_wp_real_parent_file[$parent_file];
+				}
 				return $parent_file;
 			}
 		}
 		if ( isset( $_wp_menu_nopriv[$plugin_page] ) ) {
 			$parent_file = $plugin_page;
-			if ( isset( $_wp_real_parent_file[$parent_file] ) )
-					$parent_file = $_wp_real_parent_file[$parent_file];
+			if ( isset( $_wp_real_parent_file[$parent_file] ) ) {
+								$parent_file = $_wp_real_parent_file[$parent_file];
+			}
 			return $parent_file;
 		}
 	}
 
 	if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
 		$parent_file = $pagenow;
-		if ( isset( $_wp_real_parent_file[$parent_file] ) )
-			$parent_file = $_wp_real_parent_file[$parent_file];
+		if ( isset( $_wp_real_parent_file[$parent_file] ) ) {
+					$parent_file = $_wp_real_parent_file[$parent_file];
+		}
 		return $parent_file;
 	}
 
 	foreach (array_keys( (array)$submenu ) as $parent) {
 		foreach ( $submenu[$parent] as $submenu_array ) {
-			if ( isset( $_wp_real_parent_file[$parent] ) )
-				$parent = $_wp_real_parent_file[$parent];
+			if ( isset( $_wp_real_parent_file[$parent] ) ) {
+							$parent = $_wp_real_parent_file[$parent];
+			}
 			if ( !empty($typenow) && ($submenu_array[2] == "$pagenow?post_type=$typenow") ) {
 				$parent_file = $parent;
 				return $parent;
@@ -1573,8 +1640,9 @@ 
 		}
 	}
 
-	if ( empty($parent_file) )
-		$parent_file = '';
+	if ( empty($parent_file) ) {
+			$parent_file = '';
+	}
 	return '';
 }
 
@@ -1590,8 +1658,9 @@ 
 function get_admin_page_title() {
 	global $title, $menu, $submenu, $pagenow, $plugin_page, $typenow;
 
-	if ( ! empty ( $title ) )
-		return $title;
+	if ( ! empty ( $title ) ) {
+			return $title;
+	}
 
 	$hook = get_plugin_page_hook( $plugin_page, $pagenow );
 
@@ -1629,8 +1698,10 @@ 
 						return $submenu_array[3];
 					}
 
-				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) // not the current page
+				if ( $submenu_array[2] != $pagenow || isset( $_GET['page'] ) ) {
+					// not the current page
 					continue;
+				}
 
 				if ( isset( $submenu_array[3] ) ) {
 					$title = $submenu_array[3];
@@ -1667,11 +1738,12 @@ 
  */
 function get_plugin_page_hook( $plugin_page, $parent_page ) {
 	$hook = get_plugin_page_hookname( $plugin_page, $parent_page );
-	if ( has_action($hook) )
-		return $hook;
-	else
-		return null;
-}
+	if ( has_action($hook) ) {
+			return $hook;
+	} else {
+			return null;
+	}
+	}
 
 /**
  *
@@ -1716,62 +1788,75 @@ 
 
 	$parent = get_admin_page_parent();
 
-	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
-		return false;
+	if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) ) {
+			return false;
+	}
 
 	if ( isset( $plugin_page ) ) {
-		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
-			return false;
+		if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) ) {
+					return false;
+		}
 
 		$hookname = get_plugin_page_hookname($plugin_page, $parent);
 
-		if ( !isset($_registered_pages[$hookname]) )
-			return false;
+		if ( !isset($_registered_pages[$hookname]) ) {
+					return false;
+		}
 	}
 
 	if ( empty( $parent) ) {
-		if ( isset( $_wp_menu_nopriv[$pagenow] ) )
-			return false;
-		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
-			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
-			return false;
-		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
-			return false;
+		if ( isset( $_wp_menu_nopriv[$pagenow] ) ) {
+					return false;
+		}
+		if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) ) {
+					return false;
+		}
+		if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) ) {
+					return false;
+		}
+		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+					return false;
+		}
 		foreach (array_keys( $_wp_submenu_nopriv ) as $key ) {
-			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) )
-				return false;
-			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
-			return false;
+			if ( isset( $_wp_submenu_nopriv[$key][$pagenow] ) ) {
+							return false;
+			}
+			if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) ) {
+						return false;
+			}
 		}
 		return true;
 	}
 
-	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) )
-		return false;
+	if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[$plugin_page] ) ) {
+			return false;
+	}
 
 	if ( isset( $submenu[$parent] ) ) {
 		foreach ( $submenu[$parent] as $submenu_array ) {
 			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ))
-					return true;
-				else
-					return false;
+				if ( current_user_can( $submenu_array[1] )) {
+									return true;
+				} else {
+									return false;
+				}
 			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ))
-					return true;
-				else
-					return false;
+				if ( current_user_can( $submenu_array[1] )) {
+									return true;
+				} else {
+									return false;
+				}
 			}
 		}
 	}
 
 	foreach ( $menu as $menu_array ) {
 		if ( $menu_array[2] == $parent) {
-			if ( current_user_can( $menu_array[1] ))
-				return true;
-			else
-				return false;
+			if ( current_user_can( $menu_array[1] )) {
+							return true;
+			} else {
+							return false;
+			}
 		}
 	}
 
@@ -1806,9 +1891,10 @@ 
 	}
 
 	$new_whitelist_options[ $option_group ][] = $option_name;
-	if ( $sanitize_callback != '' )
-		add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
-}
+	if ( $sanitize_callback != '' ) {
+			add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	}
+	}
 
 /**
  * Unregister a setting
@@ -1835,11 +1921,13 @@ 
 	}
 
 	$pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
-	if ( $pos !== false )
-		unset( $new_whitelist_options[ $option_group ][ $pos ] );
-	if ( $sanitize_callback != '' )
-		remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
-}
+	if ( $pos !== false ) {
+			unset( $new_whitelist_options[ $option_group ][ $pos ] );
+	}
+	if ( $sanitize_callback != '' ) {
+			remove_filter( "sanitize_option_{$option_name}", $sanitize_callback );
+	}
+	}
 
 /**
  * {@internal Missing Short Description}}
@@ -1854,8 +1942,9 @@ 
 function option_update_filter( $options ) {
 	global $new_whitelist_options;
 
-	if ( is_array( $new_whitelist_options ) )
-		$options = add_option_whitelist( $new_whitelist_options, $options );
+	if ( is_array( $new_whitelist_options ) ) {
+			$options = add_option_whitelist( $new_whitelist_options, $options );
+	}
 
 	return $options;
 }
@@ -1872,10 +1961,11 @@ 
  * @return array
  */
 function add_option_whitelist( $new_options, $options = '' ) {
-	if ( $options == '' )
-		global $whitelist_options;
-	else
-		$whitelist_options = $options;
+	if ( $options == '' ) {
+			global $whitelist_options;
+	} else {
+			$whitelist_options = $options;
+	}
 
 	foreach ( $new_options as $page => $keys ) {
 		foreach ( $keys as $key ) {
@@ -1884,8 +1974,9 @@ 
 				$whitelist_options[ $page ][] = $key;
 			} else {
 				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos === false )
-					$whitelist_options[ $page ][] = $key;
+				if ( $pos === false ) {
+									$whitelist_options[ $page ][] = $key;
+				}
 			}
 		}
 	}
@@ -1905,17 +1996,19 @@ 
  * @return array
  */
 function remove_option_whitelist( $del_options, $options = '' ) {
-	if ( $options == '' )
-		global $whitelist_options;
-	else
-		$whitelist_options = $options;
+	if ( $options == '' ) {
+			global $whitelist_options;
+	} else {
+			$whitelist_options = $options;
+	}
 
 	foreach ( $del_options as $page => $keys ) {
 		foreach ( $keys as $key ) {
 			if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
 				$pos = array_search( $key, $whitelist_options[ $page ] );
-				if ( $pos !== false )
-					unset( $whitelist_options[ $page ][ $pos ] );
+				if ( $pos !== false ) {
+									unset( $whitelist_options[ $page ][ $pos ] );
+				}
 			}
 		}
 	}
@@ -1944,7 +2037,8 @@ 
  * @param bool $clear_update_cache Whether to clear the Plugin updates cache
  */
 function wp_clean_plugins_cache( $clear_update_cache = true ) {
-	if ( $clear_update_cache )
-		delete_site_transient( 'update_plugins' );
+	if ( $clear_update_cache ) {
+			delete_site_transient( 'update_plugins' );
+	}
 	wp_cache_delete( 'plugins', 'plugins' );
 }

src/wp-admin/includes/template.php

Doc Comments +6 added lines, -6 removed lines

@@ -746,10 +746,10 @@ 
  * @global WP_Locale $wp_locale
  * @global object    $comment
  *
- * @param int|bool $edit      Accepts 1|true for editing the date, 0|false for adding the date.
- * @param int|bool $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
+ * @param integer $edit      Accepts 1|true for editing the date, 0|false for adding the date.
+ * @param integer $for_post  Accepts 1|true for applying the date to a post, 0|false for a comment.
  * @param int      $tab_index The tabindex attribute to add. Default 0.
- * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
+ * @param integer $multi     Optional. Whether the additional fields and buttons should be added.
  *                            Default 0|false.
  */
 function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
@@ -1039,9 +1039,9 @@ 
  * @global array $wp_meta_boxes
  *
  * @staticvar bool $already_sorted
- * @param string|WP_Screen $screen  Screen identifier
+ * @param string $screen  Screen identifier
  * @param string           $context box context
- * @param mixed            $object  gets passed to the box callback function as first parameter
+ * @param string            $object  gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
 function do_meta_boxes( $screen, $context, $object ) {
@@ -1567,7 +1567,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set.
  */
 function _draft_or_post_title( $post = 0 ) {

Spacing +472 added lines, -472 removed lines

@@ -23,7 +23,7 @@ 
  */
 class Walker_Category_Checklist extends Walker {
 	public $tree_type = 'category';
-	public $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
+	public $db_fields = array('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this
 
 	/**
 	 * Starts the list before the elements are added.
@@ -36,7 +36,7 @@ 
 	 * @param int    $depth  Depth of category. Used for tab indentation.
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {
+	public function start_lvl(&$output, $depth = 0, $args = array()) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent<ul class='children'>\n";
 	}
@@ -52,7 +52,7 @@ 
 	 * @param int    $depth  Depth of category. Used for tab indentation.
 	 * @param array  $args   An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {
+	public function end_lvl(&$output, $depth = 0, $args = array()) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
 	}
@@ -70,44 +70,44 @@ 
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 * @param int    $id       ID of the current term.
 	 */
-	public function start_el( &$output, $category, $depth = 0, $args = array(), $id = 0 ) {
-		if ( empty( $args['taxonomy'] ) ) {
+	public function start_el(&$output, $category, $depth = 0, $args = array(), $id = 0) {
+		if (empty($args['taxonomy'])) {
 			$taxonomy = 'category';
 		} else {
 			$taxonomy = $args['taxonomy'];
 		}
 
-		if ( $taxonomy == 'category' ) {
+		if ($taxonomy == 'category') {
 			$name = 'post_category';
 		} else {
-			$name = 'tax_input[' . $taxonomy . ']';
+			$name = 'tax_input['.$taxonomy.']';
 		}
 
-		$args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
-		$class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
+		$args['popular_cats'] = empty($args['popular_cats']) ? array() : $args['popular_cats'];
+		$class = in_array($category->term_id, $args['popular_cats']) ? ' class="popular-category"' : '';
 
-		$args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
+		$args['selected_cats'] = empty($args['selected_cats']) ? array() : $args['selected_cats'];
 
 		/** This filter is documented in wp-includes/category-template.php */
-		if ( ! empty( $args['list_only'] ) ) {
+		if ( ! empty($args['list_only'])) {
 			$aria_cheched = 'false';
 			$inner_class = 'category';
 
-			if ( in_array( $category->term_id, $args['selected_cats'] ) ) {
+			if (in_array($category->term_id, $args['selected_cats'])) {
 				$inner_class .= ' selected';
 				$aria_cheched = 'true';
 			}
 
-			$output .= "\n" . '<li' . $class . '>' .
-				'<div class="' . $inner_class . '" data-term-id=' . $category->term_id .
-				' tabindex="0" role="checkbox" aria-checked="' . $aria_cheched . '">' .
-				esc_html( apply_filters( 'the_category', $category->name ) ) . '</div>';
+			$output .= "\n".'<li'.$class.'>'.
+				'<div class="'.$inner_class.'" data-term-id='.$category->term_id.
+				' tabindex="0" role="checkbox" aria-checked="'.$aria_cheched.'">'.
+				esc_html(apply_filters('the_category', $category->name)).'</div>';
 		} else {
-			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>" .
-				'<label class="selectit"><input value="' . $category->term_id . '" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-' . $category->term_id . '"' .
-				checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
-				disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
-				esc_html( apply_filters( 'the_category', $category->name ) ) . '</label>';
+			$output .= "\n<li id='{$taxonomy}-{$category->term_id}'$class>".
+				'<label class="selectit"><input value="'.$category->term_id.'" type="checkbox" name="'.$name.'[]" id="in-'.$taxonomy.'-'.$category->term_id.'"'.
+				checked(in_array($category->term_id, $args['selected_cats']), true, false).
+				disabled(empty($args['disabled']), false, false).' /> '.
+				esc_html(apply_filters('the_category', $category->name)).'</label>';
 		}
 	}
 
@@ -123,7 +123,7 @@ 
 	 * @param int    $depth    Depth of the term in reference to parents. Default 0.
 	 * @param array  $args     An array of arguments. @see wp_terms_checklist()
 	 */
-	public function end_el( &$output, $category, $depth = 0, $args = array() ) {
+	public function end_el(&$output, $category, $depth = 0, $args = array()) {
 		$output .= "</li>\n";
 	}
 }
@@ -147,15 +147,15 @@ 
  * @param bool   $checked_ontop        Optional. Whether to move checked items out of the hierarchy and to
  *                                     the top of the list. Default true.
  */
-function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true ) {
-	wp_terms_checklist( $post_id, array(
+function wp_category_checklist($post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null, $checked_ontop = true) {
+	wp_terms_checklist($post_id, array(
 		'taxonomy' => 'category',
 		'descendants_and_self' => $descendants_and_self,
 		'selected_cats' => $selected_cats,
 		'popular_cats' => $popular_cats,
 		'walker' => $walker,
 		'checked_ontop' => $checked_ontop
-	) );
+	));
 }
 
 /**
@@ -181,7 +181,7 @@ 
  *                                        the top of the list. Default true.
  * }
  */
-function wp_terms_checklist( $post_id = 0, $args = array() ) {
+function wp_terms_checklist($post_id = 0, $args = array()) {
  	$defaults = array(
 		'descendants_and_self' => 0,
 		'selected_cats' => false,
@@ -201,11 +201,11 @@ 
 	 * @param array $args    An array of arguments.
 	 * @param int   $post_id The post ID.
 	 */
-	$params = apply_filters( 'wp_terms_checklist_args', $args, $post_id );
+	$params = apply_filters('wp_terms_checklist_args', $args, $post_id);
 
-	$r = wp_parse_args( $params, $defaults );
+	$r = wp_parse_args($params, $defaults);
 
-	if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) {
+	if (empty($r['walker']) || ! ($r['walker'] instanceof Walker)) {
 		$walker = new Walker_Category_Checklist;
 	} else {
 		$walker = $r['walker'];
@@ -214,60 +214,60 @@ 
 	$taxonomy = $r['taxonomy'];
 	$descendants_and_self = (int) $r['descendants_and_self'];
 
-	$args = array( 'taxonomy' => $taxonomy );
+	$args = array('taxonomy' => $taxonomy);
 
-	$tax = get_taxonomy( $taxonomy );
-	$args['disabled'] = ! current_user_can( $tax->cap->assign_terms );
+	$tax = get_taxonomy($taxonomy);
+	$args['disabled'] = ! current_user_can($tax->cap->assign_terms);
 
-	$args['list_only'] = ! empty( $r['list_only'] );
+	$args['list_only'] = ! empty($r['list_only']);
 
-	if ( is_array( $r['selected_cats'] ) ) {
+	if (is_array($r['selected_cats'])) {
 		$args['selected_cats'] = $r['selected_cats'];
-	} elseif ( $post_id ) {
-		$args['selected_cats'] = wp_get_object_terms( $post_id, $taxonomy, array_merge( $args, array( 'fields' => 'ids' ) ) );
+	} elseif ($post_id) {
+		$args['selected_cats'] = wp_get_object_terms($post_id, $taxonomy, array_merge($args, array('fields' => 'ids')));
 	} else {
 		$args['selected_cats'] = array();
 	}
-	if ( is_array( $r['popular_cats'] ) ) {
+	if (is_array($r['popular_cats'])) {
 		$args['popular_cats'] = $r['popular_cats'];
 	} else {
-		$args['popular_cats'] = get_terms( $taxonomy, array(
+		$args['popular_cats'] = get_terms($taxonomy, array(
 			'fields' => 'ids',
 			'orderby' => 'count',
 			'order' => 'DESC',
 			'number' => 10,
 			'hierarchical' => false
-		) );
+		));
 	}
-	if ( $descendants_and_self ) {
-		$categories = (array) get_terms( $taxonomy, array(
+	if ($descendants_and_self) {
+		$categories = (array) get_terms($taxonomy, array(
 			'child_of' => $descendants_and_self,
 			'hierarchical' => 0,
 			'hide_empty' => 0
-		) );
-		$self = get_term( $descendants_and_self, $taxonomy );
-		array_unshift( $categories, $self );
+		));
+		$self = get_term($descendants_and_self, $taxonomy);
+		array_unshift($categories, $self);
 	} else {
-		$categories = (array) get_terms( $taxonomy, array( 'get' => 'all' ) );
+		$categories = (array) get_terms($taxonomy, array('get' => 'all'));
 	}
 
-	if ( $r['checked_ontop'] ) {
+	if ($r['checked_ontop']) {
 		// Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
 		$checked_categories = array();
-		$keys = array_keys( $categories );
+		$keys = array_keys($categories);
 
-		foreach( $keys as $k ) {
-			if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
+		foreach ($keys as $k) {
+			if (in_array($categories[$k]->term_id, $args['selected_cats'])) {
 				$checked_categories[] = $categories[$k];
-				unset( $categories[$k] );
+				unset($categories[$k]);
 			}
 		}
 
 		// Put checked cats on top
-		echo call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
+		echo call_user_func_array(array($walker, 'walk'), array($checked_categories, 0, $args));
 	}
 	// Then the rest of them
-	echo call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+	echo call_user_func_array(array($walker, 'walk'), array($categories, 0, $args));
 }
 
 /**
@@ -286,33 +286,33 @@ 
  * @param bool $echo Optionally output the list as well. Defaults to true.
  * @return array List of popular term IDs.
  */
-function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
+function wp_popular_terms_checklist($taxonomy, $default = 0, $number = 10, $echo = true) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
+	if ($post && $post->ID)
 		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
 	else
 		$checked_terms = array();
 
-	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
+	$terms = get_terms($taxonomy, array('orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false));
 
 	$tax = get_taxonomy($taxonomy);
 
 	$popular_ids = array();
-	foreach ( (array) $terms as $term ) {
+	foreach ((array) $terms as $term) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // hack for AJAX use
+		if ( ! $echo) // hack for AJAX use
 			continue;
 		$id = "popular-$taxonomy-$term->term_id";
-		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
+		$checked = in_array($term->term_id, $checked_terms) ? 'checked="checked"' : '';
 		?>
 
 		<li id="<?php echo $id; ?>" class="popular-category">
 			<label class="selectit">
-				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can( $tax->cap->assign_terms ) ); ?> />
+				<input id="in-<?php echo $id; ?>" type="checkbox" <?php echo $checked; ?> value="<?php echo (int) $term->term_id; ?>" <?php disabled( ! current_user_can($tax->cap->assign_terms)); ?> />
 				<?php
 				/** This filter is documented in wp-includes/category-template.php */
-				echo esc_html( apply_filters( 'the_category', $term->name ) );
+				echo esc_html(apply_filters('the_category', $term->name));
 				?>
 			</label>
 		</li>
@@ -329,32 +329,32 @@ 
  *
  * @param int $link_id
  */
-function wp_link_category_checklist( $link_id = 0 ) {
+function wp_link_category_checklist($link_id = 0) {
 	$default = 1;
 
 	$checked_categories = array();
 
-	if ( $link_id ) {
-		$checked_categories = wp_get_link_cats( $link_id );
+	if ($link_id) {
+		$checked_categories = wp_get_link_cats($link_id);
 		// No selected categories, strange
-		if ( ! count( $checked_categories ) ) {
+		if ( ! count($checked_categories)) {
 			$checked_categories[] = $default;
 		}
 	} else {
 		$checked_categories[] = $default;
 	}
 
-	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
+	$categories = get_terms('link_category', array('orderby' => 'name', 'hide_empty' => 0));
 
-	if ( empty( $categories ) )
+	if (empty($categories))
 		return;
 
-	foreach ( $categories as $category ) {
+	foreach ($categories as $category) {
 		$cat_id = $category->term_id;
 
 		/** This filter is documented in wp-includes/category-template.php */
-		$name = esc_html( apply_filters( 'the_category', $category->name ) );
-		$checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
+		$name = esc_html(apply_filters('the_category', $category->name));
+		$checked = in_array($cat_id, $checked_categories) ? ' checked="checked"' : '';
 		echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";
 	}
 }
@@ -368,65 +368,65 @@ 
  */
 function get_inline_data($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	$title = esc_textarea( trim( $post->post_title ) );
+	$title = esc_textarea(trim($post->post_title));
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
 	echo '
-<div class="hidden" id="inline_' . $post->ID . '">
-	<div class="post_title">' . $title . '</div>
-	<div class="post_name">' . apply_filters( 'editable_slug', $post->post_name ) . '</div>
-	<div class="post_author">' . $post->post_author . '</div>
-	<div class="comment_status">' . esc_html( $post->comment_status ) . '</div>
-	<div class="ping_status">' . esc_html( $post->ping_status ) . '</div>
-	<div class="_status">' . esc_html( $post->post_status ) . '</div>
-	<div class="jj">' . mysql2date( 'd', $post->post_date, false ) . '</div>
-	<div class="mm">' . mysql2date( 'm', $post->post_date, false ) . '</div>
-	<div class="aa">' . mysql2date( 'Y', $post->post_date, false ) . '</div>
-	<div class="hh">' . mysql2date( 'H', $post->post_date, false ) . '</div>
-	<div class="mn">' . mysql2date( 'i', $post->post_date, false ) . '</div>
-	<div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
-	<div class="post_password">' . esc_html( $post->post_password ) . '</div>';
-
-	if ( $post_type_object->hierarchical )
-		echo '<div class="post_parent">' . $post->post_parent . '</div>';
-
-	if ( $post->post_type == 'page' )
-		echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
-
-	if ( post_type_supports( $post->post_type, 'page-attributes' ) )
-		echo '<div class="menu_order">' . $post->menu_order . '</div>';
-
-	$taxonomy_names = get_object_taxonomies( $post->post_type );
-	foreach ( $taxonomy_names as $taxonomy_name) {
-		$taxonomy = get_taxonomy( $taxonomy_name );
-
-		if ( $taxonomy->hierarchical && $taxonomy->show_ui ) {
-
-			$terms = get_object_term_cache( $post->ID, $taxonomy_name );
-			if ( false === $terms ) {
-				$terms = wp_get_object_terms( $post->ID, $taxonomy_name );
-				wp_cache_add( $post->ID, $terms, $taxonomy_name . '_relationships' );
+<div class="hidden" id="inline_' . $post->ID.'">
+	<div class="post_title">' . $title.'</div>
+	<div class="post_name">' . apply_filters('editable_slug', $post->post_name).'</div>
+	<div class="post_author">' . $post->post_author.'</div>
+	<div class="comment_status">' . esc_html($post->comment_status).'</div>
+	<div class="ping_status">' . esc_html($post->ping_status).'</div>
+	<div class="_status">' . esc_html($post->post_status).'</div>
+	<div class="jj">' . mysql2date('d', $post->post_date, false).'</div>
+	<div class="mm">' . mysql2date('m', $post->post_date, false).'</div>
+	<div class="aa">' . mysql2date('Y', $post->post_date, false).'</div>
+	<div class="hh">' . mysql2date('H', $post->post_date, false).'</div>
+	<div class="mn">' . mysql2date('i', $post->post_date, false).'</div>
+	<div class="ss">' . mysql2date('s', $post->post_date, false).'</div>
+	<div class="post_password">' . esc_html($post->post_password).'</div>';
+
+	if ($post_type_object->hierarchical)
+		echo '<div class="post_parent">'.$post->post_parent.'</div>';
+
+	if ($post->post_type == 'page')
+		echo '<div class="page_template">'.esc_html(get_post_meta($post->ID, '_wp_page_template', true)).'</div>';
+
+	if (post_type_supports($post->post_type, 'page-attributes'))
+		echo '<div class="menu_order">'.$post->menu_order.'</div>';
+
+	$taxonomy_names = get_object_taxonomies($post->post_type);
+	foreach ($taxonomy_names as $taxonomy_name) {
+		$taxonomy = get_taxonomy($taxonomy_name);
+
+		if ($taxonomy->hierarchical && $taxonomy->show_ui) {
+
+			$terms = get_object_term_cache($post->ID, $taxonomy_name);
+			if (false === $terms) {
+				$terms = wp_get_object_terms($post->ID, $taxonomy_name);
+				wp_cache_add($post->ID, $terms, $taxonomy_name.'_relationships');
 			}
-			$term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' );
+			$term_ids = empty($terms) ? array() : wp_list_pluck($terms, 'term_id');
 
-			echo '<div class="post_category" id="' . $taxonomy_name . '_' . $post->ID . '">' . implode( ',', $term_ids ) . '</div>';
+			echo '<div class="post_category" id="'.$taxonomy_name.'_'.$post->ID.'">'.implode(',', $term_ids).'</div>';
 
-		} elseif ( $taxonomy->show_ui ) {
+		} elseif ($taxonomy->show_ui) {
 
 			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
-				. esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '</div>';
+				. esc_html(str_replace(',', ', ', get_terms_to_edit($post->ID, $taxonomy_name))).'</div>';
 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( ! $post_type_object->hierarchical)
+		echo '<div class="sticky">'.(is_sticky($post->ID) ? 'sticky' : '').'</div>';
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
-		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	if (post_type_supports($post->post_type, 'post-formats'))
+		echo '<div class="post_format">'.esc_html(get_post_format($post->ID)).'</div>';
 
 	echo '</div>';
 }
@@ -443,7 +443,7 @@ 
  * @param string $mode
  * @param bool   $table_row
  */
-function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) {
+function wp_comment_reply($position = 1, $checkbox = false, $mode = 'single', $table_row = true) {
 	global $wp_list_table;
 	/**
 	 * Filter the in-line comment reply-to form output in the Comments
@@ -460,15 +460,15 @@ 
 	 * @param string $content The reply-to form content.
 	 * @param array  $args    An array of default args.
 	 */
-	$content = apply_filters( 'wp_comment_reply', '', array( 'position' => $position, 'checkbox' => $checkbox, 'mode' => $mode ) );
+	$content = apply_filters('wp_comment_reply', '', array('position' => $position, 'checkbox' => $checkbox, 'mode' => $mode));
 
-	if ( ! empty($content) ) {
+	if ( ! empty($content)) {
 		echo $content;
 		return;
 	}
 
-	if ( ! $wp_list_table ) {
-		if ( $mode == 'single' ) {
+	if ( ! $wp_list_table) {
+		if ($mode == 'single') {
 			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
 		} else {
 			$wp_list_table = _get_list_table('WP_Comments_List_Table');
@@ -477,12 +477,12 @@ 
 
 ?>
 <form method="get">
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
 <?php endif; ?>
-	<div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div>
+	<div id="replyhead" style="display:none;"><h5><?php _e('Reply to Comment'); ?></h5></div>
 	<div id="addhead" style="display:none;"><h5><?php _e('Add new Comment'); ?></h5></div>
 	<div id="edithead" style="display:none;">
 		<div class="inside">
@@ -504,8 +504,8 @@ 
 
 	<div id="replycontainer">
 	<?php
-	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-	wp_editor( '', 'replycontent', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
+	$quicktags_settings = array('buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close');
+	wp_editor('', 'replycontent', array('media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings));
 	?>
 	</div>
 
@@ -528,11 +528,11 @@ 
 	<input type="hidden" name="checkbox" id="checkbox" value="<?php echo $checkbox ? 1 : 0; ?>" />
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
 	<?php
-		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		wp_nonce_field('replyto-comment', '_ajax_nonce-replyto-comment', false);
+		if (current_user_can('unfiltered_html'))
+			wp_nonce_field('unfiltered-html-comment', '_wp_unfiltered_html_comment', false);
 	?>
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 </td></tr></tbody></table>
 <?php else : ?>
 </div></div>
@@ -564,15 +564,15 @@ 
  *
  * @param array $meta
  */
-function list_meta( $meta ) {
+function list_meta($meta) {
 	// Exit if no meta
-	if ( ! $meta ) {
+	if ( ! $meta) {
 		echo '
 <table id="list-table" style="display: none;">
 	<thead>
 	<tr>
-		<th class="left">' . _x( 'Name', 'meta name' ) . '</th>
-		<th>' . __( 'Value' ) . '</th>
+		<th class="left">' . _x('Name', 'meta name').'</th>
+		<th>' . __('Value').'</th>
 	</tr>
 	</thead>
 	<tbody id="the-list" data-wp-lists="list:meta">
@@ -586,14 +586,14 @@ 
 <table id="list-table">
 	<thead>
 	<tr>
-		<th class="left"><?php _ex( 'Name', 'meta name' ) ?></th>
-		<th><?php _e( 'Value' ) ?></th>
+		<th class="left"><?php _ex('Name', 'meta name') ?></th>
+		<th><?php _e('Value') ?></th>
 	</tr>
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
+	foreach ($meta as $entry)
+		echo _list_meta_row($entry, $count);
 ?>
 	</tbody>
 </table>
@@ -611,22 +611,22 @@ 
  * @param int   $count
  * @return string
  */
-function _list_meta_row( $entry, &$count ) {
+function _list_meta_row($entry, &$count) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
+	if (is_protected_meta($entry['meta_key'], 'post'))
 		return '';
 
-	if ( ! $update_nonce )
-		$update_nonce = wp_create_nonce( 'add-meta' );
+	if ( ! $update_nonce)
+		$update_nonce = wp_create_nonce('add-meta');
 
 	$r = '';
-	++ $count;
+	++$count;
 
-	if ( is_serialized( $entry['meta_value'] ) ) {
-		if ( is_serialized_string( $entry['meta_value'] ) ) {
+	if (is_serialized($entry['meta_value'])) {
+		if (is_serialized_string($entry['meta_value'])) {
 			// This is a serialized string, so we should display it.
-			$entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
+			$entry['meta_value'] = maybe_unserialize($entry['meta_value']);
 		} else {
 			// This is a serialized array/object so we should NOT display it.
 			--$count;
@@ -635,23 +635,23 @@ 
 	}
 
 	$entry['meta_key'] = esc_attr($entry['meta_key']);
-	$entry['meta_value'] = esc_textarea( $entry['meta_value'] ); // using a <textarea />
+	$entry['meta_value'] = esc_textarea($entry['meta_value']); // using a <textarea />
 	$entry['meta_id'] = (int) $entry['meta_id'];
 
-	$delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
+	$delete_nonce = wp_create_nonce('delete-meta_'.$entry['meta_id']);
 
 	$r .= "\n\t<tr id='meta-{$entry['meta_id']}'>";
-	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
+	$r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta-{$entry['meta_id']}-key'>".__('Key')."</label><input name='meta[{$entry['meta_id']}][key]' id='meta-{$entry['meta_id']}-key' type='text' size='20' value='{$entry['meta_key']}' />";
 
 	$r .= "\n\t\t<div class='submit'>";
-	$r .= get_submit_button( __( 'Delete' ), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array( 'data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce" ) );
+	$r .= get_submit_button(__('Delete'), 'deletemeta small', "deletemeta[{$entry['meta_id']}]", false, array('data-wp-lists' => "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce"));
 	$r .= "\n\t\t";
-	$r .= get_submit_button( __( 'Update' ), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array( 'data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce" ) );
+	$r .= get_submit_button(__('Update'), 'updatemeta small', "meta-{$entry['meta_id']}-submit", false, array('data-wp-lists' => "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce"));
 	$r .= "</div>";
-	$r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
+	$r .= wp_nonce_field('change-meta', '_ajax_nonce', false, false);
 	$r .= "</td>";
 
-	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
+	$r .= "\n\t\t<td><label class='screen-reader-text' for='meta-{$entry['meta_id']}-value'>".__('Value')."</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta-{$entry['meta_id']}-value' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>\n\t</tr>";
 	return $r;
 }
 
@@ -664,9 +664,9 @@ 
  *
  * @param WP_Post $post Optional. The post being edited.
  */
-function meta_form( $post = null ) {
+function meta_form($post = null) {
 	global $wpdb;
-	$post = get_post( $post );
+	$post = get_post($post);
 
 	/**
 	 * Filter the number of custom fields to retrieve for the drop-down
@@ -676,42 +676,42 @@ 
 	 *
 	 * @param int $limit Number of custom fields to retrieve. Default 30.
 	 */
-	$limit = apply_filters( 'postmeta_form_limit', 30 );
+	$limit = apply_filters('postmeta_form_limit', 30);
 	$sql = "SELECT DISTINCT meta_key
 		FROM $wpdb->postmeta
 		WHERE meta_key NOT BETWEEN '_' AND '_z'
 		HAVING meta_key NOT LIKE %s
 		ORDER BY meta_key
 		LIMIT %d";
-	$keys = $wpdb->get_col( $wpdb->prepare( $sql, $wpdb->esc_like( '_' ) . '%', $limit ) );
-	if ( $keys ) {
-		natcasesort( $keys );
+	$keys = $wpdb->get_col($wpdb->prepare($sql, $wpdb->esc_like('_').'%', $limit));
+	if ($keys) {
+		natcasesort($keys);
 		$meta_key_input_id = 'metakeyselect';
 	} else {
 		$meta_key_input_id = 'metakeyinput';
 	}
 ?>
-<p><strong><?php _e( 'Add New Custom Field:' ) ?></strong></p>
+<p><strong><?php _e('Add New Custom Field:') ?></strong></p>
 <table id="newmeta">
 <thead>
 <tr>
-<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex( 'Name', 'meta name' ) ?></label></th>
-<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
+<th class="left"><label for="<?php echo $meta_key_input_id; ?>"><?php _ex('Name', 'meta name') ?></label></th>
+<th><label for="metavalue"><?php _e('Value') ?></label></th>
 </tr>
 </thead>
 
 <tbody>
 <tr>
 <td id="newmetaleft" class="left">
-<?php if ( $keys ) { ?>
+<?php if ($keys) { ?>
 <select id="metakeyselect" name="metakeyselect">
-<option value="#NONE#"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+<option value="#NONE#"><?php _e('&mdash; Select &mdash;'); ?></option>
 <?php
 
-	foreach ( $keys as $key ) {
-		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) )
+	foreach ($keys as $key) {
+		if (is_protected_meta($key, 'post') || ! current_user_can('add_post_meta', $post->ID, $key))
 			continue;
-		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
+		echo "\n<option value='".esc_attr($key)."'>".esc_html($key)."</option>";
 	}
 ?>
 </select>
@@ -728,9 +728,9 @@ 
 
 <tr><td colspan="2">
 <div class="submit">
-<?php submit_button( __( 'Add Custom Field' ), 'secondary', 'addmeta', false, array( 'id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
+<?php submit_button(__('Add Custom Field'), 'secondary', 'addmeta', false, array('id' => 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta')); ?>
 </div>
-<?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
+<?php wp_nonce_field('add-meta', '_ajax_nonce-add-meta', false); ?>
 </td></tr>
 </tbody>
 </table>
@@ -752,15 +752,15 @@ 
  * @param int|bool $multi     Optional. Whether the additional fields and buttons should be added.
  *                            Default 0|false.
  */
-function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
+function touch_time($edit = 1, $for_post = 1, $tab_index = 0, $multi = 0) {
 	global $wp_locale, $comment;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ($for_post)
+		$edit = ! (in_array($post->post_status, array('draft', 'pending')) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt));
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
+	if ((int) $tab_index > 0)
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
 
 	// todo: Remove this?
@@ -768,56 +768,56 @@ 
 
 	$time_adj = current_time('timestamp');
 	$post_date = ($for_post) ? $post->post_date : $comment->comment_date;
-	$jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
-	$mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
-	$aa = ($edit) ? mysql2date( 'Y', $post_date, false ) : gmdate( 'Y', $time_adj );
-	$hh = ($edit) ? mysql2date( 'H', $post_date, false ) : gmdate( 'H', $time_adj );
-	$mn = ($edit) ? mysql2date( 'i', $post_date, false ) : gmdate( 'i', $time_adj );
-	$ss = ($edit) ? mysql2date( 's', $post_date, false ) : gmdate( 's', $time_adj );
-
-	$cur_jj = gmdate( 'd', $time_adj );
-	$cur_mm = gmdate( 'm', $time_adj );
-	$cur_aa = gmdate( 'Y', $time_adj );
-	$cur_hh = gmdate( 'H', $time_adj );
-	$cur_mn = gmdate( 'i', $time_adj );
-
-	$month = '<label><span class="screen-reader-text">' . __( 'Month' ) . '</span><select ' . ( $multi ? '' : 'id="mm" ' ) . 'name="mm"' . $tab_index_attribute . ">\n";
-	for ( $i = 1; $i < 13; $i = $i +1 ) {
+	$jj = ($edit) ? mysql2date('d', $post_date, false) : gmdate('d', $time_adj);
+	$mm = ($edit) ? mysql2date('m', $post_date, false) : gmdate('m', $time_adj);
+	$aa = ($edit) ? mysql2date('Y', $post_date, false) : gmdate('Y', $time_adj);
+	$hh = ($edit) ? mysql2date('H', $post_date, false) : gmdate('H', $time_adj);
+	$mn = ($edit) ? mysql2date('i', $post_date, false) : gmdate('i', $time_adj);
+	$ss = ($edit) ? mysql2date('s', $post_date, false) : gmdate('s', $time_adj);
+
+	$cur_jj = gmdate('d', $time_adj);
+	$cur_mm = gmdate('m', $time_adj);
+	$cur_aa = gmdate('Y', $time_adj);
+	$cur_hh = gmdate('H', $time_adj);
+	$cur_mn = gmdate('i', $time_adj);
+
+	$month = '<label><span class="screen-reader-text">'.__('Month').'</span><select '.($multi ? '' : 'id="mm" ').'name="mm"'.$tab_index_attribute.">\n";
+	for ($i = 1; $i < 13; $i = $i + 1) {
 		$monthnum = zeroise($i, 2);
-		$monthtext = $wp_locale->get_month_abbrev( $wp_locale->get_month( $i ) );
-		$month .= "\t\t\t" . '<option value="' . $monthnum . '" data-text="' . $monthtext . '" ' . selected( $monthnum, $mm, false ) . '>';
+		$monthtext = $wp_locale->get_month_abbrev($wp_locale->get_month($i));
+		$month .= "\t\t\t".'<option value="'.$monthnum.'" data-text="'.$monthtext.'" '.selected($monthnum, $mm, false).'>';
 		/* translators: 1: month number (01, 02, etc.), 2: month abbreviation */
-		$month .= sprintf( __( '%1$s-%2$s' ), $monthnum, $monthtext ) . "</option>\n";
+		$month .= sprintf(__('%1$s-%2$s'), $monthnum, $monthtext)."</option>\n";
 	}
 	$month .= '</select></label>';
 
-	$day = '<label><span class="screen-reader-text">' . __( 'Day' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="jj" ' ) . 'name="jj" value="' . $jj . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$year = '<label><span class="screen-reader-text">' . __( 'Year' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="aa" ' ) . 'name="aa" value="' . $aa . '" size="4" maxlength="4"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$hour = '<label><span class="screen-reader-text">' . __( 'Hour' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="hh" ' ) . 'name="hh" value="' . $hh . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
-	$minute = '<label><span class="screen-reader-text">' . __( 'Minute' ) . '</span><input type="text" ' . ( $multi ? '' : 'id="mn" ' ) . 'name="mn" value="' . $mn . '" size="2" maxlength="2"' . $tab_index_attribute . ' autocomplete="off" /></label>';
+	$day = '<label><span class="screen-reader-text">'.__('Day').'</span><input type="text" '.($multi ? '' : 'id="jj" ').'name="jj" value="'.$jj.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$year = '<label><span class="screen-reader-text">'.__('Year').'</span><input type="text" '.($multi ? '' : 'id="aa" ').'name="aa" value="'.$aa.'" size="4" maxlength="4"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$hour = '<label><span class="screen-reader-text">'.__('Hour').'</span><input type="text" '.($multi ? '' : 'id="hh" ').'name="hh" value="'.$hh.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
+	$minute = '<label><span class="screen-reader-text">'.__('Minute').'</span><input type="text" '.($multi ? '' : 'id="mn" ').'name="mn" value="'.$mn.'" size="2" maxlength="2"'.$tab_index_attribute.' autocomplete="off" /></label>';
 
 	echo '<div class="timestamp-wrap">';
 	/* translators: 1: month, 2: day, 3: year, 4: hour, 5: minute */
-	printf( __( '%1$s %2$s, %3$s @ %4$s:%5$s' ), $month, $day, $year, $hour, $minute );
+	printf(__('%1$s %2$s, %3$s @ %4$s:%5$s'), $month, $day, $year, $hour, $minute);
 
-	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
+	echo '</div><input type="hidden" id="ss" name="ss" value="'.$ss.'" />';
 
-	if ( $multi ) return;
+	if ($multi) return;
 
 	echo "\n\n";
 	$map = array(
-		'mm' => array( $mm, $cur_mm ),
-		'jj' => array( $jj, $cur_jj ),
-		'aa' => array( $aa, $cur_aa ),
-		'hh' => array( $hh, $cur_hh ),
-		'mn' => array( $mn, $cur_mn ),
+		'mm' => array($mm, $cur_mm),
+		'jj' => array($jj, $cur_jj),
+		'aa' => array($aa, $cur_aa),
+		'hh' => array($hh, $cur_hh),
+		'mn' => array($mn, $cur_mn),
 	);
-	foreach ( $map as $timeunit => $value ) {
-		list( $unit, $curr ) = $value;
+	foreach ($map as $timeunit => $value) {
+		list($unit, $curr) = $value;
 
-		echo '<input type="hidden" id="hidden_' . $timeunit . '" name="hidden_' . $timeunit . '" value="' . $unit . '" />' . "\n";
-		$cur_timeunit = 'cur_' . $timeunit;
-		echo '<input type="hidden" id="' . $cur_timeunit . '" name="' . $cur_timeunit . '" value="' . $curr . '" />' . "\n";
+		echo '<input type="hidden" id="hidden_'.$timeunit.'" name="hidden_'.$timeunit.'" value="'.$unit.'" />'."\n";
+		$cur_timeunit = 'cur_'.$timeunit;
+		echo '<input type="hidden" id="'.$cur_timeunit.'" name="'.$cur_timeunit.'" value="'.$curr.'" />'."\n";
 	}
 ?>
 
@@ -835,12 +835,12 @@ 
  *
  * @param string $default Optional. The template file name. Default empty.
  */
-function page_template_dropdown( $default = '' ) {
-	$templates = get_page_templates( get_post() );
-	ksort( $templates );
-	foreach ( array_keys( $templates ) as $template ) {
-		$selected = selected( $default, $templates[ $template ], false );
-		echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";
+function page_template_dropdown($default = '') {
+	$templates = get_page_templates(get_post());
+	ksort($templates);
+	foreach (array_keys($templates) as $template) {
+		$selected = selected($default, $templates[$template], false);
+		echo "\n\t<option value='".$templates[$template]."' $selected>$template</option>";
 	}
 }
 
@@ -857,22 +857,22 @@ 
  *
  * @return null|false Boolean False if page has no children, otherwise print out html elements
  */
-function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
+function parent_dropdown($default = 0, $parent = 0, $level = 0) {
 	global $wpdb;
 	$post = get_post();
-	$items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
+	$items = $wpdb->get_results($wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent));
 
-	if ( $items ) {
-		foreach ( $items as $item ) {
+	if ($items) {
+		foreach ($items as $item) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
+			if ($post && $post->ID && $item->ID == $post->ID)
 				continue;
 
-			$pad = str_repeat( '&nbsp;', $level * 3 );
-			$selected = selected( $default, $item->ID, false );
+			$pad = str_repeat('&nbsp;', $level * 3);
+			$selected = selected($default, $item->ID, false);
 
-			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad " . esc_html($item->post_title) . "</option>";
-			parent_dropdown( $default, $item->ID, $level +1 );
+			echo "\n\t<option class='level-$level' value='$item->ID' $selected>$pad ".esc_html($item->post_title)."</option>";
+			parent_dropdown($default, $item->ID, $level + 1);
 		}
 	} else {
 		return false;
@@ -886,20 +886,20 @@ 
  *
  * @param string $selected Slug for the role that should be already selected.
  */
-function wp_dropdown_roles( $selected = '' ) {
+function wp_dropdown_roles($selected = '') {
 	$p = '';
 	$r = '';
 
-	$editable_roles = array_reverse( get_editable_roles() );
+	$editable_roles = array_reverse(get_editable_roles());
 
-	foreach ( $editable_roles as $role => $details ) {
-		$name = translate_user_role($details['name'] );
-		if ( $selected == $role ) // preselect specified role
-			$p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
+	foreach ($editable_roles as $role => $details) {
+		$name = translate_user_role($details['name']);
+		if ($selected == $role) // preselect specified role
+			$p = "\n\t<option selected='selected' value='".esc_attr($role)."'>$name</option>";
 		else
-			$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+			$r .= "\n\t<option value='".esc_attr($role)."'>$name</option>";
 	}
-	echo $p . $r;
+	echo $p.$r;
 }
 
 /**
@@ -909,7 +909,7 @@ 
  *
  * @param string $action The action attribute for the form.
  */
-function wp_import_upload_form( $action ) {
+function wp_import_upload_form($action) {
 
 	/**
 	 * Filter the maximum allowed upload size for import files.
@@ -920,22 +920,22 @@ 
 	 *
 	 * @param int $max_upload_size Allowed upload size. Default 1 MB.
 	 */
-	$bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() );
-	$size = size_format( $bytes );
+	$bytes = apply_filters('import_upload_size_limit', wp_max_upload_size());
+	$size = size_format($bytes);
 	$upload_dir = wp_upload_dir();
-	if ( ! empty( $upload_dir['error'] ) ) :
+	if ( ! empty($upload_dir['error'])) :
 		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
 	else :
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url(wp_nonce_url($action, 'import-upload')); ?>">
 <p>
-<label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
+<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> (<?php printf(__('Maximum size: %s'), $size); ?>)
 <input type="file" id="upload" name="import" size="25" />
 <input type="hidden" name="action" value="save" />
 <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
 </p>
-<?php submit_button( __('Upload file and import'), 'button' ); ?>
+<?php submit_button(__('Upload file and import'), 'button'); ?>
 </form>
 <?php
 	endif;
@@ -966,66 +966,66 @@ 
  *                                        of the box array (which is the second parameter passed
  *                                        to your callback). Default null.
  */
-function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null ) {
+function add_meta_box($id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset($wp_meta_boxes))
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
+	if ( ! isset($wp_meta_boxes[$page]))
 		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
+	if ( ! isset($wp_meta_boxes[$page][$context]))
 		$wp_meta_boxes[$page][$context] = array();
 
-	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
-		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
+	foreach (array_keys($wp_meta_boxes[$page]) as $a_context) {
+		foreach (array('high', 'core', 'default', 'low') as $a_priority) {
+			if ( ! isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]))
 				continue;
 
 			// If a core box was previously added or removed by a plugin, don't add.
-			if ( 'core' == $priority ) {
+			if ('core' == $priority) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
+				if (false === $wp_meta_boxes[$page][$a_context][$a_priority][$id])
 					return;
 
 				/*
 				 * If box was added with default priority, give it core priority to
 				 * maintain sort order.
 				 */
-				if ( 'default' == $a_priority ) {
+				if ('default' == $a_priority) {
 					$wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
 					unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
 				}
 				return;
 			}
 			// If no priority given and id already present, use existing priority.
-			if ( empty($priority) ) {
+			if (empty($priority)) {
 				$priority = $a_priority;
 			/*
 			 * Else, if we're adding to the sorted priority, we don't know the title
 			 * or callback. Grab them from the previously added context/priority.
 			 */
-			} elseif ( 'sorted' == $priority ) {
+			} elseif ('sorted' == $priority) {
 				$title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
 				$callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
 				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
+			if ($priority != $a_priority || $context != $a_context)
 				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
 		}
 	}
 
-	if ( empty($priority) )
+	if (empty($priority))
 		$priority = 'low';
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
+	if ( ! isset($wp_meta_boxes[$page][$context][$priority]))
 		$wp_meta_boxes[$page][$context][$priority] = array();
 
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
@@ -1044,27 +1044,27 @@ 
  * @param mixed            $object  gets passed to the box callback function as first parameter
  * @return int number of meta_boxes
  */
-function do_meta_boxes( $screen, $context, $object ) {
+function do_meta_boxes($screen, $context, $object) {
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 
 	printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
 
 	// Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-	if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-		foreach ( $sorted as $box_context => $ids ) {
-			foreach ( explode( ',', $ids ) as $id ) {
-				if ( $id && 'dashboard_browser_nag' !== $id ) {
-					add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+	if ( ! $already_sorted && $sorted = get_user_option("meta-box-order_$page")) {
+		foreach ($sorted as $box_context => $ids) {
+			foreach (explode(',', $ids) as $id) {
+				if ($id && 'dashboard_browser_nag' !== $id) {
+					add_meta_box($id, null, null, $screen, $box_context, 'sorted');
 				}
 			}
 		}
@@ -1074,19 +1074,19 @@ 
 
 	$i = 0;
 
-	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
-		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
-				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+	if (isset($wp_meta_boxes[$page][$context])) {
+		foreach (array('high', 'sorted', 'core', 'default', 'low') as $priority) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
+				foreach ((array) $wp_meta_boxes[$page][$context][$priority] as $box) {
+					if (false == $box || ! $box['title'])
 						continue;
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
-					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-					if ( 'dashboard_browser_nag' != $box['id'] )
-						echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
+					echo '<div id="'.$box['id'].'" class="postbox '.postbox_classes($box['id'], $page).$hidden_class.'" '.'>'."\n";
+					if ('dashboard_browser_nag' != $box['id'])
+						echo '<div class="handlediv" title="'.esc_attr__('Click to toggle').'"><br /></div>';
 					echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
-					echo '<div class="inside">' . "\n";
+					echo '<div class="inside">'."\n";
 					call_user_func($box['callback'], $object, $box);
 					echo "</div>\n";
 					echo "</div>\n";
@@ -1115,21 +1115,21 @@ 
 function remove_meta_box($id, $screen, $context) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
+	if ( ! isset($wp_meta_boxes))
 		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
+	if ( ! isset($wp_meta_boxes[$page]))
 		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
+	if ( ! isset($wp_meta_boxes[$page][$context]))
 		$wp_meta_boxes[$page][$context] = array();
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
+	foreach (array('high', 'core', 'default', 'low') as $priority)
 		$wp_meta_boxes[$page][$context][$priority][$id] = false;
 }
 
@@ -1149,19 +1149,19 @@ 
  * @param mixed         $object  gets passed to the section callback function as first parameter.
  * @return int number of meta boxes as accordion sections.
  */
-function do_accordion_sections( $screen, $context, $object ) {
+function do_accordion_sections($screen, $context, $object) {
 	global $wp_meta_boxes;
 
-	wp_enqueue_script( 'accordion' );
+	wp_enqueue_script('accordion');
 
-	if ( empty( $screen ) )
+	if (empty($screen))
 		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	elseif (is_string($screen))
+		$screen = convert_to_screen($screen);
 
 	$page = $screen->id;
 
-	$hidden = get_hidden_meta_boxes( $screen );
+	$hidden = get_hidden_meta_boxes($screen);
 	?>
 	<div id="side-sortables" class="accordion-container">
 		<ul class="outer-border">
@@ -1169,29 +1169,29 @@ 
 	$i = 0;
 	$first_open = false;
 
-	if ( isset( $wp_meta_boxes[ $page ][ $context ] ) ) {
-		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
-			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
-				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
+	if (isset($wp_meta_boxes[$page][$context])) {
+		foreach (array('high', 'core', 'default', 'low') as $priority) {
+			if (isset($wp_meta_boxes[$page][$context][$priority])) {
+				foreach ($wp_meta_boxes[$page][$context][$priority] as $box) {
+					if (false == $box || ! $box['title'])
 						continue;
 					$i++;
-					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
+					$hidden_class = in_array($box['id'], $hidden) ? 'hide-if-js' : '';
 
 					$open_class = '';
-					if ( ! $first_open && empty( $hidden_class ) ) {
+					if ( ! $first_open && empty($hidden_class)) {
 						$first_open = true;
 						$open_class = 'open';
 					}
 					?>
-					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
+					<li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr($box['id']); ?>" id="<?php echo esc_attr($box['id']); ?>">
 						<h3 class="accordion-section-title hndle" tabindex="0">
-							<?php echo esc_html( $box['title'] ); ?>
-							<span class="screen-reader-text"><?php _e( 'Press return or enter to expand' ); ?></span>
+							<?php echo esc_html($box['title']); ?>
+							<span class="screen-reader-text"><?php _e('Press return or enter to expand'); ?></span>
 						</h3>
-						<div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
+						<div class="accordion-section-content <?php postbox_classes($box['id'], $page); ?>">
 							<div class="inside">
-								<?php call_user_func( $box['callback'], $object, $box ); ?>
+								<?php call_user_func($box['callback'], $object, $box); ?>
 							</div><!-- .inside -->
 						</div><!-- .accordion-section-content -->
 					</li><!-- .accordion-section -->
@@ -1230,13 +1230,13 @@ 
 function add_settings_section($id, $title, $callback, $page) {
 	global $wp_settings_sections;
 
-	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
+	if ('misc' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.0', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'misc'));
 		$page = 'general';
 	}
 
-	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+	if ('privacy' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.5', sprintf(__('The "%s" options group has been removed. Use another settings group.'), 'privacy'));
 		$page = 'reading';
 	}
 
@@ -1281,13 +1281,13 @@ 
 function add_settings_field($id, $title, $callback, $page, $section = 'default', $args = array()) {
 	global $wp_settings_fields;
 
-	if ( 'misc' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
+	if ('misc' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.0', __('The miscellaneous options group has been removed. Use another settings group.'));
 		$page = 'general';
 	}
 
-	if ( 'privacy' == $page ) {
-		_deprecated_argument( __FUNCTION__, '3.5', __( 'The privacy options group has been removed. Use another settings group.' ) );
+	if ('privacy' == $page) {
+		_deprecated_argument(__FUNCTION__, '3.5', __('The privacy options group has been removed. Use another settings group.'));
 		$page = 'reading';
 	}
 
@@ -1307,23 +1307,23 @@ 
  *
  * @param string $page The slug name of the page whos settings sections you want to output
  */
-function do_settings_sections( $page ) {
+function do_settings_sections($page) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
+	if ( ! isset($wp_settings_sections[$page]))
 		return;
 
-	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
+	foreach ((array) $wp_settings_sections[$page] as $section) {
+		if ($section['title'])
 			echo "<h3>{$section['title']}</h3>\n";
 
-		if ( $section['callback'] )
-			call_user_func( $section['callback'], $section );
+		if ($section['callback'])
+			call_user_func($section['callback'], $section);
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
+		if ( ! isset($wp_settings_fields) || ! isset($wp_settings_fields[$page]) || ! isset($wp_settings_fields[$page][$section['id']]))
 			continue;
 		echo '<table class="form-table">';
-		do_settings_fields( $page, $section['id'] );
+		do_settings_fields($page, $section['id']);
 		echo '</table>';
 	}
 }
@@ -1345,22 +1345,22 @@ 
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
+	if ( ! isset($wp_settings_fields[$page][$section]))
 		return;
 
-	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
+	foreach ((array) $wp_settings_fields[$page][$section] as $field) {
 		$class = '';
 
-		if ( ! empty( $field['args']['class'] ) ) {
-			$class = ' class="' . esc_attr( $field['args']['class'] ) . '"';
+		if ( ! empty($field['args']['class'])) {
+			$class = ' class="'.esc_attr($field['args']['class']).'"';
 		}
 
 		echo "<tr{$class}>";
 
-		if ( ! empty( $field['args']['label_for'] ) ) {
-			echo '<th scope="row"><label for="' . esc_attr( $field['args']['label_for'] ) . '">' . $field['title'] . '</label></th>';
+		if ( ! empty($field['args']['label_for'])) {
+			echo '<th scope="row"><label for="'.esc_attr($field['args']['label_for']).'">'.$field['title'].'</label></th>';
 		} else {
-			echo '<th scope="row">' . $field['title'] . '</th>';
+			echo '<th scope="row">'.$field['title'].'</th>';
 		}
 
 		echo '<td>';
@@ -1394,7 +1394,7 @@ 
  * @param string $type    Optional. Message type, controls HTML class. Accepts 'error' or 'updated'.
  *                        Default 'error'.
  */
-function add_settings_error( $setting, $code, $message, $type = 'error' ) {
+function add_settings_error($setting, $code, $message, $type = 'error') {
 	global $wp_settings_errors;
 
 	$wp_settings_errors[] = array(
@@ -1427,7 +1427,7 @@ 
  * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
  * @return array Array of settings errors
  */
-function get_settings_errors( $setting = '', $sanitize = false ) {
+function get_settings_errors($setting = '', $sanitize = false) {
 	global $wp_settings_errors;
 
 	/*
@@ -1435,24 +1435,24 @@ 
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
-		sanitize_option( $setting, get_option( $setting ) );
+	if ($sanitize)
+		sanitize_option($setting, get_option($setting));
 
 	// If settings were passed back from options.php then use them.
-	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
-		$wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
-		delete_transient( 'settings_errors' );
+	if (isset($_GET['settings-updated']) && $_GET['settings-updated'] && get_transient('settings_errors')) {
+		$wp_settings_errors = array_merge((array) $wp_settings_errors, get_transient('settings_errors'));
+		delete_transient('settings_errors');
 	}
 
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
+	if ( ! count($wp_settings_errors))
 		return array();
 
 	// Filter the results to those of a specific setting if one was set.
-	if ( $setting ) {
+	if ($setting) {
 		$setting_errors = array();
-		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
+		foreach ((array) $wp_settings_errors as $key => $details) {
+			if ($setting == $details['setting'])
 				$setting_errors[] = $wp_settings_errors[$key];
 		}
 		return $setting_errors;
@@ -1487,20 +1487,20 @@ 
  * @param bool   $sanitize       Whether to re-sanitize the setting value before returning errors.
  * @param bool   $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
  */
-function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
+function settings_errors($setting = '', $sanitize = false, $hide_on_update = false) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
+	if ($hide_on_update && ! empty($_GET['settings-updated']))
 		return;
 
-	$settings_errors = get_settings_errors( $setting, $sanitize );
+	$settings_errors = get_settings_errors($setting, $sanitize);
 
-	if ( empty( $settings_errors ) )
+	if (empty($settings_errors))
 		return;
 
 	$output = '';
-	foreach ( $settings_errors as $key => $details ) {
-		$css_id = 'setting-error-' . $details['code'];
-		$css_class = $details['type'] . ' settings-error notice is-dismissible';
+	foreach ($settings_errors as $key => $details) {
+		$css_id = 'setting-error-'.$details['code'];
+		$css_class = $details['type'].' settings-error notice is-dismissible';
 		$output .= "<div id='$css_id' class='$css_class'> \n";
 		$output .= "<p><strong>{$details['message']}</strong></p>";
 		$output .= "</div> \n";
@@ -1519,26 +1519,26 @@ 
 ?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
-			<?php _e( 'Find Posts or Pages' ); ?>
+			<?php _e('Find Posts or Pages'); ?>
 			<div id="find-posts-close"></div>
 		</div>
 		<div class="find-box-inside">
 			<div class="find-box-search">
-				<?php if ( $found_action ) { ?>
+				<?php if ($found_action) { ?>
 					<input type="hidden" name="found_action" value="<?php echo esc_attr($found_action); ?>" />
 				<?php } ?>
 				<input type="hidden" name="affected" id="affected" value="" />
-				<?php wp_nonce_field( 'find-posts', '_ajax_nonce', false ); ?>
-				<label class="screen-reader-text" for="find-posts-input"><?php _e( 'Search' ); ?></label>
+				<?php wp_nonce_field('find-posts', '_ajax_nonce', false); ?>
+				<label class="screen-reader-text" for="find-posts-input"><?php _e('Search'); ?></label>
 				<input type="text" id="find-posts-input" name="ps" value="" />
 				<span class="spinner"></span>
-				<input type="button" id="find-posts-search" value="<?php esc_attr_e( 'Search' ); ?>" class="button" />
+				<input type="button" id="find-posts-search" value="<?php esc_attr_e('Search'); ?>" class="button" />
 				<div class="clear"></div>
 			</div>
 			<div id="find-posts-response"></div>
 		</div>
 		<div class="find-box-buttons">
-			<?php submit_button( __( 'Select' ), 'button-primary alignright', 'find-posts-submit', false ); ?>
+			<?php submit_button(__('Select'), 'button-primary alignright', 'find-posts-submit', false); ?>
 			<div class="clear"></div>
 		</div>
 	</div>
@@ -1555,8 +1555,8 @@ 
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
+	if (isset($post->post_password))
+		echo esc_attr($post->post_password);
 }
 
 /**
@@ -1570,11 +1570,11 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The post title if set.
  */
-function _draft_or_post_title( $post = 0 ) {
-	$title = get_the_title( $post );
-	if ( empty( $title ) )
-		$title = __( '(no title)' );
-	return esc_html( $title );
+function _draft_or_post_title($post = 0) {
+	$title = get_the_title($post);
+	if (empty($title))
+		$title = __('(no title)');
+	return esc_html($title);
 }
 
 /**
@@ -1586,7 +1586,7 @@ 
  * @since 2.7.0
  */
 function _admin_search_query() {
-	echo isset($_REQUEST['s']) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	echo isset($_REQUEST['s']) ? esc_attr(wp_unslash($_REQUEST['s'])) : '';
 }
 
 /**
@@ -1601,69 +1601,69 @@ 
  * @param string $title      Optional. Title of the Iframe page. Default empty.
  * @param bool   $deprecated Not used.
  */
-function iframe_header( $title = '', $deprecated = false ) {
-	show_admin_bar( false );
+function iframe_header($title = '', $deprecated = false) {
+	show_admin_bar(false);
 	global $hook_suffix, $admin_body_class, $wp_locale;
 	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 
 	$current_screen = get_current_screen();
 
-	@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+	@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 	_wp_admin_html_begin();
 ?>
 <title><?php bloginfo('name') ?> &rsaquo; <?php echo $title ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
-wp_enqueue_style( 'colors' );
+wp_enqueue_style('colors');
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>',
 	pagenow = '<?php echo $current_screen->id; ?>',
 	typenow = '<?php echo $current_screen->post_type; ?>',
 	adminpage = '<?php echo $admin_body_class; ?>',
-	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+	decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <?php
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_enqueue_scripts', $hook_suffix );
+do_action('admin_enqueue_scripts', $hook_suffix);
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_styles-$hook_suffix" );
+do_action("admin_print_styles-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_styles' );
+do_action('admin_print_styles');
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_print_scripts-$hook_suffix" );
+do_action("admin_print_scripts-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_print_scripts' );
+do_action('admin_print_scripts');
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( "admin_head-$hook_suffix" );
+do_action("admin_head-$hook_suffix");
 
 /** This action is documented in wp-admin/admin-header.php */
-do_action( 'admin_head' );
+do_action('admin_head');
 
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
-if ( is_rtl() )
+if (is_rtl())
 	$admin_body_class .= ' rtl';
 
 ?>
 </head>
 <?php
 /** This filter is documented in wp-admin/admin-header.php */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
+$admin_body_classes = apply_filters('admin_body_class', '');
 ?>
 <body<?php
 /**
  * @global string $body_id
  */
-if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+if (isset($GLOBALS['body_id'])) echo ' id="'.$GLOBALS['body_id'].'"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1689,10 +1689,10 @@ 
 	<div class="hidden">
 <?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer', '' );
+	do_action('admin_footer', '');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 ?>
 	</div>
 <script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
@@ -1707,33 +1707,33 @@ 
  */
 function _post_states($post) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
+	if (isset($_REQUEST['post_status']))
 		$post_status = $_REQUEST['post_status'];
 	else
 		$post_status = '';
 
-	if ( !empty($post->post_password) )
+	if ( ! empty($post->post_password))
 		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
+	if ('private' == $post->post_status && 'private' != $post_status)
 		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
+	if ('draft' == $post->post_status && 'draft' != $post_status)
 		$post_states['draft'] = __('Draft');
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
+	if ('pending' == $post->post_status && 'pending' != $post_status)
 		/* translators: post state */
 		$post_states['pending'] = _x('Pending', 'post state');
-	if ( is_sticky($post->ID) )
+	if (is_sticky($post->ID))
 		$post_states['sticky'] = __('Sticky');
 
-	if ( 'future' === $post->post_status ) {
-		$post_states['scheduled'] = __( 'Scheduled' );
+	if ('future' === $post->post_status) {
+		$post_states['scheduled'] = __('Scheduled');
 	}
 
-	if ( get_option( 'page_on_front' ) == $post->ID ) {
-		$post_states['page_on_front'] = __( 'Front Page' );
+	if (get_option('page_on_front') == $post->ID) {
+		$post_states['page_on_front'] = __('Front Page');
 	}
 
-	if ( get_option( 'page_for_posts' ) == $post->ID ) {
-		$post_states['page_for_posts'] = __( 'Posts Page' );
+	if (get_option('page_for_posts') == $post->ID) {
+		$post_states['page_for_posts'] = __('Posts Page');
 	}
 
 	/**
@@ -1744,15 +1744,15 @@ 
 	 * @param array $post_states An array of post display states.
 	 * @param int   $post        The post ID.
 	 */
-	$post_states = apply_filters( 'display_post_states', $post_states, $post );
+	$post_states = apply_filters('display_post_states', $post_states, $post);
 
-	if ( ! empty($post_states) ) {
+	if ( ! empty($post_states)) {
 		$state_count = count($post_states);
 		$i = 0;
 		echo ' - ';
-		foreach ( $post_states as $state ) {
+		foreach ($post_states as $state) {
 			++$i;
-			( $i == $state_count ) ? $sep = '' : $sep = ', ';
+			($i == $state_count) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
@@ -1763,24 +1763,24 @@ 
  *
  * @param WP_Post $post
  */
-function _media_states( $post ) {
+function _media_states($post) {
 	$media_states = array();
 	$stylesheet = get_option('stylesheet');
 
-	if ( current_theme_supports( 'custom-header') ) {
-		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
-		if ( ! empty( $meta_header ) && $meta_header == $stylesheet )
-			$media_states[] = __( 'Header Image' );
+	if (current_theme_supports('custom-header')) {
+		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true);
+		if ( ! empty($meta_header) && $meta_header == $stylesheet)
+			$media_states[] = __('Header Image');
 	}
 
-	if ( current_theme_supports( 'custom-background') ) {
-		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
-		if ( ! empty( $meta_background ) && $meta_background == $stylesheet )
-			$media_states[] = __( 'Background Image' );
+	if (current_theme_supports('custom-background')) {
+		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true);
+		if ( ! empty($meta_background) && $meta_background == $stylesheet)
+			$media_states[] = __('Background Image');
 	}
 
-	if ( $post->ID == get_option( 'site_icon' ) ) {
-		$media_states[] = __( 'Site Icon' );
+	if ($post->ID == get_option('site_icon')) {
+		$media_states[] = __('Site Icon');
 	}
 
 	/**
@@ -1791,15 +1791,15 @@ 
 	 * @param array $media_states An array of media states. Default 'Header Image',
 	 *                            'Background Image', 'Site Icon'.
 	 */
-	$media_states = apply_filters( 'display_media_states', $media_states );
+	$media_states = apply_filters('display_media_states', $media_states);
 
-	if ( ! empty( $media_states ) ) {
-		$state_count = count( $media_states );
+	if ( ! empty($media_states)) {
+		$state_count = count($media_states);
 		$i = 0;
 		echo ' - ';
-		foreach ( $media_states as $state ) {
+		foreach ($media_states as $state) {
 			++$i;
-			( $i == $state_count ) ? $sep = '' : $sep = ', ';
+			($i == $state_count) ? $sep = '' : $sep = ', ';
 			echo "<span class='post-state'>$state$sep</span>";
 		}
 	}
@@ -1890,8 +1890,8 @@ 
  *                                       as a string such as 'tabindex="1"', though the array format is
  *                                       preferred. Default null.
  */
-function submit_button( $text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null ) {
-	echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
+function submit_button($text = null, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = null) {
+	echo get_submit_button($text, $type, $name, $wrap, $other_attributes);
 }
 
 /**
@@ -1915,49 +1915,49 @@ 
  *                                       Default empty.
  * @return string Submit button HTML.
  */
-function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
-		$type = explode( ' ', $type );
-
-	$button_shorthand = array( 'primary', 'small', 'large' );
-	$classes = array( 'button' );
-	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
+function get_submit_button($text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '') {
+	if ( ! is_array($type))
+		$type = explode(' ', $type);
+
+	$button_shorthand = array('primary', 'small', 'large');
+	$classes = array('button');
+	foreach ($type as $t) {
+		if ('secondary' === $t || 'button-secondary' === $t)
 			continue;
-		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
+		$classes[] = in_array($t, $button_shorthand) ? 'button-'.$t : $t;
 	}
-	$class = implode( ' ', array_unique( $classes ) );
+	$class = implode(' ', array_unique($classes));
 
-	if ( 'delete' === $type )
+	if ('delete' === $type)
 		$class = 'button-secondary delete';
 
-	$text = $text ? $text : __( 'Save Changes' );
+	$text = $text ? $text : __('Save Changes');
 
 	// Default the id attribute to $name unless an id was specifically provided in $other_attributes
 	$id = $name;
-	if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) ) {
+	if (is_array($other_attributes) && isset($other_attributes['id'])) {
 		$id = $other_attributes['id'];
-		unset( $other_attributes['id'] );
+		unset($other_attributes['id']);
 	}
 
 	$attributes = '';
-	if ( is_array( $other_attributes ) ) {
-		foreach ( $other_attributes as $attribute => $value ) {
-			$attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
+	if (is_array($other_attributes)) {
+		foreach ($other_attributes as $attribute => $value) {
+			$attributes .= $attribute.'="'.esc_attr($value).'" '; // Trailing space is important
 		}
-	} elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string
+	} elseif ( ! empty($other_attributes)) { // Attributes provided as a string
 		$attributes = $other_attributes;
 	}
 
 	// Don't output empty name and id attributes.
-	$name_attr = $name ? ' name="' . esc_attr( $name ) . '"' : '';
-	$id_attr = $id ? ' id="' . esc_attr( $id ) . '"' : '';
+	$name_attr = $name ? ' name="'.esc_attr($name).'"' : '';
+	$id_attr = $id ? ' id="'.esc_attr($id).'"' : '';
 
-	$button = '<input type="submit"' . $name_attr . $id_attr . ' class="' . esc_attr( $class );
-	$button	.= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+	$button = '<input type="submit"'.$name_attr.$id_attr.' class="'.esc_attr($class);
+	$button	.= '" value="'.esc_attr($text).'" '.$attributes.' />';
 
-	if ( $wrap ) {
-		$button = '<p class="submit">' . $button . '</p>';
+	if ($wrap) {
+		$button = '<p class="submit">'.$button.'</p>';
 	}
 
 	return $button;
@@ -1970,9 +1970,9 @@ 
 function _wp_admin_html_begin() {
 	global $is_IE;
 
-	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
+	$admin_html_class = (is_admin_bar_showing()) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
+	if ($is_IE)
 		@header('X-UA-Compatible: IE=edge');
 
 ?>
@@ -1984,13 +1984,13 @@ 
 	 *
 	 * @since 2.2.0
 	 */
-	do_action( 'admin_xml_ns' );
+	do_action('admin_xml_ns');
 ?> <?php language_attributes(); ?>>
 <![endif]-->
 <!--[if !(IE 8) ]><!-->
 <html xmlns="http://www.w3.org/1999/xhtml" class="<?php echo $admin_html_class; ?>" <?php
 	/** This action is documented in wp-admin/includes/template.php */
-	do_action( 'admin_xml_ns' );
+	do_action('admin_xml_ns');
 ?> <?php language_attributes(); ?>>
 <!--<![endif]-->
 <head>
@@ -2014,7 +2014,7 @@ 
 	 *
 	 * @param string $hook_suffix The current admin page.
 	 */
-	public static function enqueue_scripts( $hook_suffix ) {
+	public static function enqueue_scripts($hook_suffix) {
 		/*
 		 * Register feature pointers
 		 *
@@ -2033,10 +2033,10 @@ 
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
+		if (empty($registered_pointers[$hook_suffix]))
 			return;
 
-		$pointers = (array) $registered_pointers[ $hook_suffix ];
+		$pointers = (array) $registered_pointers[$hook_suffix];
 
 		/*
 		 * Specify required capabilities for feature pointers
@@ -2056,28 +2056,28 @@ 
 		);
 
 		// Get dismissed pointers
-		$dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+		$dismissed = explode(',', (string) get_user_meta(get_current_user_id(), 'dismissed_wp_pointers', true));
 
 		$got_pointers = false;
-		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
-			if ( isset( $caps_required[ $pointer ] ) ) {
-				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
+		foreach (array_diff($pointers, $dismissed) as $pointer) {
+			if (isset($caps_required[$pointer])) {
+				foreach ($caps_required[$pointer] as $cap) {
+					if ( ! current_user_can($cap))
 						continue 2;
 				}
 			}
 
 			// Bind pointer print function
-			add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
+			add_action('admin_print_footer_scripts', array('WP_Internal_Pointers', 'pointer_'.$pointer));
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
+		if ( ! $got_pointers)
 			return;
 
 		// Add pointers script and style to queue
-		wp_enqueue_style( 'wp-pointer' );
-		wp_enqueue_script( 'wp-pointer' );
+		wp_enqueue_style('wp-pointer');
+		wp_enqueue_script('wp-pointer');
 	}
 
 	/**
@@ -2091,14 +2091,14 @@ 
 	 * @param string $selector The HTML elements, on which the pointer should be attached.
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
-	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
+	private static function print_js($pointer_id, $selector, $args) {
+		if (empty($pointer_id) || empty($selector) || empty($args) || empty($args['content']))
 			return;
 
 		?>
 		<script type="text/javascript">
 		(function($){
-			var options = <?php echo wp_json_encode( $args ); ?>, setup;
+			var options = <?php echo wp_json_encode($args); ?>, setup;
 
 			if ( ! options )
 				return;
@@ -2146,8 +2146,8 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	public static function dismiss_pointers_for_new_users( $user_id ) {
-		add_user_meta( $user_id, 'dismissed_wp_pointers', '' );
+	public static function dismiss_pointers_for_new_users($user_id) {
+		add_user_meta($user_id, 'dismissed_wp_pointers', '');
 	}
 }
 
@@ -2159,13 +2159,13 @@ 
  * @param string $hook_name The hook name (also known as the hook suffix) used to determine the screen.
  * @return WP_Screen Screen object.
  */
-function convert_to_screen( $hook_name ) {
-	if ( ! class_exists( 'WP_Screen' ) ) {
-		_doing_it_wrong( 'convert_to_screen(), add_meta_box()', __( "Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead." ), '3.3' );
-		return (object) array( 'id' => '_invalid', 'base' => '_are_belong_to_us' );
+function convert_to_screen($hook_name) {
+	if ( ! class_exists('WP_Screen')) {
+		_doing_it_wrong('convert_to_screen(), add_meta_box()', __("Likely direct inclusion of wp-admin/includes/template.php in order to use add_meta_box(). This is very wrong. Hook the add_meta_box() call into the add_meta_boxes action instead."), '3.3');
+		return (object) array('id' => '_invalid', 'base' => '_are_belong_to_us');
 	}
 
-	return WP_Screen::get( $hook_name );
+	return WP_Screen::get($hook_name);
 }
 
 /**
@@ -2207,41 +2207,41 @@ 
  *     @type int    $number The number of ratings that makes up this rating. Default 0.
  * }
  */
-function wp_star_rating( $args = array() ) {
+function wp_star_rating($args = array()) {
 	$defaults = array(
 		'rating' => 0,
 		'type' => 'rating',
 		'number' => 0,
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	// Non-english decimal places when the $rating is coming from a string
-	$rating = str_replace( ',', '.', $r['rating'] );
+	$rating = str_replace(',', '.', $r['rating']);
 
 	// Convert Percentage to star rating, 0..5 in .5 increments
-	if ( 'percent' == $r['type'] ) {
-		$rating = round( $rating / 10, 0 ) / 2;
+	if ('percent' == $r['type']) {
+		$rating = round($rating / 10, 0) / 2;
 	}
 
 	// Calculate the number of each type of star needed
-	$full_stars = floor( $rating );
-	$half_stars = ceil( $rating - $full_stars );
+	$full_stars = floor($rating);
+	$half_stars = ceil($rating - $full_stars);
 	$empty_stars = 5 - $full_stars - $half_stars;
 
-	if ( $r['number'] ) {
+	if ($r['number']) {
 		/* translators: 1: The rating, 2: The number of ratings */
-		$format = _n( '%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number'] );
-		$title = sprintf( $format, number_format_i18n( $rating, 1 ), number_format_i18n( $r['number'] ) );
+		$format = _n('%1$s rating based on %2$s rating', '%1$s rating based on %2$s ratings', $r['number']);
+		$title = sprintf($format, number_format_i18n($rating, 1), number_format_i18n($r['number']));
 	} else {
 		/* translators: 1: The rating */
-		$title = sprintf( __( '%s rating' ), number_format_i18n( $rating, 1 ) );
+		$title = sprintf(__('%s rating'), number_format_i18n($rating, 1));
 	}
 
-	echo '<div class="star-rating" title="' . esc_attr( $title ) . '">';
-	echo '<span class="screen-reader-text">' . $title . '</span>';
-	echo str_repeat( '<div class="star star-full"></div>', $full_stars );
-	echo str_repeat( '<div class="star star-half"></div>', $half_stars );
-	echo str_repeat( '<div class="star star-empty"></div>', $empty_stars);
+	echo '<div class="star-rating" title="'.esc_attr($title).'">';
+	echo '<span class="screen-reader-text">'.$title.'</span>';
+	echo str_repeat('<div class="star star-full"></div>', $full_stars);
+	echo str_repeat('<div class="star star-half"></div>', $half_stars);
+	echo str_repeat('<div class="star star-empty"></div>', $empty_stars);
 	echo '</div>';
 }
 
@@ -2252,5 +2252,5 @@ 
  * @since 4.2.0
  */
 function _wp_posts_page_notice() {
-	echo '<div class="notice notice-warning inline"><p>' . __( 'You are currently editing the page that shows your latest posts.' ) . '</p></div>';
+	echo '<div class="notice notice-warning inline"><p>'.__('You are currently editing the page that shows your latest posts.').'</p></div>';
 }

Braces +237 added lines, -155 removed lines

@@ -289,10 +289,11 @@ 
 function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $echo = true ) {
 	$post = get_post();
 
-	if ( $post && $post->ID )
-		$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
-	else
-		$checked_terms = array();
+	if ( $post && $post->ID ) {
+			$checked_terms = wp_get_object_terms($post->ID, $taxonomy, array('fields'=>'ids'));
+	} else {
+			$checked_terms = array();
+	}
 
 	$terms = get_terms( $taxonomy, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => $number, 'hierarchical' => false ) );
 
@@ -301,8 +302,10 @@ 
 	$popular_ids = array();
 	foreach ( (array) $terms as $term ) {
 		$popular_ids[] = $term->term_id;
-		if ( !$echo ) // hack for AJAX use
+		if ( !$echo ) {
+			// hack for AJAX use
 			continue;
+		}
 		$id = "popular-$taxonomy-$term->term_id";
 		$checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : '';
 		?>
@@ -346,8 +349,9 @@ 
 
 	$categories = get_terms( 'link_category', array( 'orderby' => 'name', 'hide_empty' => 0 ) );
 
-	if ( empty( $categories ) )
-		return;
+	if ( empty( $categories ) ) {
+			return;
+	}
 
 	foreach ( $categories as $category ) {
 		$cat_id = $category->term_id;
@@ -368,8 +372,9 @@ 
  */
 function get_inline_data($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( ! current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	$title = esc_textarea( trim( $post->post_title ) );
 
@@ -390,14 +395,17 @@ 
 	<div class="ss">' . mysql2date( 's', $post->post_date, false ) . '</div>
 	<div class="post_password">' . esc_html( $post->post_password ) . '</div>';
 
-	if ( $post_type_object->hierarchical )
-		echo '<div class="post_parent">' . $post->post_parent . '</div>';
+	if ( $post_type_object->hierarchical ) {
+			echo '<div class="post_parent">' . $post->post_parent . '</div>';
+	}
 
-	if ( $post->post_type == 'page' )
-		echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
+	if ( $post->post_type == 'page' ) {
+			echo '<div class="page_template">' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '</div>';
+	}
 
-	if ( post_type_supports( $post->post_type, 'page-attributes' ) )
-		echo '<div class="menu_order">' . $post->menu_order . '</div>';
+	if ( post_type_supports( $post->post_type, 'page-attributes' ) ) {
+			echo '<div class="menu_order">' . $post->menu_order . '</div>';
+	}
 
 	$taxonomy_names = get_object_taxonomies( $post->post_type );
 	foreach ( $taxonomy_names as $taxonomy_name) {
@@ -422,11 +430,13 @@ 
 		}
 	}
 
-	if ( !$post_type_object->hierarchical )
-		echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	if ( !$post_type_object->hierarchical ) {
+			echo '<div class="sticky">' . (is_sticky($post->ID) ? 'sticky' : '') . '</div>';
+	}
 
-	if ( post_type_supports( $post->post_type, 'post-formats' ) )
-		echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+			echo '<div class="post_format">' . esc_html( get_post_format( $post->ID ) ) . '</div>';
+	}
 
 	echo '</div>';
 }
@@ -479,9 +489,12 @@ 
 <form method="get">
 <?php if ( $table_row ) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
-<?php else : ?>
+<?php else {
+	: ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<div id="replyhead" style="display:none;"><h5><?php _e( 'Reply to Comment' ); ?></h5></div>
 	<div id="addhead" style="display:none;"><h5><?php _e('Add new Comment'); ?></h5></div>
 	<div id="edithead" style="display:none;">
@@ -529,14 +542,18 @@ 
 	<input type="hidden" name="mode" id="mode" value="<?php echo esc_attr($mode); ?>" />
 	<?php
 		wp_nonce_field( 'replyto-comment', '_ajax_nonce-replyto-comment', false );
-		if ( current_user_can( 'unfiltered_html' ) )
-			wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		if ( current_user_can( 'unfiltered_html' ) ) {
+					wp_nonce_field( 'unfiltered-html-comment', '_wp_unfiltered_html_comment', false );
+		}
 	?>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
-<?php else : ?>
+<?php else {
+	: ?>
 </div></div>
-<?php endif; ?>
+<?php endif;
+}
+?>
 </form>
 <?php
 }
@@ -592,9 +609,10 @@ 
 	</thead>
 	<tbody id='the-list' data-wp-lists='list:meta'>
 <?php
-	foreach ( $meta as $entry )
-		echo _list_meta_row( $entry, $count );
-?>
+	foreach ( $meta as $entry ) {
+			echo _list_meta_row( $entry, $count );
+	}
+	?>
 	</tbody>
 </table>
 <?php
@@ -614,11 +632,13 @@ 
 function _list_meta_row( $entry, &$count ) {
 	static $update_nonce = '';
 
-	if ( is_protected_meta( $entry['meta_key'], 'post' ) )
-		return '';
+	if ( is_protected_meta( $entry['meta_key'], 'post' ) ) {
+			return '';
+	}
 
-	if ( ! $update_nonce )
-		$update_nonce = wp_create_nonce( 'add-meta' );
+	if ( ! $update_nonce ) {
+			$update_nonce = wp_create_nonce( 'add-meta' );
+	}
 
 	$r = '';
 	++ $count;
@@ -709,8 +729,9 @@ 
 <?php
 
 	foreach ( $keys as $key ) {
-		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) )
-			continue;
+		if ( is_protected_meta( $key, 'post' ) || ! current_user_can( 'add_post_meta', $post->ID, $key ) ) {
+					continue;
+		}
 		echo "\n<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
 	}
 ?>
@@ -756,12 +777,14 @@ 
 	global $wp_locale, $comment;
 	$post = get_post();
 
-	if ( $for_post )
-		$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	if ( $for_post ) {
+			$edit = ! ( in_array($post->post_status, array('draft', 'pending') ) && (!$post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
+	}
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 )
-		$tab_index_attribute = " tabindex=\"$tab_index\"";
+	if ( (int) $tab_index > 0 ) {
+			$tab_index_attribute = " tabindex=\"$tab_index\"";
+	}
 
 	// todo: Remove this?
 	// echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
@@ -802,7 +825,9 @@ 
 
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
-	if ( $multi ) return;
+	if ( $multi ) {
+		return;
+	}
 
 	echo "\n\n";
 	$map = array(
@@ -865,8 +890,9 @@ 
 	if ( $items ) {
 		foreach ( $items as $item ) {
 			// A page cannot be its own parent.
-			if ( $post && $post->ID && $item->ID == $post->ID )
-				continue;
+			if ( $post && $post->ID && $item->ID == $post->ID ) {
+							continue;
+			}
 
 			$pad = str_repeat( '&nbsp;', $level * 3 );
 			$selected = selected( $default, $item->ID, false );
@@ -894,10 +920,12 @@ 
 
 	foreach ( $editable_roles as $role => $details ) {
 		$name = translate_user_role($details['name'] );
-		if ( $selected == $role ) // preselect specified role
+		if ( $selected == $role ) {
+			// preselect specified role
 			$p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
-		else
-			$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+		} else {
+					$r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
+		}
 	}
 	echo $p . $r;
 }
@@ -926,9 +954,12 @@ 
 	if ( ! empty( $upload_dir['error'] ) ) :
 		?><div class="error"><p><?php _e('Before you can upload your import file, you will need to fix the following error:'); ?></p>
 		<p><strong><?php echo $upload_dir['error']; ?></strong></p></div><?php
-	else :
+	else {
+		:
 ?>
-<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) ); ?>">
+<form enctype="multipart/form-data" id="import-upload-form" method="post" class="wp-upload-form" action="<?php echo esc_url( wp_nonce_url( $action, 'import-upload' ) );
+	}
+	?>">
 <p>
 <label for="upload"><?php _e( 'Choose a file from your computer:' ); ?></label> (<?php printf( __('Maximum size: %s' ), $size ); ?>)
 <input type="file" id="upload" name="import" size="25" />
@@ -969,30 +1000,36 @@ 
 function add_meta_box( $id, $title, $callback, $screen = null, $context = 'advanced', $priority = 'default', $callback_args = null ) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
-		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	if ( !isset($wp_meta_boxes) ) {
+			$wp_meta_boxes = array();
+	}
+	if ( !isset($wp_meta_boxes[$page]) ) {
+			$wp_meta_boxes[$page] = array();
+	}
+	if ( !isset($wp_meta_boxes[$page][$context]) ) {
+			$wp_meta_boxes[$page][$context] = array();
+	}
 
 	foreach ( array_keys($wp_meta_boxes[$page]) as $a_context ) {
 		foreach ( array('high', 'core', 'default', 'low') as $a_priority ) {
-			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) )
-				continue;
+			if ( !isset($wp_meta_boxes[$page][$a_context][$a_priority][$id]) ) {
+							continue;
+			}
 
 			// If a core box was previously added or removed by a plugin, don't add.
 			if ( 'core' == $priority ) {
 				// If core box previously deleted, don't add
-				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
-					return;
+				if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] ) {
+									return;
+				}
 
 				/*
 				 * If box was added with default priority, give it core priority to
@@ -1017,16 +1054,19 @@ 
 				$callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
 			}
 			// An id can be in only one priority and one context.
-			if ( $priority != $a_priority || $context != $a_context )
-				unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			if ( $priority != $a_priority || $context != $a_context ) {
+							unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
+			}
 		}
 	}
 
-	if ( empty($priority) )
-		$priority = 'low';
+	if ( empty($priority) ) {
+			$priority = 'low';
+	}
 
-	if ( !isset($wp_meta_boxes[$page][$context][$priority]) )
-		$wp_meta_boxes[$page][$context][$priority] = array();
+	if ( !isset($wp_meta_boxes[$page][$context][$priority]) ) {
+			$wp_meta_boxes[$page][$context][$priority] = array();
+	}
 
 	$wp_meta_boxes[$page][$context][$priority][$id] = array('id' => $id, 'title' => $title, 'callback' => $callback, 'args' => $callback_args);
 }
@@ -1048,10 +1088,11 @@ 
 	global $wp_meta_boxes;
 	static $already_sorted = false;
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -1078,13 +1119,15 @@ 
 		foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ]) ) {
 				foreach ( (array) $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 					$i++;
 					$hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
 					echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-					if ( 'dashboard_browser_nag' != $box['id'] )
-						echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
+					if ( 'dashboard_browser_nag' != $box['id'] ) {
+											echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
+					}
 					echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
 					echo '<div class="inside">' . "\n";
 					call_user_func($box['callback'], $object, $box);
@@ -1115,23 +1158,28 @@ 
 function remove_meta_box($id, $screen, $context) {
 	global $wp_meta_boxes;
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
-	if ( !isset($wp_meta_boxes) )
-		$wp_meta_boxes = array();
-	if ( !isset($wp_meta_boxes[$page]) )
-		$wp_meta_boxes[$page] = array();
-	if ( !isset($wp_meta_boxes[$page][$context]) )
-		$wp_meta_boxes[$page][$context] = array();
+	if ( !isset($wp_meta_boxes) ) {
+			$wp_meta_boxes = array();
+	}
+	if ( !isset($wp_meta_boxes[$page]) ) {
+			$wp_meta_boxes[$page] = array();
+	}
+	if ( !isset($wp_meta_boxes[$page][$context]) ) {
+			$wp_meta_boxes[$page][$context] = array();
+	}
 
-	foreach ( array('high', 'core', 'default', 'low') as $priority )
-		$wp_meta_boxes[$page][$context][$priority][$id] = false;
-}
+	foreach ( array('high', 'core', 'default', 'low') as $priority ) {
+			$wp_meta_boxes[$page][$context][$priority][$id] = false;
+	}
+	}
 
 /**
  * Meta Box Accordion Template Function
@@ -1154,10 +1202,11 @@ 
 
 	wp_enqueue_script( 'accordion' );
 
-	if ( empty( $screen ) )
-		$screen = get_current_screen();
-	elseif ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( empty( $screen ) ) {
+			$screen = get_current_screen();
+	} elseif ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	$page = $screen->id;
 
@@ -1173,8 +1222,9 @@ 
 		foreach ( array( 'high', 'core', 'default', 'low' ) as $priority ) {
 			if ( isset( $wp_meta_boxes[ $page ][ $context ][ $priority ] ) ) {
 				foreach ( $wp_meta_boxes[ $page ][ $context ][ $priority ] as $box ) {
-					if ( false == $box || ! $box['title'] )
-						continue;
+					if ( false == $box || ! $box['title'] ) {
+											continue;
+					}
 					$i++;
 					$hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
 
@@ -1310,18 +1360,22 @@ 
 function do_settings_sections( $page ) {
 	global $wp_settings_sections, $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_sections[$page] ) )
-		return;
+	if ( ! isset( $wp_settings_sections[$page] ) ) {
+			return;
+	}
 
 	foreach ( (array) $wp_settings_sections[$page] as $section ) {
-		if ( $section['title'] )
-			echo "<h3>{$section['title']}</h3>\n";
+		if ( $section['title'] ) {
+					echo "<h3>{$section['title']}</h3>\n";
+		}
 
-		if ( $section['callback'] )
-			call_user_func( $section['callback'], $section );
+		if ( $section['callback'] ) {
+					call_user_func( $section['callback'], $section );
+		}
 
-		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) )
-			continue;
+		if ( ! isset( $wp_settings_fields ) || !isset( $wp_settings_fields[$page] ) || !isset( $wp_settings_fields[$page][$section['id']] ) ) {
+					continue;
+		}
 		echo '<table class="form-table">';
 		do_settings_fields( $page, $section['id'] );
 		echo '</table>';
@@ -1345,8 +1399,9 @@ 
 function do_settings_fields($page, $section) {
 	global $wp_settings_fields;
 
-	if ( ! isset( $wp_settings_fields[$page][$section] ) )
-		return;
+	if ( ! isset( $wp_settings_fields[$page][$section] ) ) {
+			return;
+	}
 
 	foreach ( (array) $wp_settings_fields[$page][$section] as $field ) {
 		$class = '';
@@ -1435,8 +1490,9 @@ 
 	 * This allows the $sanitize_callback from register_setting() to run, adding
 	 * any settings errors you want to show by default.
 	 */
-	if ( $sanitize )
-		sanitize_option( $setting, get_option( $setting ) );
+	if ( $sanitize ) {
+			sanitize_option( $setting, get_option( $setting ) );
+	}
 
 	// If settings were passed back from options.php then use them.
 	if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
@@ -1445,15 +1501,17 @@ 
 	}
 
 	// Check global in case errors have been added on this pageload.
-	if ( ! count( $wp_settings_errors ) )
-		return array();
+	if ( ! count( $wp_settings_errors ) ) {
+			return array();
+	}
 
 	// Filter the results to those of a specific setting if one was set.
 	if ( $setting ) {
 		$setting_errors = array();
 		foreach ( (array) $wp_settings_errors as $key => $details ) {
-			if ( $setting == $details['setting'] )
-				$setting_errors[] = $wp_settings_errors[$key];
+			if ( $setting == $details['setting'] ) {
+							$setting_errors[] = $wp_settings_errors[$key];
+			}
 		}
 		return $setting_errors;
 	}
@@ -1489,13 +1547,15 @@ 
  */
 function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
 
-	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) )
-		return;
+	if ( $hide_on_update && ! empty( $_GET['settings-updated'] ) ) {
+			return;
+	}
 
 	$settings_errors = get_settings_errors( $setting, $sanitize );
 
-	if ( empty( $settings_errors ) )
-		return;
+	if ( empty( $settings_errors ) ) {
+			return;
+	}
 
 	$output = '';
 	foreach ( $settings_errors as $key => $details ) {
@@ -1555,9 +1615,10 @@ 
  */
 function the_post_password() {
 	$post = get_post();
-	if ( isset( $post->post_password ) )
-		echo esc_attr( $post->post_password );
-}
+	if ( isset( $post->post_password ) ) {
+			echo esc_attr( $post->post_password );
+	}
+	}
 
 /**
  * Get the post title.
@@ -1572,8 +1633,9 @@ 
  */
 function _draft_or_post_title( $post = 0 ) {
 	$title = get_the_title( $post );
-	if ( empty( $title ) )
-		$title = __( '(no title)' );
+	if ( empty( $title ) ) {
+			$title = __( '(no title)' );
+	}
 	return esc_html( $title );
 }
 
@@ -1650,8 +1712,9 @@ 
 
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
 ?>
 </head>
@@ -1663,7 +1726,10 @@ 
 /**
  * @global string $body_id
  */
-if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+if ( isset($GLOBALS['body_id']) ) {
+	echo ' id="' . $GLOBALS['body_id'] . '"';
+}
+?> class="wp-admin wp-core-ui no-js iframe <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
 <script type="text/javascript">
 (function(){
 var c = document.body.className;
@@ -1707,22 +1773,28 @@ 
  */
 function _post_states($post) {
 	$post_states = array();
-	if ( isset( $_REQUEST['post_status'] ) )
-		$post_status = $_REQUEST['post_status'];
-	else
-		$post_status = '';
-
-	if ( !empty($post->post_password) )
-		$post_states['protected'] = __('Password protected');
-	if ( 'private' == $post->post_status && 'private' != $post_status )
-		$post_states['private'] = __('Private');
-	if ( 'draft' == $post->post_status && 'draft' != $post_status )
-		$post_states['draft'] = __('Draft');
-	if ( 'pending' == $post->post_status && 'pending' != $post_status )
-		/* translators: post state */
+	if ( isset( $_REQUEST['post_status'] ) ) {
+			$post_status = $_REQUEST['post_status'];
+	} else {
+			$post_status = '';
+	}
+
+	if ( !empty($post->post_password) ) {
+			$post_states['protected'] = __('Password protected');
+	}
+	if ( 'private' == $post->post_status && 'private' != $post_status ) {
+			$post_states['private'] = __('Private');
+	}
+	if ( 'draft' == $post->post_status && 'draft' != $post_status ) {
+			$post_states['draft'] = __('Draft');
+	}
+	if ( 'pending' == $post->post_status && 'pending' != $post_status ) {
+			/* translators: post state */
 		$post_states['pending'] = _x('Pending', 'post state');
-	if ( is_sticky($post->ID) )
-		$post_states['sticky'] = __('Sticky');
+	}
+	if ( is_sticky($post->ID) ) {
+			$post_states['sticky'] = __('Sticky');
+	}
 
 	if ( 'future' === $post->post_status ) {
 		$post_states['scheduled'] = __( 'Scheduled' );
@@ -1769,14 +1841,16 @@ 
 
 	if ( current_theme_supports( 'custom-header') ) {
 		$meta_header = get_post_meta($post->ID, '_wp_attachment_is_custom_header', true );
-		if ( ! empty( $meta_header ) && $meta_header == $stylesheet )
-			$media_states[] = __( 'Header Image' );
+		if ( ! empty( $meta_header ) && $meta_header == $stylesheet ) {
+					$media_states[] = __( 'Header Image' );
+		}
 	}
 
 	if ( current_theme_supports( 'custom-background') ) {
 		$meta_background = get_post_meta($post->ID, '_wp_attachment_is_custom_background', true );
-		if ( ! empty( $meta_background ) && $meta_background == $stylesheet )
-			$media_states[] = __( 'Background Image' );
+		if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
+					$media_states[] = __( 'Background Image' );
+		}
 	}
 
 	if ( $post->ID == get_option( 'site_icon' ) ) {
@@ -1916,20 +1990,23 @@ 
  * @return string Submit button HTML.
  */
 function get_submit_button( $text = '', $type = 'primary large', $name = 'submit', $wrap = true, $other_attributes = '' ) {
-	if ( ! is_array( $type ) )
-		$type = explode( ' ', $type );
+	if ( ! is_array( $type ) ) {
+			$type = explode( ' ', $type );
+	}
 
 	$button_shorthand = array( 'primary', 'small', 'large' );
 	$classes = array( 'button' );
 	foreach ( $type as $t ) {
-		if ( 'secondary' === $t || 'button-secondary' === $t )
-			continue;
+		if ( 'secondary' === $t || 'button-secondary' === $t ) {
+					continue;
+		}
 		$classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
 	}
 	$class = implode( ' ', array_unique( $classes ) );
 
-	if ( 'delete' === $type )
-		$class = 'button-secondary delete';
+	if ( 'delete' === $type ) {
+			$class = 'button-secondary delete';
+	}
 
 	$text = $text ? $text : __( 'Save Changes' );
 
@@ -1972,8 +2049,9 @@ 
 
 	$admin_html_class = ( is_admin_bar_showing() ) ? 'wp-toolbar' : '';
 
-	if ( $is_IE )
-		@header('X-UA-Compatible: IE=edge');
+	if ( $is_IE ) {
+			@header('X-UA-Compatible: IE=edge');
+	}
 
 ?>
 <!DOCTYPE html>
@@ -2033,8 +2111,9 @@ 
 		);
 
 		// Check if screen related pointer is registered
-		if ( empty( $registered_pointers[ $hook_suffix ] ) )
-			return;
+		if ( empty( $registered_pointers[ $hook_suffix ] ) ) {
+					return;
+		}
 
 		$pointers = (array) $registered_pointers[ $hook_suffix ];
 
@@ -2062,8 +2141,9 @@ 
 		foreach ( array_diff( $pointers, $dismissed ) as $pointer ) {
 			if ( isset( $caps_required[ $pointer ] ) ) {
 				foreach ( $caps_required[ $pointer ] as $cap ) {
-					if ( ! current_user_can( $cap ) )
-						continue 2;
+					if ( ! current_user_can( $cap ) ) {
+											continue 2;
+					}
 				}
 			}
 
@@ -2072,8 +2152,9 @@ 
 			$got_pointers = true;
 		}
 
-		if ( ! $got_pointers )
-			return;
+		if ( ! $got_pointers ) {
+					return;
+		}
 
 		// Add pointers script and style to queue
 		wp_enqueue_style( 'wp-pointer' );
@@ -2092,8 +2173,9 @@ 
 	 * @param array  $args Arguments to be passed to the pointer JS (see wp-pointer.js).
 	 */
 	private static function print_js( $pointer_id, $selector, $args ) {
-		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) )
-			return;
+		if ( empty( $pointer_id ) || empty( $selector ) || empty( $args ) || empty( $args['content'] ) ) {
+					return;
+		}
 
 		?>
 		<script type="text/javascript">

src/wp-admin/includes/upgrade.php

Doc Comments +2 added lines, -2 removed lines

@@ -1795,7 +1795,7 @@ 
  *
  * @param string $table Database table name.
  * @param string $index Index name to drop.
- * @return true True, when finished.
+ * @return boolean True, when finished.
  */
 function drop_index($table, $index) {
 	global $wpdb;
@@ -1818,7 +1818,7 @@ 
  *
  * @param string $table Database table name.
  * @param string $index Database table index column.
- * @return true True, when done with execution.
+ * @return boolean True, when done with execution.
  */
 function add_clean_index($table, $index) {
 	global $wpdb;

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * WordPress Upgrade API
- *
- * Most of the functions are pluggable and can be overwritten.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Upgrade API
+	 *
+	 * Most of the functions are pluggable and can be overwritten.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** Include user install customize script. */
 if ( file_exists(WP_CONTENT_DIR . '/install.php') )
@@ -2005,7 +2005,7 @@ 
 	global $wpdb;
 
 	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+		$queries = wp_get_db_schema( $queries );
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {

Switch Indentation +25 added lines, -25 removed lines

@@ -2103,15 +2103,15 @@ 
 			// Verify the found field name.
 			$validfield = true;
 			switch (strtolower($fieldname)) {
-			case '':
-			case 'primary':
-			case 'index':
-			case 'fulltext':
-			case 'unique':
-			case 'key':
-				$validfield = false;
-				$indices[] = trim(trim($fld), ", \n");
-				break;
+				case '':
+				case 'primary':
+				case 'index':
+				case 'fulltext':
+				case 'unique':
+				case 'key':
+					$validfield = false;
+					$indices[] = trim(trim($fld), ", \n");
+					break;
 			}
 			$fld = trim($fld);
 
@@ -2495,22 +2495,22 @@ 
  */
 function translate_level_to_role($level) {
 	switch ($level) {
-	case 10:
-	case 9:
-	case 8:
-		return 'administrator';
-	case 7:
-	case 6:
-	case 5:
-		return 'editor';
-	case 4:
-	case 3:
-	case 2:
-		return 'author';
-	case 1:
-		return 'contributor';
-	case 0:
-		return 'subscriber';
+		case 10:
+		case 9:
+		case 8:
+			return 'administrator';
+		case 7:
+		case 6:
+		case 5:
+			return 'editor';
+		case 4:
+		case 3:
+		case 2:
+			return 'author';
+		case 1:
+			return 'contributor';
+		case 0:
+			return 'subscriber';
 	}
 }
 

Spacing +546 added lines, -546 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
-	require (WP_CONTENT_DIR . '/install.php');
+if (file_exists(WP_CONTENT_DIR.'/install.php'))
+	require (WP_CONTENT_DIR.'/install.php');
 
 /** WordPress Administration API */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 /** WordPress Schema API */
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
+require_once(ABSPATH.'wp-admin/includes/schema.php');
 
-if ( !function_exists('wp_install') ) :
+if ( ! function_exists('wp_install')) :
 /**
  * Installs the site.
  *
@@ -36,9 +36,9 @@ 
  * @param string $language      Optional. Language chosen. Default empty.
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6' );
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.6');
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -50,8 +50,8 @@ 
 	update_option('admin_email', $user_email);
 	update_option('blog_public', $public);
 
-	if ( $language ) {
-		update_option( 'WPLANG', $language );
+	if ($language) {
+		update_option('WPLANG', $language);
 	}
 
 	$guessurl = wp_guess_url();
@@ -59,7 +59,7 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
+	if ( ! $public)
 		update_option('default_pingback_flag', 0);
 
 	/*
@@ -69,13 +69,13 @@ 
 	$user_id = username_exists($user_name);
 	$user_password = trim($user_password);
 	$email_password = false;
-	if ( !$user_id && empty($user_password) ) {
-		$user_password = wp_generate_password( 12, false );
+	if ( ! $user_id && empty($user_password)) {
+		$user_password = wp_generate_password(12, false);
 		$message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
 		update_user_option($user_id, 'default_password_nag', true, true);
 		$email_password = true;
-	} elseif ( ! $user_id ) {
+	} elseif ( ! $user_id) {
 		// Password has been provided
 		$message = '<em>'.__('Your chosen password.').'</em>';
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
@@ -92,7 +92,7 @@ 
 
 	flush_rewrite_rules();
 
-	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
+	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.')));
 
 	wp_cache_flush();
 
@@ -103,13 +103,13 @@ 
 	 *
 	 * @param WP_User $user The site owner.
 	 */
-	do_action( 'wp_install', $user );
+	do_action('wp_install', $user);
 
 	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
 endif;
 
-if ( !function_exists('wp_install_defaults') ) :
+if ( ! function_exists('wp_install_defaults')) :
 /**
  * Creates the initial content for a newly-installed site.
  *
@@ -124,7 +124,7 @@ 
  *
  * @param int $user_id User ID.
  */
-function wp_install_defaults( $user_id ) {
+function wp_install_defaults($user_id) {
 	global $wpdb, $wp_rewrite, $table_prefix;
 
 	// Default category
@@ -132,10 +132,10 @@ 
 	/* translators: Default category slug */
 	$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
 
-	if ( global_terms_enabled() ) {
-		$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-		if ( $cat_id == null ) {
-			$wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+	if (global_terms_enabled()) {
+		$cat_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug));
+		if ($cat_id == null) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)));
 			$cat_id = $wpdb->insert_id;
 		}
 		update_option('default_category', $cat_id);
@@ -143,28 +143,28 @@ 
 		$cat_id = 1;
 	}
 
-	$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+	$wpdb->insert($wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0));
+	$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
 	$cat_tt_id = $wpdb->insert_id;
 
 	// First post
-	$now = current_time( 'mysql' );
-	$now_gmt = current_time( 'mysql', 1 );
-	$first_post_guid = get_option( 'home' ) . '/?p=1';
+	$now = current_time('mysql');
+	$now_gmt = current_time('mysql', 1);
+	$first_post_guid = get_option('home').'/?p=1';
 
-	if ( is_multisite() ) {
-		$first_post = get_site_option( 'first_post' );
+	if (is_multisite()) {
+		$first_post = get_site_option('first_post');
 
-		if ( empty($first_post) )
-			$first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' );
+		if (empty($first_post))
+			$first_post = __('Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!');
 
-		$first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post );
-		$first_post = str_replace( "SITE_NAME", get_current_site()->site_name, $first_post );
+		$first_post = str_replace("SITE_URL", esc_url(network_home_url()), $first_post);
+		$first_post = str_replace("SITE_NAME", get_current_site()->site_name, $first_post);
 	} else {
-		$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
+		$first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start writing!');
 	}
 
-	$wpdb->insert( $wpdb->posts, array(
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
@@ -172,7 +172,7 @@ 
 		'post_excerpt' => '',
 		'post_title' => __('Hello world!'),
 		/* translators: Default post slug */
-		'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
+		'post_name' => sanitize_title(_x('hello-world', 'Default post slug')),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -181,19 +181,19 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
+	$wpdb->insert($wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1));
 
 	// Default comment
 	$first_comment_author = __('Mr WordPress');
 	$first_comment_url = 'https://wordpress.org/';
 	$first_comment = __('Hi, this is a comment.
 To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
-	if ( is_multisite() ) {
-		$first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
-		$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
-		$first_comment = get_site_option( 'first_comment', $first_comment );
+	if (is_multisite()) {
+		$first_comment_author = get_site_option('first_comment_author', $first_comment_author);
+		$first_comment_url = get_site_option('first_comment_url', network_home_url());
+		$first_comment = get_site_option('first_comment', $first_comment);
 	}
-	$wpdb->insert( $wpdb->comments, array(
+	$wpdb->insert($wpdb->comments, array(
 		'comment_post_ID' => 1,
 		'comment_author' => $first_comment_author,
 		'comment_author_email' => '',
@@ -204,7 +204,7 @@ 
 	));
 
 	// First Page
-	$first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+	$first_page = sprintf(__("This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
 
 <blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
 
@@ -212,19 +212,19 @@ 
 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
-As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
-	$first_post_guid = get_option('home') . '/?page_id=2';
-	$wpdb->insert( $wpdb->posts, array(
+As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url());
+	if (is_multisite())
+		$first_page = get_site_option('first_page', $first_page);
+	$first_post_guid = get_option('home').'/?page_id=2';
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
 		'post_content' => $first_page,
 		'post_excerpt' => '',
-		'post_title' => __( 'Sample Page' ),
+		'post_title' => __('Sample Page'),
 		/* translators: Default page slug */
-		'post_name' => __( 'sample-page' ),
+		'post_name' => __('sample-page'),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -233,37 +233,37 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
+	$wpdb->insert($wpdb->postmeta, array('post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default'));
 
 	// Set up default widgets for default theme.
-	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
-
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
-
-	if ( is_multisite() ) {
+	update_option('widget_search', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('widget_recent-posts', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_recent-comments', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_archives', array(2 => array('title' => '', 'count' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_categories', array(2 => array('title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_meta', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('sidebars_widgets', array('wp_inactive_widgets' => array(), 'sidebar-1' => array(0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2',), 'array_version' => 3));
+
+	if ( ! is_multisite())
+		update_user_meta($user_id, 'show_welcome_panel', 1);
+	elseif ( ! is_super_admin($user_id) && ! metadata_exists('user', $user_id, 'show_welcome_panel'))
+		update_user_meta($user_id, 'show_welcome_panel', 2);
+
+	if (is_multisite()) {
 		// Flush rules to pick up the new page.
 		$wp_rewrite->init();
 		$wp_rewrite->flush_rules();
 
 		$user = new WP_User($user_id);
-		$wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
+		$wpdb->update($wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email'));
 
 		// Remove all perms except for the login user.
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level'));
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities'));
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( ! is_super_admin($user_id) && $user_id != 1)
+			$wpdb->delete($wpdb->usermeta, array('user_id' => $user_id, 'meta_key' => $wpdb->base_prefix.'1_capabilities'));
 	}
 }
 endif;
@@ -283,7 +283,7 @@ 
 	global $wp_rewrite;
 
 	// Bail if a permalink structure is already enabled.
-	if ( get_option( 'permalink_structure' ) ) {
+	if (get_option('permalink_structure')) {
 		return true;
 	}
 
@@ -300,20 +300,20 @@ 
 		'/index.php/%year%/%monthnum%/%day%/%postname%/'
 	);
 
-	foreach ( (array) $permalink_structures as $permalink_structure ) {
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+	foreach ((array) $permalink_structures as $permalink_structure) {
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 
 		/*
 	 	 * Flush rules with the hard option to force refresh of the web-server's
 	 	 * rewrite config file (e.g. .htaccess or web.config).
 	 	 */
-		$wp_rewrite->flush_rules( true );
+		$wp_rewrite->flush_rules(true);
 
 		// Test against a real WordPress Post, or if none were created, a random 404 page.
-		$test_url = get_permalink( 1 );
+		$test_url = get_permalink(1);
 
-		if ( ! $test_url ) {
-			$test_url = home_url( '/wordpress-check-for-rewrites/' );
+		if ( ! $test_url) {
+			$test_url = home_url('/wordpress-check-for-rewrites/');
 		}
 
 		/*
@@ -323,11 +323,11 @@ 
 	 	 * Uses wp_remote_get() instead of wp_remote_head() because web servers
 	 	 * can block head requests.
 	 	 */
-		$response          = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
-		$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
-		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
+		$response          = wp_remote_get($test_url, array('timeout' => 5));
+		$x_pingback_header = wp_remote_retrieve_header($response, 'x-pingback');
+		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo('pingback_url');
 
-		if ( $pretty_permalinks ) {
+		if ($pretty_permalinks) {
 			return true;
 		}
 	}
@@ -336,13 +336,13 @@ 
 	 * If it makes it this far, pretty permalinks failed.
 	 * Fallback to query-string permalinks.
 	 */
-	$wp_rewrite->set_permalink_structure( '' );
-	$wp_rewrite->flush_rules( true );
+	$wp_rewrite->set_permalink_structure('');
+	$wp_rewrite->flush_rules(true);
 
 	return false;
 }
 
-if ( !function_exists('wp_new_blog_notification') ) :
+if ( ! function_exists('wp_new_blog_notification')) :
 /**
  * Notifies the site admin that the setup is complete.
  *
@@ -357,11 +357,11 @@ 
  * @param string $password   User's Password.
  */
 function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 	$email = $user->user_email;
 	$name = $user->user_login;
 	$login_url = wp_login_url();
-	$message = sprintf( __( "Your new WordPress site has been successfully set up at:
+	$message = sprintf(__("Your new WordPress site has been successfully set up at:
 
 %1\$s
 
@@ -375,13 +375,13 @@ 
 
 --The WordPress Team
 https://wordpress.org/
-"), $blog_url, $name, $password, $login_url );
+"), $blog_url, $name, $password, $login_url);
 
 	@wp_mail($email, __('New WordPress Site'), $message);
 }
 endif;
 
-if ( !function_exists('wp_upgrade') ) :
+if ( ! function_exists('wp_upgrade')) :
 /**
  * Runs WordPress Upgrade functions.
  *
@@ -399,10 +399,10 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
-	if ( ! is_blog_installed() )
+	if ( ! is_blog_installed())
 		return;
 
 	wp_check_mysql_version();
@@ -410,15 +410,15 @@ 
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
+	if (is_multisite() && is_main_site())
 		upgrade_network();
 	wp_cache_flush();
 
-	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+	if (is_multisite()) {
+		if ($wpdb->get_row("SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'"))
+			$wpdb->query("UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'");
 		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+			$wpdb->query("INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());");
 	}
 
 	/**
@@ -429,7 +429,7 @@ 
 	 * @param int $wp_db_version         The new $wp_db_version.
 	 * @param int $wp_current_db_version The old (current) $wp_db_version.
 	 */
-	do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
+	do_action('wp_upgrade', $wp_db_version, $wp_current_db_version);
 }
 endif;
 
@@ -449,100 +449,100 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
 	// If the version is not set in the DB, try to guess the version.
-	if ( empty($wp_current_db_version) ) {
+	if (empty($wp_current_db_version)) {
 		$wp_current_db_version = 0;
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
+		if ( ! empty($template))
 			$wp_current_db_version = 2541;
 	}
 
-	if ( $wp_current_db_version < 6039 )
+	if ($wp_current_db_version < 6039)
 		upgrade_230_options_table();
 
 	populate_options();
 
-	if ( $wp_current_db_version < 2541 ) {
+	if ($wp_current_db_version < 2541) {
 		upgrade_100();
 		upgrade_101();
 		upgrade_110();
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
+	if ($wp_current_db_version < 3308)
 		upgrade_160();
 
-	if ( $wp_current_db_version < 4772 )
+	if ($wp_current_db_version < 4772)
 		upgrade_210();
 
-	if ( $wp_current_db_version < 4351 )
+	if ($wp_current_db_version < 4351)
 		upgrade_old_slugs();
 
-	if ( $wp_current_db_version < 5539 )
+	if ($wp_current_db_version < 5539)
 		upgrade_230();
 
-	if ( $wp_current_db_version < 6124 )
+	if ($wp_current_db_version < 6124)
 		upgrade_230_old_tables();
 
-	if ( $wp_current_db_version < 7499 )
+	if ($wp_current_db_version < 7499)
 		upgrade_250();
 
-	if ( $wp_current_db_version < 7935 )
+	if ($wp_current_db_version < 7935)
 		upgrade_252();
 
-	if ( $wp_current_db_version < 8201 )
+	if ($wp_current_db_version < 8201)
 		upgrade_260();
 
-	if ( $wp_current_db_version < 8989 )
+	if ($wp_current_db_version < 8989)
 		upgrade_270();
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		upgrade_280();
 
-	if ( $wp_current_db_version < 11958 )
+	if ($wp_current_db_version < 11958)
 		upgrade_290();
 
-	if ( $wp_current_db_version < 15260 )
+	if ($wp_current_db_version < 15260)
 		upgrade_300();
 
-	if ( $wp_current_db_version < 19389 )
+	if ($wp_current_db_version < 19389)
 		upgrade_330();
 
-	if ( $wp_current_db_version < 20080 )
+	if ($wp_current_db_version < 20080)
 		upgrade_340();
 
-	if ( $wp_current_db_version < 22422 )
+	if ($wp_current_db_version < 22422)
 		upgrade_350();
 
-	if ( $wp_current_db_version < 25824 )
+	if ($wp_current_db_version < 25824)
 		upgrade_370();
 
-	if ( $wp_current_db_version < 26148 )
+	if ($wp_current_db_version < 26148)
 		upgrade_372();
 
-	if ( $wp_current_db_version < 26691 )
+	if ($wp_current_db_version < 26691)
 		upgrade_380();
 
-	if ( $wp_current_db_version < 29630 )
+	if ($wp_current_db_version < 29630)
 		upgrade_400();
 
-	if ( $wp_current_db_version < 33055 )
+	if ($wp_current_db_version < 33055)
 		upgrade_430();
 
-	if ( $wp_current_db_version < 33056 )
+	if ($wp_current_db_version < 33056)
 		upgrade_431();
 
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
 
-	update_option( 'db_version', $wp_db_version );
-	update_option( 'db_upgraded', true );
+	update_option('db_version', $wp_db_version);
+	update_option('db_upgraded', true);
 }
 
 /**
@@ -558,10 +558,10 @@ 
 	// Get the title and ID of every post, post_name to check if it already has a value
 	$posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''");
 	if ($posts) {
-		foreach($posts as $post) {
+		foreach ($posts as $post) {
 			if ('' == $post->post_name) {
 				$newtitle = sanitize_title($post->post_title);
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID));
 			}
 		}
 	}
@@ -570,7 +570,7 @@ 
 	foreach ($categories as $category) {
 		if ('' == $category->category_nicename) {
 			$newtitle = sanitize_title($category->cat_name);
-			$wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
+			$wpdb->update($wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID));
 		}
 	}
 
@@ -578,7 +578,7 @@ 
 		SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
 		WHERE option_name LIKE %s
 		AND option_value LIKE %s";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('links_rating_image').'%', $wpdb->esc_like('wp-links/links-images/').'%'));
 
 	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
 	if ($done_ids) :
@@ -586,7 +586,7 @@ 
 		foreach ($done_ids as $done_id) :
 			$done_posts[] = $done_id->post_id;
 		endforeach;
-		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
+		$catwhere = ' AND ID NOT IN ('.implode(',', $done_posts).')';
 	else:
 		$catwhere = '';
 	endif;
@@ -595,9 +595,9 @@ 
 	if ($allposts) :
 		foreach ($allposts as $post) {
 			// Check to see if it's already been imported
-			$cat = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category) );
-			if (!$cat && 0 != $post->post_category) { // If there's no result
-				$wpdb->insert( $wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category) );
+			$cat = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category));
+			if ( ! $cat && 0 != $post->post_category) { // If there's no result
+				$wpdb->insert($wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category));
 			}
 		}
 	endif;
@@ -619,8 +619,8 @@ 
 	add_clean_index($wpdb->categories, 'category_nicename');
 	add_clean_index($wpdb->comments, 'comment_approved');
 	add_clean_index($wpdb->comments, 'comment_post_ID');
-	add_clean_index($wpdb->links , 'link_category');
-	add_clean_index($wpdb->links , 'link_visible');
+	add_clean_index($wpdb->links, 'link_category');
+	add_clean_index($wpdb->links, 'link_visible');
 }
 
 /**
@@ -638,14 +638,14 @@ 
 	foreach ($users as $user) {
 		if ('' == $user->user_nicename) {
 			$newname = sanitize_title($user->user_nickname);
-			$wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
+			$wpdb->update($wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID));
 		}
 	}
 
 	$users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
 	foreach ($users as $row) {
-		if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-			$wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
+		if ( ! preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
+			$wpdb->update($wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID));
 		}
 	}
 
@@ -654,7 +654,7 @@ 
 
 	$time_difference = $all_options->time_difference;
 
-		$server_time = time()+date('Z');
+		$server_time = time() + date('Z');
 	$weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
 	$gmt_time = time();
 
@@ -671,7 +671,7 @@ 
 	// <michel_v> I just slapped myself silly for not thinking about it earlier
 	$got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
 
-	if (!$got_gmt_fields) {
+	if ( ! $got_gmt_fields) {
 
 		// Add or subtract time to all dates, to get GMT dates
 		$add_hours = intval($diff_gmt_weblogger);
@@ -698,16 +698,16 @@ 
 	// Remove extraneous backslashes.
 	$posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts");
 	if ($posts) {
-		foreach($posts as $post) {
+		foreach ($posts as $post) {
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
+			if (empty($post->guid))
 				$guid = get_permalink($post->ID);
 			else
 				$guid = $post->guid;
 
-			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+			$wpdb->update($wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID));
 
 		}
 	}
@@ -715,22 +715,22 @@ 
 	// Remove extraneous backslashes.
 	$comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
 	if ($comments) {
-		foreach($comments as $comment) {
+		foreach ($comments as $comment) {
 			$comment_content = deslash($comment->comment_content);
 			$comment_author = deslash($comment->comment_author);
 
-			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
+			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID));
 		}
 	}
 
 	// Remove extraneous backslashes.
 	$links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
 	if ($links) {
-		foreach($links as $link) {
+		foreach ($links as $link) {
 			$link_name = deslash($link->link_name);
 			$link_description = deslash($link->link_description);
 
-			$wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
+			$wpdb->update($wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id));
 		}
 	}
 
@@ -740,16 +740,16 @@ 
 	 * If plugins are not stored in an array, they're stored in the old
 	 * newline separated format. Convert to new format.
 	 */
-	if ( !is_array( $active_plugins ) ) {
+	if ( ! is_array($active_plugins)) {
 		$active_plugins = explode("\n", trim($active_plugins));
 		update_option('active_plugins', $active_plugins);
 	}
 
 	// Obsolete tables
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optionvalues');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiontypes');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroups');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroup_options');
 
 	// Update comments table to use comment_type
 	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
@@ -757,11 +757,11 @@ 
 
 	// Some versions have multiple duplicate option_name rows with the same values
 	$options = $wpdb->get_results("SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name");
-	foreach ( $options as $option ) {
-		if ( 1 != $option->dupes ) { // Could this be done in the query?
+	foreach ($options as $option) {
+		if (1 != $option->dupes) { // Could this be done in the query?
 			$limit = $option->dupes - 1;
-			$dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
-			if ( $dupe_ids ) {
+			$dupe_ids = $wpdb->get_col($wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit));
+			if ($dupe_ids) {
 				$dupe_ids = join($dupe_ids, ',');
 				$wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
 			}
@@ -785,27 +785,27 @@ 
 	populate_roles_160();
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
-	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
-
-		if ( isset( $user->user_idmode ) ):
+	foreach ($users as $user) :
+		if ( ! empty($user->user_firstname))
+			update_user_meta($user->ID, 'first_name', wp_slash($user->user_firstname));
+		if ( ! empty($user->user_lastname))
+			update_user_meta($user->ID, 'last_name', wp_slash($user->user_lastname));
+		if ( ! empty($user->user_nickname))
+			update_user_meta($user->ID, 'nickname', wp_slash($user->user_nickname));
+		if ( ! empty($user->user_level))
+			update_user_meta($user->ID, $wpdb->prefix.'user_level', $user->user_level);
+		if ( ! empty($user->user_icq))
+			update_user_meta($user->ID, 'icq', wp_slash($user->user_icq));
+		if ( ! empty($user->user_aim))
+			update_user_meta($user->ID, 'aim', wp_slash($user->user_aim));
+		if ( ! empty($user->user_msn))
+			update_user_meta($user->ID, 'msn', wp_slash($user->user_msn));
+		if ( ! empty($user->user_yim))
+			update_user_meta($user->ID, 'yim', wp_slash($user->user_icq));
+		if ( ! empty($user->user_description))
+			update_user_meta($user->ID, 'description', wp_slash($user->user_description));
+
+		if (isset($user->user_idmode)):
 			$idmode = $user->user_idmode;
 			if ($idmode == 'nickname') $id = $user->user_nickname;
 			if ($idmode == 'login') $id = $user->user_login;
@@ -813,46 +813,46 @@ 
 			if ($idmode == 'lastname') $id = $user->user_lastname;
 			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
 			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
-			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
+			if ( ! $idmode) $id = $user->user_nickname;
+			$wpdb->update($wpdb->users, array('display_name' => $id), array('ID' => $user->ID));
 		endif;
 
 		// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
-		if ( empty($caps) || defined('RESET_CAPS') ) {
-			$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
+		$caps = get_user_meta($user->ID, $wpdb->prefix.'capabilities');
+		if (empty($caps) || defined('RESET_CAPS')) {
+			$level = get_user_meta($user->ID, $wpdb->prefix.'user_level', true);
 			$role = translate_level_to_role($level);
-			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+			update_user_meta($user->ID, $wpdb->prefix.'capabilities', array($role => true));
 		}
 
 	endforeach;
-	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
+	$old_user_fields = array('user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level');
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
+	foreach ($old_user_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
-	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
+	$comments = $wpdb->get_results("SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID");
+	if (is_array($comments))
 		foreach ($comments as $comment)
-			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+			$wpdb->update($wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID));
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
 	 * and put the mime type in post_type instead of post_mime_type.
 	 */
-	if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
+	if ($wp_current_db_version > 2541 && $wp_current_db_version <= 3091) {
 		$objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
 		foreach ($objects as $object) {
-			$wpdb->update( $wpdb->posts, array(	'post_status' => 'attachment',
+			$wpdb->update($wpdb->posts, array('post_status' => 'attachment',
 												'post_mime_type' => $object->post_type,
 												'post_type' => ''),
-										 array( 'ID' => $object->ID ) );
+										 array('ID' => $object->ID));
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']))
+				update_attached_file($object->ID, $meta['file']);
 		}
 	}
 }
@@ -868,38 +868,38 @@ 
 function upgrade_210() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 3506 ) {
+	if ($wp_current_db_version < 3506) {
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts)) foreach ($posts as $post) {
 			$status = $post->post_status;
 			$type = 'post';
 
-			if ( 'static' == $status ) {
+			if ('static' == $status) {
 				$status = 'publish';
 				$type = 'page';
-			} elseif ( 'attachment' == $status ) {
+			} elseif ('attachment' == $status) {
 				$status = 'inherit';
 				$type = 'attachment';
 			}
 
-			$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID) );
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID));
 		}
 	}
 
-	if ( $wp_current_db_version < 3845 ) {
+	if ($wp_current_db_version < 3845) {
 		populate_roles_210();
 	}
 
-	if ( $wp_current_db_version < 3531 ) {
+	if ($wp_current_db_version < 3531) {
 		// Give future posts a post_status of future.
 		$now = gmdate('Y-m-d H:i:59');
-		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
+		$wpdb->query("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( ! empty($posts))
+			foreach ($posts as $post)
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
 	}
 }
@@ -915,7 +915,7 @@ 
 function upgrade_230() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 5200 ) {
+	if ($wp_current_db_version < 5200) {
 		populate_roles_230();
 	}
 
@@ -932,78 +932,78 @@ 
 		$term_group = 0;
 
 		// Associate terms with the same slug in a term group and make slugs unique.
-		if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+		if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 			$term_group = $exists[0]->term_group;
 			$id = $exists[0]->term_id;
 			$num = 2;
 			do {
-				$alt_slug = $slug . "-$num";
+				$alt_slug = $slug."-$num";
 				$num++;
-				$slug_check = $wpdb->get_var( $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug) );
-			} while ( $slug_check );
+				$slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug));
+			} while ($slug_check);
 
 			$slug = $alt_slug;
 
-			if ( empty( $term_group ) ) {
+			if (empty($term_group)) {
 				$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id));
 			}
 		}
 
-		$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
-		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
+		$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
+		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group));
 
 		$count = 0;
-		if ( !empty($category->category_count) ) {
+		if ( ! empty($category->category_count)) {
 			$count = (int) $category->category_count;
 			$taxonomy = 'category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->link_count) ) {
+		if ( ! empty($category->link_count)) {
 			$count = (int) $category->link_count;
 			$taxonomy = 'link_category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->tag_count) ) {
+		if ( ! empty($category->tag_count)) {
 			$have_tags = true;
 			$count = (int) $category->tag_count;
 			$taxonomy = 'post_tag';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( empty($count) ) {
+		if (empty($count)) {
 			$count = 0;
 			$taxonomy = 'category';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
+	if ($have_tags)
 		$select .= ', rel_type';
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
+		if ( ! empty($post->rel_type) && 'tag' == $post->rel_type)
 			$taxonomy = 'tag';
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
+		if (empty($tt_id))
 			continue;
 
-		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
+		$wpdb->insert($wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id));
 	}
 
 	// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
-	if ( $wp_current_db_version < 3570 ) {
+	if ($wp_current_db_version < 3570) {
 		/*
 		 * Create link_category terms for link categories. Create a map of link
 		 * cat IDs to link_category terms.
@@ -1011,8 +1011,8 @@ 
 		$link_cat_id_map = array();
 		$default_link_cat = 0;
 		$tt_ids = array();
-		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
-		foreach ( $link_cats as $category) {
+		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM ".$wpdb->prefix.'linkcategories');
+		foreach ($link_cats as $category) {
 			$cat_id = (int) $category->cat_id;
 			$term_id = 0;
 			$name = wp_slash($category->cat_name);
@@ -1020,66 +1020,66 @@ 
 			$term_group = 0;
 
 			// Associate terms with the same slug in a term group and make slugs unique.
-			if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+			if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 				$term_group = $exists[0]->term_group;
 				$term_id = $exists[0]->term_id;
 			}
 
-			if ( empty($term_id) ) {
-				$wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
+			if (empty($term_id)) {
+				$wpdb->insert($wpdb->terms, compact('name', 'slug', 'term_group'));
 				$term_id = (int) $wpdb->insert_id;
 			}
 
 			$link_cat_id_map[$cat_id] = $term_id;
 			$default_link_cat = $term_id;
 
-			$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
+			$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0));
 			$tt_ids[$term_id] = (int) $wpdb->insert_id;
 		}
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
-			if ( 0 == $link->link_category )
+		if ( ! empty($links)) foreach ($links as $link) {
+			if (0 == $link->link_category)
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
+			if ( ! isset($link_cat_id_map[$link->link_category]))
 				continue;
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
 
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id));
 		}
 
 		// Set default to the last category we grabbed during the upgrade loop.
 		update_option('default_link_category', $default_link_cat);
 	} else {
 		$links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
-		foreach ( $links as $link ) {
+		foreach ($links as $link) {
 			$link_id = (int) $link->link_id;
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id));
 		}
 	}
 
-	if ( $wp_current_db_version < 4772 ) {
+	if ($wp_current_db_version < 4772) {
 		// Obsolete linkcategories table
-		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
+		$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'linkcategories');
 	}
 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
-	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+	foreach ((array) $terms as $term) {
+		if (('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy))
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id));
 		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id));
+		$wpdb->update($wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id));
 	}
 }
 
@@ -1092,9 +1092,9 @@ 
  */
 function upgrade_230_options_table() {
 	global $wpdb;
-	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
+	$old_options_fields = array('option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level');
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
+	foreach ($old_options_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
 	$wpdb->show_errors();
 }
@@ -1108,9 +1108,9 @@ 
  */
 function upgrade_230_old_tables() {
 	global $wpdb;
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'categories');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'link2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'post2cat');
 }
 
 /**
@@ -1136,7 +1136,7 @@ 
 function upgrade_250() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 6689 ) {
+	if ($wp_current_db_version < 6689) {
 		populate_roles_250();
 	}
 
@@ -1165,7 +1165,7 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
+	if ($wp_current_db_version < 8000)
 		populate_roles_260();
 }
 
@@ -1180,12 +1180,12 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
+	if ($wp_current_db_version < 8980)
 		populate_roles_270();
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	if ($wp_current_db_version < 8921)
+		$wpdb->query("UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'");
 }
 
 /**
@@ -1199,22 +1199,22 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		populate_roles_280();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
-			foreach( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->option_value ) {
-					update_option( $row->option_name, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->option_value) {
+					update_option($row->option_name, $value);
 				}
 			}
 			$start += 20;
 		}
-		refresh_blog_details( $wpdb->blogid );
+		refresh_blog_details($wpdb->blogid);
 	}
 }
 
@@ -1228,11 +1228,11 @@ 
 function upgrade_290() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 11958 ) {
+	if ($wp_current_db_version < 11958) {
 		// Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion
-		if ( get_option( 'thread_comments_depth' ) == '1' ) {
-			update_option( 'thread_comments_depth', 2 );
-			update_option( 'thread_comments', 0 );
+		if (get_option('thread_comments_depth') == '1') {
+			update_option('thread_comments_depth', 2);
+			update_option('thread_comments', 0);
 		}
 	}
 }
@@ -1248,14 +1248,14 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
+	if ($wp_current_db_version < 15093)
 		populate_roles_300();
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ($wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined('MULTISITE') && get_site_option('siteurl') === false)
+		add_site_option('siteurl', '');
 
 	// 3.0 screen options key name changes.
-	if ( wp_should_upgrade_global_tables() ) {
+	if (wp_should_upgrade_global_tables()) {
 		$sql = "DELETE FROM $wpdb->usermeta
 			WHERE meta_key LIKE %s
 			OR meta_key LIKE %s
@@ -1269,15 +1269,15 @@ 
 			OR meta_key = 'manageeditcolumnshidden'
 			OR meta_key = 'categories_per_page'
 			OR meta_key = 'edit_tags_per_page'";
-		$prefix = $wpdb->esc_like( $wpdb->base_prefix );
-		$wpdb->query( $wpdb->prepare( $sql,
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'manage-'	   ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-order'  ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'metaboxorder'    ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'screen_layout'   ) . '%'
-		) );
+		$prefix = $wpdb->esc_like($wpdb->base_prefix);
+		$wpdb->query($wpdb->prepare($sql,
+			$prefix.'%'.$wpdb->esc_like('meta-box-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('closedpostboxes').'%',
+			$prefix.'%'.$wpdb->esc_like('manage-').'%'.$wpdb->esc_like('-columns-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('meta-box-order').'%',
+			$prefix.'%'.$wpdb->esc_like('metaboxorder').'%',
+			$prefix.'%'.$wpdb->esc_like('screen_layout').'%'
+		));
 	}
 
 }
@@ -1295,52 +1295,52 @@ 
 function upgrade_330() {
 	global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
 
-	if ( $wp_current_db_version < 19061 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
+	if ($wp_current_db_version < 19061 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')");
 	}
 
-	if ( $wp_current_db_version >= 11548 )
+	if ($wp_current_db_version >= 11548)
 		return;
 
-	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+	$sidebars_widgets = get_option('sidebars_widgets', array());
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+	if (isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets))
 		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
+	elseif ( ! isset($sidebars_widgets['array_version']))
 		$sidebars_widgets['array_version'] = 1;
 
-	switch ( $sidebars_widgets['array_version'] ) {
+	switch ($sidebars_widgets['array_version']) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
-			foreach ( (array) $sidebar as $i => $name ) {
+			foreach ((array) $sidebars_widgets as $index => $sidebar)
+			if (is_array($sidebar))
+			foreach ((array) $sidebar as $i => $name) {
 				$id = strtolower($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 				$id = sanitize_title($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 
 				$found = false;
 
-				foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-					if ( strtolower($widget['name']) == strtolower($name) ) {
+				foreach ($wp_registered_widgets as $widget_id => $widget) {
+					if (strtolower($widget['name']) == strtolower($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
-					} elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+					} elseif (sanitize_title($widget['name']) == sanitize_title($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
 					}
 				}
 
-				if ( $found )
+				if ($found)
 					continue;
 
 				unset($_sidebars_widgets[$index][$i]);
@@ -1352,7 +1352,7 @@ 
 		case 2 :
 			$sidebars_widgets = retrieve_widgets();
 			$sidebars_widgets['array_version'] = 3;
-			update_option( 'sidebars_widgets', $sidebars_widgets );
+			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 }
 
@@ -1367,27 +1367,27 @@ 
 function upgrade_340() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 19798 ) {
+	if ($wp_current_db_version < 19798) {
 		$wpdb->hide_errors();
-		$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+		$wpdb->query("ALTER TABLE $wpdb->options DROP COLUMN blog_id");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 19799 ) {
+	if ($wp_current_db_version < 19799) {
 		$wpdb->hide_errors();
 		$wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 20022 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" );
+	if ($wp_current_db_version < 20022 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'");
 	}
 
-	if ( $wp_current_db_version < 20080 ) {
-		if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
-			$uninstall_plugins = get_option( 'uninstall_plugins' );
-			delete_option( 'uninstall_plugins' );
-			add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
+	if ($wp_current_db_version < 20080) {
+		if ('yes' == $wpdb->get_var("SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'")) {
+			$uninstall_plugins = get_option('uninstall_plugins');
+			delete_option('uninstall_plugins');
+			add_option('uninstall_plugins', $uninstall_plugins, null, 'no');
 		}
 	}
 }
@@ -1403,23 +1403,23 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ($wp_current_db_version < 22006 && $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 1); // Previously set to 0 by populate_options()
 
-	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 21811 && wp_should_upgrade_global_tables()) {
 		$meta_keys = array();
-		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+		foreach (array_merge(get_post_types(), get_taxonomies()) as $name) {
+			if (false !== strpos($name, '-'))
+			$meta_keys[] = 'edit_'.str_replace('-', '_', $name).'_per_page';
 		}
-		if ( $meta_keys ) {
-			$meta_keys = implode( "', '", $meta_keys );
-			$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')" );
+		if ($meta_keys) {
+			$meta_keys = implode("', '", $meta_keys);
+			$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')");
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
+	if ($wp_current_db_version < 22422 && $term = get_term_by('slug', 'post-format-standard', 'post_format'))
+		wp_delete_term($term->term_id, 'post_format');
 }
 
 /**
@@ -1431,8 +1431,8 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	if ($wp_current_db_version < 25824)
+		wp_clear_scheduled_hook('wp_auto_updates_maybe_update');
 }
 
 /**
@@ -1445,8 +1445,8 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 26148)
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 }
 
 /**
@@ -1458,8 +1458,8 @@ 
  */
 function upgrade_380() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26691 ) {
-		deactivate_plugins( array( 'mp6/mp6.php' ), true );
+	if ($wp_current_db_version < 26691) {
+		deactivate_plugins(array('mp6/mp6.php'), true);
 	}
 }
 
@@ -1472,12 +1472,12 @@ 
  */
 function upgrade_400() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 29630 ) {
-		if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
-			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) {
-				update_option( 'WPLANG', WPLANG );
+	if ($wp_current_db_version < 29630) {
+		if ( ! is_multisite() && false === get_option('WPLANG')) {
+			if (defined('WPLANG') && ('' !== WPLANG) && in_array(WPLANG, get_available_languages())) {
+				update_option('WPLANG', WPLANG);
 			} else {
-				update_option( 'WPLANG', '' );
+				update_option('WPLANG', '');
 			}
 		}
 	}
@@ -1504,29 +1504,29 @@ 
 function upgrade_430() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 32364 ) {
+	if ($wp_current_db_version < 32364) {
 		upgrade_430_fix_comments();
 	}
 
 	// Shared terms are split in a separate process.
-	if ( $wp_current_db_version < 32814 ) {
-		update_option( 'finished_splitting_shared_terms', 0 );
-		wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+	if ($wp_current_db_version < 32814) {
+		update_option('finished_splitting_shared_terms', 0);
+		wp_schedule_single_event(time() + (1 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 	}
 
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( is_multisite() ) {
-			$tables = $wpdb->tables( 'blog' );
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (is_multisite()) {
+			$tables = $wpdb->tables('blog');
 		} else {
-			$tables = $wpdb->tables( 'all' );
-			if ( ! wp_should_upgrade_global_tables() ) {
-				$global_tables = $wpdb->tables( 'global' );
-				$tables = array_diff_assoc( $tables, $global_tables );
+			$tables = $wpdb->tables('all');
+			if ( ! wp_should_upgrade_global_tables()) {
+				$global_tables = $wpdb->tables('global');
+				$tables = array_diff_assoc($tables, $global_tables);
 			}
 		}
 
-		foreach ( $tables as $table ) {
-			maybe_convert_table_to_utf8mb4( $table );
+		foreach ($tables as $table) {
+			maybe_convert_table_to_utf8mb4($table);
 		}
 	}
 }
@@ -1542,18 +1542,18 @@ 
 function upgrade_430_fix_comments() {
 	global $wp_current_db_version, $wpdb;
 
-	$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
+	$content_length = $wpdb->get_col_length($wpdb->comments, 'comment_content');
 
-	if ( is_wp_error( $content_length ) ) {
+	if (is_wp_error($content_length)) {
 		return;
 	}
 
-	if ( false === $content_length ) {
+	if (false === $content_length) {
 		$content_length = array(
 			'type'   => 'byte',
 			'length' => 65535,
 		);
-	} elseif ( ! is_array( $content_length ) ) {
+	} elseif ( ! is_array($content_length)) {
 		$length = (int) $content_length > 0 ? (int) $content_length : 65535;
 		$content_length = array(
 			'type'	 => 'byte',
@@ -1561,12 +1561,12 @@ 
 		);
 	}
 
-	if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) {
+	if ('byte' !== $content_length['type'] || 0 === $content_length['length']) {
 		// Sites with malformed DB schemas are on their own.
 		return;
 	}
 
-	$allowed_length = intval( $content_length['length'] ) - 10;
+	$allowed_length = intval($content_length['length']) - 10;
 
 	$comments = $wpdb->get_results(
 		"SELECT `comment_ID` FROM `{$wpdb->comments}`
@@ -1575,8 +1575,8 @@ 
 			AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
 	);
 
-	foreach ( $comments as $comment ) {
-		wp_delete_comment( $comment->comment_ID, true );
+	foreach ($comments as $comment) {
+		wp_delete_comment($comment->comment_ID, true);
 	}
 }
 
@@ -1588,10 +1588,10 @@ 
 function upgrade_431() {
 	// Fix incorrect cron entries for term splitting
 	$cron_array = _get_cron_array();
-	if ( isset( $cron_array['wp_batch_split_terms'] ) ) {
-		foreach ( $cron_array['wp_batch_split_terms'] as $timestamp_hook => $cron_data ) {
-			foreach ( $cron_data as $key => $args ) {
-				wp_unschedule_event( 'wp_batch_split_terms', $timestamp_hook, $args['args'] );
+	if (isset($cron_array['wp_batch_split_terms'])) {
+		foreach ($cron_array['wp_batch_split_terms'] as $timestamp_hook => $cron_data) {
+			foreach ($cron_data as $key => $args) {
+				wp_unschedule_event('wp_batch_split_terms', $timestamp_hook, $args['args']);
 			}
 		}
 	}
@@ -1609,7 +1609,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Always.
-	if ( is_main_network() ) {
+	if (is_main_network()) {
 		/*
 		 * Deletes all expired transients. The multi-table delete syntax is used
 		 * to delete the transient record from table a, and the corresponding
@@ -1621,32 +1621,32 @@ 
 			AND a.meta_key NOT LIKE %s
 			AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
 			AND b.meta_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 
 	// 2.8.
-	if ( $wp_current_db_version < 11549 ) {
-		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
-		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
-		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
+	if ($wp_current_db_version < 11549) {
+		$wpmu_sitewide_plugins = get_site_option('wpmu_sitewide_plugins');
+		$active_sitewide_plugins = get_site_option('active_sitewide_plugins');
+		if ($wpmu_sitewide_plugins) {
+			if ( ! $active_sitewide_plugins)
 				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
 			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+				$sitewide_plugins = array_merge((array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins);
 
-			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+			update_site_option('active_sitewide_plugins', $sitewide_plugins);
 		}
-		delete_site_option( 'wpmu_sitewide_plugins' );
-		delete_site_option( 'deactivated_sitewide_plugins' );
+		delete_site_option('wpmu_sitewide_plugins');
+		delete_site_option('deactivated_sitewide_plugins');
 
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
-			foreach( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->meta_value ) {
-					update_site_option( $row->meta_key, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->meta_value) {
+					update_site_option($row->meta_key, $value);
 				}
 			}
 			$start += 20;
@@ -1654,95 +1654,95 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ($wp_current_db_version < 13576)
+		update_site_option('global_terms_enabled', '1');
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ($wp_current_db_version < 19390)
+		update_site_option('initial_db_version', $wp_current_db_version);
 
-	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+	if ($wp_current_db_version < 19470) {
+		if (false === get_site_option('active_sitewide_plugins'))
+			update_site_option('active_sitewide_plugins', array());
 	}
 
 	// 3.4
-	if ( $wp_current_db_version < 20148 ) {
+	if ($wp_current_db_version < 20148) {
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		$allowedthemes  = get_site_option( 'allowedthemes'  );
-		$allowed_themes = get_site_option( 'allowed_themes' );
-		if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
+		$allowedthemes  = get_site_option('allowedthemes');
+		$allowed_themes = get_site_option('allowed_themes');
+		if (false === $allowedthemes && is_array($allowed_themes) && $allowed_themes) {
 			$converted = array();
 			$themes = wp_get_themes();
-			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+			foreach ($themes as $stylesheet => $theme_data) {
+				if (isset($allowed_themes[$theme_data->get('Name')]))
+					$converted[$stylesheet] = true;
 			}
-			update_site_option( 'allowedthemes', $converted );
-			delete_site_option( 'allowed_themes' );
+			update_site_option('allowedthemes', $converted);
+			delete_site_option('allowed_themes');
 		}
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ($wp_current_db_version < 21823)
+		update_site_option('ms_files_rewriting', '1');
 
 	// 3.5.2
-	if ( $wp_current_db_version < 24448 ) {
-		$illegal_names = get_site_option( 'illegal_names' );
-		if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
-			$illegal_name = reset( $illegal_names );
-			$illegal_names = explode( ' ', $illegal_name );
-			update_site_option( 'illegal_names', $illegal_names );
+	if ($wp_current_db_version < 24448) {
+		$illegal_names = get_site_option('illegal_names');
+		if (is_array($illegal_names) && count($illegal_names) === 1) {
+			$illegal_name = reset($illegal_names);
+			$illegal_names = explode(' ', $illegal_name);
+			update_site_option('illegal_names', $illegal_names);
 		}
 	}
 
 	// 4.2
-	if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
-		if ( wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
-			$wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+	if ($wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4') {
+		if (wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))");
+			$wpdb->query("ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
 
 	// 4.3
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (wp_should_upgrade_global_tables()) {
 			$upgrade = false;
-			$indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
-			foreach( $indexes as $index ) {
-				if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
+			$indexes = $wpdb->get_results("SHOW INDEXES FROM $wpdb->signups");
+			foreach ($indexes as $index) {
+				if ('domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part) {
 					$upgrade = true;
 					break;
 				}
 			}
 
-			if ( $upgrade ) {
-				$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+			if ($upgrade) {
+				$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 			}
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
@@ -1770,9 +1770,9 @@ 
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
 
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) );
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($table_name));
 
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 
@@ -1780,7 +1780,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 	return false;
@@ -1841,7 +1841,7 @@ 
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1851,7 +1851,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1869,37 +1869,37 @@ 
  * @param string $table The table to convert.
  * @return bool true if the table was converted, false if it wasn't.
  */
-function maybe_convert_table_to_utf8mb4( $table ) {
+function maybe_convert_table_to_utf8mb4($table) {
 	global $wpdb;
 
-	$results = $wpdb->get_results( "SHOW FULL COLUMNS FROM `$table`" );
-	if ( ! $results ) {
+	$results = $wpdb->get_results("SHOW FULL COLUMNS FROM `$table`");
+	if ( ! $results) {
 		return false;
 	}
 
-	foreach ( $results as $column ) {
-		if ( $column->Collation ) {
-			list( $charset ) = explode( '_', $column->Collation );
-			$charset = strtolower( $charset );
-			if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+	foreach ($results as $column) {
+		if ($column->Collation) {
+			list($charset) = explode('_', $column->Collation);
+			$charset = strtolower($charset);
+			if ('utf8' !== $charset && 'utf8mb4' !== $charset) {
 				// Don't upgrade tables that have non-utf8 columns.
 				return false;
 			}
 		}
 	}
 
-	$table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" );
-	if ( ! $table_details ) {
+	$table_details = $wpdb->get_row("SHOW TABLE STATUS LIKE '$table'");
+	if ( ! $table_details) {
 		return false;
 	}
 
-	list( $table_charset ) = explode( '_', $table_details->Collation );
-	$table_charset = strtolower( $table_charset );
-	if ( 'utf8mb4' === $table_charset ) {
+	list($table_charset) = explode('_', $table_details->Collation);
+	$table_charset = strtolower($table_charset);
+	if ('utf8mb4' === $table_charset) {
 		return true;
 	}
 
-	return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" );
+	return $wpdb->query("ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
 }
 
 /**
@@ -1914,11 +1914,11 @@ 
 function get_alloptions_110() {
 	global $wpdb;
 	$all_options = new stdClass;
-	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
-		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
-			$all_options->{$option->option_name} = stripslashes( $option->option_value );
+	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
+		foreach ($options as $option) {
+			if ('siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name)
+				$option->option_value = untrailingslashit($option->option_value);
+			$all_options->{$option->option_name} = stripslashes($option->option_value);
 		}
 	}
 	return $all_options;
@@ -1939,21 +1939,21 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ($setting == 'home' && defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ($setting == 'siteurl' && defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 
-	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
+	$option = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting));
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ('home' == $setting && '' == $option)
+		return __get_option('siteurl');
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ('siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting)
+		$option = untrailingslashit($option);
 
-	return maybe_unserialize( $option );
+	return maybe_unserialize($option);
 }
 
 /**
@@ -2001,16 +2001,16 @@ 
  *                              Default true.
  * @return array Strings containing the results of the various update queries.
  */
-function dbDelta( $queries = '', $execute = true ) {
+function dbDelta($queries = '', $execute = true) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if (in_array($queries, array('', 'all', 'blog', 'global', 'ms_global'), true))
+	    $queries = wp_get_db_schema($queries);
 
 	// Separate individual queries into an array
-	if ( !is_array($queries) ) {
-		$queries = explode( ';', $queries );
-		$queries = array_filter( $queries );
+	if ( ! is_array($queries)) {
+		$queries = explode(';', $queries);
+		$queries = array_filter($queries);
 	}
 
 	/**
@@ -2020,22 +2020,22 @@ 
 	 *
 	 * @param array $queries An array of dbDelta SQL queries.
 	 */
-	$queries = apply_filters( 'dbdelta_queries', $queries );
+	$queries = apply_filters('dbdelta_queries', $queries);
 
 	$cqueries = array(); // Creation Queries
 	$iqueries = array(); // Insertion Queries
 	$for_update = array();
 
 	// Create a tablename index for an array ($cqueries) of queries
-	foreach($queries as $qry) {
-		if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
-			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
+	foreach ($queries as $qry) {
+		if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
+			$cqueries[trim($matches[1], '`')] = $qry;
 			$for_update[$matches[1]] = 'Created table '.$matches[1];
-		} elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
-			array_unshift( $cqueries, $qry );
-		} elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
+			array_unshift($cqueries, $qry);
+		} elseif (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
-		} elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
 		} else {
 			// Unrecognized query type
@@ -2051,7 +2051,7 @@ 
 	 *
 	 * @param array $cqueries An array of dbDelta create SQL queries.
 	 */
-	$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
+	$cqueries = apply_filters('dbdelta_create_queries', $cqueries);
 
 	/**
 	 * Filter the dbDelta SQL queries for inserting or updating.
@@ -2062,22 +2062,22 @@ 
 	 *
 	 * @param array $iqueries An array of dbDelta insert or update SQL queries.
 	 */
-	$iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
+	$iqueries = apply_filters('dbdelta_insert_queries', $iqueries);
 
-	$global_tables = $wpdb->tables( 'global' );
-	foreach ( $cqueries as $table => $qry ) {
+	$global_tables = $wpdb->tables('global');
+	foreach ($cqueries as $table => $qry) {
 		// Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
-		if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) {
-			unset( $cqueries[ $table ], $for_update[ $table ] );
+		if (in_array($table, $global_tables) && ! wp_should_upgrade_global_tables()) {
+			unset($cqueries[$table], $for_update[$table]);
 			continue;
 		}
 
 		// Fetch the table column structure from the database
 		$suppress = $wpdb->suppress_errors();
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
-		$wpdb->suppress_errors( $suppress );
+		$wpdb->suppress_errors($suppress);
 
-		if ( ! $tablefields )
+		if ( ! $tablefields)
 			continue;
 
 		// Clear the field and index arrays.
@@ -2098,7 +2098,7 @@ 
 
 			// Extract the field name.
 			preg_match("|^([^ ]*)|", trim($fld), $fvals);
-			$fieldname = trim( $fvals[1], '`' );
+			$fieldname = trim($fvals[1], '`');
 
 			// Verify the found field name.
 			$validfield = true;
@@ -2134,7 +2134,7 @@ 
 				// Is actual field type different from the field type in query?
 				if ($tablefield->Type != $fieldtype) {
 					// Add a query to change the column type
-					$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
+					$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} ".$cfields[strtolower($tablefield->Field)];
 					$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
 				}
 
@@ -2177,7 +2177,7 @@ 
 				// Add the index to the index data array.
 				$keyname = $tableindex->Key_name;
 				$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
+				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0) ? true : false;
 			}
 
 			// For each actual index in the index array.
@@ -2187,7 +2187,7 @@ 
 				$index_string = '';
 				if ($index_name == 'PRIMARY') {
 					$index_string .= 'PRIMARY ';
-				} elseif ( $index_data['unique'] ) {
+				} elseif ($index_data['unique']) {
 					$index_string .= 'UNIQUE ';
 				}
 				$index_string .= 'KEY ';
@@ -2208,7 +2208,7 @@ 
 				}
 
 				// The alternative index string doesn't care about subparts
-				$alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
+				$alt_index_columns = preg_replace('/\([^)]*\)/', '', $index_columns);
 
 				// Add the column list to the index create string.
 				$index_strings = array(
@@ -2216,9 +2216,9 @@ 
 					"$index_string ($alt_index_columns)",
 				);
 
-				foreach( $index_strings as $index_string ) {
-					if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
-						unset( $indices[ $aindex ] );
+				foreach ($index_strings as $index_string) {
+					if ( ! (($aindex = array_search($index_string, $indices)) === false)) {
+						unset($indices[$aindex]);
 						break;
 						// todo: Remove this?
 						//echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
@@ -2230,14 +2230,14 @@ 
 		}
 
 		// For every remaining index specified for the table.
-		foreach ( (array) $indices as $index ) {
+		foreach ((array) $indices as $index) {
 			// Push a query line into $cqueries that adds the index to that table.
 			$cqueries[] = "ALTER TABLE {$table} ADD $index";
-			$for_update[] = 'Added index ' . $table . ' ' . $index;
+			$for_update[] = 'Added index '.$table.' '.$index;
 		}
 
 		// Remove the original table creation query from processing.
-		unset( $cqueries[ $table ], $for_update[ $table ] );
+		unset($cqueries[$table], $for_update[$table]);
 	}
 
 	$allqueries = array_merge($cqueries, $iqueries);
@@ -2264,10 +2264,10 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current( $tables = 'all' ) {
-	$alterations = dbDelta( $tables );
+function make_db_current($tables = 'all') {
+	$alterations = dbDelta($tables);
 	echo "<ol>\n";
-	foreach($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
 	echo "</ol>\n";
 }
 
@@ -2283,8 +2283,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current_silent( $tables = 'all' ) {
-	dbDelta( $tables );
+function make_db_current_silent($tables = 'all') {
+	dbDelta($tables);
 }
 
 /**
@@ -2300,9 +2300,9 @@ 
  */
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
+	if ( ! file_exists("$home_path/index.php"))
 		return false;
 
 	/*
@@ -2321,7 +2321,7 @@ 
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
+				if ( ! @copy(WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME.'/index.php', "$site_dir/$newfile"))
 					return false;
 
 				// Don't copy anything.
@@ -2329,7 +2329,7 @@ 
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
+		if ( ! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
 			return false;
 
 		chmod("$site_dir/$newfile", 0777);
@@ -2341,7 +2341,7 @@ 
 
 			foreach ($lines as $line) {
 				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+					$line = '//'.$line;
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2356,7 +2356,7 @@ 
 	}
 
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\nTheme Name: $theme_name\nTheme URI: ".__get_option('siteurl')."\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
 	$stylelines = file_get_contents("$site_dir/style.css");
 	if ($stylelines) {
@@ -2382,18 +2382,18 @@ 
  * @return false|void
  */
 function make_site_theme_from_default($theme_name, $template) {
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
-	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
+	$default_dir = WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME;
 
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
-		while(($theme_file = readdir( $theme_dir )) !== false) {
+		while (($theme_file = readdir($theme_dir)) !== false) {
 			if (is_dir("$default_dir/$theme_file"))
 				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
+			if ( ! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
 				return;
 			chmod("$site_dir/$theme_file", 0777);
 		}
@@ -2406,28 +2406,28 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
+			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: '.$theme_name;
+			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: '.__get_option('url');
 			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
 			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
 			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
-			fwrite($f, $line . "\n");
+			fwrite($f, $line."\n");
 		}
 		fclose($f);
 	}
 
 	// Copy the images.
 	umask(0);
-	if (! mkdir("$site_dir/images", 0777)) {
+	if ( ! mkdir("$site_dir/images", 0777)) {
 		return false;
 	}
 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
-		while(($image = readdir($images_dir)) !== false) {
+		while (($image = readdir($images_dir)) !== false) {
 			if (is_dir("$default_dir/images/$image"))
 				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
+			if ( ! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
 				return;
 			chmod("$site_dir/images/$image", 0777);
 		}
@@ -2448,30 +2448,30 @@ 
 	// Name the theme after the blog.
 	$theme_name = __get_option('blogname');
 	$template = sanitize_title($theme_name);
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
 	// If the theme already exists, nothing to do.
-	if ( is_dir($site_dir)) {
+	if (is_dir($site_dir)) {
 		return false;
 	}
 
 	// We must be able to write to the themes dir.
-	if (! is_writable(WP_CONTENT_DIR . "/themes")) {
+	if ( ! is_writable(WP_CONTENT_DIR."/themes")) {
 		return false;
 	}
 
 	umask(0);
-	if (! mkdir($site_dir, 0777)) {
+	if ( ! mkdir($site_dir, 0777)) {
 		return false;
 	}
 
-	if (file_exists(ABSPATH . 'wp-layout.css')) {
-		if (! make_site_theme_from_oldschool($theme_name, $template)) {
+	if (file_exists(ABSPATH.'wp-layout.css')) {
+		if ( ! make_site_theme_from_oldschool($theme_name, $template)) {
 			// TODO: rm -rf the site theme directory.
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
+		if ( ! make_site_theme_from_default($theme_name, $template))
 			// TODO: rm -rf the site theme directory.
 			return false;
 	}
@@ -2524,8 +2524,8 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
+	if (is_wp_error($result))
+		die($result->get_error_message());
 }
 
 /**
@@ -2534,12 +2534,12 @@ 
  * @since 2.2.0
  */
 function maybe_disable_automattic_widgets() {
-	$plugins = __get_option( 'active_plugins' );
+	$plugins = __get_option('active_plugins');
 
-	foreach ( (array) $plugins as $plugin ) {
-		if ( basename( $plugin ) == 'widgets.php' ) {
-			array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
-			update_option( 'active_plugins', $plugins );
+	foreach ((array) $plugins as $plugin) {
+		if (basename($plugin) == 'widgets.php') {
+			array_splice($plugins, array_search($plugin, $plugins), 1);
+			update_option('active_plugins', $plugins);
 			break;
 		}
 	}
@@ -2556,8 +2556,8 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
+	if ($wp_current_db_version >= 22006 && get_option('link_manager_enabled') && ! $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 0);
 }
 
 /**
@@ -2572,7 +2572,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Upgrade versions prior to 2.9
-	if ( $wp_current_db_version < 11557 ) {
+	if ($wp_current_db_version < 11557) {
 		// Delete duplicate options. Keep the option with the highest option_id.
 		$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
 
@@ -2584,32 +2584,32 @@ 
 	}
 
 	// Multisite schema upgrades.
-	if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables()) {
 
 		// Upgrade verions prior to 3.7
-		if ( $wp_current_db_version < 25179 ) {
+		if ($wp_current_db_version < 25179) {
 			// New primary key for signups.
-			$wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+			$wpdb->query("ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain");
 		}
 
-		if ( $wp_current_db_version < 25448 ) {
+		if ($wp_current_db_version < 25448) {
 			// Convert archived from enum to tinyint.
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'");
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0");
 		}
 	}
 
 	// Upgrade versions prior to 4.2.
-	if ( $wp_current_db_version < 31351 ) {
-		if ( ! is_multisite() && wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
+	if ($wp_current_db_version < 31351) {
+		if ( ! is_multisite() && wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
 		}
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" );
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))");
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))");
+		$wpdb->query("ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))");
 	}
 }
 
@@ -2621,7 +2621,7 @@ 
  * @global wpdb   $wpdb
  * @global string $charset_collate
  */
-if ( !function_exists( 'install_global_terms' ) ) :
+if ( ! function_exists('install_global_terms')) :
 function install_global_terms() {
 	global $wpdb, $charset_collate;
 	$ms_queries = "
@@ -2636,7 +2636,7 @@ 
 ) $charset_collate;
 ";
 // now create tables
-	dbDelta( $ms_queries );
+	dbDelta($ms_queries);
 }
 endif;
 
@@ -2661,7 +2661,7 @@ 
 function wp_should_upgrade_global_tables() {
 
 	// Return false early if explicitly not upgrading
-	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+	if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
 		return false;
 	}
 
@@ -2669,12 +2669,12 @@ 
 	$should_upgrade = true;
 
 	// Set to false if not on main network (does not matter if not multi-network)
-	if ( ! is_main_network() ) {
+	if ( ! is_main_network()) {
 		$should_upgrade = false;
 	}
 
 	// Set to false if not on main site of current network (does not matter if not multi-site)
-	if ( ! is_main_site() ) {
+	if ( ! is_main_site()) {
 		$should_upgrade = false;
 	}
 
@@ -2683,5 +2683,5 @@ 
 	 *
 	 * @param bool $should_upgrade Whether to run the upgrade routines on global tables.
 	 */
-	return apply_filters( 'wp_should_upgrade_global_tables', $should_upgrade );
+	return apply_filters('wp_should_upgrade_global_tables', $should_upgrade);
 }

Braces +365 added lines, -235 removed lines

@@ -9,8 +9,9 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
+if ( file_exists(WP_CONTENT_DIR . '/install.php') ) {
 	require (WP_CONTENT_DIR . '/install.php');
+}
 
 /** WordPress Administration API */
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -37,8 +38,9 @@ 
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.6' );
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -59,8 +61,9 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
-		update_option('default_pingback_flag', 0);
+	if ( ! $public ) {
+			update_option('default_pingback_flag', 0);
+	}
 
 	/*
 	 * Create default user. If the user already exists, the user tables are
@@ -155,8 +158,9 @@ 
 	if ( is_multisite() ) {
 		$first_post = get_site_option( 'first_post' );
 
-		if ( empty($first_post) )
-			$first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' );
+		if ( empty($first_post) ) {
+					$first_post = __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start writing!' );
+		}
 
 		$first_post = str_replace( "SITE_URL", esc_url( network_home_url() ), $first_post );
 		$first_post = str_replace( "SITE_NAME", get_current_site()->site_name, $first_post );
@@ -213,8 +217,9 @@ 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
+	if ( is_multisite() ) {
+			$first_page = get_site_option( 'first_page', $first_page );
+	}
 	$first_post_guid = get_option('home') . '/?page_id=2';
 	$wpdb->insert( $wpdb->posts, array(
 		'post_author' => $user_id,
@@ -244,10 +249,11 @@ 
 	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
 	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
 
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	if ( ! is_multisite() ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 1 );
+	} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	}
 
 	if ( is_multisite() ) {
 		// Flush rules to pick up the new page.
@@ -262,8 +268,9 @@ 
 		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( !is_super_admin( $user_id ) && $user_id != 1 ) {
+					$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		}
 	}
 }
 endif;
@@ -399,26 +406,30 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
-	if ( ! is_blog_installed() )
-		return;
+	if ( ! is_blog_installed() ) {
+			return;
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
-		upgrade_network();
+	if ( is_multisite() && is_main_site() ) {
+			upgrade_network();
+	}
 	wp_cache_flush();
 
 	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
-		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
+					$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+		} else {
+					$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		}
 	}
 
 	/**
@@ -449,8 +460,9 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty($wp_current_db_version) ) {
@@ -458,12 +470,14 @@ 
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
-			$wp_current_db_version = 2541;
+		if ( !empty($template) ) {
+					$wp_current_db_version = 2541;
+		}
 	}
 
-	if ( $wp_current_db_version < 6039 )
-		upgrade_230_options_table();
+	if ( $wp_current_db_version < 6039 ) {
+			upgrade_230_options_table();
+	}
 
 	populate_options();
 
@@ -474,68 +488,89 @@ 
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
-		upgrade_160();
+	if ( $wp_current_db_version < 3308 ) {
+			upgrade_160();
+	}
 
-	if ( $wp_current_db_version < 4772 )
-		upgrade_210();
+	if ( $wp_current_db_version < 4772 ) {
+			upgrade_210();
+	}
 
-	if ( $wp_current_db_version < 4351 )
-		upgrade_old_slugs();
+	if ( $wp_current_db_version < 4351 ) {
+			upgrade_old_slugs();
+	}
 
-	if ( $wp_current_db_version < 5539 )
-		upgrade_230();
+	if ( $wp_current_db_version < 5539 ) {
+			upgrade_230();
+	}
 
-	if ( $wp_current_db_version < 6124 )
-		upgrade_230_old_tables();
+	if ( $wp_current_db_version < 6124 ) {
+			upgrade_230_old_tables();
+	}
 
-	if ( $wp_current_db_version < 7499 )
-		upgrade_250();
+	if ( $wp_current_db_version < 7499 ) {
+			upgrade_250();
+	}
 
-	if ( $wp_current_db_version < 7935 )
-		upgrade_252();
+	if ( $wp_current_db_version < 7935 ) {
+			upgrade_252();
+	}
 
-	if ( $wp_current_db_version < 8201 )
-		upgrade_260();
+	if ( $wp_current_db_version < 8201 ) {
+			upgrade_260();
+	}
 
-	if ( $wp_current_db_version < 8989 )
-		upgrade_270();
+	if ( $wp_current_db_version < 8989 ) {
+			upgrade_270();
+	}
 
-	if ( $wp_current_db_version < 10360 )
-		upgrade_280();
+	if ( $wp_current_db_version < 10360 ) {
+			upgrade_280();
+	}
 
-	if ( $wp_current_db_version < 11958 )
-		upgrade_290();
+	if ( $wp_current_db_version < 11958 ) {
+			upgrade_290();
+	}
 
-	if ( $wp_current_db_version < 15260 )
-		upgrade_300();
+	if ( $wp_current_db_version < 15260 ) {
+			upgrade_300();
+	}
 
-	if ( $wp_current_db_version < 19389 )
-		upgrade_330();
+	if ( $wp_current_db_version < 19389 ) {
+			upgrade_330();
+	}
 
-	if ( $wp_current_db_version < 20080 )
-		upgrade_340();
+	if ( $wp_current_db_version < 20080 ) {
+			upgrade_340();
+	}
 
-	if ( $wp_current_db_version < 22422 )
-		upgrade_350();
+	if ( $wp_current_db_version < 22422 ) {
+			upgrade_350();
+	}
 
-	if ( $wp_current_db_version < 25824 )
-		upgrade_370();
+	if ( $wp_current_db_version < 25824 ) {
+			upgrade_370();
+	}
 
-	if ( $wp_current_db_version < 26148 )
-		upgrade_372();
+	if ( $wp_current_db_version < 26148 ) {
+			upgrade_372();
+	}
 
-	if ( $wp_current_db_version < 26691 )
-		upgrade_380();
+	if ( $wp_current_db_version < 26691 ) {
+			upgrade_380();
+	}
 
-	if ( $wp_current_db_version < 29630 )
-		upgrade_400();
+	if ( $wp_current_db_version < 29630 ) {
+			upgrade_400();
+	}
 
-	if ( $wp_current_db_version < 33055 )
-		upgrade_430();
+	if ( $wp_current_db_version < 33055 ) {
+			upgrade_430();
+	}
 
-	if ( $wp_current_db_version < 33056 )
-		upgrade_431();
+	if ( $wp_current_db_version < 33056 ) {
+			upgrade_431();
+	}
 
 	maybe_disable_link_manager();
 
@@ -587,8 +622,10 @@ 
 			$done_posts[] = $done_id->post_id;
 		endforeach;
 		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
-	else:
+	else {
+		:
 		$catwhere = '';
+	}
 	endif;
 
 	$allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
@@ -702,10 +739,11 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
-				$guid = get_permalink($post->ID);
-			else
-				$guid = $post->guid;
+			if ( empty($post->guid) ) {
+							$guid = get_permalink($post->ID);
+			} else {
+							$guid = $post->guid;
+			}
 
 			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
 
@@ -786,34 +824,57 @@ 
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
 	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		if ( !empty( $user->user_firstname ) ) {
+					update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
+		}
+		if ( !empty( $user->user_lastname ) ) {
+					update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
+		}
+		if ( !empty( $user->user_nickname ) ) {
+					update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
+		}
+		if ( !empty( $user->user_level ) ) {
+					update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+		}
+		if ( !empty( $user->user_icq ) ) {
+					update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_aim ) ) {
+					update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
+		}
+		if ( !empty( $user->user_msn ) ) {
+					update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
+		}
+		if ( !empty( $user->user_yim ) ) {
+					update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_description ) ) {
+					update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		}
 
 		if ( isset( $user->user_idmode ) ):
 			$idmode = $user->user_idmode;
-			if ($idmode == 'nickname') $id = $user->user_nickname;
-			if ($idmode == 'login') $id = $user->user_login;
-			if ($idmode == 'firstname') $id = $user->user_firstname;
-			if ($idmode == 'lastname') $id = $user->user_lastname;
-			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
-			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
+			if ($idmode == 'nickname') {
+				$id = $user->user_nickname;
+			}
+			if ($idmode == 'login') {
+				$id = $user->user_login;
+			}
+			if ($idmode == 'firstname') {
+				$id = $user->user_firstname;
+			}
+			if ($idmode == 'lastname') {
+				$id = $user->user_lastname;
+			}
+			if ($idmode == 'namefl') {
+				$id = $user->user_firstname.' '.$user->user_lastname;
+			}
+			if ($idmode == 'namelf') {
+				$id = $user->user_lastname.' '.$user->user_firstname;
+			}
+			if (!$idmode) {
+				$id = $user->user_nickname;
+			}
 			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
 		endif;
 
@@ -828,15 +889,17 @@ 
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	foreach ( $old_user_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	}
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
-		foreach ($comments as $comment)
+	if ( is_array( $comments ) ) {
+			foreach ($comments as $comment)
 			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+	}
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
@@ -851,8 +914,9 @@ 
 										 array( 'ID' => $object->ID ) );
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']) ) {
+							update_attached_file( $object->ID, $meta['file'] );
+			}
 		}
 	}
 }
@@ -872,8 +936,10 @@ 
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts) ) {
+			foreach ($posts as $post) {
 			$status = $post->post_status;
+		}
 			$type = 'post';
 
 			if ( 'static' == $status ) {
@@ -898,9 +964,10 @@ 
 		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( !empty($posts) ) {
+					foreach ( $posts as $post )
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+		}
 	}
 }
 
@@ -985,19 +1052,22 @@ 
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
-		$select .= ', rel_type';
+	if ( $have_tags ) {
+			$select .= ', rel_type';
+	}
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
 	foreach ( $posts as $post ) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
-			$taxonomy = 'tag';
+		if ( !empty($post->rel_type) && 'tag' == $post->rel_type) {
+					$taxonomy = 'tag';
+		}
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
-			continue;
+		if ( empty($tt_id) ) {
+					continue;
+		}
 
 		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
 	}
@@ -1039,15 +1109,19 @@ 
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
+		if ( !empty($links) ) {
+			foreach ( $links as $link ) {
 			if ( 0 == $link->link_category )
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
-				continue;
+		}
+			if ( ! isset($link_cat_id_map[$link->link_category]) ) {
+							continue;
+			}
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
 		}
@@ -1061,8 +1135,9 @@ 
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
 		}
 	}
@@ -1075,10 +1150,11 @@ 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
 	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) ) {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		} else {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		}
 		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
 	}
 }
@@ -1094,8 +1170,9 @@ 
 	global $wpdb;
 	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	foreach ( $old_options_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	}
 	$wpdb->show_errors();
 }
 
@@ -1165,9 +1242,10 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
-		populate_roles_260();
-}
+	if ( $wp_current_db_version < 8000 ) {
+			populate_roles_260();
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.7.
@@ -1180,13 +1258,15 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
-		populate_roles_270();
+	if ( $wp_current_db_version < 8980 ) {
+			populate_roles_270();
+	}
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
-}
+	if ( $wp_current_db_version < 8921 ) {
+			$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.8.
@@ -1199,15 +1279,17 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
-		populate_roles_280();
+	if ( $wp_current_db_version < 10360 ) {
+			populate_roles_280();
+	}
 	if ( is_multisite() ) {
 		$start = 0;
 		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
 			foreach( $rows as $row ) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->option_value ) {
 					update_option( $row->option_name, $value );
 				}
@@ -1248,11 +1330,13 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
-		populate_roles_300();
+	if ( $wp_current_db_version < 15093 ) {
+			populate_roles_300();
+	}
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
+			add_site_option( 'siteurl', '' );
+	}
 
 	// 3.0 screen options key name changes.
 	if ( wp_should_upgrade_global_tables() ) {
@@ -1299,23 +1383,26 @@ 
 		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
 	}
 
-	if ( $wp_current_db_version >= 11548 )
-		return;
+	if ( $wp_current_db_version >= 11548 ) {
+			return;
+	}
 
 	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
-		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
-		$sidebars_widgets['array_version'] = 1;
+	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) ) {
+			$sidebars_widgets['array_version'] = 3;
+	} elseif ( !isset($sidebars_widgets['array_version']) ) {
+			$sidebars_widgets['array_version'] = 1;
+	}
 
 	switch ( $sidebars_widgets['array_version'] ) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
+			foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+						if ( is_array($sidebar) )
 			foreach ( (array) $sidebar as $i => $name ) {
 				$id = strtolower($name);
+			}
 				if ( isset($wp_registered_widgets[$id]) ) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
@@ -1340,8 +1427,9 @@ 
 					}
 				}
 
-				if ( $found )
-					continue;
+				if ( $found ) {
+									continue;
+				}
 
 				unset($_sidebars_widgets[$index][$i]);
 			}
@@ -1403,14 +1491,17 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 1 );
+	}
+	// Previously set to 0 by populate_options()
 
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			if ( false !== strpos( $name, '-' ) ) {
+						$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			}
 		}
 		if ( $meta_keys ) {
 			$meta_keys = implode( "', '", $meta_keys );
@@ -1418,9 +1509,10 @@ 
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
-}
+	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
+			wp_delete_term( $term->term_id, 'post_format' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.
@@ -1431,9 +1523,10 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
-}
+	if ( $wp_current_db_version < 25824 ) {
+			wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.2.
@@ -1445,9 +1538,10 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
-}
+	if ( $wp_current_db_version < 26148 ) {
+			wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.8.0.
@@ -1629,10 +1723,11 @@ 
 		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
 		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
 		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
-				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
-			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			if ( !$active_sitewide_plugins ) {
+							$sitewide_plugins = (array) $wpmu_sitewide_plugins;
+			} else {
+							$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			}
 
 			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
 		}
@@ -1643,8 +1738,9 @@ 
 		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
 			foreach( $rows as $row ) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->meta_value ) {
 					update_site_option( $row->meta_key, $value );
 				}
@@ -1654,16 +1750,19 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ( $wp_current_db_version < 13576 ) {
+			update_site_option( 'global_terms_enabled', '1' );
+	}
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ( $wp_current_db_version < 19390 ) {
+			update_site_option( 'initial_db_version', $wp_current_db_version );
+	}
 
 	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+		if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
+					update_site_option( 'active_sitewide_plugins', array() );
+		}
 	}
 
 	// 3.4
@@ -1675,8 +1774,9 @@ 
 			$converted = array();
 			$themes = wp_get_themes();
 			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) ) {
+									$converted[ $stylesheet ] = true;
+				}
 			}
 			update_site_option( 'allowedthemes', $converted );
 			delete_site_option( 'allowed_themes' );
@@ -1684,8 +1784,9 @@ 
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ( $wp_current_db_version < 21823 ) {
+			update_site_option( 'ms_files_rewriting', '1' );
+	}
 
 	// 3.5.2
 	if ( $wp_current_db_version < 24448 ) {
@@ -1916,8 +2017,9 @@ 
 	$all_options = new stdClass;
 	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
 		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
+							$option->option_value = untrailingslashit( $option->option_value );
+			}
 			$all_options->{$option->option_name} = stripslashes( $option->option_value );
 		}
 	}
@@ -1939,19 +2041,23 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 
 	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ( 'home' == $setting && '' == $option ) {
+			return __get_option( 'siteurl' );
+	}
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
+			$option = untrailingslashit( $option );
+	}
 
 	return maybe_unserialize( $option );
 }
@@ -2004,8 +2110,9 @@ 
 function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+		    $queries = wp_get_db_schema( $queries );
+	}
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {
@@ -2077,8 +2184,9 @@ 
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
 		$wpdb->suppress_errors( $suppress );
 
-		if ( ! $tablefields )
-			continue;
+		if ( ! $tablefields ) {
+					continue;
+		}
 
 		// Clear the field and index arrays.
 		$cfields = $indices = array();
@@ -2198,7 +2306,9 @@ 
 
 				// For each column in the index.
 				foreach ($index_data['columns'] as $column_data) {
-					if ($index_columns != '') $index_columns .= ',';
+					if ($index_columns != '') {
+						$index_columns .= ',';
+					}
 
 					// Add the field to the column list string.
 					$index_columns .= $column_data['fieldname'];
@@ -2267,7 +2377,9 @@ 
 function make_db_current( $tables = 'all' ) {
 	$alterations = dbDelta( $tables );
 	echo "<ol>\n";
-	foreach($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach($alterations as $alteration) {
+		echo "<li>$alteration</li>\n";
+	}
 	echo "</ol>\n";
 }
 
@@ -2302,8 +2414,9 @@ 
 	$home_path = get_home_path();
 	$site_dir = WP_CONTENT_DIR . "/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
-		return false;
+	if (! file_exists("$home_path/index.php")) {
+			return false;
+	}
 
 	/*
 	 * Copy files from the old locations to the site theme.
@@ -2312,25 +2425,28 @@ 
 	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 
 	foreach ($files as $oldfile => $newfile) {
-		if ($oldfile == 'index.php')
-			$oldpath = $home_path;
-		else
-			$oldpath = ABSPATH;
+		if ($oldfile == 'index.php') {
+					$oldpath = $home_path;
+		} else {
+					$oldpath = ABSPATH;
+		}
 
 		// Check to make sure it's not a new index.
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
-					return false;
+				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) {
+									return false;
+				}
 
 				// Don't copy anything.
 				continue;
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
-			return false;
+		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) {
+					return false;
+		}
 
 		chmod("$site_dir/$newfile", 0777);
 
@@ -2340,8 +2456,9 @@ 
 			$f = fopen("$site_dir/$newfile", 'w');
 
 			foreach ($lines as $line) {
-				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+				if (preg_match('/require.*wp-blog-header/', $line)) {
+									$line = '//' . $line;
+				}
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2391,10 +2508,12 @@ 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
 		while(($theme_file = readdir( $theme_dir )) !== false) {
-			if (is_dir("$default_dir/$theme_file"))
-				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
-				return;
+			if (is_dir("$default_dir/$theme_file")) {
+							continue;
+			}
+			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file")) {
+							return;
+			}
 			chmod("$site_dir/$theme_file", 0777);
 		}
 	}
@@ -2406,11 +2525,17 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
-			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
-			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
-			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+			if (strpos($line, 'Theme Name:') !== false) {
+				$line = 'Theme Name: ' . $theme_name;
+			} elseif (strpos($line, 'Theme URI:') !== false) {
+				$line = 'Theme URI: ' . __get_option('url');
+			} elseif (strpos($line, 'Description:') !== false) {
+				$line = 'Description: Your theme.';
+			} elseif (strpos($line, 'Version:') !== false) {
+				$line = 'Version: 1';
+			} elseif (strpos($line, 'Author:') !== false) {
+				$line = 'Author: You';
+			}
 			fwrite($f, $line . "\n");
 		}
 		fclose($f);
@@ -2425,10 +2550,12 @@ 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
 		while(($image = readdir($images_dir)) !== false) {
-			if (is_dir("$default_dir/images/$image"))
-				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
-				return;
+			if (is_dir("$default_dir/images/$image")) {
+							continue;
+			}
+			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image")) {
+							return;
+			}
 			chmod("$site_dir/images/$image", 0777);
 		}
 	}
@@ -2471,9 +2598,10 @@ 
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
-			// TODO: rm -rf the site theme directory.
+		if (! make_site_theme_from_default($theme_name, $template)) {
+					// TODO: rm -rf the site theme directory.
 			return false;
+		}
 	}
 
 	// Make the new site theme active.
@@ -2524,9 +2652,10 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
-}
+	if ( is_wp_error( $result ) ) {
+			die( $result->get_error_message() );
+	}
+	}
 
 /**
  * Disables the Automattic widgets plugin, which was merged into core.
@@ -2556,9 +2685,10 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
-}
+	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 0 );
+	}
+	}
 
 /**
  * Runs before the schema is upgraded.

src/wp-content/themes/twentyeleven/functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -387,7 +387,7 @@ 
  * @since Twenty Eleven 1.0
  *
  * @param string $more The Read More text.
- * @return The filtered Read More text.
+ * @return string filtered Read More text.
  */
 function twentyeleven_auto_excerpt_more( $more ) {
 	if ( ! is_admin() ) {
@@ -540,7 +540,7 @@ 
  *
  * @since Twenty Eleven 1.0
  *
- * @return string|bool URL or false when no link is present.
+ * @return false|string URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
 	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )

Spacing +139 added lines, -139 removed lines

@@ -39,15 +39,15 @@ 
  */
 
 // Set the content width based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset($content_width))
 	$content_width = 584;
 
 /*
  * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
  */
-add_action( 'after_setup_theme', 'twentyeleven_setup' );
+add_action('after_setup_theme', 'twentyeleven_setup');
 
-if ( ! function_exists( 'twentyeleven_setup' ) ):
+if ( ! function_exists('twentyeleven_setup')):
 /**
  * Set up theme defaults and registers support for various WordPress features.
  *
@@ -77,43 +77,43 @@ 
 	 * a find and replace to change 'twentyeleven' to the name
 	 * of your theme in all the template files.
 	 */
-	load_theme_textdomain( 'twentyeleven', get_template_directory() . '/languages' );
+	load_theme_textdomain('twentyeleven', get_template_directory().'/languages');
 
 	// This theme styles the visual editor with editor-style.css to match the theme style.
 	add_editor_style();
 
 	// Load up our theme options page and related code.
-	require( get_template_directory() . '/inc/theme-options.php' );
+	require(get_template_directory().'/inc/theme-options.php');
 
 	// Grab Twenty Eleven's Ephemera widget.
-	require( get_template_directory() . '/inc/widgets.php' );
+	require(get_template_directory().'/inc/widgets.php');
 
 	// Add default posts and comments RSS feed links to <head>.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	// This theme uses wp_nav_menu() in one location.
-	register_nav_menu( 'primary', __( 'Primary Menu', 'twentyeleven' ) );
+	register_nav_menu('primary', __('Primary Menu', 'twentyeleven'));
 
 	// Add support for a variety of post formats
-	add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
+	add_theme_support('post-formats', array('aside', 'link', 'gallery', 'status', 'quote', 'image'));
 
 	$theme_options = twentyeleven_get_theme_options();
-	if ( 'dark' == $theme_options['color_scheme'] )
+	if ('dark' == $theme_options['color_scheme'])
 		$default_background_color = '1d1d1d';
 	else
 		$default_background_color = 'e2e2e2';
 
 	// Add support for custom backgrounds.
-	add_theme_support( 'custom-background', array(
+	add_theme_support('custom-background', array(
 		/*
 		 * Let WordPress know what our default background color is.
 		 * This is dependent on our current color scheme.
 		 */
 		'default-color' => $default_background_color,
-	) );
+	));
 
 	// This theme uses Featured Images (also known as post thumbnails) for per-post/per-page Custom Header images
-	add_theme_support( 'post-thumbnails' );
+	add_theme_support('post-thumbnails');
 
 	// Add support for custom headers.
 	$custom_header_support = array(
@@ -127,7 +127,7 @@ 
 		 *
 		 * @param int The default header image width in pixels. Default 1000.
 		 */
-		'width' => apply_filters( 'twentyeleven_header_image_width', 1000 ),
+		'width' => apply_filters('twentyeleven_header_image_width', 1000),
 		/**
 		 * Filter the Twenty Eleven default header image height.
 		 *
@@ -135,7 +135,7 @@ 
 		 *
 		 * @param int The default header image height in pixels. Default 288.
 		 */
-		'height' => apply_filters( 'twentyeleven_header_image_height', 288 ),
+		'height' => apply_filters('twentyeleven_header_image_height', 288),
 		// Support flexible heights.
 		'flex-height' => true,
 		// Random image rotation by default.
@@ -148,15 +148,15 @@ 
 		'admin-preview-callback' => 'twentyeleven_admin_header_image',
 	);
 
-	add_theme_support( 'custom-header', $custom_header_support );
+	add_theme_support('custom-header', $custom_header_support);
 
-	if ( ! function_exists( 'get_custom_header' ) ) {
+	if ( ! function_exists('get_custom_header')) {
 		// This is all for compatibility with versions of WordPress prior to 3.4.
-		define( 'HEADER_TEXTCOLOR', $custom_header_support['default-text-color'] );
-		define( 'HEADER_IMAGE', '' );
-		define( 'HEADER_IMAGE_WIDTH', $custom_header_support['width'] );
-		define( 'HEADER_IMAGE_HEIGHT', $custom_header_support['height'] );
-		add_custom_image_header( $custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback'] );
+		define('HEADER_TEXTCOLOR', $custom_header_support['default-text-color']);
+		define('HEADER_IMAGE', '');
+		define('HEADER_IMAGE_WIDTH', $custom_header_support['width']);
+		define('HEADER_IMAGE_HEIGHT', $custom_header_support['height']);
+		add_custom_image_header($custom_header_support['wp-head-callback'], $custom_header_support['admin-head-callback'], $custom_header_support['admin-preview-callback']);
 		add_custom_background();
 	}
 
@@ -165,71 +165,71 @@ 
 	 * We want them to be the size of the header image that we just defined.
 	 * Larger images will be auto-cropped to fit, smaller ones will be ignored. See header.php.
 	 */
-	set_post_thumbnail_size( $custom_header_support['width'], $custom_header_support['height'], true );
+	set_post_thumbnail_size($custom_header_support['width'], $custom_header_support['height'], true);
 
 	/*
 	 * Add Twenty Eleven's custom image sizes.
 	 * Used for large feature (header) images.
 	 */
-	add_image_size( 'large-feature', $custom_header_support['width'], $custom_header_support['height'], true );
+	add_image_size('large-feature', $custom_header_support['width'], $custom_header_support['height'], true);
 	// Used for featured posts if a large-feature doesn't exist.
-	add_image_size( 'small-feature', 500, 300 );
+	add_image_size('small-feature', 500, 300);
 
 	// Default custom headers packaged with the theme. %s is a placeholder for the theme template directory URI.
-	register_default_headers( array(
+	register_default_headers(array(
 		'wheel' => array(
 			'url' => '%s/images/headers/wheel.jpg',
 			'thumbnail_url' => '%s/images/headers/wheel-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Wheel', 'twentyeleven' )
+			'description' => __('Wheel', 'twentyeleven')
 		),
 		'shore' => array(
 			'url' => '%s/images/headers/shore.jpg',
 			'thumbnail_url' => '%s/images/headers/shore-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Shore', 'twentyeleven' )
+			'description' => __('Shore', 'twentyeleven')
 		),
 		'trolley' => array(
 			'url' => '%s/images/headers/trolley.jpg',
 			'thumbnail_url' => '%s/images/headers/trolley-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Trolley', 'twentyeleven' )
+			'description' => __('Trolley', 'twentyeleven')
 		),
 		'pine-cone' => array(
 			'url' => '%s/images/headers/pine-cone.jpg',
 			'thumbnail_url' => '%s/images/headers/pine-cone-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Pine Cone', 'twentyeleven' )
+			'description' => __('Pine Cone', 'twentyeleven')
 		),
 		'chessboard' => array(
 			'url' => '%s/images/headers/chessboard.jpg',
 			'thumbnail_url' => '%s/images/headers/chessboard-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Chessboard', 'twentyeleven' )
+			'description' => __('Chessboard', 'twentyeleven')
 		),
 		'lanterns' => array(
 			'url' => '%s/images/headers/lanterns.jpg',
 			'thumbnail_url' => '%s/images/headers/lanterns-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Lanterns', 'twentyeleven' )
+			'description' => __('Lanterns', 'twentyeleven')
 		),
 		'willow' => array(
 			'url' => '%s/images/headers/willow.jpg',
 			'thumbnail_url' => '%s/images/headers/willow-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Willow', 'twentyeleven' )
+			'description' => __('Willow', 'twentyeleven')
 		),
 		'hanoi' => array(
 			'url' => '%s/images/headers/hanoi.jpg',
 			'thumbnail_url' => '%s/images/headers/hanoi-thumbnail.jpg',
 			/* translators: header image description */
-			'description' => __( 'Hanoi Plant', 'twentyeleven' )
+			'description' => __('Hanoi Plant', 'twentyeleven')
 		)
-	) );
+	));
 }
 endif; // twentyeleven_setup
 
-if ( ! function_exists( 'twentyeleven_header_style' ) ) :
+if ( ! function_exists('twentyeleven_header_style')) :
 /**
  * Styles the header image and text displayed on the blog.
  *
@@ -239,7 +239,7 @@ 
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( $text_color == HEADER_TEXTCOLOR )
+	if ($text_color == HEADER_TEXTCOLOR)
 		return;
 
 	// If we get this far, we have custom styles. Let's do this.
@@ -247,7 +247,7 @@ 
 	<style type="text/css" id="twentyeleven-header-css">
 	<?php
 		// Has the text been hidden?
-		if ( 'blank' == $text_color ) :
+		if ('blank' == $text_color) :
 	?>
 		#site-title,
 		#site-description {
@@ -269,7 +269,7 @@ 
 }
 endif; // twentyeleven_header_style
 
-if ( ! function_exists( 'twentyeleven_admin_header_style' ) ) :
+if ( ! function_exists('twentyeleven_admin_header_style')) :
 /**
  * Styles the header image displayed on the Appearance > Header admin panel.
  *
@@ -302,7 +302,7 @@ 
 	}
 	<?php
 		// If the user has set a custom color for the text use that
-		if ( get_header_textcolor() != HEADER_TEXTCOLOR ) :
+		if (get_header_textcolor() != HEADER_TEXTCOLOR) :
 	?>
 		#site-title a,
 		#site-description {
@@ -319,7 +319,7 @@ 
 }
 endif; // twentyeleven_admin_header_style
 
-if ( ! function_exists( 'twentyeleven_admin_header_image' ) ) :
+if ( ! function_exists('twentyeleven_admin_header_image')) :
 /**
  * Custom header image markup displayed on the Appearance > Header admin panel.
  *
@@ -333,14 +333,14 @@ 
 		$color = get_header_textcolor();
 		$image = get_header_image();
 		$style = 'display: none;';
-		if ( $color && $color != 'blank' ) {
-			$style = 'color: #' . $color . ';';
+		if ($color && $color != 'blank') {
+			$style = 'color: #'.$color.';';
 		}
 		?>
-		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr( $style ); ?>" onclick="return false;" href="<?php echo esc_url( home_url( '/' ) ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-		<div id="desc" class="displaying-header-text" style="<?php echo esc_attr( $style ); ?>"><?php bloginfo( 'description' ); ?></div>
-  		<?php if ( $image ) : ?>
-			<img src="<?php echo esc_url( $image ); ?>" alt="" />
+		<h1 class="displaying-header-text"><a id="name" style="<?php echo esc_attr($style); ?>" onclick="return false;" href="<?php echo esc_url(home_url('/')); ?>" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
+		<div id="desc" class="displaying-header-text" style="<?php echo esc_attr($style); ?>"><?php bloginfo('description'); ?></div>
+  		<?php if ($image) : ?>
+			<img src="<?php echo esc_url($image); ?>" alt="" />
 		<?php endif; ?>
 	</div>
 <?php }
@@ -358,12 +358,12 @@ 
  * @param int $length The number of excerpt characters.
  * @return int The filtered number of characters.
  */
-function twentyeleven_excerpt_length( $length ) {
+function twentyeleven_excerpt_length($length) {
 	return 40;
 }
-add_filter( 'excerpt_length', 'twentyeleven_excerpt_length' );
+add_filter('excerpt_length', 'twentyeleven_excerpt_length');
 
-if ( ! function_exists( 'twentyeleven_continue_reading_link' ) ) :
+if ( ! function_exists('twentyeleven_continue_reading_link')) :
 /**
  * Return a "Continue Reading" link for excerpts
  *
@@ -372,7 +372,7 @@ 
  * @return string The "Continue Reading" HTML link.
  */
 function twentyeleven_continue_reading_link() {
-	return ' <a href="'. esc_url( get_permalink() ) . '">' . __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) . '</a>';
+	return ' <a href="'.esc_url(get_permalink()).'">'.__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven').'</a>';
 }
 endif; // twentyeleven_continue_reading_link
 
@@ -389,13 +389,13 @@ 
  * @param string $more The Read More text.
  * @return The filtered Read More text.
  */
-function twentyeleven_auto_excerpt_more( $more ) {
-	if ( ! is_admin() ) {
-		return ' &hellip;' . twentyeleven_continue_reading_link();
+function twentyeleven_auto_excerpt_more($more) {
+	if ( ! is_admin()) {
+		return ' &hellip;'.twentyeleven_continue_reading_link();
 	}
 	return $more;
 }
-add_filter( 'excerpt_more', 'twentyeleven_auto_excerpt_more' );
+add_filter('excerpt_more', 'twentyeleven_auto_excerpt_more');
 
 /**
  * Add a pretty "Continue Reading" link to custom post excerpts.
@@ -408,13 +408,13 @@ 
  * @param string $output The "Continue Reading" link.
  * @return string The filtered "Continue Reading" link.
  */
-function twentyeleven_custom_excerpt_more( $output ) {
-	if ( has_excerpt() && ! is_attachment() && ! is_admin() ) {
+function twentyeleven_custom_excerpt_more($output) {
+	if (has_excerpt() && ! is_attachment() && ! is_admin()) {
 		$output .= twentyeleven_continue_reading_link();
 	}
 	return $output;
 }
-add_filter( 'get_the_excerpt', 'twentyeleven_custom_excerpt_more' );
+add_filter('get_the_excerpt', 'twentyeleven_custom_excerpt_more');
 
 /**
  * Show a home link for the wp_nav_menu() fallback, wp_page_menu().
@@ -424,12 +424,12 @@ 
  * @param array $args The page menu arguments. @see wp_page_menu()
  * @return array The filtered page menu arguments.
  */
-function twentyeleven_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
+function twentyeleven_page_menu_args($args) {
+	if ( ! isset($args['show_home']))
 		$args['show_home'] = true;
 	return $args;
 }
-add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
+add_filter('wp_page_menu_args', 'twentyeleven_page_menu_args');
 
 /**
  * Register sidebars and widgetized areas.
@@ -440,60 +440,60 @@ 
  */
 function twentyeleven_widgets_init() {
 
-	register_widget( 'Twenty_Eleven_Ephemera_Widget' );
+	register_widget('Twenty_Eleven_Ephemera_Widget');
 
-	register_sidebar( array(
-		'name' => __( 'Main Sidebar', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Main Sidebar', 'twentyeleven'),
 		'id' => 'sidebar-1',
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Showcase Sidebar', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Showcase Sidebar', 'twentyeleven'),
 		'id' => 'sidebar-2',
-		'description' => __( 'The sidebar for the optional Showcase Template', 'twentyeleven' ),
+		'description' => __('The sidebar for the optional Showcase Template', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area One', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Footer Area One', 'twentyeleven'),
 		'id' => 'sidebar-3',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+		'description' => __('An optional widget area for your site footer', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area Two', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Footer Area Two', 'twentyeleven'),
 		'id' => 'sidebar-4',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+		'description' => __('An optional widget area for your site footer', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 
-	register_sidebar( array(
-		'name' => __( 'Footer Area Three', 'twentyeleven' ),
+	register_sidebar(array(
+		'name' => __('Footer Area Three', 'twentyeleven'),
 		'id' => 'sidebar-5',
-		'description' => __( 'An optional widget area for your site footer', 'twentyeleven' ),
+		'description' => __('An optional widget area for your site footer', 'twentyeleven'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget' => '</aside>',
 		'before_title' => '<h3 class="widget-title">',
 		'after_title' => '</h3>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentyeleven_widgets_init' );
+add_action('widgets_init', 'twentyeleven_widgets_init');
 
-if ( ! function_exists( 'twentyeleven_content_nav' ) ) :
+if ( ! function_exists('twentyeleven_content_nav')) :
 /**
  * Display navigation to next/previous pages when applicable.
  *
@@ -501,14 +501,14 @@ 
  *
  * @param string $html_id The HTML id attribute.
  */
-function twentyeleven_content_nav( $html_id ) {
+function twentyeleven_content_nav($html_id) {
 	global $wp_query;
 
-	if ( $wp_query->max_num_pages > 1 ) : ?>
-		<nav id="<?php echo esc_attr( $html_id ); ?>">
-			<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
-			<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven' ) ); ?></div>
-			<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></div>
+	if ($wp_query->max_num_pages > 1) : ?>
+		<nav id="<?php echo esc_attr($html_id); ?>">
+			<h3 class="assistive-text"><?php _e('Post navigation', 'twentyeleven'); ?></h3>
+			<div class="nav-previous"><?php next_posts_link(__('<span class="meta-nav">&larr;</span> Older posts', 'twentyeleven')); ?></div>
+			<div class="nav-next"><?php previous_posts_link(__('Newer posts <span class="meta-nav">&rarr;</span>', 'twentyeleven')); ?></div>
 		</nav><!-- #nav-above -->
 	<?php endif;
 }
@@ -526,13 +526,13 @@ 
  */
 function twentyeleven_get_first_url() {
 	$content = get_the_content();
-	$has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false;
+	$has_url = function_exists('get_url_in_content') ? get_url_in_content($content) : false;
 
-	if ( ! $has_url )
+	if ( ! $has_url)
 		$has_url = twentyeleven_url_grabber();
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+	return ($has_url) ? $has_url : apply_filters('the_permalink', get_permalink());
 }
 
 /**
@@ -543,10 +543,10 @@ 
  * @return string|bool URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
+	if ( ! preg_match('/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches))
 		return false;
 
-	return esc_url_raw( $matches[1] );
+	return esc_url_raw($matches[1]);
 }
 
 /**
@@ -557,18 +557,18 @@ 
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
 
-	if ( is_active_sidebar( 'sidebar-3' ) )
+	if (is_active_sidebar('sidebar-3'))
 		$count++;
 
-	if ( is_active_sidebar( 'sidebar-4' ) )
+	if (is_active_sidebar('sidebar-4'))
 		$count++;
 
-	if ( is_active_sidebar( 'sidebar-5' ) )
+	if (is_active_sidebar('sidebar-5'))
 		$count++;
 
 	$class = '';
 
-	switch ( $count ) {
+	switch ($count) {
 		case '1':
 			$class = 'one';
 			break;
@@ -580,11 +580,11 @@ 
 			break;
 	}
 
-	if ( $class )
-		echo 'class="' . esc_attr( $class ) . '"';
+	if ($class)
+		echo 'class="'.esc_attr($class).'"';
 }
 
-if ( ! function_exists( 'twentyeleven_comment' ) ) :
+if ( ! function_exists('twentyeleven_comment')) :
 /**
  * Template for comments and pingbacks.
  *
@@ -599,14 +599,14 @@ 
  * @param array  $args    An array of comment arguments. @see get_comment_reply_link()
  * @param int    $depth   The depth of the comment.
  */
-function twentyeleven_comment( $comment, $args, $depth ) {
+function twentyeleven_comment($comment, $args, $depth) {
 	$GLOBALS['comment'] = $comment;
-	switch ( $comment->comment_type ) :
+	switch ($comment->comment_type) :
 		case 'pingback' :
 		case 'trackback' :
 	?>
 	<li class="post pingback">
-		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
+		<p><?php _e('Pingback:', 'twentyeleven'); ?> <?php comment_author_link(); ?><?php edit_comment_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?></p>
 	<?php
 			break;
 		default :
@@ -617,28 +617,28 @@ 
 				<div class="comment-author vcard">
 					<?php
 						$avatar_size = 68;
-						if ( '0' != $comment->comment_parent )
+						if ('0' != $comment->comment_parent)
 							$avatar_size = 39;
 
-						echo get_avatar( $comment, $avatar_size );
+						echo get_avatar($comment, $avatar_size);
 
 						/* translators: 1: comment author, 2: date and time */
-						printf( __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
-							sprintf( '<span class="fn">%s</span>', get_comment_author_link() ),
-							sprintf( '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
-								esc_url( get_comment_link( $comment->comment_ID ) ),
-								get_comment_time( 'c' ),
+						printf(__('%1$s on %2$s <span class="says">said:</span>', 'twentyeleven'),
+							sprintf('<span class="fn">%s</span>', get_comment_author_link()),
+							sprintf('<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+								esc_url(get_comment_link($comment->comment_ID)),
+								get_comment_time('c'),
 								/* translators: 1: date, 2: time */
-								sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
+								sprintf(__('%1$s at %2$s', 'twentyeleven'), get_comment_date(), get_comment_time())
 							)
 						);
 					?>
 
-					<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+					<?php edit_comment_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 				</div><!-- .comment-author .vcard -->
 
-				<?php if ( $comment->comment_approved == '0' ) : ?>
-					<em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'twentyeleven' ); ?></em>
+				<?php if ($comment->comment_approved == '0') : ?>
+					<em class="comment-awaiting-moderation"><?php _e('Your comment is awaiting moderation.', 'twentyeleven'); ?></em>
 					<br />
 				<?php endif; ?>
 
@@ -647,7 +647,7 @@ 
 			<div class="comment-content"><?php comment_text(); ?></div>
 
 			<div class="reply">
-				<?php comment_reply_link( array_merge( $args, array( 'reply_text' => __( 'Reply <span>&darr;</span>', 'twentyeleven' ), 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+				<?php comment_reply_link(array_merge($args, array('reply_text' => __('Reply <span>&darr;</span>', 'twentyeleven'), 'depth' => $depth, 'max_depth' => $args['max_depth']))); ?>
 			</div><!-- .reply -->
 		</article><!-- #comment-## -->
 
@@ -657,7 +657,7 @@ 
 }
 endif; // ends check for twentyeleven_comment()
 
-if ( ! function_exists( 'twentyeleven_posted_on' ) ) :
+if ( ! function_exists('twentyeleven_posted_on')) :
 /**
  * Print HTML with meta information for the current post-date/time and author.
  *
@@ -666,13 +666,13 @@ 
  * @since Twenty Eleven 1.0
  */
 function twentyeleven_posted_on() {
-	printf( __( '<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven' ),
-		esc_url( get_permalink() ),
-		esc_attr( get_the_time() ),
-		esc_attr( get_the_date( 'c' ) ),
-		esc_html( get_the_date() ),
-		esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
-		esc_attr( sprintf( __( 'View all posts by %s', 'twentyeleven' ), get_the_author() ) ),
+	printf(__('<span class="sep">Posted on </span><a href="%1$s" title="%2$s" rel="bookmark"><time class="entry-date" datetime="%3$s">%4$s</time></a><span class="by-author"> <span class="sep"> by </span> <span class="author vcard"><a class="url fn n" href="%5$s" title="%6$s" rel="author">%7$s</a></span></span>', 'twentyeleven'),
+		esc_url(get_permalink()),
+		esc_attr(get_the_time()),
+		esc_attr(get_the_date('c')),
+		esc_html(get_the_date()),
+		esc_url(get_author_posts_url(get_the_author_meta('ID'))),
+		esc_attr(sprintf(__('View all posts by %s', 'twentyeleven'), get_the_author())),
 		get_the_author()
 	);
 }
@@ -689,17 +689,17 @@ 
  * @param array $classes Existing body classes.
  * @return array The filtered array of body classes.
  */
-function twentyeleven_body_classes( $classes ) {
+function twentyeleven_body_classes($classes) {
 
-	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
+	if (function_exists('is_multi_author') && ! is_multi_author())
 		$classes[] = 'single-author';
 
-	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
+	if (is_singular() && ! is_home() && ! is_page_template('showcase.php') && ! is_page_template('sidebar-page.php'))
 		$classes[] = 'singular';
 
 	return $classes;
 }
-add_filter( 'body_class', 'twentyeleven_body_classes' );
+add_filter('body_class', 'twentyeleven_body_classes');
 
 /**
  * Retrieve the IDs for images in a gallery.
@@ -714,20 +714,20 @@ 
 function twentyeleven_get_gallery_images() {
 	$images = array();
 
-	if ( function_exists( 'get_post_galleries' ) ) {
-		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
-			$images = explode( ',', $galleries[0]['ids'] );
+	if (function_exists('get_post_galleries')) {
+		$galleries = get_post_galleries(get_the_ID(), false);
+		if (isset($galleries[0]['ids']))
+			$images = explode(',', $galleries[0]['ids']);
 	} else {
 		$pattern = get_shortcode_regex();
-		preg_match( "/$pattern/s", get_the_content(), $match );
-		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
-			$images = explode( ',', $atts['ids'] );
+		preg_match("/$pattern/s", get_the_content(), $match);
+		$atts = shortcode_parse_atts($match[3]);
+		if (isset($atts['ids']))
+			$images = explode(',', $atts['ids']);
 	}
 
-	if ( ! $images ) {
-		$images = get_posts( array(
+	if ( ! $images) {
+		$images = get_posts(array(
 			'fields'         => 'ids',
 			'numberposts'    => 999,
 			'order'          => 'ASC',
@@ -735,7 +735,7 @@ 
 			'post_mime_type' => 'image',
 			'post_parent'    => get_the_ID(),
 			'post_type'      => 'attachment',
-		) );
+		));
 	}
 
 	return $images;

Braces +52 added lines, -34 removed lines

@@ -39,8 +39,9 @@ 
  */
 
 // Set the content width based on the theme's design and stylesheet.
-if ( ! isset( $content_width ) )
+if ( ! isset( $content_width ) ) {
 	$content_width = 584;
+}
 
 /*
  * Tell WordPress to run twentyeleven_setup() when the 'after_setup_theme' hook is run.
@@ -98,10 +99,11 @@ 
 	add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
 
 	$theme_options = twentyeleven_get_theme_options();
-	if ( 'dark' == $theme_options['color_scheme'] )
-		$default_background_color = '1d1d1d';
-	else
-		$default_background_color = 'e2e2e2';
+	if ( 'dark' == $theme_options['color_scheme'] ) {
+			$default_background_color = '1d1d1d';
+	} else {
+			$default_background_color = 'e2e2e2';
+	}
 
 	// Add support for custom backgrounds.
 	add_theme_support( 'custom-background', array(
@@ -239,8 +241,9 @@ 
 	$text_color = get_header_textcolor();
 
 	// If no custom options for text are set, let's bail.
-	if ( $text_color == HEADER_TEXTCOLOR )
-		return;
+	if ( $text_color == HEADER_TEXTCOLOR ) {
+			return;
+	}
 
 	// If we get this far, we have custom styles. Let's do this.
 	?>
@@ -257,11 +260,14 @@ 
 		}
 	<?php
 		// If the user has set a custom color for the text use that
-		else :
+		else {
+			:
 	?>
 		#site-title a,
 		#site-description {
-			color: #<?php echo $text_color; ?>;
+			color: #<?php echo $text_color;
+		}
+		?>;
 		}
 	<?php endif; ?>
 	</style>
@@ -425,8 +431,9 @@ 
  * @return array The filtered page menu arguments.
  */
 function twentyeleven_page_menu_args( $args ) {
-	if ( ! isset( $args['show_home'] ) )
-		$args['show_home'] = true;
+	if ( ! isset( $args['show_home'] ) ) {
+			$args['show_home'] = true;
+	}
 	return $args;
 }
 add_filter( 'wp_page_menu_args', 'twentyeleven_page_menu_args' );
@@ -528,8 +535,9 @@ 
 	$content = get_the_content();
 	$has_url = function_exists( 'get_url_in_content' ) ? get_url_in_content( $content ) : false;
 
-	if ( ! $has_url )
-		$has_url = twentyeleven_url_grabber();
+	if ( ! $has_url ) {
+			$has_url = twentyeleven_url_grabber();
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return ( $has_url ) ? $has_url : apply_filters( 'the_permalink', get_permalink() );
@@ -543,8 +551,9 @@ 
  * @return string|bool URL or false when no link is present.
  */
 function twentyeleven_url_grabber() {
-	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
-		return false;
+	if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) ) {
+			return false;
+	}
 
 	return esc_url_raw( $matches[1] );
 }
@@ -557,14 +566,17 @@ 
 function twentyeleven_footer_sidebar_class() {
 	$count = 0;
 
-	if ( is_active_sidebar( 'sidebar-3' ) )
-		$count++;
+	if ( is_active_sidebar( 'sidebar-3' ) ) {
+			$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-4' ) )
-		$count++;
+	if ( is_active_sidebar( 'sidebar-4' ) ) {
+			$count++;
+	}
 
-	if ( is_active_sidebar( 'sidebar-5' ) )
-		$count++;
+	if ( is_active_sidebar( 'sidebar-5' ) ) {
+			$count++;
+	}
 
 	$class = '';
 
@@ -580,9 +592,10 @@ 
 			break;
 	}
 
-	if ( $class )
-		echo 'class="' . esc_attr( $class ) . '"';
-}
+	if ( $class ) {
+			echo 'class="' . esc_attr( $class ) . '"';
+	}
+	}
 
 if ( ! function_exists( 'twentyeleven_comment' ) ) :
 /**
@@ -617,8 +630,9 @@ 
 				<div class="comment-author vcard">
 					<?php
 						$avatar_size = 68;
-						if ( '0' != $comment->comment_parent )
-							$avatar_size = 39;
+						if ( '0' != $comment->comment_parent ) {
+													$avatar_size = 39;
+						}
 
 						echo get_avatar( $comment, $avatar_size );
 
@@ -691,11 +705,13 @@ 
  */
 function twentyeleven_body_classes( $classes ) {
 
-	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() )
-		$classes[] = 'single-author';
+	if ( function_exists( 'is_multi_author' ) && ! is_multi_author() ) {
+			$classes[] = 'single-author';
+	}
 
-	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) )
-		$classes[] = 'singular';
+	if ( is_singular() && ! is_home() && ! is_page_template( 'showcase.php' ) && ! is_page_template( 'sidebar-page.php' ) ) {
+			$classes[] = 'singular';
+	}
 
 	return $classes;
 }
@@ -716,14 +732,16 @@ 
 
 	if ( function_exists( 'get_post_galleries' ) ) {
 		$galleries = get_post_galleries( get_the_ID(), false );
-		if ( isset( $galleries[0]['ids'] ) )
-			$images = explode( ',', $galleries[0]['ids'] );
+		if ( isset( $galleries[0]['ids'] ) ) {
+					$images = explode( ',', $galleries[0]['ids'] );
+		}
 	} else {
 		$pattern = get_shortcode_regex();
 		preg_match( "/$pattern/s", get_the_content(), $match );
 		$atts = shortcode_parse_atts( $match[3] );
-		if ( isset( $atts['ids'] ) )
-			$images = explode( ',', $atts['ids'] );
+		if ( isset( $atts['ids'] ) ) {
+					$images = explode( ',', $atts['ids'] );
+		}
 	}
 
 	if ( ! $images ) {

src/wp-includes/bookmark.php

Doc Comments +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|stdClass $bookmark
+ * @param integer|null $bookmark
  * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
  * @param string $filter Optional, default is 'raw'.
  * @return array|object|null Type returned depends on $output value.

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Link/Bookmark API
- *
- * @package WordPress
- * @subpackage Bookmark
- */
+	 * Link/Bookmark API
+	 *
+	 * @package WordPress
+	 * @subpackage Bookmark
+	 */
 
 /**
  * Retrieve Bookmark data

Switch Indentation +18 added lines, -18 removed lines

@@ -354,24 +354,24 @@
  */
 function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
 	switch ( $field ) {
-	case 'link_id' : // ints
-	case 'link_rating' :
-		$value = (int) $value;
-		break;
-	case 'link_category' : // array( ints )
-		$value = array_map('absint', (array) $value);
-		// We return here so that the categories aren't filtered.
-		// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
-		return $value;
-
-	case 'link_visible' : // bool stored as Y|N
-		$value = preg_replace('/[^YNyn]/', '', $value);
-		break;
-	case 'link_target' : // "enum"
-		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
-		break;
+		case 'link_id' : // ints
+		case 'link_rating' :
+			$value = (int) $value;
+			break;
+		case 'link_category' : // array( ints )
+			$value = array_map('absint', (array) $value);
+			// We return here so that the categories aren't filtered.
+			// The 'link_category' filter is for the name of a link category, not an array of a link's link categories
+			return $value;
+
+		case 'link_visible' : // bool stored as Y|N
+			$value = preg_replace('/[^YNyn]/', '', $value);
+			break;
+		case 'link_target' : // "enum"
+			$targets = array('_top', '_blank');
+			if ( ! in_array($value, $targets) )
+				$value = '';
+			break;
 	}
 
 	if ( 'raw' == $context )

Spacing +103 added lines, -103 removed lines

@@ -21,36 +21,36 @@ 
 function get_bookmark($bookmark, $output = OBJECT, $filter = 'raw') {
 	global $wpdb;
 
-	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
+	if (empty($bookmark)) {
+		if (isset($GLOBALS['link']))
 			$_bookmark = & $GLOBALS['link'];
 		else
 			$_bookmark = null;
-	} elseif ( is_object($bookmark) ) {
+	} elseif (is_object($bookmark)) {
 		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
 		$_bookmark = $bookmark;
 	} else {
-		if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) {
+		if (isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark)) {
 			$_bookmark = & $GLOBALS['link'];
-		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) {
+		} elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark')) {
 			$_bookmark = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->links WHERE link_id = %d LIMIT 1", $bookmark));
-			if ( $_bookmark ) {
-				$_bookmark->link_category = array_unique( wp_get_object_terms( $_bookmark->link_id, 'link_category', array( 'fields' => 'ids' ) ) );
-				wp_cache_add( $_bookmark->link_id, $_bookmark, 'bookmark' );
+			if ($_bookmark) {
+				$_bookmark->link_category = array_unique(wp_get_object_terms($_bookmark->link_id, 'link_category', array('fields' => 'ids')));
+				wp_cache_add($_bookmark->link_id, $_bookmark, 'bookmark');
 			}
 		}
 	}
 
-	if ( ! $_bookmark )
+	if ( ! $_bookmark)
 		return $_bookmark;
 
 	$_bookmark = sanitize_bookmark($_bookmark, $filter);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_bookmark;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		return get_object_vars($_bookmark);
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		return array_values(get_object_vars($_bookmark));
 	} else {
 		return $_bookmark;
@@ -67,17 +67,17 @@ 
  * @param string $context Optional. The context of how the field will be used.
  * @return string|WP_Error
  */
-function get_bookmark_field( $field, $bookmark, $context = 'display' ) {
+function get_bookmark_field($field, $bookmark, $context = 'display') {
 	$bookmark = (int) $bookmark;
-	$bookmark = get_bookmark( $bookmark );
+	$bookmark = get_bookmark($bookmark);
 
-	if ( is_wp_error($bookmark) )
+	if (is_wp_error($bookmark))
 		return $bookmark;
 
-	if ( !is_object($bookmark) )
+	if ( ! is_object($bookmark))
 		return '';
 
-	if ( !isset($bookmark->$field) )
+	if ( ! isset($bookmark->$field))
 		return '';
 
 	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
@@ -114,7 +114,7 @@ 
  * }
  * @return array List of bookmark row objects.
  */
-function get_bookmarks( $args = '' ) {
+function get_bookmarks($args = '') {
 	global $wpdb;
 
 	$defaults = array(
@@ -125,12 +125,12 @@ 
 		'exclude' => '', 'search' => ''
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$key = md5( serialize( $r ) );
-	if ( $cache = wp_cache_get( 'get_bookmarks', 'bookmark' ) ) {
-		if ( is_array( $cache ) && isset( $cache[ $key ] ) ) {
-			$bookmarks = $cache[ $key ];
+	$key = md5(serialize($r));
+	if ($cache = wp_cache_get('get_bookmarks', 'bookmark')) {
+		if (is_array($cache) && isset($cache[$key])) {
+			$bookmarks = $cache[$key];
 			/**
 			 * Filter the returned list of bookmarks.
 			 *
@@ -146,98 +146,98 @@ 
 			 * @param array $bookmarks List of the cached bookmarks.
 			 * @param array $r         An array of bookmark query arguments.
 			 */
-			return apply_filters( 'get_bookmarks', $bookmarks, $r );
+			return apply_filters('get_bookmarks', $bookmarks, $r);
 		}
 	}
 
-	if ( ! is_array( $cache ) ) {
+	if ( ! is_array($cache)) {
 		$cache = array();
 	}
 
 	$inclusions = '';
-	if ( ! empty( $r['include'] ) ) {
-		$r['exclude'] = '';  //ignore exclude, category, and category_name params if using include
+	if ( ! empty($r['include'])) {
+		$r['exclude'] = ''; //ignore exclude, category, and category_name params if using include
 		$r['category'] = '';
 		$r['category_name'] = '';
-		$inclinks = preg_split( '/[\s,]+/', $r['include'] );
-		if ( count( $inclinks ) ) {
-			foreach ( $inclinks as $inclink ) {
-				if ( empty( $inclusions ) ) {
-					$inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' ';
+		$inclinks = preg_split('/[\s,]+/', $r['include']);
+		if (count($inclinks)) {
+			foreach ($inclinks as $inclink) {
+				if (empty($inclusions)) {
+					$inclusions = ' AND ( link_id = '.intval($inclink).' ';
 				} else {
-					$inclusions .= ' OR link_id = ' . intval( $inclink ) . ' ';
+					$inclusions .= ' OR link_id = '.intval($inclink).' ';
 				}
 			}
 		}
 	}
-	if (! empty( $inclusions ) ) {
+	if ( ! empty($inclusions)) {
 		$inclusions .= ')';
 	}
 
 	$exclusions = '';
-	if ( ! empty( $r['exclude'] ) ) {
-		$exlinks = preg_split( '/[\s,]+/', $r['exclude'] );
-		if ( count( $exlinks ) ) {
-			foreach ( $exlinks as $exlink ) {
-				if ( empty( $exclusions ) ) {
-					$exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' ';
+	if ( ! empty($r['exclude'])) {
+		$exlinks = preg_split('/[\s,]+/', $r['exclude']);
+		if (count($exlinks)) {
+			foreach ($exlinks as $exlink) {
+				if (empty($exclusions)) {
+					$exclusions = ' AND ( link_id <> '.intval($exlink).' ';
 				} else {
-					$exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' ';
+					$exclusions .= ' AND link_id <> '.intval($exlink).' ';
 				}
 			}
 		}
 	}
-	if ( ! empty( $exclusions ) ) {
+	if ( ! empty($exclusions)) {
 		$exclusions .= ')';
 	}
 
-	if ( ! empty( $r['category_name'] ) ) {
-		if ( $r['category'] = get_term_by('name', $r['category_name'], 'link_category') ) {
+	if ( ! empty($r['category_name'])) {
+		if ($r['category'] = get_term_by('name', $r['category_name'], 'link_category')) {
 			$r['category'] = $r['category']->term_id;
 		} else {
-			$cache[ $key ] = array();
-			wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+			$cache[$key] = array();
+			wp_cache_set('get_bookmarks', $cache, 'bookmark');
 			/** This filter is documented in wp-includes/bookmark.php */
-			return apply_filters( 'get_bookmarks', array(), $r );
+			return apply_filters('get_bookmarks', array(), $r);
 		}
 	}
 
 	$search = '';
-	if ( ! empty( $r['search'] ) ) {
-		$like = '%' . $wpdb->esc_like( $r['search'] ) . '%';
-		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like );
+	if ( ! empty($r['search'])) {
+		$like = '%'.$wpdb->esc_like($r['search']).'%';
+		$search = $wpdb->prepare(" AND ( (link_url LIKE %s) OR (link_name LIKE %s) OR (link_description LIKE %s) ) ", $like, $like, $like);
 	}
 
 	$category_query = '';
 	$join = '';
-	if ( ! empty( $r['category'] ) ) {
-		$incategories = preg_split( '/[\s,]+/', $r['category'] );
-		if ( count($incategories) ) {
-			foreach ( $incategories as $incat ) {
-				if ( empty( $category_query ) ) {
-					$category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
+	if ( ! empty($r['category'])) {
+		$incategories = preg_split('/[\s,]+/', $r['category']);
+		if (count($incategories)) {
+			foreach ($incategories as $incat) {
+				if (empty($category_query)) {
+					$category_query = ' AND ( tt.term_id = '.intval($incat).' ';
 				} else {
-					$category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' ';
+					$category_query .= ' OR tt.term_id = '.intval($incat).' ';
 				}
 			}
 		}
 	}
-	if ( ! empty( $category_query ) ) {
+	if ( ! empty($category_query)) {
 		$category_query .= ") AND taxonomy = 'link_category'";
 		$join = " INNER JOIN $wpdb->term_relationships AS tr ON ($wpdb->links.link_id = tr.object_id) INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_taxonomy_id = tr.term_taxonomy_id";
 	}
 
-	if ( $r['show_updated'] ) {
+	if ($r['show_updated']) {
 		$recently_updated_test = ", IF (DATE_ADD(link_updated, INTERVAL 120 MINUTE) >= NOW(), 1,0) as recently_updated ";
 	} else {
 		$recently_updated_test = '';
 	}
 
-	$get_updated = ( $r['show_updated'] ) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
+	$get_updated = ($r['show_updated']) ? ', UNIX_TIMESTAMP(link_updated) AS link_updated_f ' : '';
 
-	$orderby = strtolower( $r['orderby'] );
+	$orderby = strtolower($r['orderby']);
 	$length = '';
-	switch ( $orderby ) {
+	switch ($orderby) {
 		case 'length':
 			$length = ", CHAR_LENGTH(link_name) AS length";
 			break;
@@ -249,47 +249,47 @@ 
 			break;
 		default:
 			$orderparams = array();
-			$keys = array( 'link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description' );
-			foreach ( explode( ',', $orderby ) as $ordparam ) {
-				$ordparam = trim( $ordparam );
+			$keys = array('link_id', 'link_name', 'link_url', 'link_visible', 'link_rating', 'link_owner', 'link_updated', 'link_notes', 'link_description');
+			foreach (explode(',', $orderby) as $ordparam) {
+				$ordparam = trim($ordparam);
 
-				if ( in_array( 'link_' . $ordparam, $keys ) ) {
-					$orderparams[] = 'link_' . $ordparam;
-				} elseif ( in_array( $ordparam, $keys ) ) {
+				if (in_array('link_'.$ordparam, $keys)) {
+					$orderparams[] = 'link_'.$ordparam;
+				} elseif (in_array($ordparam, $keys)) {
 					$orderparams[] = $ordparam;
 				}
 			}
-			$orderby = implode( ',', $orderparams );
+			$orderby = implode(',', $orderparams);
 	}
 
-	if ( empty( $orderby ) ) {
+	if (empty($orderby)) {
 		$orderby = 'link_name';
 	}
 
-	$order = strtoupper( $r['order'] );
-	if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
+	$order = strtoupper($r['order']);
+	if ('' !== $order && ! in_array($order, array('ASC', 'DESC'))) {
 		$order = 'ASC';
 	}
 
 	$visible = '';
-	if ( $r['hide_invisible'] ) {
+	if ($r['hide_invisible']) {
 		$visible = "AND link_visible = 'Y'";
 	}
 
 	$query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
 	$query .= " $exclusions $inclusions $search";
 	$query .= " ORDER BY $orderby $order";
-	if ( $r['limit'] != -1 ) {
-		$query .= ' LIMIT ' . $r['limit'];
+	if ($r['limit'] != -1) {
+		$query .= ' LIMIT '.$r['limit'];
 	}
 
-	$results = $wpdb->get_results( $query );
+	$results = $wpdb->get_results($query);
 
-	$cache[ $key ] = $results;
-	wp_cache_set( 'get_bookmarks', $cache, 'bookmark' );
+	$cache[$key] = $results;
+	wp_cache_set('get_bookmarks', $cache, 'bookmark');
 
 	/** This filter is documented in wp-includes/bookmark.php */
-	return apply_filters( 'get_bookmarks', $results, $r );
+	return apply_filters('get_bookmarks', $results, $r);
 }
 
 /**
@@ -305,9 +305,9 @@ 
 function sanitize_bookmark($bookmark, $context = 'display') {
 	$fields = array('link_id', 'link_url', 'link_name', 'link_image', 'link_target', 'link_category',
 		'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_updated',
-		'link_rel', 'link_notes', 'link_rss', );
+		'link_rel', 'link_notes', 'link_rss',);
 
-	if ( is_object($bookmark) ) {
+	if (is_object($bookmark)) {
 		$do_object = true;
 		$link_id = $bookmark->link_id;
 	} else {
@@ -315,12 +315,12 @@ 
 		$link_id = $bookmark['link_id'];
 	}
 
-	foreach ( $fields as $field ) {
-		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
+	foreach ($fields as $field) {
+		if ($do_object) {
+			if (isset($bookmark->$field))
 				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
 		} else {
-			if ( isset($bookmark[$field]) )
+			if (isset($bookmark[$field]))
 				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
 		}
 	}
@@ -353,7 +353,7 @@ 
  * @return mixed The filtered value
  */
 function sanitize_bookmark_field($field, $value, $bookmark_id, $context) {
-	switch ( $field ) {
+	switch ($field) {
 	case 'link_id' : // ints
 	case 'link_rating' :
 		$value = (int) $value;
@@ -369,34 +369,34 @@ 
 		break;
 	case 'link_target' : // "enum"
 		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
+		if ( ! in_array($value, $targets))
 			$value = '';
 		break;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "edit_$field", $value, $bookmark_id );
+		$value = apply_filters("edit_$field", $value, $bookmark_id);
 
-		if ( 'link_notes' == $field ) {
-			$value = esc_html( $value ); // textarea_escaped
+		if ('link_notes' == $field) {
+			$value = esc_html($value); // textarea_escaped
 		} else {
 			$value = esc_attr($value);
 		}
-	} elseif ( 'db' == $context ) {
+	} elseif ('db' == $context) {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( "pre_$field", $value );
+		$value = apply_filters("pre_$field", $value);
 	} else {
 		/** This filter is documented in wp-includes/post.php */
-		$value = apply_filters( $field, $value, $bookmark_id, $context );
+		$value = apply_filters($field, $value, $bookmark_id, $context);
 
-		if ( 'attribute' == $context ) {
-			$value = esc_attr( $value );
-		} elseif ( 'js' == $context ) {
-			$value = esc_js( $value );
+		if ('attribute' == $context) {
+			$value = esc_attr($value);
+		} elseif ('js' == $context) {
+			$value = esc_js($value);
 		}
 	}
 
@@ -408,8 +408,8 @@ 
  *
  * @since 2.7.0
  */
-function clean_bookmark_cache( $bookmark_id ) {
-	wp_cache_delete( $bookmark_id, 'bookmark' );
-	wp_cache_delete( 'get_bookmarks', 'bookmark' );
-	clean_object_term_cache( $bookmark_id, 'link');
+function clean_bookmark_cache($bookmark_id) {
+	wp_cache_delete($bookmark_id, 'bookmark');
+	wp_cache_delete('get_bookmarks', 'bookmark');
+	clean_object_term_cache($bookmark_id, 'link');
 }

Braces +29 added lines, -20 removed lines

@@ -22,10 +22,11 @@ 
 	global $wpdb;
 
 	if ( empty($bookmark) ) {
-		if ( isset($GLOBALS['link']) )
-			$_bookmark = & $GLOBALS['link'];
-		else
-			$_bookmark = null;
+		if ( isset($GLOBALS['link']) ) {
+					$_bookmark = & $GLOBALS['link'];
+		} else {
+					$_bookmark = null;
+		}
 	} elseif ( is_object($bookmark) ) {
 		wp_cache_add($bookmark->link_id, $bookmark, 'bookmark');
 		$_bookmark = $bookmark;
@@ -41,8 +42,9 @@ 
 		}
 	}
 
-	if ( ! $_bookmark )
-		return $_bookmark;
+	if ( ! $_bookmark ) {
+			return $_bookmark;
+	}
 
 	$_bookmark = sanitize_bookmark($_bookmark, $filter);
 
@@ -71,14 +73,17 @@ 
 	$bookmark = (int) $bookmark;
 	$bookmark = get_bookmark( $bookmark );
 
-	if ( is_wp_error($bookmark) )
-		return $bookmark;
+	if ( is_wp_error($bookmark) ) {
+			return $bookmark;
+	}
 
-	if ( !is_object($bookmark) )
-		return '';
+	if ( !is_object($bookmark) ) {
+			return '';
+	}
 
-	if ( !isset($bookmark->$field) )
-		return '';
+	if ( !isset($bookmark->$field) ) {
+			return '';
+	}
 
 	return sanitize_bookmark_field($field, $bookmark->$field, $bookmark->link_id, $context);
 }
@@ -317,11 +322,13 @@ 
 
 	foreach ( $fields as $field ) {
 		if ( $do_object ) {
-			if ( isset($bookmark->$field) )
-				$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			if ( isset($bookmark->$field) ) {
+							$bookmark->$field = sanitize_bookmark_field($field, $bookmark->$field, $link_id, $context);
+			}
 		} else {
-			if ( isset($bookmark[$field]) )
-				$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			if ( isset($bookmark[$field]) ) {
+							$bookmark[$field] = sanitize_bookmark_field($field, $bookmark[$field], $link_id, $context);
+			}
 		}
 	}
 
@@ -369,13 +376,15 @@ 
 		break;
 	case 'link_target' : // "enum"
 		$targets = array('_top', '_blank');
-		if ( ! in_array($value, $targets) )
-			$value = '';
+		if ( ! in_array($value, $targets) ) {
+					$value = '';
+		}
 		break;
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	if ( 'edit' == $context ) {
 		/** This filter is documented in wp-includes/post.php */

src/wp-includes/cache.php

Doc Comments +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
  *
  * @since 2.0.0
  *
- * @return true Always returns True
+ * @return boolean Always returns True
  */
 function wp_cache_close() {
 	return true;
@@ -483,7 +483,7 @@ 
 	 *
 	 * @since 2.0.0
 	 *
-	 * @return true Always returns true
+	 * @return boolean Always returns true
 	 */
 	public function flush() {
 		$this->cache = array();
@@ -623,7 +623,7 @@ 
 	 * @param mixed $data The contents to store in the cache
 	 * @param string $group Where to group the cache contents
 	 * @param int $expire Not Used
-	 * @return true Always returns true
+	 * @return boolean Always returns true
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
 		if ( empty( $group ) )
@@ -715,7 +715,7 @@ 
 	 *
 	 * @since  2.0.8
 	 *
-	 * @return true True value. Won't be used by PHP
+	 * @return boolean True value. Won't be used by PHP
 	 */
 	public function __destruct() {
 		return true;

Indentation +1 added lines, -1 removed lines

@@ -692,7 +692,7 @@
 	 *
 	 * @since 2.0.8
 	 *
-     * @global int $blog_id
+	 * @global int $blog_id
 	 */
 	public function __construct() {
 		global $blog_id;

Spacing +90 added lines, -90 removed lines

@@ -21,10 +21,10 @@ 
  * @param int $expire When the cache data should be expired
  * @return bool False if cache key and group already exist, true on success
  */
-function wp_cache_add( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_add($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->add( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->add($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -55,10 +55,10 @@ 
  * @param string $group The group the key is in.
  * @return false|int False on failure, the item's new value on success.
  */
-function wp_cache_decr( $key, $offset = 1, $group = '' ) {
+function wp_cache_decr($key, $offset = 1, $group = '') {
 	global $wp_object_cache;
 
-	return $wp_object_cache->decr( $key, $offset, $group );
+	return $wp_object_cache->decr($key, $offset, $group);
 }
 
 /**
@@ -107,10 +107,10 @@ 
  * @return bool|mixed False on failure to retrieve contents or the cache
  *		              contents on success
  */
-function wp_cache_get( $key, $group = '', $force = false, &$found = null ) {
+function wp_cache_get($key, $group = '', $force = false, &$found = null) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->get( $key, $group, $force, $found );
+	return $wp_object_cache->get($key, $group, $force, $found);
 }
 
 /**
@@ -125,10 +125,10 @@ 
  * @param string $group The group the key is in.
  * @return false|int False on failure, the item's new value on success.
  */
-function wp_cache_incr( $key, $offset = 1, $group = '' ) {
+function wp_cache_incr($key, $offset = 1, $group = '') {
 	global $wp_object_cache;
 
-	return $wp_object_cache->incr( $key, $offset, $group );
+	return $wp_object_cache->incr($key, $offset, $group);
 }
 
 /**
@@ -155,10 +155,10 @@ 
  * @param int $expire When to expire the cache contents
  * @return bool False if not exists, true if contents were replaced
  */
-function wp_cache_replace( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_replace($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->replace( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->replace($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -174,10 +174,10 @@ 
  * @param int $expire When to expire the cache contents
  * @return bool False on failure, true on success
  */
-function wp_cache_set( $key, $data, $group = '', $expire = 0 ) {
+function wp_cache_set($key, $data, $group = '', $expire = 0) {
 	global $wp_object_cache;
 
-	return $wp_object_cache->set( $key, $data, $group, (int) $expire );
+	return $wp_object_cache->set($key, $data, $group, (int) $expire);
 }
 
 /**
@@ -191,10 +191,10 @@ 
  *
  * @param int $blog_id Blog ID
  */
-function wp_cache_switch_to_blog( $blog_id ) {
+function wp_cache_switch_to_blog($blog_id) {
 	global $wp_object_cache;
 
-	$wp_object_cache->switch_to_blog( $blog_id );
+	$wp_object_cache->switch_to_blog($blog_id);
 }
 
 /**
@@ -206,10 +206,10 @@ 
  *
  * @param string|array $groups A group or an array of groups to add
  */
-function wp_cache_add_global_groups( $groups ) {
+function wp_cache_add_global_groups($groups) {
 	global $wp_object_cache;
 
-	$wp_object_cache->add_global_groups( $groups );
+	$wp_object_cache->add_global_groups($groups);
 }
 
 /**
@@ -219,7 +219,7 @@ 
  *
  * @param string|array $groups A group or an array of groups to add
  */
-function wp_cache_add_non_persistent_groups( $groups ) {
+function wp_cache_add_non_persistent_groups($groups) {
 	// Default cache doesn't persist so nothing to do here.
 }
 
@@ -241,7 +241,7 @@ 
  * @global WP_Object_Cache $wp_object_cache
  */
 function wp_cache_reset() {
-	_deprecated_function( __FUNCTION__, '3.5' );
+	_deprecated_function(__FUNCTION__, '3.5');
 
 	global $wp_object_cache;
 
@@ -329,7 +329,7 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
+	public function __get($name) {
 		return $this->$name;
 	}
 
@@ -343,7 +343,7 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		return $this->$name = $value;
 	}
 
@@ -356,8 +356,8 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
+	public function __isset($name) {
+		return isset($this->$name);
 	}
 
 	/**
@@ -368,8 +368,8 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
+	public function __unset($name) {
+		unset($this->$name);
 	}
 
 	/**
@@ -387,21 +387,21 @@ 
 	 * @param int $expire When to expire the cache contents
 	 * @return bool False if cache key and group already exist, true on success
 	 */
-	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
+	public function add($key, $data, $group = 'default', $expire = 0) {
+		if (wp_suspend_cache_addition())
 			return false;
 
-		if ( empty( $group ) )
+		if (empty($group))
 			$group = 'default';
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$id = $this->blog_prefix.$key;
 
-		if ( $this->_exists( $id, $group ) )
+		if ($this->_exists($id, $group))
 			return false;
 
-		return $this->set( $key, $data, $group, (int) $expire );
+		return $this->set($key, $data, $group, (int) $expire);
 	}
 
 	/**
@@ -411,11 +411,11 @@ 
 	 *
 	 * @param array $groups List of groups that are global.
 	 */
-	public function add_global_groups( $groups ) {
+	public function add_global_groups($groups) {
 		$groups = (array) $groups;
 
-		$groups = array_fill_keys( $groups, true );
-		$this->global_groups = array_merge( $this->global_groups, $groups );
+		$groups = array_fill_keys($groups, true);
+		$this->global_groups = array_merge($this->global_groups, $groups);
 	}
 
 	/**
@@ -428,27 +428,27 @@ 
 	 * @param string $group The group the key is in.
 	 * @return false|int False on failure, the item's new value on success.
 	 */
-	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+	public function decr($key, $offset = 1, $group = 'default') {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric($this->cache[$group][$key]))
+			$this->cache[$group][$key] = 0;
 
 		$offset = (int) $offset;
 
-		$this->cache[ $group ][ $key ] -= $offset;
+		$this->cache[$group][$key] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ($this->cache[$group][$key] < 0)
+			$this->cache[$group][$key] = 0;
 
-		return $this->cache[ $group ][ $key ];
+		return $this->cache[$group][$key];
 	}
 
 	/**
@@ -464,17 +464,17 @@ 
 	 *
 	 * @return bool False if the contents weren't deleted and true on success
 	 */
-	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
+	public function delete($key, $group = 'default', $deprecated = false) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		unset( $this->cache[$group][$key] );
+		unset($this->cache[$group][$key]);
 		return true;
 	}
 
@@ -508,17 +508,17 @@ 
 	 * @return false|mixed False on failure to retrieve contents or the cache
 	 *		               contents on success
 	 */
-	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
+	public function get($key, $group = 'default', $force = false, &$found = null) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( $this->_exists( $key, $group ) ) {
+		if ($this->_exists($key, $group)) {
 			$found = true;
 			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
+			if (is_object($this->cache[$group][$key]))
 				return clone $this->cache[$group][$key];
 			else
 				return $this->cache[$group][$key];
@@ -539,27 +539,27 @@ 
 	 * @param string $group The group the key is in.
 	 * @return false|int False on failure, the item's new value on success.
 	 */
-	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
+	public function incr($key, $offset = 1, $group = 'default') {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $key, $group ) )
+		if ( ! $this->_exists($key, $group))
 			return false;
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric($this->cache[$group][$key]))
+			$this->cache[$group][$key] = 0;
 
 		$offset = (int) $offset;
 
-		$this->cache[ $group ][ $key ] += $offset;
+		$this->cache[$group][$key] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ($this->cache[$group][$key] < 0)
+			$this->cache[$group][$key] = 0;
 
-		return $this->cache[ $group ][ $key ];
+		return $this->cache[$group][$key];
 	}
 
 	/**
@@ -574,18 +574,18 @@ 
 	 * @param int $expire When to expire the cache contents
 	 * @return bool False if not exists, true if contents were replaced
 	 */
-	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+	public function replace($key, $data, $group = 'default', $expire = 0) {
+		if (empty($group))
 			$group = 'default';
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$id = $this->blog_prefix.$key;
 
-		if ( ! $this->_exists( $id, $group ) )
+		if ( ! $this->_exists($id, $group))
 			return false;
 
-		return $this->set( $key, $data, $group, (int) $expire );
+		return $this->set($key, $data, $group, (int) $expire);
 	}
 
 	/**
@@ -596,12 +596,12 @@ 
 	 * @see switch_to_blog()
 	 */
 	public function reset() {
-		_deprecated_function( __FUNCTION__, '3.5', 'switch_to_blog()' );
+		_deprecated_function(__FUNCTION__, '3.5', 'switch_to_blog()');
 
 		// Clear out non-global caches since the blog ID has changed.
-		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
-				unset( $this->cache[ $group ] );
+		foreach (array_keys($this->cache) as $group) {
+			if ( ! isset($this->global_groups[$group]))
+				unset($this->cache[$group]);
 		}
 	}
 
@@ -625,14 +625,14 @@ 
 	 * @param int $expire Not Used
 	 * @return true Always returns true
 	 */
-	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
+	public function set($key, $data, $group = 'default', $expire = 0) {
+		if (empty($group))
 			$group = 'default';
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ($this->multisite && ! isset($this->global_groups[$group]))
+			$key = $this->blog_prefix.$key;
 
-		if ( is_object( $data ) )
+		if (is_object($data))
 			$data = clone $data;
 
 		$this->cache[$group][$key] = $data;
@@ -654,7 +654,7 @@ 
 		echo "</p>";
 		echo '<ul>';
 		foreach ($this->cache as $group => $cache) {
-			echo "<li><strong>Group:</strong> $group - ( " . number_format( strlen( serialize( $cache ) ) / 1024, 2 ) . 'k )</li>';
+			echo "<li><strong>Group:</strong> $group - ( ".number_format(strlen(serialize($cache)) / 1024, 2).'k )</li>';
 		}
 		echo '</ul>';
 	}
@@ -668,9 +668,9 @@ 
 	 *
 	 * @param int $blog_id Blog ID
 	 */
-	public function switch_to_blog( $blog_id ) {
+	public function switch_to_blog($blog_id) {
 		$blog_id = (int) $blog_id;
-		$this->blog_prefix = $this->multisite ? $blog_id . ':' : '';
+		$this->blog_prefix = $this->multisite ? $blog_id.':' : '';
 	}
 
 	/**
@@ -683,8 +683,8 @@ 
 	 * @param string $group
 	 * @return bool
 	 */
-	protected function _exists( $key, $group ) {
-		return isset( $this->cache[ $group ] ) && ( isset( $this->cache[ $group ][ $key ] ) || array_key_exists( $key, $this->cache[ $group ] ) );
+	protected function _exists($key, $group) {
+		return isset($this->cache[$group]) && (isset($this->cache[$group][$key]) || array_key_exists($key, $this->cache[$group]));
 	}
 
 	/**
@@ -698,14 +698,14 @@ 
 		global $blog_id;
 
 		$this->multisite = is_multisite();
-		$this->blog_prefix =  $this->multisite ? $blog_id . ':' : '';
+		$this->blog_prefix = $this->multisite ? $blog_id.':' : '';
 
 
 		/**
 		 * @todo This should be moved to the PHP4 style constructor, PHP5
 		 * already calls __destruct()
 		 */
-		register_shutdown_function( array( $this, '__destruct' ) );
+		register_shutdown_function(array($this, '__destruct'));
 	}
 
 	/**

Braces +83 added lines, -56 removed lines

@@ -388,18 +388,22 @@ 
 	 * @return bool False if cache key and group already exist, true on success
 	 */
 	public function add( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( wp_suspend_cache_addition() )
-			return false;
+		if ( wp_suspend_cache_addition() ) {
+					return false;
+		}
 
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$id = $this->blog_prefix . $key;
+		}
 
-		if ( $this->_exists( $id, $group ) )
-			return false;
+		if ( $this->_exists( $id, $group ) ) {
+					return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -429,24 +433,29 @@ 
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function decr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] -= $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -465,14 +474,17 @@ 
 	 * @return bool False if the contents weren't deleted and true on success
 	 */
 	public function delete( $key, $group = 'default', $deprecated = false ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
 		unset( $this->cache[$group][$key] );
 		return true;
@@ -509,19 +521,22 @@ 
 	 *		               contents on success
 	 */
 	public function get( $key, $group = 'default', $force = false, &$found = null ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
 		if ( $this->_exists( $key, $group ) ) {
 			$found = true;
 			$this->cache_hits += 1;
-			if ( is_object($this->cache[$group][$key]) )
-				return clone $this->cache[$group][$key];
-			else
-				return $this->cache[$group][$key];
+			if ( is_object($this->cache[$group][$key]) ) {
+							return clone $this->cache[$group][$key];
+			} else {
+							return $this->cache[$group][$key];
+			}
 		}
 
 		$found = false;
@@ -540,24 +555,29 @@ 
 	 * @return false|int False on failure, the item's new value on success.
 	 */
 	public function incr( $key, $offset = 1, $group = 'default' ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $key, $group ) )
-			return false;
+		if ( ! $this->_exists( $key, $group ) ) {
+					return false;
+		}
 
-		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( ! is_numeric( $this->cache[ $group ][ $key ] ) ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		$offset = (int) $offset;
 
 		$this->cache[ $group ][ $key ] += $offset;
 
-		if ( $this->cache[ $group ][ $key ] < 0 )
-			$this->cache[ $group ][ $key ] = 0;
+		if ( $this->cache[ $group ][ $key ] < 0 ) {
+					$this->cache[ $group ][ $key ] = 0;
+		}
 
 		return $this->cache[ $group ][ $key ];
 	}
@@ -575,15 +595,18 @@ 
 	 * @return bool False if not exists, true if contents were replaced
 	 */
 	public function replace( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
 		$id = $key;
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$id = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$id = $this->blog_prefix . $key;
+		}
 
-		if ( ! $this->_exists( $id, $group ) )
-			return false;
+		if ( ! $this->_exists( $id, $group ) ) {
+					return false;
+		}
 
 		return $this->set( $key, $data, $group, (int) $expire );
 	}
@@ -600,8 +623,9 @@ 
 
 		// Clear out non-global caches since the blog ID has changed.
 		foreach ( array_keys( $this->cache ) as $group ) {
-			if ( ! isset( $this->global_groups[ $group ] ) )
-				unset( $this->cache[ $group ] );
+			if ( ! isset( $this->global_groups[ $group ] ) ) {
+							unset( $this->cache[ $group ] );
+			}
 		}
 	}
 
@@ -626,14 +650,17 @@ 
 	 * @return true Always returns true
 	 */
 	public function set( $key, $data, $group = 'default', $expire = 0 ) {
-		if ( empty( $group ) )
-			$group = 'default';
+		if ( empty( $group ) ) {
+					$group = 'default';
+		}
 
-		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) )
-			$key = $this->blog_prefix . $key;
+		if ( $this->multisite && ! isset( $this->global_groups[ $group ] ) ) {
+					$key = $this->blog_prefix . $key;
+		}
 
-		if ( is_object( $data ) )
-			$data = clone $data;
+		if ( is_object( $data ) ) {
+					$data = clone $data;
+		}
 
 		$this->cache[$group][$key] = $data;
 		return true;