ntwb / wordpress

src/wp-admin/includes/class-wp-upgrader-skins.php

Doc Comments +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param bool   $error
 	 * @param string $context
 	 * @param bool   $allow_relaxed_file_ownership
-	 * @return type
+	 * @return boolean
 	 */
 	public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
 		$url = $this->options['url'];
@@ -885,7 +885,7 @@ 
 	}
 
 	/**
-	 * @param string|array|WP_Error $data
+	 * @param string $data
 	 */
 	public function feedback( $data ) {
 		if ( is_wp_error( $data ) ) {

Spacing +189 added lines, -189 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
+		$defaults = array('url' => '', 'nonce' => '', 'title' => '', 'context' => false);
 		$this->options = wp_parse_args($args, $defaults);
 	}
 
@@ -35,8 +35,8 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if (is_object($upgrader))
+			$this->upgrader = & $upgrader;
 		$this->add_strings();
 	}
 
@@ -61,37 +61,37 @@ 
 	 * @param bool   $allow_relaxed_file_ownership
 	 * @return type
 	 */
-	public function request_filesystem_credentials( $error = false, $context = false, $allow_relaxed_file_ownership = false ) {
+	public function request_filesystem_credentials($error = false, $context = false, $allow_relaxed_file_ownership = false) {
 		$url = $this->options['url'];
-		if ( ! $context ) {
+		if ( ! $context) {
 			$context = $this->options['context'];
 		}
-		if ( !empty($this->options['nonce']) ) {
+		if ( ! empty($this->options['nonce'])) {
 			$url = wp_nonce_url($url, $this->options['nonce']);
 		}
 
 		$extra_fields = array();
 
-		return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
+		return request_filesystem_credentials($url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function header() {
-		if ( $this->done_header ) {
+		if ($this->done_header) {
 			return;
 		}
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		echo '<h1>' . $this->options['title'] . '</h1>';
+		echo '<h1>'.$this->options['title'].'</h1>';
 	}
 
 	/**
 	 * @access public
 	 */
 	public function footer() {
-		if ( $this->done_footer ) {
+		if ($this->done_footer) {
 			return;
 		}
 		$this->done_footer = true;
@@ -103,14 +103,14 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
+		if ( ! $this->done_header)
 			$this->header();
-		if ( is_string($errors) ) {
+		if (is_string($errors)) {
 			$this->feedback($errors);
-		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
-			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+		} elseif (is_wp_error($errors) && $errors->get_error_code()) {
+			foreach ($errors->get_error_messages() as $message) {
+				if ($errors->get_error_data() && is_string($errors->get_error_data()))
+					$this->feedback($message.' '.esc_html(strip_tags($errors->get_error_data())));
 				else
 					$this->feedback($message);
 			}
@@ -122,19 +122,19 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
+		if (isset($this->upgrader->strings[$string]))
 			$string = $this->upgrader->strings[$string];
 
-		if ( strpos($string, '%') !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
 			$args = array_splice($args, 1);
-			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
+			if ($args) {
+				$args = array_map('strip_tags', $args);
+				$args = array_map('esc_html', $args);
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
+		if (empty($string))
 			return;
 		show_message($string);
 	}
@@ -157,22 +157,22 @@ 
 	 * @param string $type Type of update count to decrement. Likely values include 'plugin',
 	 *                     'theme', 'translation', etc.
 	 */
-	protected function decrement_update_count( $type ) {
-		if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+	protected function decrement_update_count($type) {
+		if ( ! $this->result || is_wp_error($this->result) || 'up_to_date' === $this->result) {
 			return;
 		}
 
-		if ( defined( 'IFRAME_REQUEST' ) ) {
+		if (defined('IFRAME_REQUEST')) {
 			echo '<script type="text/javascript">
 					if ( window.postMessage && JSON ) {
-						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
+						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type.'" } ), window.location.protocol + "//" + window.location.hostname );
 					}
 				</script>';
 		} else {
 			echo '<script type="text/javascript">
 					(function( wp ) {
 						if ( wp && wp.updates.decrementCount ) {
-							wp.updates.decrementCount( "' . $type . '" );
+							wp.updates.decrementCount( "' . $type.'" );
 						}
 					})( window.wp );
 				</script>';
@@ -206,14 +206,14 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
+	public function __construct($args = array()) {
+		$defaults = array('url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin'));
 		$args = wp_parse_args($args, $defaults);
 
 		$this->plugin = $args['plugin'];
 
-		$this->plugin_active = is_plugin_active( $this->plugin );
-		$this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
+		$this->plugin_active = is_plugin_active($this->plugin);
+		$this->plugin_network_active = is_plugin_active_for_network($this->plugin);
 
 		parent::__construct($args);
 	}
@@ -223,19 +223,19 @@ 
 	 */
 	public function after() {
 		$this->plugin = $this->upgrader->plugin_info();
-		if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
+		if ( ! empty($this->plugin) && ! is_wp_error($this->result) && $this->plugin_active) {
 			// Currently used only when JS is off for a single plugin update?
-			echo '<iframe title="' . esc_attr__( 'Update progress' ) . '" style="border:0;overflow:hidden" width="100%" height="170" src="' . wp_nonce_url( 'update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin ) . '"></iframe>';
+			echo '<iframe title="'.esc_attr__('Update progress').'" style="border:0;overflow:hidden" width="100%" height="170" src="'.wp_nonce_url('update.php?action=activate-plugin&networkwide='.$this->plugin_network_active.'&plugin='.urlencode($this->plugin), 'activate-plugin_'.$this->plugin).'"></iframe>';
 		}
 
-		$this->decrement_update_count( 'plugin' );
+		$this->decrement_update_count('plugin');
 
-		$update_actions =  array(
-			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
+		$update_actions = array(
+			'activate_plugin' => '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.urlencode($this->plugin), 'activate-plugin_'.$this->plugin).'" target="_parent">'.__('Activate Plugin').'</a>',
+			'plugins_page' => '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>'
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['activate_plugin'] );
+		if ($this->plugin_active || ! $this->result || is_wp_error($this->result) || ! current_user_can('activate_plugins'))
+			unset($update_actions['activate_plugin']);
 
 		/**
 		 * Filter the list of action links available following a single plugin update.
@@ -245,10 +245,10 @@ 
 		 * @param array  $update_actions Array of plugin action links.
 		 * @param string $plugin         Path to the plugin file.
 		 */
-		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
+		$update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $this->plugin);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -271,7 +271,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '' );
+		$defaults = array('url' => '', 'nonce' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		parent::__construct($args);
@@ -287,7 +287,7 @@ 
 		/* translators: 1: Title of an update */
 		$this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
 		/* translators: 1: Title of an update */
-		$this->upgrader->strings['skin_update_successful'] = __( '%1$s updated successfully.' ) . ' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>' . __( 'Show Details' ) . '</span><span class="hidden">' . __( 'Hide Details' ) . '</span></a>';
+		$this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span></a>';
 		$this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
 	}
 
@@ -295,21 +295,21 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
+		if (isset($this->upgrader->strings[$string]))
 			$string = $this->upgrader->strings[$string];
 
-		if ( strpos($string, '%') !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
 			$args = array_splice($args, 1);
-			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
+			if ($args) {
+				$args = array_map('strip_tags', $args);
+				$args = array_map('esc_html', $args);
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
+		if (empty($string))
 			return;
-		if ( $this->in_loop )
+		if ($this->in_loop)
 			echo "$string<br />\n";
 		else
 			echo "<p>$string</p>\n";
@@ -334,20 +334,20 @@ 
 	 * @param string|WP_Error $error
 	 */
 	public function error($error) {
-		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
+		if (is_string($error) && isset($this->upgrader->strings[$error]))
 			$this->error = $this->upgrader->strings[$error];
 
-		if ( is_wp_error($error) ) {
+		if (is_wp_error($error)) {
 			$messages = array();
-			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
+			foreach ($error->get_error_messages() as $emessage) {
+				if ($error->get_error_data() && is_string($error->get_error_data()))
+					$messages[] = $emessage.' '.esc_html(strip_tags($error->get_error_data()));
 				else
 					$messages[] = $emessage;
 			}
 			$this->error = implode(', ', $messages);
 		}
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+		echo '<script type="text/javascript">jQuery(\'.waiting-'.esc_js($this->upgrader->update_current).'\').hide();</script>';
 	}
 
 	/**
@@ -370,9 +370,9 @@ 
 	 */
 	public function before($title = '') {
 		$this->in_loop = true;
-		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').css("display", "inline-block");</script>';
-		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
+		printf('<h2>'.$this->upgrader->strings['skin_before_update_header'].' <span class="spinner waiting-'.$this->upgrader->update_current.'"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count);
+		echo '<script type="text/javascript">jQuery(\'.waiting-'.esc_js($this->upgrader->update_current).'\').css("display", "inline-block");</script>';
+		echo '<div class="update-messages hide-if-js" id="progress-'.esc_attr($this->upgrader->update_current).'"><p>';
 		$this->flush_output();
 	}
 
@@ -382,19 +382,19 @@ 
 	 */
 	public function after($title = '') {
 		echo '</p></div>';
-		if ( $this->error || ! $this->result ) {
-			if ( $this->error ) {
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '<strong>' . $this->error . '</strong>' ) . '</p></div>';
+		if ($this->error || ! $this->result) {
+			if ($this->error) {
+				echo '<div class="error"><p>'.sprintf($this->upgrader->strings['skin_update_failed_error'], $title, '<strong>'.$this->error.'</strong>').'</p></div>';
 			} else {
-				echo '<div class="error"><p>' . sprintf($this->upgrader->strings['skin_update_failed'], $title) . '</p></div>';
+				echo '<div class="error"><p>'.sprintf($this->upgrader->strings['skin_update_failed'], $title).'</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
+			echo '<script type="text/javascript">jQuery(\'#progress-'.esc_js($this->upgrader->update_current).'\').show();</script>';
 		}
-		if ( $this->result && ! is_wp_error( $this->result ) ) {
-			if ( ! $this->error )
-				echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
-			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
+		if ($this->result && ! is_wp_error($this->result)) {
+			if ( ! $this->error)
+				echo '<div class="updated"><p>'.sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-'.esc_js($this->upgrader->update_current).'\').toggle();jQuery(\'span\', this).toggle(); return false;').'</p></div>';
+			echo '<script type="text/javascript">jQuery(\'.waiting-'.esc_js($this->upgrader->update_current).'\').hide();</script>';
 		}
 
 		$this->reset();
@@ -440,7 +440,7 @@ 
 	 */
 	public function after($title = '') {
 		parent::after($this->plugin_info['Title']);
-		$this->decrement_update_count( 'plugin' );
+		$this->decrement_update_count('plugin');
 	}
 
 	/**
@@ -448,12 +448,12 @@ 
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'plugins_page' => '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>',
+			'updates_page' => '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>'
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['plugins_page'] );
+		if ( ! current_user_can('activate_plugins'))
+			unset($update_actions['plugins_page']);
 
 		/**
 		 * Filter the list of action links available following bulk plugin updates.
@@ -463,10 +463,10 @@ 
 		 * @param array $update_actions Array of plugin action links.
 		 * @param array $plugin_info    Array of information for the last-updated plugin.
 		 */
-		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
+		$update_actions = apply_filters('update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -483,7 +483,7 @@ 
 	 * @param string $title
 	 */
 	public function before($title = '') {
-		parent::before( $this->theme_info->display('Name') );
+		parent::before($this->theme_info->display('Name'));
 	}
 
 	/**
@@ -491,8 +491,8 @@ 
 	 * @param string $title
 	 */
 	public function after($title = '') {
-		parent::after( $this->theme_info->display('Name') );
-		$this->decrement_update_count( 'theme' );
+		parent::after($this->theme_info->display('Name'));
+		$this->decrement_update_count('theme');
 	}
 
 	/**
@@ -500,12 +500,12 @@ 
 	 */
 	public function bulk_footer() {
 		parent::bulk_footer();
-		$update_actions =  array(
-			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
-			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
+		$update_actions = array(
+			'themes_page' => '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>',
+			'updates_page' => '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>'
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
-			unset( $update_actions['themes_page'] );
+		if ( ! current_user_can('switch_themes') && ! current_user_can('edit_theme_options'))
+			unset($update_actions['themes_page']);
 
 		/**
 		 * Filter the list of action links available following bulk theme updates.
@@ -515,10 +515,10 @@ 
 		 * @param array $update_actions Array of theme action links.
 		 * @param array $theme_info     Array of information for the last-updated theme.
 		 */
-		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
+		$update_actions = apply_filters('update_bulk_theme_complete_actions', $update_actions, $this->theme_info);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -538,7 +538,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
+		$defaults = array('type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		$this->type = $args['type'];
@@ -551,8 +551,8 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		if ( ! empty($this->api))
+			$this->upgrader->strings['process_success'] = sprintf(__('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
 	}
 
 	/**
@@ -563,30 +563,30 @@ 
 
 		$install_actions = array();
 
-		$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
+		$from = isset($_GET['from']) ? wp_unslash($_GET['from']) : 'plugins';
 
-		if ( 'import' == $from )
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
+		if ('import' == $from)
+			$install_actions['activate_plugin'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;from=import&amp;plugin='.urlencode($plugin_file), 'activate-plugin_'.$plugin_file).'" target="_parent">'.__('Activate Plugin &amp; Run Importer').'</a>';
 		else
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+			$install_actions['activate_plugin'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.urlencode($plugin_file), 'activate-plugin_'.$plugin_file).'" target="_parent">'.__('Activate Plugin').'</a>';
 
-		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-			$install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
-			unset( $install_actions['activate_plugin'] );
+		if (is_multisite() && current_user_can('manage_network_plugins')) {
+			$install_actions['network_activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin='.urlencode($plugin_file), 'activate-plugin_'.$plugin_file).'" target="_parent">'.__('Network Activate').'</a>';
+			unset($install_actions['activate_plugin']);
 		}
 
-		if ( 'import' == $from ) {
-			$install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>';
-		} elseif ( $this->type == 'web' ) {
-			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>';
+		if ('import' == $from) {
+			$install_actions['importers_page'] = '<a href="'.admin_url('import.php').'" target="_parent">'.__('Return to Importers').'</a>';
+		} elseif ($this->type == 'web') {
+			$install_actions['plugins_page'] = '<a href="'.self_admin_url('plugin-install.php').'" target="_parent">'.__('Return to Plugin Installer').'</a>';
 		} else {
-			$install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>';
+			$install_actions['plugins_page'] = '<a href="'.self_admin_url('plugins.php').'" target="_parent">'.__('Return to Plugins page').'</a>';
 		}
 
-		if ( ! $this->result || is_wp_error($this->result) ) {
-			unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
-		} elseif ( ! current_user_can( 'activate_plugins' ) ) {
-			unset( $install_actions['activate_plugin'] );
+		if ( ! $this->result || is_wp_error($this->result)) {
+			unset($install_actions['activate_plugin'], $install_actions['network_activate']);
+		} elseif ( ! current_user_can('activate_plugins')) {
+			unset($install_actions['activate_plugin']);
 		}
 
 		/**
@@ -600,10 +600,10 @@ 
 		 *                                via upload.
 		 * @param string $plugin_file     Path to the plugin file.
 		 */
-		$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
+		$install_actions = apply_filters('install_plugin_complete_actions', $install_actions, $this->api, $plugin_file);
 
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions))
+			$this->feedback(implode(' | ', (array) $install_actions));
 	}
 }
 
@@ -623,7 +623,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
+		$defaults = array('type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		$this->type = $args['type'];
@@ -636,49 +636,49 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( ! empty($this->api))
+			$this->upgrader->strings['process_success'] = sprintf($this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
+		if (empty($this->upgrader->result['destination_name']))
 			return;
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
+		if (empty($theme_info))
 			return;
 
 		$name       = $theme_info->display('Name');
 		$stylesheet = $this->upgrader->result['destination_name'];
 		$template   = $theme_info->get_template();
 
-		$activate_link = add_query_arg( array(
+		$activate_link = add_query_arg(array(
 			'action'     => 'activate',
-			'template'   => urlencode( $template ),
-			'stylesheet' => urlencode( $stylesheet ),
-		), admin_url('themes.php') );
-		$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+			'template'   => urlencode($template),
+			'stylesheet' => urlencode($stylesheet),
+		), admin_url('themes.php'));
+		$activate_link = wp_nonce_url($activate_link, 'switch-theme_'.$stylesheet);
 
 		$install_actions = array();
 
-		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$install_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+		if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+			$install_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Live Preview').'</span><span class="screen-reader-text">'.sprintf(__('Live Preview &#8220;%s&#8221;'), $name).'</span></a>';
 		}
-		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
+		$install_actions['activate'] = '<a href="'.esc_url($activate_link).'" class="activatelink"><span aria-hidden="true">'.__('Activate').'</span><span class="screen-reader-text">'.sprintf(__('Activate &#8220;%s&#8221;'), $name).'</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		if (is_network_admin() && current_user_can('manage_network_themes'))
+			$install_actions['network_enable'] = '<a href="'.esc_url(wp_nonce_url('themes.php?action=enable&amp;theme='.urlencode($stylesheet), 'enable-theme_'.$stylesheet)).'" target="_parent">'.__('Network Enable').'</a>';
 
-		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		if ($this->type == 'web')
+			$install_actions['themes_page'] = '<a href="'.self_admin_url('theme-install.php').'" target="_parent">'.__('Return to Theme Installer').'</a>';
+		elseif (current_user_can('switch_themes') || current_user_can('edit_theme_options'))
+			$install_actions['themes_page'] = '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>';
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
-			unset( $install_actions['activate'], $install_actions['preview'] );
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can('switch_themes'))
+			unset($install_actions['activate'], $install_actions['preview']);
 
 		/**
 		 * Filter the list of action links available following a single theme installation.
@@ -690,9 +690,9 @@ 
 		 * @param string   $stylesheet      Theme directory name.
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
-		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		$install_actions = apply_filters('install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info);
+		if ( ! empty($install_actions))
+			$this->feedback(implode(' | ', (array) $install_actions));
 	}
 }
 
@@ -711,7 +711,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme') );
+		$defaults = array('url' => '', 'theme' => '', 'nonce' => '', 'title' => __('Update Theme'));
 		$args = wp_parse_args($args, $defaults);
 
 		$this->theme = $args['theme'];
@@ -723,37 +723,37 @@ 
 	 * @access public
 	 */
 	public function after() {
-		$this->decrement_update_count( 'theme' );
+		$this->decrement_update_count('theme');
 
 		$update_actions = array();
-		if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
+		if ( ! empty($this->upgrader->result['destination_name']) && $theme_info = $this->upgrader->theme_info()) {
 			$name       = $theme_info->display('Name');
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template   = $theme_info->get_template();
 
-			$activate_link = add_query_arg( array(
+			$activate_link = add_query_arg(array(
 				'action'     => 'activate',
-				'template'   => urlencode( $template ),
-				'stylesheet' => urlencode( $stylesheet ),
-			), admin_url('themes.php') );
-			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
-
-			if ( get_stylesheet() == $stylesheet ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
+				'template'   => urlencode($template),
+				'stylesheet' => urlencode($stylesheet),
+			), admin_url('themes.php'));
+			$activate_link = wp_nonce_url($activate_link, 'switch-theme_'.$stylesheet);
+
+			if (get_stylesheet() == $stylesheet) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+					$update_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Customize').'</span><span class="screen-reader-text">'.sprintf(__('Customize &#8220;%s&#8221;'), $name).'</span></a>';
 				}
-			} elseif ( current_user_can( 'switch_themes' ) ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-					$update_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+			} elseif (current_user_can('switch_themes')) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+					$update_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Live Preview').'</span><span class="screen-reader-text">'.sprintf(__('Live Preview &#8220;%s&#8221;'), $name).'</span></a>';
 				}
-				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
+				$update_actions['activate'] = '<a href="'.esc_url($activate_link).'" class="activatelink"><span aria-hidden="true">'.__('Activate').'</span><span class="screen-reader-text">'.sprintf(__('Activate &#8220;%s&#8221;'), $name).'</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if ( ! $this->result || is_wp_error($this->result) || is_network_admin())
+				unset($update_actions['preview'], $update_actions['activate']);
 		}
 
-		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		$update_actions['themes_page'] = '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>';
 
 		/**
 		 * Filter the list of action links available following a single theme update.
@@ -763,10 +763,10 @@ 
 		 * @param array  $update_actions Array of theme action links.
 		 * @param string $theme          Theme directory name.
 		 */
-		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
+		$update_actions = apply_filters('update_theme_complete_actions', $update_actions, $this->theme);
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions))
+			$this->feedback(implode(' | ', (array) $update_actions));
 	}
 }
 
@@ -787,35 +787,35 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function __construct( $args = array() ) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => __( 'Update Translations' ), 'skip_header_footer' => false );
-		$args = wp_parse_args( $args, $defaults );
-		if ( $args['skip_header_footer'] ) {
+	public function __construct($args = array()) {
+		$defaults = array('url' => '', 'nonce' => '', 'title' => __('Update Translations'), 'skip_header_footer' => false);
+		$args = wp_parse_args($args, $defaults);
+		if ($args['skip_header_footer']) {
 			$this->done_header = true;
 			$this->done_footer = true;
 			$this->display_footer_actions = false;
 		}
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function before() {
-		$name = $this->upgrader->get_name_for_update( $this->language_update );
+		$name = $this->upgrader->get_name_for_update($this->language_update);
 
 		echo '<div class="update-messages lp-show-latest">';
 
-		printf( '<h2>' . __( 'Updating translations for %1$s (%2$s)&#8230;' ) . '</h2>', $name, $this->language_update->language );
+		printf('<h2>'.__('Updating translations for %1$s (%2$s)&#8230;').'</h2>', $name, $this->language_update->language);
 	}
 
 	/**
 	 *
 	 * @param string|WP_Error $error
 	 */
-	public function error( $error ) {
+	public function error($error) {
 		echo '<div class="lp-error">';
-		parent::error( $error );
+		parent::error($error);
 		echo '</div>';
 	}
 
@@ -830,9 +830,9 @@ 
 	 * @access public
 	 */
 	public function bulk_footer() {
-		$this->decrement_update_count( 'translation' );
+		$this->decrement_update_count('translation');
 		$update_actions = array();
-		$update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>';
+		$update_actions['updates_page'] = '<a href="'.self_admin_url('update-core.php').'" target="_parent">'.__('Return to WordPress Updates page').'</a>';
 
 		/**
 		 * Filter the list of action links available following a translations update.
@@ -841,10 +841,10 @@ 
 		 *
 		 * @param array $update_actions Array of translations update links.
 		 */
-		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
+		$update_actions = apply_filters('update_translations_complete_actions', $update_actions);
 
-		if ( $update_actions && $this->display_footer_actions )
-			$this->feedback( implode( ' | ', $update_actions ) );
+		if ($update_actions && $this->display_footer_actions)
+			$this->feedback(implode(' | ', $update_actions));
 	}
 }
 
@@ -868,14 +868,14 @@ 
 	 * @param bool   $allow_relaxed_file_ownership
 	 * @return bool
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
-		if ( $context ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
+		if ($context) {
 			$this->options['context'] = $context;
 		}
 		// TODO: fix up request_filesystem_credentials(), or split it, to allow us to request a no-output version
 		// This will output a credentials form in event of failure, We don't want that, so just hide with a buffer
 		ob_start();
-		$result = parent::request_filesystem_credentials( $error, $context, $allow_relaxed_file_ownership );
+		$result = parent::request_filesystem_credentials($error, $context, $allow_relaxed_file_ownership);
 		ob_end_clean();
 		return $result;
 	}
@@ -892,37 +892,37 @@ 
 	/**
 	 * @param string|array|WP_Error $data
 	 */
-	public function feedback( $data ) {
-		if ( is_wp_error( $data ) ) {
+	public function feedback($data) {
+		if (is_wp_error($data)) {
 			$string = $data->get_error_message();
-		} elseif ( is_array( $data ) ) {
+		} elseif (is_array($data)) {
 			return;
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty($this->upgrader->strings[$string]))
+			$string = $this->upgrader->strings[$string];
 
-		if ( strpos( $string, '%' ) !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
-			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			$args = array_splice($args, 1);
+			if ( ! empty($args))
+				$string = vsprintf($string, $args);
 		}
 
-		$string = trim( $string );
+		$string = trim($string);
 
 		// Only allow basic HTML in the messages, as it'll be used in emails/logs rather than direct browser output.
-		$string = wp_kses( $string, array(
+		$string = wp_kses($string, array(
 			'a' => array(
 				'href' => true
 			),
 			'br' => true,
 			'em' => true,
 			'strong' => true,
-		) );
+		));
 
-		if ( empty( $string ) )
+		if (empty($string))
 			return;
 
 		$this->messages[] = $string;
@@ -940,7 +940,7 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty($output))
+			$this->feedback($output);
 	}
 }

Braces +112 added lines, -78 removed lines

@@ -35,8 +35,9 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if ( is_object($upgrader) ) {
+					$this->upgrader =& $upgrader;
+		}
 		$this->add_strings();
 	}
 
@@ -103,16 +104,18 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
-			$this->header();
+		if ( ! $this->done_header ) {
+					$this->header();
+		}
 		if ( is_string($errors) ) {
 			$this->feedback($errors);
 		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
 			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
-				else
-					$this->feedback($message);
+				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+									$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+				} else {
+									$this->feedback($message);
+				}
 			}
 		}
 	}
@@ -122,8 +125,9 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+		if ( isset( $this->upgrader->strings[$string] ) ) {
+					$string = $this->upgrader->strings[$string];
+		}
 
 		if ( strpos($string, '%') !== false ) {
 			$args = func_get_args();
@@ -134,8 +138,9 @@ 
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
-			return;
+		if ( empty($string) ) {
+					return;
+		}
 		show_message($string);
 	}
 
@@ -234,8 +239,9 @@ 
 			'activate_plugin' => '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>',
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'
 		);
-		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['activate_plugin'] );
+		if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) {
+					unset( $update_actions['activate_plugin'] );
+		}
 
 		/**
 		 * Filter the list of action links available following a single plugin update.
@@ -247,8 +253,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -295,8 +302,9 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+		if ( isset( $this->upgrader->strings[$string] ) ) {
+					$string = $this->upgrader->strings[$string];
+		}
 
 		if ( strpos($string, '%') !== false ) {
 			$args = func_get_args();
@@ -307,12 +315,14 @@ 
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
-			return;
-		if ( $this->in_loop )
-			echo "$string<br />\n";
-		else
-			echo "<p>$string</p>\n";
+		if ( empty($string) ) {
+					return;
+		}
+		if ( $this->in_loop ) {
+					echo "$string<br />\n";
+		} else {
+					echo "<p>$string</p>\n";
+		}
 	}
 
 	/**
@@ -334,16 +344,18 @@ 
 	 * @param string|WP_Error $error
 	 */
 	public function error($error) {
-		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) )
-			$this->error = $this->upgrader->strings[$error];
+		if ( is_string($error) && isset( $this->upgrader->strings[$error] ) ) {
+					$this->error = $this->upgrader->strings[$error];
+		}
 
 		if ( is_wp_error($error) ) {
 			$messages = array();
 			foreach ( $error->get_error_messages() as $emessage ) {
-				if ( $error->get_error_data() && is_string( $error->get_error_data() ) )
-					$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
-				else
-					$messages[] = $emessage;
+				if ( $error->get_error_data() && is_string( $error->get_error_data() ) ) {
+									$messages[] = $emessage . ' ' . esc_html( strip_tags( $error->get_error_data() ) );
+				} else {
+									$messages[] = $emessage;
+				}
 			}
 			$this->error = implode(', ', $messages);
 		}
@@ -392,8 +404,9 @@ 
 			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
 		}
 		if ( $this->result && ! is_wp_error( $this->result ) ) {
-			if ( ! $this->error )
-				echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+			if ( ! $this->error ) {
+							echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+			}
 			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
 		}
 
@@ -452,8 +465,9 @@ 
 			'plugins_page' => '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>',
 			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
-		if ( ! current_user_can( 'activate_plugins' ) )
-			unset( $update_actions['plugins_page'] );
+		if ( ! current_user_can( 'activate_plugins' ) ) {
+					unset( $update_actions['plugins_page'] );
+		}
 
 		/**
 		 * Filter the list of action links available following bulk plugin updates.
@@ -465,8 +479,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -504,8 +519,9 @@ 
 			'themes_page' => '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>',
 			'updates_page' => '<a href="' . self_admin_url( 'update-core.php' ) . '" target="_parent">' . __( 'Return to WordPress Updates page' ) . '</a>'
 		);
-		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) )
-			unset( $update_actions['themes_page'] );
+		if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
+					unset( $update_actions['themes_page'] );
+		}
 
 		/**
 		 * Filter the list of action links available following bulk theme updates.
@@ -517,8 +533,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_bulk_theme_complete_actions', $update_actions, $this->theme_info );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -551,8 +568,9 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		if ( !empty($this->api) ) {
+					$this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+		}
 	}
 
 	/**
@@ -565,10 +583,11 @@ 
 
 		$from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
 
-		if ( 'import' == $from )
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
-		else
-			$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+		if ( 'import' == $from ) {
+					$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
+		} else {
+					$install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+		}
 
 		if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
 			$install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
@@ -602,8 +621,9 @@ 
 		 */
 		$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
 
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions) ) {
+					$this->feedback(implode(' | ', (array)$install_actions));
+		}
 	}
 }
 
@@ -636,20 +656,23 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( !empty($this->api) ) {
+					$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		}
 	}
 
 	/**
 	 * @access public
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
-			return;
+		if ( empty($this->upgrader->result['destination_name']) ) {
+					return;
+		}
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
-			return;
+		if ( empty( $theme_info ) ) {
+					return;
+		}
 
 		$name       = $theme_info->display('Name');
 		$stylesheet = $this->upgrader->result['destination_name'];
@@ -669,16 +692,19 @@ 
 		}
 		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) {
+					$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		}
 
-		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		if ( $this->type == 'web' ) {
+					$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
+		} elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) {
+					$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		}
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
-			unset( $install_actions['activate'], $install_actions['preview'] );
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) {
+					unset( $install_actions['activate'], $install_actions['preview'] );
+		}
 
 		/**
 		 * Filter the list of action links available following a single theme installation.
@@ -691,8 +717,9 @@ 
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
 		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions) ) {
+					$this->feedback(implode(' | ', (array)$install_actions));
+		}
 	}
 }
 
@@ -749,8 +776,9 @@ 
 				$update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() )
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
+							unset( $update_actions['preview'], $update_actions['activate'] );
+			}
 		}
 
 		$update_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
@@ -765,8 +793,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
 
-		if ( ! empty($update_actions) )
-			$this->feedback(implode(' | ', (array)$update_actions));
+		if ( ! empty($update_actions) ) {
+					$this->feedback(implode(' | ', (array)$update_actions));
+		}
 	}
 }
 
@@ -843,8 +872,9 @@ 
 		 */
 		$update_actions = apply_filters( 'update_translations_complete_actions', $update_actions );
 
-		if ( $update_actions && $this->display_footer_actions )
-			$this->feedback( implode( ' | ', $update_actions ) );
+		if ( $update_actions && $this->display_footer_actions ) {
+					$this->feedback( implode( ' | ', $update_actions ) );
+		}
 	}
 }
 
@@ -900,14 +930,16 @@ 
 		} else {
 			$string = $data;
 		}
-		if ( ! empty( $this->upgrader->strings[ $string ] ) )
-			$string = $this->upgrader->strings[ $string ];
+		if ( ! empty( $this->upgrader->strings[ $string ] ) ) {
+					$string = $this->upgrader->strings[ $string ];
+		}
 
 		if ( strpos( $string, '%' ) !== false ) {
 			$args = func_get_args();
 			$args = array_splice( $args, 1 );
-			if ( ! empty( $args ) )
-				$string = vsprintf( $string, $args );
+			if ( ! empty( $args ) ) {
+							$string = vsprintf( $string, $args );
+			}
 		}
 
 		$string = trim( $string );
@@ -922,8 +954,9 @@ 
 			'strong' => true,
 		) );
 
-		if ( empty( $string ) )
-			return;
+		if ( empty( $string ) ) {
+					return;
+		}
 
 		$this->messages[] = $string;
 	}
@@ -940,7 +973,8 @@ 
 	 */
 	public function footer() {
 		$output = ob_get_clean();
-		if ( ! empty( $output ) )
-			$this->feedback( $output );
+		if ( ! empty( $output ) ) {
+					$this->feedback( $output );
+		}
 	}
 }

src/wp-admin/includes/dashboard.php

Doc Comments +1 added lines, -1 removed lines

@@ -1277,7 +1277,7 @@
  *
  * @global string $wp_version
  *
- * @return array|bool False on failure, array of browser data on success.
+ * @return string False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
 	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )

Indentation +12 added lines, -12 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Dashboard Widget Administration Screen API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Dashboard Widget Administration Screen API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Registers dashboard widgets.
@@ -1353,13 +1353,13 @@ 
 	}
 
 	/**
-	* Filter the notice output for the 'Browse Happy' nag meta box.
-	*
-	* @since 3.2.0
-	*
-	* @param string $notice   The notice content.
-	* @param array  $response An array containing web browser information.
-	*/
+	 * Filter the notice output for the 'Browse Happy' nag meta box.
+	 *
+	 * @since 3.2.0
+	 *
+	 * @param string $notice   The notice content.
+	 * @param array  $response An array containing web browser information.
+	 */
 	echo apply_filters( 'browse-happy-notice', $notice, $response );
 }
 

Spacing +368 added lines, -368 removed lines

@@ -26,43 +26,43 @@ 
 
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['upgrade'] ) {
-		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+	if ($response && $response['upgrade']) {
+		add_filter('postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class');
+		if ($response['insecure'])
+			wp_add_dashboard_widget('dashboard_browser_nag', __('You are using an insecure browser!'), 'wp_dashboard_browser_nag');
 		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+			wp_add_dashboard_widget('dashboard_browser_nag', __('Your browser is out of date!'), 'wp_dashboard_browser_nag');
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if (is_blog_admin() && current_user_can('edit_posts'))
+		wp_add_dashboard_widget('dashboard_right_now', __('At a Glance'), 'wp_dashboard_right_now');
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if (is_network_admin())
+		wp_add_dashboard_widget('network_dashboard_right_now', __('Right Now'), 'wp_network_dashboard_right_now');
 
 	// Activity Widget
-	if ( is_blog_admin() ) {
-		wp_add_dashboard_widget( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_site_activity' );
+	if (is_blog_admin()) {
+		wp_add_dashboard_widget('dashboard_activity', __('Activity'), 'wp_dashboard_site_activity');
 	}
 
 	// QuickPress Widget
-	if ( is_blog_admin() && current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-		$quick_draft_title = sprintf( '<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __( 'Quick Draft' ), __( 'Drafts' ) );
-		wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
+	if (is_blog_admin() && current_user_can(get_post_type_object('post')->cap->create_posts)) {
+		$quick_draft_title = sprintf('<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __('Quick Draft'), __('Drafts'));
+		wp_add_dashboard_widget('dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press');
 	}
 
 	// WordPress News
-	wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress News' ), 'wp_dashboard_primary' );
+	wp_add_dashboard_widget('dashboard_primary', __('WordPress News'), 'wp_dashboard_primary');
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 
 		/**
 		 * Fires after core widgets for the Network Admin dashboard have been registered.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'wp_network_dashboard_setup' );
+		do_action('wp_network_dashboard_setup');
 
 		/**
 		 * Filter the list of widgets to load for the Network Admin dashboard.
@@ -71,15 +71,15 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
-	} elseif ( is_user_admin() ) {
+		$dashboard_widgets = apply_filters('wp_network_dashboard_widgets', array());
+	} elseif (is_user_admin()) {
 
 		/**
 		 * Fires after core widgets for the User Admin dashboard have been registered.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'wp_user_dashboard_setup' );
+		do_action('wp_user_dashboard_setup');
 
 		/**
 		 * Filter the list of widgets to load for the User Admin dashboard.
@@ -88,7 +88,7 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_user_dashboard_widgets', array() );
+		$dashboard_widgets = apply_filters('wp_user_dashboard_widgets', array());
 	} else {
 
 		/**
@@ -96,7 +96,7 @@ 
 		 *
 		 * @since 2.5.0
 		 */
-		do_action( 'wp_dashboard_setup' );
+		do_action('wp_dashboard_setup');
 
 		/**
 		 * Filter the list of widgets to load for the admin dashboard.
@@ -105,28 +105,28 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+		$dashboard_widgets = apply_filters('wp_dashboard_widgets', array());
 	}
 
-	foreach ( $dashboard_widgets as $widget_id ) {
-		$name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>';
-		wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback'] );
+	foreach ($dashboard_widgets as $widget_id) {
+		$name = empty($wp_registered_widgets[$widget_id]['all_link']) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name']." <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>".__('View all').'</a>';
+		wp_add_dashboard_widget($widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback']);
 	}
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
-		check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
+	if ('POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id'])) {
+		check_admin_referer('edit-dashboard-widget_'.$_POST['widget_id'], 'dashboard-widget-nonce');
 		ob_start(); // hack - but the same hack wp-admin/widgets.php uses
-		wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
+		wp_dashboard_trigger_widget_control($_POST['widget_id']);
 		ob_end_clean();
-		wp_redirect( remove_query_arg( 'edit' ) );
+		wp_redirect(remove_query_arg('edit'));
 		exit;
 	}
 
 	/** This action is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'do_meta_boxes', $screen->id, 'normal', '' );
+	do_action('do_meta_boxes', $screen->id, 'normal', '');
 
 	/** This action is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'do_meta_boxes', $screen->id, 'side', '' );
+	do_action('do_meta_boxes', $screen->id, 'side', '');
 }
 
 /**
@@ -144,33 +144,33 @@ 
  * @param array    $callback_args    Optional. Data that should be set as the $args property of the widget array
  *                                   (which is the second parameter passed to your callback). Default null.
  */
-function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) {
+function wp_add_dashboard_widget($widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null) {
 	$screen = get_current_screen();
 	global $wp_dashboard_control_callbacks;
 
-	if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
+	if ($control_callback && current_user_can('edit_dashboard') && is_callable($control_callback)) {
 		$wp_dashboard_control_callbacks[$widget_id] = $control_callback;
-		if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
-			list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
-			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
+		if (isset($_GET['edit']) && $widget_id == $_GET['edit']) {
+			list($url) = explode('#', add_query_arg('edit', false), 2);
+			$widget_name .= ' <span class="postbox-title-action"><a href="'.esc_url($url).'">'.__('Cancel').'</a></span>';
 			$callback = '_wp_dashboard_control_callback';
 		} else {
-			list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
-			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
+			list($url) = explode('#', add_query_arg('edit', $widget_id), 2);
+			$widget_name .= ' <span class="postbox-title-action"><a href="'.esc_url("$url#$widget_id").'" class="edit-box open-box">'.__('Configure').'</a></span>';
 		}
 	}
 
-	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
+	$side_widgets = array('dashboard_quick_press', 'dashboard_primary');
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
+	if (in_array($widget_id, $side_widgets))
 		$location = 'side';
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
+	if ('dashboard_browser_nag' === $widget_id)
 		$priority = 'high';
 
-	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
+	add_meta_box($widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args);
 }
 
 /**
@@ -182,12 +182,12 @@ 
  * @param mixed $dashboard
  * @param array $meta_box
  */
-function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
+function _wp_dashboard_control_callback($dashboard, $meta_box) {
 	echo '<form method="post" class="dashboard-widget-control-form">';
-	wp_dashboard_trigger_widget_control( $meta_box['id'] );
-	wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
-	echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
-	submit_button( __('Submit') );
+	wp_dashboard_trigger_widget_control($meta_box['id']);
+	wp_nonce_field('edit-dashboard-widget_'.$meta_box['id'], 'dashboard-widget-nonce');
+	echo '<input type="hidden" name="widget_id" value="'.esc_attr($meta_box['id']).'" />';
+	submit_button(__('Submit'));
 	echo '</form>';
 }
 
@@ -198,31 +198,31 @@ 
  */
 function wp_dashboard() {
 	$screen = get_current_screen();
-	$columns = absint( $screen->get_columns() );
+	$columns = absint($screen->get_columns());
 	$columns_css = '';
-	if ( $columns ) {
+	if ($columns) {
 		$columns_css = " columns-$columns";
 	}
 
 ?>
 <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
 	<div id="postbox-container-1" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'normal', ''); ?>
 	</div>
 	<div id="postbox-container-2" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'side', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'side', ''); ?>
 	</div>
 	<div id="postbox-container-3" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'column3', ''); ?>
 	</div>
 	<div id="postbox-container-4" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'column4', ''); ?>
 	</div>
 </div>
 
 <?php
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-	wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+	wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+	wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 
 }
 
@@ -243,42 +243,42 @@ 
 	<ul>
 	<?php
 	// Posts and Pages
-	foreach ( array( 'post', 'page' ) as $post_type ) {
-		$num_posts = wp_count_posts( $post_type );
-		if ( $num_posts && $num_posts->publish ) {
-			if ( 'post' == $post_type ) {
-				$text = _n( '%s Post', '%s Posts', $num_posts->publish );
+	foreach (array('post', 'page') as $post_type) {
+		$num_posts = wp_count_posts($post_type);
+		if ($num_posts && $num_posts->publish) {
+			if ('post' == $post_type) {
+				$text = _n('%s Post', '%s Posts', $num_posts->publish);
 			} else {
-				$text = _n( '%s Page', '%s Pages', $num_posts->publish );
+				$text = _n('%s Page', '%s Pages', $num_posts->publish);
 			}
-			$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
-				printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
+			$text = sprintf($text, number_format_i18n($num_posts->publish));
+			$post_type_object = get_post_type_object($post_type);
+			if ($post_type_object && current_user_can($post_type_object->cap->edit_posts)) {
+				printf('<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text);
 			} else {
-				printf( '<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text );
+				printf('<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text);
 			}
 
 		}
 	}
 	// Comments
 	$num_comm = wp_count_comments();
-	if ( $num_comm && $num_comm->approved ) {
-		$text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
+	if ($num_comm && $num_comm->approved) {
+		$text = sprintf(_n('%s Comment', '%s Comments', $num_comm->approved), number_format_i18n($num_comm->approved));
 		?>
 		<li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
 		<?php
-		$moderated_comments_count_i18n = number_format_i18n( $num_comm->moderated );
+		$moderated_comments_count_i18n = number_format_i18n($num_comm->moderated);
 		/* translators: Number of comments in moderation */
-		$text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+		$text = sprintf(_nx('%s in moderation', '%s in moderation', $num_comm->moderated, 'comments'), $moderated_comments_count_i18n);
 		/* translators: Number of comments in moderation */
-		$aria_label = sprintf( _nx( '%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+		$aria_label = sprintf(_nx('%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments'), $moderated_comments_count_i18n);
 		?>
 		<li class="comment-mod-count<?php
-			if ( ! $num_comm->moderated ) {
+			if ( ! $num_comm->moderated) {
 				echo ' hidden';
 			}
-		?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e( $aria_label ); ?>"><?php echo $text; ?></a></li>
+		?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e($aria_label); ?>"><?php echo $text; ?></a></li>
 		<?php
 	}
 
@@ -293,10 +293,10 @@ 
 	 *
 	 * @param array $items Array of extra 'At a Glance' widget items.
 	 */
-	$elements = apply_filters( 'dashboard_glance_items', array() );
+	$elements = apply_filters('dashboard_glance_items', array());
 
-	if ( $elements ) {
-		echo '<li>' . implode( "</li>\n<li>", $elements ) . "</li>\n";
+	if ($elements) {
+		echo '<li>'.implode("</li>\n<li>", $elements)."</li>\n";
 	}
 
 	?>
@@ -305,7 +305,7 @@ 
 	update_right_now_message();
 
 	// Check if search engines are asked not to index this site.
-	if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '0' == get_option( 'blog_public' ) ) {
+	if ( ! is_network_admin() && ! is_user_admin() && current_user_can('manage_options') && '0' == get_option('blog_public')) {
 
 		/**
 		 * Filter the link title attribute for the 'Search Engines Discouraged'
@@ -318,7 +318,7 @@ 
 		 *
 		 * @param string $title Default attribute text.
 		 */
-		$title = apply_filters( 'privacy_on_link_title', '' );
+		$title = apply_filters('privacy_on_link_title', '');
 
 		/**
 		 * Filter the link label for the 'Search Engines Discouraged' message
@@ -330,7 +330,7 @@ 
 		 *
 		 * @param string $content Default text.
 		 */
-		$content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+		$content = apply_filters('privacy_on_link_text', __('Search Engines Discouraged'));
 		$title_attr = '' === $title ? '' : " title='$title'";
 
 		echo "<p><a href='options-reading.php'$title_attr>$content</a></p>";
@@ -351,7 +351,7 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'rightnow_end' );
+	do_action('rightnow_end');
 
 	/**
 	 * Fires at the end of the 'At a Glance' dashboard widget.
@@ -360,11 +360,11 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'activity_box_end' );
+	do_action('activity_box_end');
 
 	$actions = ob_get_clean();
 
-	if ( !empty( $actions ) ) : ?>
+	if ( ! empty($actions)) : ?>
 	<div class="sub">
 		<?php echo $actions; ?>
 	</div>
@@ -376,25 +376,25 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if (current_user_can('create_sites'))
+		$actions['create-site'] = '<a href="'.network_admin_url('site-new.php').'">'.__('Create a New Site').'</a>';
+	if (current_user_can('create_users'))
+		$actions['create-user'] = '<a href="'.network_admin_url('user-new.php').'">'.__('Create a New User').'</a>';
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
 
-	$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
-	$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
+	$user_text = sprintf(_n('%s user', '%s users', $c_users), number_format_i18n($c_users));
+	$blog_text = sprintf(_n('%s site', '%s sites', $c_blogs), number_format_i18n($c_blogs));
 
-	$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
+	$sentence = sprintf(__('You have %1$s and %2$s.'), $blog_text, $user_text);
 
-	if ( $actions ) {
+	if ($actions) {
 		echo '<ul class="subsubsub">';
-		foreach ( $actions as $class => $action ) {
-			 $actions[ $class ] = "\t<li class='$class'>$action";
+		foreach ($actions as $class => $action) {
+			 $actions[$class] = "\t<li class='$class'>$action";
 		}
-		echo implode( " |</li>\n", $actions ) . "</li>\n";
+		echo implode(" |</li>\n", $actions)."</li>\n";
 		echo '</ul>';
 	}
 ?>
@@ -412,22 +412,22 @@ 
 		 *
 		 * @param null $unused
 		 */
-		do_action( 'wpmuadminresult', '' );
+		do_action('wpmuadminresult', '');
 	?>
 
 	<form action="<?php echo network_admin_url('users.php'); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+			<label class="screen-reader-text" for="search-users"><?php _e('Search Users'); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
-			<?php submit_button( __( 'Search Users' ), 'button', false, false, array( 'id' => 'submit_users' ) ); ?>
+			<?php submit_button(__('Search Users'), 'button', false, false, array('id' => 'submit_users')); ?>
 		</p>
 	</form>
 
 	<form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+			<label class="screen-reader-text" for="search-sites"><?php _e('Search Sites'); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
-			<?php submit_button( __( 'Search Sites' ), 'button', false, false, array( 'id' => 'submit_sites' ) ); ?>
+			<?php submit_button(__('Search Sites'), 'button', false, false, array('id' => 'submit_sites')); ?>
 		</p>
 	</form>
 <?php
@@ -436,14 +436,14 @@ 
 	 *
 	 * @since MU
 	 */
-	do_action( 'mu_rightnow_end' );
+	do_action('mu_rightnow_end');
 
 	/**
 	 * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
 	 *
 	 * @since MU
 	 */
-	do_action( 'mu_activity_box_end' );
+	do_action('mu_activity_box_end');
 }
 
 /**
@@ -455,37 +455,37 @@ 
  *
  * @param string $error_msg Optional. Error message. Default false.
  */
-function wp_dashboard_quick_press( $error_msg = false ) {
+function wp_dashboard_quick_press($error_msg = false) {
 	global $post_ID;
 
-	if ( ! current_user_can( 'edit_posts' ) ) {
+	if ( ! current_user_can('edit_posts')) {
 		return;
 	}
 
 	/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
-	$last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
-	if ( $last_post_id ) {
-		$post = get_post( $last_post_id );
-		if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
-			$post = get_default_post_to_edit( 'post', true );
-			update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+	$last_post_id = (int) get_user_option('dashboard_quick_press_last_post_id'); // Get the last post_ID
+	if ($last_post_id) {
+		$post = get_post($last_post_id);
+		if (empty($post) || $post->post_status != 'auto-draft') { // auto-draft doesn't exists anymore
+			$post = get_default_post_to_edit('post', true);
+			update_user_option(get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID); // Save post_ID
 		} else {
 			$post->post_title = ''; // Remove the auto draft title
 		}
 	} else {
-		$post = get_default_post_to_edit( 'post' , true);
+		$post = get_default_post_to_edit('post', true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if ( ! (is_super_admin($user_id) && ! in_array(get_current_blog_id(), array_keys(get_blogs_of_user($user_id)))))
+			update_user_option($user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID); // Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
 ?>
 
-	<form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
+	<form name="post" action="<?php echo esc_url(admin_url('post.php')); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
 
-		<?php if ( $error_msg ) : ?>
+		<?php if ($error_msg) : ?>
 		<div class="error"><?php echo $error_msg; ?></div>
 		<?php endif; ?>
 
@@ -494,14 +494,14 @@ 
 
 				<?php
 				/** This filter is documented in wp-admin/edit-form-advanced.php */
-				echo apply_filters( 'enter_title_here', __( 'Title' ), $post );
+				echo apply_filters('enter_title_here', __('Title'), $post);
 				?>
 			</label>
 			<input type="text" name="post_title" id="title" autocomplete="off" />
 		</div>
 
 		<div class="textarea-wrap" id="description-wrap">
-			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e( 'What&#8217;s on your mind?' ); ?></label>
+			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e('What&#8217;s on your mind?'); ?></label>
 			<textarea name="content" id="content" class="mceEditor" rows="3" cols="15" autocomplete="off"></textarea>
 		</div>
 
@@ -509,8 +509,8 @@ 
 			<input type="hidden" name="action" id="quickpost-action" value="post-quickdraft-save" />
 			<input type="hidden" name="post_ID" value="<?php echo $post_ID; ?>" />
 			<input type="hidden" name="post_type" value="post" />
-			<?php wp_nonce_field( 'add-post' ); ?>
-			<?php submit_button( __( 'Save Draft' ), 'primary', 'save', false, array( 'id' => 'save-post' ) ); ?>
+			<?php wp_nonce_field('add-post'); ?>
+			<?php submit_button(__('Save Draft'), 'primary', 'save', false, array('id' => 'save-post')); ?>
 			<br class="clear" />
 		</p>
 
@@ -526,8 +526,8 @@ 
  *
  * @param array $drafts
  */
-function wp_dashboard_recent_drafts( $drafts = false ) {
-	if ( ! $drafts ) {
+function wp_dashboard_recent_drafts($drafts = false) {
+	if ( ! $drafts) {
 		$query_args = array(
 			'post_type'      => 'post',
 			'post_status'    => 'draft',
@@ -544,30 +544,30 @@ 
 		 *
 		 * @param array $query_args The query arguments for the 'Recent Drafts' dashboard widget.
 		 */
-		$query_args = apply_filters( 'dashboard_recent_drafts_query_args', $query_args );
+		$query_args = apply_filters('dashboard_recent_drafts_query_args', $query_args);
 
-		$drafts = get_posts( $query_args );
-		if ( ! $drafts ) {
+		$drafts = get_posts($query_args);
+		if ( ! $drafts) {
 			return;
  		}
  	}
 
 	echo '<div class="drafts">';
-	if ( count( $drafts ) > 3 ) {
-		echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '" aria-label="' . __( 'View all drafts' ) . '">' . _x( 'View all', 'drafts' ) . "</a></p>\n";
+	if (count($drafts) > 3) {
+		echo '<p class="view-all"><a href="'.esc_url(admin_url('edit.php?post_status=draft')).'" aria-label="'.__('View all drafts').'">'._x('View all', 'drafts')."</a></p>\n";
  	}
-	echo '<h2 class="hide-if-no-js">' . __( 'Drafts' ) . "</h2>\n<ul>";
+	echo '<h2 class="hide-if-no-js">'.__('Drafts')."</h2>\n<ul>";
 
-	$drafts = array_slice( $drafts, 0, 3 );
-	foreach ( $drafts as $draft ) {
-		$url = get_edit_post_link( $draft->ID );
-		$title = _draft_or_post_title( $draft->ID );
+	$drafts = array_slice($drafts, 0, 3);
+	foreach ($drafts as $draft) {
+		$url = get_edit_post_link($draft->ID);
+		$title = _draft_or_post_title($draft->ID);
 		echo "<li>\n";
 		/* translators: %s: post title */
-		echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
-		echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
-		if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
-			echo '<p>' . $the_content . '</p>';
+		echo '<div class="draft-title"><a href="'.esc_url($url).'" aria-label="'.esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)).'">'.esc_html($title).'</a>';
+		echo '<time datetime="'.get_the_time('c', $draft).'">'.get_the_time(__('F j, Y'), $draft).'</time></div>';
+		if ($the_content = wp_trim_words($draft->post_content, 10)) {
+			echo '<p>'.$the_content.'</p>';
  		}
 		echo "</li>\n";
  	}
@@ -585,20 +585,20 @@ 
  * @param WP_Comment $comment   The current comment.
  * @param bool       $show_date Optional. Whether to display the date.
  */
-function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
+function _wp_dashboard_recent_comments_row(&$comment, $show_date = true) {
 	$GLOBALS['comment'] = clone $comment;
 
-	if ( $comment->comment_post_ID > 0 ) {
+	if ($comment->comment_post_ID > 0) {
 
-		$comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
-		$comment_post_url = get_the_permalink( $comment->comment_post_ID );
+		$comment_post_title = _draft_or_post_title($comment->comment_post_ID);
+		$comment_post_url = get_the_permalink($comment->comment_post_ID);
 		$comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
 	} else {
 		$comment_post_link = '';
 	}
 
 	$actions_string = '';
-	if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if (current_user_can('edit_comment', $comment->comment_ID)) {
 		// Pre-order it: Approve | Reply | Edit | Spam | Trash.
 		$actions = array(
 			'approve' => '', 'unapprove' => '',
@@ -609,29 +609,29 @@ 
 			'view' => '',
 		);
 
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
-		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+		$del_nonce = esc_html('_wpnonce='.wp_create_nonce("delete-comment_$comment->comment_ID"));
+		$approve_nonce = esc_html('_wpnonce='.wp_create_nonce("approve-comment_$comment->comment_ID"));
 
-		$approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+		$approve_url = esc_url("comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce");
+		$unapprove_url = esc_url("comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce");
+		$spam_url = esc_url("comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+		$trash_url = esc_url("comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+		$delete_url = esc_url("comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
 
-		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
-		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\'' . $comment->comment_ID . '\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" aria-label="' . esc_attr__( 'Reply to this comment' ) . '" href="#">' . __( 'Reply' ) . '</a>';
-		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='".esc_attr__('Approve this comment')."'>".__('Approve').'</a>';
+		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='".esc_attr__('Unapprove this comment')."'>".__('Unapprove').'</a>';
+		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='".esc_attr__('Edit this comment')."'>".__('Edit').'</a>';
+		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" aria-label="'.esc_attr__('Reply to this comment').'" href="#">'.__('Reply').'</a>';
+		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='".esc_attr__('Mark this comment as spam')."'>"./* translators: mark as spam link */ _x('Spam', 'verb').'</a>';
 
-		if ( ! EMPTY_TRASH_DAYS ) {
-			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
+		if ( ! EMPTY_TRASH_DAYS) {
+			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='".esc_attr__('Delete this comment permanently')."'>".__('Delete Permanently').'</a>';
 		} else {
-			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='".esc_attr__('Move this comment to the Trash')."'>"._x('Trash', 'verb').'</a>';
 		}
 
-		if ( '1' === $comment->comment_approved ) {
-			$actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>';
+		if ('1' === $comment->comment_approved) {
+			$actions['view'] = '<a class="comment-link" href="'.esc_url(get_comment_link($comment)).'" aria-label="'.esc_attr__('View this comment').'">'.__('View').'</a>';
 		}
 
 		/**
@@ -645,15 +645,15 @@ 
 		 *                            'Delete', and 'Trash'.
 		 * @param WP_Comment $comment The comment object.
 		 */
-		$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
+		$actions = apply_filters('comment_row_actions', array_filter($actions), $comment);
 
 		$i = 0;
-		foreach ( $actions as $action => $link ) {
+		foreach ($actions as $action => $link) {
 			++$i;
-			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+			((('approve' == $action || 'unapprove' == $action) && 2 === $i) || 1 === $i) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action )
+			if ('reply' == $action || 'quickedit' == $action)
 				$action .= ' hide-if-no-js';
 
 			$actions_string .= "<span class='$action'>$sep$link</span>";
@@ -661,30 +661,30 @@ 
 	}
 ?>
 
-		<li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status( $comment ) ), $comment ); ?>>
+		<li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class(array('comment-item', wp_get_comment_status($comment)), $comment); ?>>
 
-			<?php echo get_avatar( $comment, 50, 'mystery' ); ?>
+			<?php echo get_avatar($comment, 50, 'mystery'); ?>
 
-			<?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
+			<?php if ( ! $comment->comment_type || 'comment' == $comment->comment_type) : ?>
 
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
 			<?php
 				// Comments might not have a post they relate to, e.g. programmatically created ones.
-				if ( $comment_post_link ) {
+				if ($comment_post_link) {
 					printf(
 						/* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */
-						__( 'From %1$s on %2$s %3$s' ),
-						'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+						__('From %1$s on %2$s %3$s'),
+						'<cite class="comment-author">'.get_comment_author_link($comment).'</cite>',
 						$comment_post_link,
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				} else {
 					printf(
 						/* translators: 1: comment author, 2: notification if the comment is pending */
-						__( 'From %1$s %2$s' ),
-						'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						__('From %1$s %2$s'),
+						'<cite class="comment-author">'.get_comment_author_link($comment).'</cite>',
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				}
 			?>
@@ -692,45 +692,45 @@ 
 
 			<?php
 			else :
-				switch ( $comment->comment_type ) {
+				switch ($comment->comment_type) {
 					case 'pingback' :
-						$type = __( 'Pingback' );
+						$type = __('Pingback');
 						break;
 					case 'trackback' :
-						$type = __( 'Trackback' );
+						$type = __('Trackback');
 						break;
 					default :
-						$type = ucwords( $comment->comment_type );
+						$type = ucwords($comment->comment_type);
 				}
-				$type = esc_html( $type );
+				$type = esc_html($type);
 			?>
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
 			<?php
 				// Pingbacks, Trackbacks or custom comment types might not have a post they relate to, e.g. programmatically created ones.
-				if ( $comment_post_link ) {
+				if ($comment_post_link) {
 					printf(
 						/* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
-						_x( '%1$s on %2$s %3$s', 'dashboard' ),
+						_x('%1$s on %2$s %3$s', 'dashboard'),
 						"<strong>$type</strong>",
 						$comment_post_link,
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				} else {
 					printf(
 						/* translators: 1: type of comment, 2: notification if the comment is pending */
-						_x( '%1$s %2$s', 'dashboard' ),
+						_x('%1$s %2$s', 'dashboard'),
 						"<strong>$type</strong>",
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				}
 			?>
 			</p>
-			<p class="comment-author"><?php comment_author_link( $comment ); ?></p>
+			<p class="comment-author"><?php comment_author_link($comment); ?></p>
 
 			<?php endif; // comment_type ?>
-			<blockquote><p><?php comment_excerpt( $comment ); ?></p></blockquote>
-			<?php if ( $actions_string ) : ?>
+			<blockquote><p><?php comment_excerpt($comment); ?></p></blockquote>
+			<?php if ($actions_string) : ?>
 			<p class="row-actions"><?php echo $actions_string; ?></p>
 			<?php endif; ?>
 			</div>
@@ -748,27 +748,27 @@ 
 
 	echo '<div id="activity-widget">';
 
-	$future_posts = wp_dashboard_recent_posts( array(
+	$future_posts = wp_dashboard_recent_posts(array(
 		'max'     => 5,
 		'status'  => 'future',
 		'order'   => 'ASC',
-		'title'   => __( 'Publishing Soon' ),
+		'title'   => __('Publishing Soon'),
 		'id'      => 'future-posts',
-	) );
-	$recent_posts = wp_dashboard_recent_posts( array(
+	));
+	$recent_posts = wp_dashboard_recent_posts(array(
 		'max'     => 5,
 		'status'  => 'publish',
 		'order'   => 'DESC',
-		'title'   => __( 'Recently Published' ),
+		'title'   => __('Recently Published'),
 		'id'      => 'published-posts',
-	) );
+	));
 
 	$recent_comments = wp_dashboard_recent_comments();
 
-	if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+	if ( ! $future_posts && ! $recent_posts && ! $recent_comments) {
 		echo '<div class="no-activity">';
 		echo '<p class="smiley"></p>';
-		echo '<p>' . __( 'No activity yet!' ) . '</p>';
+		echo '<p>'.__('No activity yet!').'</p>';
 		echo '</div>';
 	}
 
@@ -791,16 +791,16 @@ 
  * }
  * @return bool False if no posts were found. True otherwise.
  */
-function wp_dashboard_recent_posts( $args ) {
+function wp_dashboard_recent_posts($args) {
 	$query_args = array(
 		'post_type'      => 'post',
 		'post_status'    => $args['status'],
 		'orderby'        => 'date',
 		'order'          => $args['order'],
-		'posts_per_page' => intval( $args['max'] ),
+		'posts_per_page' => intval($args['max']),
 		'no_found_rows'  => true,
 		'cache_results'  => false,
-		'perm'           => ( 'future' === $args['status'] ) ? 'editable' : 'readable',
+		'perm'           => ('future' === $args['status']) ? 'editable' : 'readable',
 	);
 
 	/**
@@ -810,47 +810,47 @@ 
 	 *
 	 * @param array $query_args The arguments passed to WP_Query to produce the list of posts.
 	 */
-	$query_args = apply_filters( 'dashboard_recent_posts_query_args', $query_args );
-	$posts = new WP_Query( $query_args );
+	$query_args = apply_filters('dashboard_recent_posts_query_args', $query_args);
+	$posts = new WP_Query($query_args);
 
-	if ( $posts->have_posts() ) {
+	if ($posts->have_posts()) {
 
-		echo '<div id="' . $args['id'] . '" class="activity-block">';
+		echo '<div id="'.$args['id'].'" class="activity-block">';
 
-		echo '<h3>' . $args['title'] . '</h3>';
+		echo '<h3>'.$args['title'].'</h3>';
 
 		echo '<ul>';
 
-		$today    = date( 'Y-m-d', current_time( 'timestamp' ) );
-		$tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
+		$today    = date('Y-m-d', current_time('timestamp'));
+		$tomorrow = date('Y-m-d', strtotime('+1 day', current_time('timestamp')));
 
-		while ( $posts->have_posts() ) {
+		while ($posts->have_posts()) {
 			$posts->the_post();
 
-			$time = get_the_time( 'U' );
-			if ( date( 'Y-m-d', $time ) == $today ) {
-				$relative = __( 'Today' );
-			} elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
-				$relative = __( 'Tomorrow' );
-			} elseif ( date( 'Y', $time ) !== date( 'Y', current_time( 'timestamp' ) ) ) {
+			$time = get_the_time('U');
+			if (date('Y-m-d', $time) == $today) {
+				$relative = __('Today');
+			} elseif (date('Y-m-d', $time) == $tomorrow) {
+				$relative = __('Tomorrow');
+			} elseif (date('Y', $time) !== date('Y', current_time('timestamp'))) {
 				/* translators: date and time format for recent posts on the dashboard, from a different calendar year, see http://php.net/date */
-				$relative = date_i18n( __( 'M jS Y' ), $time );
+				$relative = date_i18n(__('M jS Y'), $time);
 			} else {
 				/* translators: date and time format for recent posts on the dashboard, see http://php.net/date */
-				$relative = date_i18n( __( 'M jS' ), $time );
+				$relative = date_i18n(__('M jS'), $time);
 			}
 
 			// Use the post edit link for those who can edit, the permalink otherwise.
-			$recent_post_link = current_user_can( 'edit_post', get_the_ID() ) ? get_edit_post_link() : get_permalink();
+			$recent_post_link = current_user_can('edit_post', get_the_ID()) ? get_edit_post_link() : get_permalink();
 
 			$draft_or_post_title = _draft_or_post_title();
 			printf(
 				'<li><span>%1$s</span> <a href="%2$s" aria-label="%3$s">%4$s</a></li>',
 				/* translators: 1: relative date, 2: time */
-				sprintf( _x( '%1$s, %2$s', 'dashboard' ), $relative, get_the_time() ),
+				sprintf(_x('%1$s, %2$s', 'dashboard'), $relative, get_the_time()),
 				$recent_post_link,
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $draft_or_post_title ) ),
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $draft_or_post_title)),
 				$draft_or_post_title
 			);
 		}
@@ -875,7 +875,7 @@ 
  * @param int $total_items Optional. Number of comments to query. Default 5.
  * @return bool False if no comments were found. True otherwise.
  */
-function wp_dashboard_recent_comments( $total_items = 5 ) {
+function wp_dashboard_recent_comments($total_items = 5) {
 	// Select all comment types and filter out spam later for better query performance.
 	$comments = array();
 
@@ -883,36 +883,36 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
+	if ( ! current_user_can('edit_posts'))
 		$comments_query['status'] = 'approve';
 
-	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
-		if ( ! is_array( $possible ) ) {
+	while (count($comments) < $total_items && $possible = get_comments($comments_query)) {
+		if ( ! is_array($possible)) {
 			break;
 		}
-		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+		foreach ($possible as $comment) {
+			if ( ! current_user_can('read_post', $comment->comment_post_ID))
 				continue;
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
+			if (count($comments) == $total_items)
 				break 2;
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
 	}
 
-	if ( $comments ) {
+	if ($comments) {
 		echo '<div id="latest-comments" class="activity-block">';
-		echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
+		echo '<h3>'.__('Recent Comments').'</h3>';
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ($comments as $comment)
+			_wp_dashboard_recent_comments_row($comment);
 		echo '</ul>';
 
-		if ( current_user_can( 'edit_posts' ) ) {
-			echo '<h3 class="screen-reader-text">' . __( 'View more comments' ) . '</h3>';
-			_get_list_table( 'WP_Comments_List_Table' )->views();
+		if (current_user_can('edit_posts')) {
+			echo '<h3 class="screen-reader-text">'.__('View more comments').'</h3>';
+			_get_list_table('WP_Comments_List_Table')->views();
 		}
 
 		wp_comment_reply( -1, false, 'dashboard', false );
@@ -932,10 +932,10 @@ 
  *
  * @param string $widget_id
  */
-function wp_dashboard_rss_output( $widget_id ) {
-	$widgets = get_option( 'dashboard_widget_options' );
+function wp_dashboard_rss_output($widget_id) {
+	$widgets = get_option('dashboard_widget_options');
 	echo '<div class="rss-widget">';
-	wp_widget_rss_output( $widgets[ $widget_id ] );
+	wp_widget_rss_output($widgets[$widget_id]);
 	echo "</div>";
 }
 
@@ -954,37 +954,37 @@ 
  * @param array $check_urls RSS feeds
  * @return bool False on failure. True on success.
  */
-function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
-	$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
-	$doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
+function wp_dashboard_cached_rss_widget($widget_id, $callback, $check_urls = array()) {
+	$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><p class="hide-if-js">'.__('This widget requires JavaScript.').'</p>';
+	$doing_ajax = (defined('DOING_AJAX') && DOING_AJAX);
 
-	if ( empty($check_urls) ) {
-		$widgets = get_option( 'dashboard_widget_options' );
-		if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
+	if (empty($check_urls)) {
+		$widgets = get_option('dashboard_widget_options');
+		if (empty($widgets[$widget_id]['url']) && ! $doing_ajax) {
 			echo $loading;
 			return false;
 		}
-		$check_urls = array( $widgets[$widget_id]['url'] );
+		$check_urls = array($widgets[$widget_id]['url']);
 	}
 
 	$locale = get_locale();
-	$cache_key = 'dash_' . md5( $widget_id . '_' . $locale );
-	if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+	$cache_key = 'dash_'.md5($widget_id.'_'.$locale);
+	if (false !== ($output = get_transient($cache_key))) {
 		echo $output;
 		return true;
 	}
 
-	if ( ! $doing_ajax ) {
+	if ( ! $doing_ajax) {
 		echo $loading;
 		return false;
 	}
 
-	if ( $callback && is_callable( $callback ) ) {
-		$args = array_slice( func_get_args(), 3 );
-		array_unshift( $args, $widget_id, $check_urls );
+	if ($callback && is_callable($callback)) {
+		$args = array_slice(func_get_args(), 3);
+		array_unshift($args, $widget_id, $check_urls);
 		ob_start();
-		call_user_func_array( $callback, $args );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds)
+		call_user_func_array($callback, $args);
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS); // Default lifetime in cache of 12 hours (same as the feeds)
 	}
 
 	return true;
@@ -1003,11 +1003,11 @@ 
  *
  * @param int $widget_control_id Registered Widget ID.
  */
-function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
+function wp_dashboard_trigger_widget_control($widget_control_id = false) {
 	global $wp_dashboard_control_callbacks;
 
-	if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id]) ) {
-		call_user_func( $wp_dashboard_control_callbacks[$widget_control_id], '', array( 'id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) );
+	if (is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id])) {
+		call_user_func($wp_dashboard_control_callbacks[$widget_control_id], '', array('id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id]));
 	}
 }
 
@@ -1022,25 +1022,25 @@ 
  * @param string $widget_id
  * @param array $form_inputs
  */
-function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
+function wp_dashboard_rss_control($widget_id, $form_inputs = array()) {
+	if ( ! $widget_options = get_option('dashboard_widget_options'))
 		$widget_options = array();
 
-	if ( !isset($widget_options[$widget_id]) )
+	if ( ! isset($widget_options[$widget_id]))
 		$widget_options[$widget_id] = array();
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
-		$_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
-		$widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
+	if ('POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number])) {
+		$_POST['widget-rss'][$number] = wp_unslash($_POST['widget-rss'][$number]);
+		$widget_options[$widget_id] = wp_widget_rss_process($_POST['widget-rss'][$number]);
 		$widget_options[$widget_id]['number'] = $number;
 
 		// Title is optional. If black, fill it if possible.
-		if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
+		if ( ! $widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title'])) {
 			$rss = fetch_feed($widget_options[$widget_id]['url']);
-			if ( is_wp_error($rss) ) {
+			if (is_wp_error($rss)) {
 				$widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
 			} else {
 				$widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
@@ -1048,12 +1048,12 @@ 
 				unset($rss);
 			}
 		}
-		update_option( 'dashboard_widget_options', $widget_options );
-		$cache_key = 'dash_' . md5( $widget_id );
-		delete_transient( $cache_key );
+		update_option('dashboard_widget_options', $widget_options);
+		$cache_key = 'dash_'.md5($widget_id);
+		delete_transient($cache_key);
 	}
 
-	wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
+	wp_widget_rss_form($widget_options[$widget_id], $form_inputs);
 }
 
 /**
@@ -1072,7 +1072,7 @@ 
 			 *
 			 * @param string $link The widget's primary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_primary_link', __( 'https://wordpress.org/news/' ) ),
+			'link' => apply_filters('dashboard_primary_link', __('https://wordpress.org/news/')),
 
 			/**
 			 * Filter the primary feed URL for the 'WordPress News' dashboard widget.
@@ -1081,7 +1081,7 @@ 
 			 *
 			 * @param string $url The widget's primary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
+			'url' => apply_filters('dashboard_primary_feed', __('http://wordpress.org/news/feed/')),
 
 			/**
 			 * Filter the primary link title for the 'WordPress News' dashboard widget.
@@ -1090,7 +1090,7 @@ 
 			 *
 			 * @param string $title Title attribute for the widget's primary link.
 			 */
-			'title'        => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
+			'title'        => apply_filters('dashboard_primary_title', __('WordPress Blog')),
 			'items'        => 1,
 			'show_summary' => 1,
 			'show_author'  => 0,
@@ -1105,7 +1105,7 @@ 
 			 *
 			 * @param string $link The widget's secondary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
+			'link' => apply_filters('dashboard_secondary_link', __('https://planet.wordpress.org/')),
 
 			/**
 			 * Filter the secondary feed URL for the 'WordPress News' dashboard widget.
@@ -1114,7 +1114,7 @@ 
 			 *
 			 * @param string $url The widget's secondary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
+			'url' => apply_filters('dashboard_secondary_feed', __('https://planet.wordpress.org/feed/')),
 
 			/**
 			 * Filter the secondary link title for the 'WordPress News' dashboard widget.
@@ -1123,7 +1123,7 @@ 
 			 *
 			 * @param string $title Title attribute for the widget's secondary link.
 			 */
-			'title'        => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
+			'title'        => apply_filters('dashboard_secondary_title', __('Other WordPress News')),
 
 			/**
 			 * Filter the number of secondary link items for the 'WordPress News' dashboard widget.
@@ -1132,14 +1132,14 @@ 
 			 *
 			 * @param string $items How many items to show in the secondary feed.
 			 */
-			'items'        => apply_filters( 'dashboard_secondary_items', 3 ),
+			'items'        => apply_filters('dashboard_secondary_items', 3),
 			'show_summary' => 0,
 			'show_author'  => 0,
 			'show_date'    => 0,
 		)
 	);
 
-	if ( ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) ) {
+	if (( ! is_multisite() && is_blog_admin() && current_user_can('install_plugins')) || (is_network_admin() && current_user_can('manage_network_plugins') && current_user_can('install_plugins'))) {
 		$feeds['plugins'] = array(
 			'link'         => '',
 			'url'          => array(
@@ -1153,7 +1153,7 @@ 
 		);
 	}
 
-	wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds );
+	wp_dashboard_cached_rss_widget('dashboard_primary', 'wp_dashboard_primary_output', $feeds);
 }
 
 /**
@@ -1164,14 +1164,14 @@ 
  * @param string $widget_id Widget ID.
  * @param array  $feeds     Array of RSS feeds.
  */
-function wp_dashboard_primary_output( $widget_id, $feeds ) {
-	foreach ( $feeds as $type => $args ) {
+function wp_dashboard_primary_output($widget_id, $feeds) {
+	foreach ($feeds as $type => $args) {
 		$args['type'] = $type;
 		echo '<div class="rss-widget">';
-		if ( $type === 'plugins' ) {
-			wp_dashboard_plugins_output( $args['url'], $args );
+		if ($type === 'plugins') {
+			wp_dashboard_plugins_output($args['url'], $args);
 		} else {
-			wp_widget_rss_output( $args['url'], $args );
+			wp_widget_rss_output($args['url'], $args);
 		}
 		echo "</div>";
 	}
@@ -1185,47 +1185,47 @@ 
  * @param string $rss  The RSS feed URL.
  * @param array  $args Array of arguments for this RSS feed.
  */
-function wp_dashboard_plugins_output( $rss, $args = array() ) {
+function wp_dashboard_plugins_output($rss, $args = array()) {
 	// Plugin feeds plus link to install them
-	$popular = fetch_feed( $args['url']['popular'] );
+	$popular = fetch_feed($args['url']['popular']);
 
-	if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
-		$plugin_slugs = array_keys( get_plugins() );
-		set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
+	if (false === $plugin_slugs = get_transient('plugin_slugs')) {
+		$plugin_slugs = array_keys(get_plugins());
+		set_transient('plugin_slugs', $plugin_slugs, DAY_IN_SECONDS);
 	}
 
 	echo '<ul>';
 
-	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
+	foreach (array($popular) as $feed) {
+		if (is_wp_error($feed) || ! $feed->get_item_quantity())
 			continue;
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin
-		while ( true ) {
+		while (true) {
 			// Abort this foreach loop iteration if there's no plugins left of this type
-			if ( 0 == count($items) )
+			if (0 == count($items))
 				continue 2;
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
 
-			list($link, $frag) = explode( '#', $item->get_link() );
+			list($link, $frag) = explode('#', $item->get_link());
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
+			if (preg_match('|/([^/]+?)/?$|', $link, $matches))
 				$slug = $matches[1];
 			else {
-				unset( $items[$item_key] );
+				unset($items[$item_key]);
 				continue;
 			}
 
 			// Is this random plugin's slug already installed? If so, try again.
-			reset( $plugin_slugs );
-			foreach ( $plugin_slugs as $plugin_slug ) {
-				if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
-					unset( $items[$item_key] );
+			reset($plugin_slugs);
+			foreach ($plugin_slugs as $plugin_slug) {
+				if ($slug == substr($plugin_slug, 0, strlen($slug))) {
+					unset($items[$item_key]);
 					continue 2;
 				}
 			}
@@ -1235,22 +1235,22 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
+		while ((null !== $item_key = array_rand($items)) && false !== strpos($items[$item_key]->get_description(), 'Plugin Name:'))
 			unset($items[$item_key]);
 
-		if ( !isset($items[$item_key]) )
+		if ( ! isset($items[$item_key]))
 			continue;
 
 		$raw_title = $item->get_title();
 
-		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
-		echo '<li class="dashboard-news-plugin"><span>' . __( 'Popular Plugin' ) . ':</span> ' . esc_html( $raw_title ) .
-			'&nbsp;<a href="' . $ilink . '" class="thickbox open-plugin-details-modal" aria-label="' .
+		$ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin='.$slug, 'install-plugin_'.$slug).'&amp;TB_iframe=true&amp;width=600&amp;height=800';
+		echo '<li class="dashboard-news-plugin"><span>'.__('Popular Plugin').':</span> '.esc_html($raw_title).
+			'&nbsp;<a href="'.$ilink.'" class="thickbox open-plugin-details-modal" aria-label="'.
 			/* translators: %s: plugin name */
-			esc_attr( sprintf( __( 'Install %s' ), $raw_title ) ) . '">(' . __( 'Install' ) . ')</a></li>';
+			esc_attr(sprintf(__('Install %s'), $raw_title)).'">('.__('Install').')</a></li>';
 
 		$feed->__destruct();
-		unset( $feed );
+		unset($feed);
 	}
 
 	echo '</ul>';
@@ -1266,48 +1266,48 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
  */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
+	if ( ! is_multisite() || ! current_user_can('upload_files') || get_site_option('upload_space_check_disabled'))
 		return true;
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
+	if ($used > $quota)
 		$percentused = '100';
 	else
-		$percentused = ( $used / $quota ) * 100;
-	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
-	$used = round( $used, 2 );
-	$percentused = number_format( $percentused );
+		$percentused = ($used / $quota) * 100;
+	$used_class = ($percentused >= 70) ? ' warning' : '';
+	$used = round($used, 2);
+	$percentused = number_format($percentused);
 
 	?>
-	<h3 class="mu-storage"><?php _e( 'Storage Space' ); ?></h3>
+	<h3 class="mu-storage"><?php _e('Storage Space'); ?></h3>
 	<div class="mu-storage">
 	<ul>
 		<li class="storage-count">
 			<?php $text = sprintf(
 				/* translators: number of megabytes */
-				__( '%s MB Space Allowed' ),
-				number_format_i18n( $quota )
+				__('%s MB Space Allowed'),
+				number_format_i18n($quota)
 			);
 			printf(
 				'<a href="%1$s">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
-				esc_url( admin_url( 'upload.php' ) ),
+				esc_url(admin_url('upload.php')),
 				$text,
-				__( 'Manage Uploads' )
+				__('Manage Uploads')
 			); ?>
 		</li><li class="storage-count <?php echo $used_class; ?>">
 			<?php $text = sprintf(
 				/* translators: 1: number of megabytes, 2: percentage */
-				__( '%1$s MB (%2$s%%) Space Used' ),
-				number_format_i18n( $used, 2 ),
+				__('%1$s MB (%2$s%%) Space Used'),
+				number_format_i18n($used, 2),
 				$percentused
 			);
 			printf(
 				'<a href="%1$s" class="musublink">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
-				esc_url( admin_url( 'upload.php' ) ),
+				esc_url(admin_url('upload.php')),
 				$text,
-				__( 'Manage Uploads' )
+				__('Manage Uploads')
 			); ?>
 		</li>
 	</ul>
@@ -1320,35 +1320,35 @@ 
 	$notice = '';
 	$response = wp_check_browser_version();
 
-	if ( $response ) {
-		if ( $response['insecure'] ) {
+	if ($response) {
+		if ($response['insecure']) {
 			/* translators: %s: browser name and link */
-			$msg = sprintf( __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
-				sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
+			$msg = sprintf(__("It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser."),
+				sprintf('<a href="%s">%s</a>', esc_url($response['update_url']), esc_html($response['name']))
 			);
 		} else {
 			/* translators: %s: browser name and link */
-			$msg = sprintf( __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ),
-				sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
+			$msg = sprintf(__("It looks like you're using an old version of %s. For the best WordPress experience, please update your browser."),
+				sprintf('<a href="%s">%s</a>', esc_url($response['update_url']), esc_html($response['name']))
 			);
 		}
 
 		$browser_nag_class = '';
-		if ( !empty( $response['img_src'] ) ) {
-			$img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
+		if ( ! empty($response['img_src'])) {
+			$img_src = (is_ssl() && ! empty($response['img_src_ssl'])) ? $response['img_src_ssl'] : $response['img_src'];
 
-			$notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
+			$notice .= '<div class="alignright browser-icon"><a href="'.esc_attr($response['update_url']).'"><img src="'.esc_attr($img_src).'" alt="" /></a></div>';
 			$browser_nag_class = ' has-browser-icon';
 		}
 		$notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ('en_US' !== $locale)
+			$browsehappy = add_query_arg('locale', $locale, $browsehappy);
 
-		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
-		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
+		$notice .= '<p>'.sprintf(__('<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>'), esc_attr($response['update_url']), esc_html($response['name']), esc_url($browsehappy)).'</p>';
+		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="'.esc_attr__('Dismiss the browser warning panel').'">'.__('Dismiss').'</a></p>';
 		$notice .= '<div class="clear"></div>';
 	}
 
@@ -1360,7 +1360,7 @@ 
 	* @param string $notice   The notice content.
 	* @param array  $response An array containing web browser information.
 	*/
-	echo apply_filters( 'browse-happy-notice', $notice, $response );
+	echo apply_filters('browse-happy-notice', $notice, $response);
 }
 
 /**
@@ -1369,10 +1369,10 @@ 
  * @param array $classes
  * @return array
  */
-function dashboard_browser_nag_class( $classes ) {
+function dashboard_browser_nag_class($classes) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
+	if ($response && $response['insecure'])
 		$classes[] = 'browser-insecure';
 
 	return $classes;
@@ -1388,22 +1388,22 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+	if (empty($_SERVER['HTTP_USER_AGENT']))
 		return false;
 
-	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
+	$key = md5($_SERVER['HTTP_USER_AGENT']);
 
-	if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+	if (false === ($response = get_site_transient('browser_'.$key))) {
 		global $wp_version;
 
 		$options = array(
-			'body'			=> array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
-			'user-agent'	=> 'WordPress/' . $wp_version . '; ' . home_url()
+			'body'			=> array('useragent' => $_SERVER['HTTP_USER_AGENT']),
+			'user-agent'	=> 'WordPress/'.$wp_version.'; '.home_url()
 		);
 
-		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
+		$response = wp_remote_post('http://api.wordpress.org/core/browse-happy/1.1/', $options);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 			return false;
 
 		/**
@@ -1417,12 +1417,12 @@ 
 		 *  'img_src' - string - An image representing the browser
 		 *  'img_src_ssl' - string - An image (over SSL) representing the browser
 		 */
-		$response = json_decode( wp_remote_retrieve_body( $response ), true );
+		$response = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $response ) )
+		if ( ! is_array($response))
 			return false;
 
-		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
+		set_site_transient('browser_'.$key, $response, WEEK_IN_SECONDS);
 	}
 
 	return $response;
@@ -1441,55 +1441,55 @@ 
 function wp_welcome_panel() {
 	?>
 	<div class="welcome-panel-content">
-	<h2><?php _e( 'Welcome to WordPress!' ); ?></h2>
-	<p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
+	<h2><?php _e('Welcome to WordPress!'); ?></h2>
+	<p class="about-description"><?php _e('We&#8217;ve assembled some links to get you started:'); ?></p>
 	<div class="welcome-panel-column-container">
 	<div class="welcome-panel-column">
-		<?php if ( current_user_can( 'customize' ) ): ?>
-			<h3><?php _e( 'Get Started' ); ?></h3>
-			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+		<?php if (current_user_can('customize')): ?>
+			<h3><?php _e('Get Started'); ?></h3>
+			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e('Customize Your Site'); ?></a>
 		<?php endif; ?>
-		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
-		<?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-			<p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
+		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url('themes.php'); ?>"><?php _e('Customize Your Site'); ?></a>
+		<?php if (current_user_can('install_themes') || (current_user_can('switch_themes') && count(wp_get_themes(array('allowed' => true))) > 1)) : ?>
+			<p class="hide-if-no-customize"><?php printf(__('or, <a href="%s">change your theme completely</a>'), admin_url('themes.php')); ?></p>
 		<?php endif; ?>
 	</div>
 	<div class="welcome-panel-column">
-		<h3><?php _e( 'Next Steps' ); ?></h3>
+		<h3><?php _e('Next Steps'); ?></h3>
 		<ul>
-		<?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-		<?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php if ('page' == get_option('show_on_front') && ! get_option('page_for_posts')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-edit-page">'.__('Edit your front page').'</a>', get_edit_post_link(get_option('page_on_front'))); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add additional pages').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
+		<?php elseif ('page' == get_option('show_on_front')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-edit-page">'.__('Edit your front page').'</a>', get_edit_post_link(get_option('page_on_front'))); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add additional pages').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-write-blog">'.__('Add a blog post').'</a>', admin_url('post-new.php')); ?></li>
 		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-write-blog">'.__('Write your first blog post').'</a>', admin_url('post-new.php')); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add an About page').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
 		<?php endif; ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-view-site">'.__('View your site').'</a>', home_url('/')); ?></li>
 		</ul>
 	</div>
 	<div class="welcome-panel-column welcome-panel-last">
-		<h3><?php _e( 'More Actions' ); ?></h3>
+		<h3><?php _e('More Actions'); ?></h3>
 		<ul>
-		<?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
+		<?php if (current_theme_supports('widgets') || current_theme_supports('menus')) : ?>
 			<li><div class="welcome-icon welcome-widgets-menus"><?php
-				if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
-					printf( __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
-						admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) );
-				} elseif ( current_theme_supports( 'widgets' ) ) {
-					echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
+				if (current_theme_supports('widgets') && current_theme_supports('menus')) {
+					printf(__('Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>'),
+						admin_url('widgets.php'), admin_url('nav-menus.php'));
+				} elseif (current_theme_supports('widgets')) {
+					echo '<a href="'.admin_url('widgets.php').'">'.__('Manage widgets').'</a>';
 				} else {
-					echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
+					echo '<a href="'.admin_url('nav-menus.php').'">'.__('Manage menus').'</a>';
 				}
 			?></div></li>
 		<?php endif; ?>
-		<?php if ( current_user_can( 'manage_options' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
+		<?php if (current_user_can('manage_options')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-comments">'.__('Turn comments on or off').'</a>', admin_url('options-discussion.php')); ?></li>
 		<?php endif; ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', __( 'https://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-learn-more">'.__('Learn more about getting started').'</a>', __('https://codex.wordpress.org/First_Steps_With_WordPress')); ?></li>
 		</ul>
 	</div>
 	</div>

Braces +94 added lines, -62 removed lines

@@ -28,18 +28,21 @@ 
 
 	if ( $response && $response['upgrade'] ) {
 		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
-		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		if ( $response['insecure'] ) {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+		} else {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		}
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if ( is_blog_admin() && current_user_can('edit_posts') ) {
+			wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	}
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if ( is_network_admin() ) {
+			wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	}
 
 	// Activity Widget
 	if ( is_blog_admin() ) {
@@ -163,12 +166,14 @@ 
 	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
-		$location = 'side';
+	if ( in_array($widget_id, $side_widgets) ) {
+			$location = 'side';
+	}
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
-		$priority = 'high';
+	if ( 'dashboard_browser_nag' === $widget_id ) {
+			$priority = 'high';
+	}
 
 	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
@@ -376,10 +381,12 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if ( current_user_can('create_sites') ) {
+			$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
+	}
+	if ( current_user_can('create_users') ) {
+			$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	}
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
@@ -476,8 +483,10 @@ 
 		$post = get_default_post_to_edit( 'post' , true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) ) {
+					update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID );
+		}
+		// Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
@@ -653,8 +662,9 @@ 
 			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action )
-				$action .= ' hide-if-no-js';
+			if ( 'reply' == $action || 'quickedit' == $action ) {
+							$action .= ' hide-if-no-js';
+			}
 
 			$actions_string .= "<span class='$action'>$sep$link</span>";
 		}
@@ -691,10 +701,12 @@ 
 			</p>
 
 			<?php
-			else :
+			else {
+				:
 				switch ( $comment->comment_type ) {
 					case 'pingback' :
 						$type = __( 'Pingback' );
+			}
 						break;
 					case 'trackback' :
 						$type = __( 'Trackback' );
@@ -883,19 +895,22 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
-		$comments_query['status'] = 'approve';
+	if ( ! current_user_can( 'edit_posts' ) ) {
+			$comments_query['status'] = 'approve';
+	}
 
 	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
 		if ( ! is_array( $possible ) ) {
 			break;
 		}
 		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
-				continue;
+			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) {
+							continue;
+			}
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
-				break 2;
+			if ( count( $comments ) == $total_items ) {
+							break 2;
+			}
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
@@ -906,8 +921,9 @@ 
 		echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ( $comments as $comment ) {
+					_wp_dashboard_recent_comments_row( $comment );
+		}
 		echo '</ul>';
 
 		if ( current_user_can( 'edit_posts' ) ) {
@@ -1023,11 +1039,13 @@ 
  * @param array $form_inputs
  */
 function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
-		$widget_options = array();
+	if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) {
+			$widget_options = array();
+	}
 
-	if ( !isset($widget_options[$widget_id]) )
-		$widget_options[$widget_id] = array();
+	if ( !isset($widget_options[$widget_id]) ) {
+			$widget_options[$widget_id] = array();
+	}
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
@@ -1197,16 +1215,18 @@ 
 	echo '<ul>';
 
 	foreach ( array( $popular ) as $feed ) {
-		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() )
-			continue;
+		if ( is_wp_error( $feed ) || ! $feed->get_item_quantity() ) {
+					continue;
+		}
 
 		$items = $feed->get_items(0, 5);
 
 		// Pick a random, non-installed plugin
 		while ( true ) {
 			// Abort this foreach loop iteration if there's no plugins left of this type
-			if ( 0 == count($items) )
-				continue 2;
+			if ( 0 == count($items) ) {
+							continue 2;
+			}
 
 			$item_key = array_rand($items);
 			$item = $items[$item_key];
@@ -1214,9 +1234,9 @@ 
 			list($link, $frag) = explode( '#', $item->get_link() );
 
 			$link = esc_url($link);
-			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
-				$slug = $matches[1];
-			else {
+			if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) ) {
+							$slug = $matches[1];
+			} else {
 				unset( $items[$item_key] );
 				continue;
 			}
@@ -1235,11 +1255,13 @@ 
 		}
 
 		// Eliminate some common badly formed plugin descriptions
-		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
-			unset($items[$item_key]);
+		while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) ) {
+					unset($items[$item_key]);
+		}
 
-		if ( !isset($items[$item_key]) )
-			continue;
+		if ( !isset($items[$item_key]) ) {
+					continue;
+		}
 
 		$raw_title = $item->get_title();
 
@@ -1266,16 +1288,18 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
  */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
-		$percentused = '100';
-	else
-		$percentused = ( $used / $quota ) * 100;
+	if ( $used > $quota ) {
+			$percentused = '100';
+	} else {
+			$percentused = ( $used / $quota ) * 100;
+	}
 	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
 	$used = round( $used, 2 );
 	$percentused = number_format( $percentused );
@@ -1344,8 +1368,9 @@ 
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ( 'en_US' !== $locale ) {
+					$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		}
 
 		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
 		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
@@ -1372,8 +1397,9 @@ 
 function dashboard_browser_nag_class( $classes ) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
-		$classes[] = 'browser-insecure';
+	if ( $response && $response['insecure'] ) {
+			$classes[] = 'browser-insecure';
+	}
 
 	return $classes;
 }
@@ -1388,8 +1414,9 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
-		return false;
+	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
+			return false;
+	}
 
 	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
 
@@ -1403,8 +1430,9 @@ 
 
 		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+					return false;
+		}
 
 		/**
 		 * Response should be an array with:
@@ -1419,8 +1447,9 @@ 
 		 */
 		$response = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $response ) )
-			return false;
+		if ( ! is_array( $response ) ) {
+					return false;
+		}
 
 		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
 	}
@@ -1464,8 +1493,11 @@ 
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php else {
+	: ?>
+			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) );
+}
+?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 		<?php endif; ?>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>

src/wp-admin/includes/file.php

Doc Comments +1 added lines, -1 removed lines

@@ -833,7 +833,7 @@
  *
  * @global WP_Filesystem_Base $wp_filesystem Subclass
  *
- * @param array|false  $args                         Optional. Connection args, These are passed directly to
+ * @param boolean  $args                         Optional. Connection args, These are passed directly to
  *                                                   the `WP_Filesystem_*()` classes. Default false.
  * @param string|false $context                      Optional. Context for get_filesystem_method(). Default false.
  * @param bool         $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 /**
- * Filesystem API: Top-level functionality
- *
- * Functions for reading, writing, modifying, and deleting files on the file system.
- * Includes functionality for theme-specific files as well as operations for uploading,
- * archiving, and rendering output when necessary.
- *
- * @package WordPress
- * @subpackage Filesystem
- * @since 2.3.0
- */
+	 * Filesystem API: Top-level functionality
+	 *
+	 * Functions for reading, writing, modifying, and deleting files on the file system.
+	 * Includes functionality for theme-specific files as well as operations for uploading,
+	 * archiving, and rendering output when necessary.
+	 *
+	 * @package WordPress
+	 * @subpackage Filesystem
+	 * @since 2.3.0
+	 */
 
 /** The descriptions for theme files. */
 $wp_file_descriptions = array(

Spacing +366 added lines, -366 removed lines

@@ -13,48 +13,48 @@ 
 
 /** The descriptions for theme files. */
 $wp_file_descriptions = array(
-	'functions.php'         => __( 'Theme Functions' ),
-	'header.php'            => __( 'Theme Header' ),
-	'footer.php'            => __( 'Theme Footer' ),
-	'sidebar.php'           => __( 'Sidebar' ),
-	'comments.php'          => __( 'Comments' ),
-	'searchform.php'        => __( 'Search Form' ),
-	'404.php'               => __( '404 Template' ),
-	'link.php'              => __( 'Links Template' ),
+	'functions.php'         => __('Theme Functions'),
+	'header.php'            => __('Theme Header'),
+	'footer.php'            => __('Theme Footer'),
+	'sidebar.php'           => __('Sidebar'),
+	'comments.php'          => __('Comments'),
+	'searchform.php'        => __('Search Form'),
+	'404.php'               => __('404 Template'),
+	'link.php'              => __('Links Template'),
 	// Archives
-	'index.php'             => __( 'Main Index Template' ),
-	'archive.php'           => __( 'Archives' ),
-	'author.php'            => __( 'Author Template' ),
-	'taxonomy.php'          => __( 'Taxonomy Template' ),
-	'category.php'          => __( 'Category Template' ),
-	'tag.php'               => __( 'Tag Template' ),
-	'home.php'              => __( 'Posts Page' ),
-	'search.php'            => __( 'Search Results' ),
-	'date.php'              => __( 'Date Template' ),
+	'index.php'             => __('Main Index Template'),
+	'archive.php'           => __('Archives'),
+	'author.php'            => __('Author Template'),
+	'taxonomy.php'          => __('Taxonomy Template'),
+	'category.php'          => __('Category Template'),
+	'tag.php'               => __('Tag Template'),
+	'home.php'              => __('Posts Page'),
+	'search.php'            => __('Search Results'),
+	'date.php'              => __('Date Template'),
 	// Content
-	'singular.php'          => __( 'Singular Template' ),
-	'single.php'            => __( 'Single Post' ),
-	'page.php'              => __( 'Single Page' ),
-	'front-page.php'        => __( 'Static Front Page' ),
+	'singular.php'          => __('Singular Template'),
+	'single.php'            => __('Single Post'),
+	'page.php'              => __('Single Page'),
+	'front-page.php'        => __('Static Front Page'),
 	// Attachments
-	'attachment.php'        => __( 'Attachment Template' ),
-	'image.php'             => __( 'Image Attachment Template' ),
-	'video.php'             => __( 'Video Attachment Template' ),
-	'audio.php'             => __( 'Audio Attachment Template' ),
-	'application.php'       => __( 'Application Attachment Template' ),
+	'attachment.php'        => __('Attachment Template'),
+	'image.php'             => __('Image Attachment Template'),
+	'video.php'             => __('Video Attachment Template'),
+	'audio.php'             => __('Audio Attachment Template'),
+	'application.php'       => __('Application Attachment Template'),
 	// Stylesheets
-	'style.css'             => __( 'Stylesheet' ),
-	'editor-style.css'      => __( 'Visual Editor Stylesheet' ),
-	'editor-style-rtl.css'  => __( 'Visual Editor RTL Stylesheet' ),
-	'rtl.css'               => __( 'RTL Stylesheet' ),
+	'style.css'             => __('Stylesheet'),
+	'editor-style.css'      => __('Visual Editor Stylesheet'),
+	'editor-style-rtl.css'  => __('Visual Editor RTL Stylesheet'),
+	'rtl.css'               => __('RTL Stylesheet'),
 	// Other
-	'my-hacks.php'          => __( 'my-hacks.php (legacy hacks support)' ),
-	'.htaccess'             => __( '.htaccess (for rewrite rules )' ),
+	'my-hacks.php'          => __('my-hacks.php (legacy hacks support)'),
+	'.htaccess'             => __('.htaccess (for rewrite rules )'),
 	// Deprecated files
-	'wp-layout.css'         => __( 'Stylesheet' ),
-	'wp-comments.php'       => __( 'Comments Template' ),
-	'wp-comments-popup.php' => __( 'Popup Comments Template' ),
-	'comments-popup.php'    => __( 'Popup Comments' ),
+	'wp-layout.css'         => __('Stylesheet'),
+	'wp-comments.php'       => __('Comments Template'),
+	'wp-comments-popup.php' => __('Popup Comments Template'),
+	'comments-popup.php'    => __('Popup Comments'),
 );
 
 /**
@@ -68,21 +68,21 @@ 
  * @return string Description of file from $wp_file_descriptions or basename of $file if description doesn't exist.
  *                Appends 'Page Template' to basename of $file if the file is a page template
  */
-function get_file_description( $file ) {
+function get_file_description($file) {
 	global $wp_file_descriptions, $allowed_files;
 
-	$relative_pathinfo = pathinfo( $file );
-	$file_path = $allowed_files[ $file ];
-	if ( isset( $wp_file_descriptions[ basename( $file ) ] ) && '.' === $relative_pathinfo['dirname'] ) {
-		return $wp_file_descriptions[ basename( $file ) ];
-	} elseif ( file_exists( $file_path ) && is_file( $file_path ) ) {
-		$template_data = implode( '', file( $file_path ) );
-		if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) ) {
-			return sprintf( __( '%s Page Template' ), _cleanup_header_comment( $name[1] ) );
+	$relative_pathinfo = pathinfo($file);
+	$file_path = $allowed_files[$file];
+	if (isset($wp_file_descriptions[basename($file)]) && '.' === $relative_pathinfo['dirname']) {
+		return $wp_file_descriptions[basename($file)];
+	} elseif (file_exists($file_path) && is_file($file_path)) {
+		$template_data = implode('', file($file_path));
+		if (preg_match('|Template Name:(.*)$|mi', $template_data, $name)) {
+			return sprintf(__('%s Page Template'), _cleanup_header_comment($name[1]));
 		}
 	}
 
-	return trim( basename( $file ) );
+	return trim(basename($file));
 }
 
 /**
@@ -93,18 +93,18 @@ 
  * @return string Full filesystem path to the root of the WordPress installation
  */
 function get_home_path() {
-	$home    = set_url_scheme( get_option( 'home' ), 'http' );
-	$siteurl = set_url_scheme( get_option( 'siteurl' ), 'http' );
-	if ( ! empty( $home ) && 0 !== strcasecmp( $home, $siteurl ) ) {
-		$wp_path_rel_to_home = str_ireplace( $home, '', $siteurl ); /* $siteurl - $home */
-		$pos = strripos( str_replace( '\\', '/', $_SERVER['SCRIPT_FILENAME'] ), trailingslashit( $wp_path_rel_to_home ) );
-		$home_path = substr( $_SERVER['SCRIPT_FILENAME'], 0, $pos );
-		$home_path = trailingslashit( $home_path );
+	$home    = set_url_scheme(get_option('home'), 'http');
+	$siteurl = set_url_scheme(get_option('siteurl'), 'http');
+	if ( ! empty($home) && 0 !== strcasecmp($home, $siteurl)) {
+		$wp_path_rel_to_home = str_ireplace($home, '', $siteurl); /* $siteurl - $home */
+		$pos = strripos(str_replace('\\', '/', $_SERVER['SCRIPT_FILENAME']), trailingslashit($wp_path_rel_to_home));
+		$home_path = substr($_SERVER['SCRIPT_FILENAME'], 0, $pos);
+		$home_path = trailingslashit($home_path);
 	} else {
 		$home_path = ABSPATH;
 	}
 
-	return str_replace( '\\', '/', $home_path );
+	return str_replace('\\', '/', $home_path);
 }
 
 /**
@@ -117,30 +117,30 @@ 
  * @param int    $levels Optional. Levels of folders to follow, Default 100 (PHP Loop limit).
  * @return bool|array False on failure, Else array of files
  */
-function list_files( $folder = '', $levels = 100 ) {
-	if ( empty($folder) )
+function list_files($folder = '', $levels = 100) {
+	if (empty($folder))
 		return false;
 
-	if ( ! $levels )
+	if ( ! $levels)
 		return false;
 
 	$files = array();
-	if ( $dir = @opendir( $folder ) ) {
-		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
+	if ($dir = @opendir($folder)) {
+		while (($file = readdir($dir)) !== false) {
+			if (in_array($file, array('.', '..')))
 				continue;
-			if ( is_dir( $folder . '/' . $file ) ) {
-				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if ( $files2 )
-					$files = array_merge($files, $files2 );
+			if (is_dir($folder.'/'.$file)) {
+				$files2 = list_files($folder.'/'.$file, $levels - 1);
+				if ($files2)
+					$files = array_merge($files, $files2);
 				else
-					$files[] = $folder . '/' . $file . '/';
+					$files[] = $folder.'/'.$file.'/';
 			} else {
-				$files[] = $folder . '/' . $file;
+				$files[] = $folder.'/'.$file;
 			}
 		}
 	}
-	@closedir( $dir );
+	@closedir($dir);
 	return $files;
 }
 
@@ -157,35 +157,35 @@ 
  * @param string $dir      Optional. Directory to store the file in. Default empty.
  * @return string a writable filename
  */
-function wp_tempnam( $filename = '', $dir = '' ) {
-	if ( empty( $dir ) ) {
+function wp_tempnam($filename = '', $dir = '') {
+	if (empty($dir)) {
 		$dir = get_temp_dir();
 	}
 
-	if ( empty( $filename ) || '.' == $filename || '/' == $filename ) {
+	if (empty($filename) || '.' == $filename || '/' == $filename) {
 		$filename = time();
 	}
 
 	// Use the basename of the given file without the extension as the name for the temporary directory
-	$temp_filename = basename( $filename );
-	$temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename );
+	$temp_filename = basename($filename);
+	$temp_filename = preg_replace('|\.[^.]*$|', '', $temp_filename);
 
 	// If the folder is falsey, use its parent directory name instead.
-	if ( ! $temp_filename ) {
-		return wp_tempnam( dirname( $filename ), $dir );
+	if ( ! $temp_filename) {
+		return wp_tempnam(dirname($filename), $dir);
 	}
 
 	// Suffix some random data to avoid filename conflicts
-	$temp_filename .= '-' . wp_generate_password( 6, false );
+	$temp_filename .= '-'.wp_generate_password(6, false);
 	$temp_filename .= '.tmp';
-	$temp_filename = $dir . wp_unique_filename( $dir, $temp_filename );
+	$temp_filename = $dir.wp_unique_filename($dir, $temp_filename);
 
-	$fp = @fopen( $temp_filename, 'x' );
-	if ( ! $fp && is_writable( $dir ) && file_exists( $temp_filename ) ) {
-		return wp_tempnam( $filename, $dir );
+	$fp = @fopen($temp_filename, 'x');
+	if ( ! $fp && is_writable($dir) && file_exists($temp_filename)) {
+		return wp_tempnam($filename, $dir);
 	}
-	if ( $fp ) {
-		fclose( $fp );
+	if ($fp) {
+		fclose($fp);
 	}
 
 	return $temp_filename;
@@ -202,21 +202,21 @@ 
  * @param array $allowed_files Array of allowed files to edit, $file must match an entry exactly
  * @return string|null
  */
-function validate_file_to_edit( $file, $allowed_files = '' ) {
-	$code = validate_file( $file, $allowed_files );
+function validate_file_to_edit($file, $allowed_files = '') {
+	$code = validate_file($file, $allowed_files);
 
-	if (!$code )
+	if ( ! $code)
 		return $file;
 
-	switch ( $code ) {
+	switch ($code) {
 		case 1 :
-			wp_die( __( 'Sorry, that file cannot be edited.' ) );
+			wp_die(__('Sorry, that file cannot be edited.'));
 
 		// case 2 :
 		// wp_die( __('Sorry, can’t call files with their real path.' ));
 
 		case 3 :
-			wp_die( __( 'Sorry, that file cannot be edited.' ) );
+			wp_die(__('Sorry, that file cannot be edited.'));
 	}
 }
 
@@ -236,11 +236,11 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function _wp_handle_upload( &$file, $overrides, $time, $action ) {
+function _wp_handle_upload(&$file, $overrides, $time, $action) {
 	// The default error handler.
-	if ( ! function_exists( 'wp_handle_upload_error' ) ) {
-		function wp_handle_upload_error( &$file, $message ) {
-			return array( 'error' => $message );
+	if ( ! function_exists('wp_handle_upload_error')) {
+		function wp_handle_upload_error(&$file, $message) {
+			return array('error' => $message);
 		}
 	}
 
@@ -254,24 +254,24 @@ 
 	 *
 	 * @param array $file An array of data for a single file.
 	 */
-	$file = apply_filters( "{$action}_prefilter", $file );
+	$file = apply_filters("{$action}_prefilter", $file);
 
 	// You may define your own function and pass the name in $overrides['upload_error_handler']
 	$upload_error_handler = 'wp_handle_upload_error';
-	if ( isset( $overrides['upload_error_handler'] ) ) {
+	if (isset($overrides['upload_error_handler'])) {
 		$upload_error_handler = $overrides['upload_error_handler'];
 	}
 
 	// You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
-	if ( isset( $file['error'] ) && ! is_numeric( $file['error'] ) && $file['error'] ) {
-		return $upload_error_handler( $file, $file['error'] );
+	if (isset($file['error']) && ! is_numeric($file['error']) && $file['error']) {
+		return $upload_error_handler($file, $file['error']);
 	}
 
 	// Install user overrides. Did we mention that this voids your warranty?
 
 	// You may define your own function and pass the name in $overrides['unique_filename_callback']
 	$unique_filename_callback = null;
-	if ( isset( $overrides['unique_filename_callback'] ) ) {
+	if (isset($overrides['unique_filename_callback'])) {
 		$unique_filename_callback = $overrides['unique_filename_callback'];
 	}
 
@@ -279,72 +279,72 @@ 
 	 * This may not have orignially been intended to be overrideable,
 	 * but historically has been.
 	 */
-	if ( isset( $overrides['upload_error_strings'] ) ) {
+	if (isset($overrides['upload_error_strings'])) {
 		$upload_error_strings = $overrides['upload_error_strings'];
 	} else {
 		// Courtesy of php.net, the strings that describe the error indicated in $_FILES[{form field}]['error'].
 		$upload_error_strings = array(
 			false,
-			__( 'The uploaded file exceeds the upload_max_filesize directive in php.ini.' ),
-			__( 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.' ),
-			__( 'The uploaded file was only partially uploaded.' ),
-			__( 'No file was uploaded.' ),
+			__('The uploaded file exceeds the upload_max_filesize directive in php.ini.'),
+			__('The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'),
+			__('The uploaded file was only partially uploaded.'),
+			__('No file was uploaded.'),
 			'',
-			__( 'Missing a temporary folder.' ),
-			__( 'Failed to write file to disk.' ),
-			__( 'File upload stopped by extension.' )
+			__('Missing a temporary folder.'),
+			__('Failed to write file to disk.'),
+			__('File upload stopped by extension.')
 		);
 	}
 
 	// All tests are on by default. Most can be turned off by $overrides[{test_name}] = false;
-	$test_form = isset( $overrides['test_form'] ) ? $overrides['test_form'] : true;
-	$test_size = isset( $overrides['test_size'] ) ? $overrides['test_size'] : true;
+	$test_form = isset($overrides['test_form']) ? $overrides['test_form'] : true;
+	$test_size = isset($overrides['test_size']) ? $overrides['test_size'] : true;
 
 	// If you override this, you must provide $ext and $type!!
-	$test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
-	$mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
+	$test_type = isset($overrides['test_type']) ? $overrides['test_type'] : true;
+	$mimes = isset($overrides['mimes']) ? $overrides['mimes'] : false;
 
 	// A correct form post will pass this test.
-	if ( $test_form && ( ! isset( $_POST['action'] ) || ( $_POST['action'] != $action ) ) ) {
-		return call_user_func( $upload_error_handler, $file, __( 'Invalid form submission.' ) );
+	if ($test_form && ( ! isset($_POST['action']) || ($_POST['action'] != $action))) {
+		return call_user_func($upload_error_handler, $file, __('Invalid form submission.'));
 	}
 	// A successful upload will pass this test. It makes no sense to override this one.
-	if ( isset( $file['error'] ) && $file['error'] > 0 ) {
-		return call_user_func( $upload_error_handler, $file, $upload_error_strings[ $file['error'] ] );
+	if (isset($file['error']) && $file['error'] > 0) {
+		return call_user_func($upload_error_handler, $file, $upload_error_strings[$file['error']]);
 	}
 
-	$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize( $file['tmp_name'] );
+	$test_file_size = 'wp_handle_upload' === $action ? $file['size'] : filesize($file['tmp_name']);
 	// A non-empty file will pass this test.
-	if ( $test_size && ! ( $test_file_size > 0 ) ) {
-		if ( is_multisite() ) {
-			$error_msg = __( 'File is empty. Please upload something more substantial.' );
+	if ($test_size && ! ($test_file_size > 0)) {
+		if (is_multisite()) {
+			$error_msg = __('File is empty. Please upload something more substantial.');
 		} else {
-			$error_msg = __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' );
+			$error_msg = __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.');
 		}
-		return call_user_func( $upload_error_handler, $file, $error_msg );
+		return call_user_func($upload_error_handler, $file, $error_msg);
 	}
 
 	// A properly uploaded file will pass this test. There should be no reason to override this one.
-	$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file( $file['tmp_name'] ) : @ is_file( $file['tmp_name'] );
-	if ( ! $test_uploaded_file ) {
-		return call_user_func( $upload_error_handler, $file, __( 'Specified file failed upload test.' ) );
+	$test_uploaded_file = 'wp_handle_upload' === $action ? @ is_uploaded_file($file['tmp_name']) : @ is_file($file['tmp_name']);
+	if ( ! $test_uploaded_file) {
+		return call_user_func($upload_error_handler, $file, __('Specified file failed upload test.'));
 	}
 
 	// A correct MIME type will pass this test. Override $mimes or use the upload_mimes filter.
-	if ( $test_type ) {
-		$wp_filetype = wp_check_filetype_and_ext( $file['tmp_name'], $file['name'], $mimes );
-		$ext = empty( $wp_filetype['ext'] ) ? '' : $wp_filetype['ext'];
-		$type = empty( $wp_filetype['type'] ) ? '' : $wp_filetype['type'];
-		$proper_filename = empty( $wp_filetype['proper_filename'] ) ? '' : $wp_filetype['proper_filename'];
+	if ($test_type) {
+		$wp_filetype = wp_check_filetype_and_ext($file['tmp_name'], $file['name'], $mimes);
+		$ext = empty($wp_filetype['ext']) ? '' : $wp_filetype['ext'];
+		$type = empty($wp_filetype['type']) ? '' : $wp_filetype['type'];
+		$proper_filename = empty($wp_filetype['proper_filename']) ? '' : $wp_filetype['proper_filename'];
 
 		// Check to see if wp_check_filetype_and_ext() determined the filename was incorrect
-		if ( $proper_filename ) {
+		if ($proper_filename) {
 			$file['name'] = $proper_filename;
 		}
-		if ( ( ! $type || !$ext ) && ! current_user_can( 'unfiltered_upload' ) ) {
-			return call_user_func( $upload_error_handler, $file, __( 'Sorry, this file type is not permitted for security reasons.' ) );
+		if (( ! $type || ! $ext) && ! current_user_can('unfiltered_upload')) {
+			return call_user_func($upload_error_handler, $file, __('Sorry, this file type is not permitted for security reasons.'));
 		}
-		if ( ! $type ) {
+		if ( ! $type) {
 			$type = $file['type'];
 		}
 	} else {
@@ -355,41 +355,41 @@ 
 	 * A writable uploads dir will pass this test. Again, there's no point
 	 * overriding this one.
 	 */
-	if ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) {
-		return call_user_func( $upload_error_handler, $file, $uploads['error'] );
+	if ( ! (($uploads = wp_upload_dir($time)) && false === $uploads['error'])) {
+		return call_user_func($upload_error_handler, $file, $uploads['error']);
 	}
 
-	$filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
+	$filename = wp_unique_filename($uploads['path'], $file['name'], $unique_filename_callback);
 
 	// Move the file to the uploads dir.
-	$new_file = $uploads['path'] . "/$filename";
-	if ( 'wp_handle_upload' === $action ) {
-		$move_new_file = @ move_uploaded_file( $file['tmp_name'], $new_file );
+	$new_file = $uploads['path']."/$filename";
+	if ('wp_handle_upload' === $action) {
+		$move_new_file = @ move_uploaded_file($file['tmp_name'], $new_file);
 	} else {
 		// use copy and unlink because rename breaks streams.
-		$move_new_file = @ copy( $file['tmp_name'], $new_file );
-		unlink( $file['tmp_name'] );
+		$move_new_file = @ copy($file['tmp_name'], $new_file);
+		unlink($file['tmp_name']);
 	}
 
-	if ( false === $move_new_file ) {
-		if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
-			$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+	if (false === $move_new_file) {
+		if (0 === strpos($uploads['basedir'], ABSPATH)) {
+			$error_path = str_replace(ABSPATH, '', $uploads['basedir']).$uploads['subdir'];
 		} else {
-			$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+			$error_path = basename($uploads['basedir']).$uploads['subdir'];
 		}
-		return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
+		return $upload_error_handler($file, sprintf(__('The uploaded file could not be moved to %s.'), $error_path));
 	}
 
 	// Set correct file permissions.
-	$stat = stat( dirname( $new_file ));
+	$stat = stat(dirname($new_file));
 	$perms = $stat['mode'] & 0000666;
-	@ chmod( $new_file, $perms );
+	@ chmod($new_file, $perms);
 
 	// Compute the URL.
-	$url = $uploads['url'] . "/$filename";
+	$url = $uploads['url']."/$filename";
 
-	if ( is_multisite() ) {
-		delete_transient( 'dirsize_cache' );
+	if (is_multisite()) {
+		delete_transient('dirsize_cache');
 	}
 
 	/**
@@ -406,11 +406,11 @@ 
 	 * }
 	 * @param string $context The type of upload action. Values include 'upload' or 'sideload'.
 	 */
-	return apply_filters( 'wp_handle_upload', array(
+	return apply_filters('wp_handle_upload', array(
 		'file' => $new_file,
 		'url'  => $url,
 		'type' => $type
-	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload' );
+	), 'wp_handle_sideload' === $action ? 'sideload' : 'upload');
 }
 
 /**
@@ -428,17 +428,17 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_upload( &$file, $overrides = false, $time = null ) {
+function wp_handle_upload(&$file, $overrides = false, $time = null) {
 	/*
 	 *  $_POST['action'] must be set and its value must equal $overrides['action']
 	 *  or this:
 	 */
 	$action = 'wp_handle_upload';
-	if ( isset( $overrides['action'] ) ) {
+	if (isset($overrides['action'])) {
 		$action = $overrides['action'];
 	}
 
-	return _wp_handle_upload( $file, $overrides, $time, $action );
+	return _wp_handle_upload($file, $overrides, $time, $action);
 }
 
 /**
@@ -455,16 +455,16 @@ 
  * @return array On success, returns an associative array of file attributes. On failure, returns
  *               $overrides['upload_error_handler'](&$file, $message ) or array( 'error'=>$message ).
  */
-function wp_handle_sideload( &$file, $overrides = false, $time = null ) {
+function wp_handle_sideload(&$file, $overrides = false, $time = null) {
 	/*
 	 *  $_POST['action'] must be set and its value must equal $overrides['action']
 	 *  or this:
 	 */
 	$action = 'wp_handle_sideload';
-	if ( isset( $overrides['action'] ) ) {
+	if (isset($overrides['action'])) {
 		$action = $overrides['action'];
 	}
-	return _wp_handle_upload( $file, $overrides, $time, $action );
+	return _wp_handle_upload($file, $overrides, $time, $action);
 }
 
 
@@ -478,32 +478,32 @@ 
  * @param int $timeout The timeout for the request to download the file default 300 seconds
  * @return mixed WP_Error on failure, string Filename on success.
  */
-function download_url( $url, $timeout = 300 ) {
+function download_url($url, $timeout = 300) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
+	if ( ! $url)
 		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
 
 	$tmpfname = wp_tempnam($url);
-	if ( ! $tmpfname )
+	if ( ! $tmpfname)
 		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
 
-	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
+	$response = wp_safe_remote_get($url, array('timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname));
 
-	if ( is_wp_error( $response ) ) {
-		unlink( $tmpfname );
+	if (is_wp_error($response)) {
+		unlink($tmpfname);
 		return $response;
 	}
 
-	if ( 200 != wp_remote_retrieve_response_code( $response ) ){
-		unlink( $tmpfname );
-		return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+	if (200 != wp_remote_retrieve_response_code($response)) {
+		unlink($tmpfname);
+		return new WP_Error('http_404', trim(wp_remote_retrieve_response_message($response)));
 	}
 
-	$content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
-	if ( $content_md5 ) {
-		$md5_check = verify_file_md5( $tmpfname, $content_md5 );
-		if ( is_wp_error( $md5_check ) ) {
-			unlink( $tmpfname );
+	$content_md5 = wp_remote_retrieve_header($response, 'content-md5');
+	if ($content_md5) {
+		$md5_check = verify_file_md5($tmpfname, $content_md5);
+		if (is_wp_error($md5_check)) {
+			unlink($tmpfname);
 			return $md5_check;
 		}
 	}
@@ -520,20 +520,20 @@ 
  * @param string $expected_md5 The expected MD5 of the file, either a base64 encoded raw md5, or a hex-encoded md5
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
-function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = base64_decode( $expected_md5 );
+function verify_file_md5($filename, $expected_md5) {
+	if (32 == strlen($expected_md5))
+		$expected_raw_md5 = pack('H*', $expected_md5);
+	elseif (24 == strlen($expected_md5))
+		$expected_raw_md5 = base64_decode($expected_md5);
 	else
 		return false; // unknown format
 
-	$file_md5 = md5_file( $filename, true );
+	$file_md5 = md5_file($filename, true);
 
-	if ( $file_md5 === $expected_raw_md5 )
+	if ($file_md5 === $expected_raw_md5)
 		return true;
 
-	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
+	return new WP_Error('md5_mismatch', sprintf(__('The checksum of the file (%1$s) does not match the expected checksum value (%2$s).'), bin2hex($file_md5), bin2hex($expected_raw_md5)));
 }
 
 /**
@@ -554,28 +554,28 @@ 
 function unzip_file($file, $to) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+	if ( ! $wp_filesystem || ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
 	// Unzip can use a lot of memory, but not this much hopefully
 	/** This filter is documented in wp-admin/admin.php */
-	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+	@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 
 	$needed_dirs = array();
 	$to = trailingslashit($to);
 
 	// Determine any parent dir's needed (of the upgrade directory)
-	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
+	if ( ! $wp_filesystem->is_dir($to)) { //Only do parents if no children exist
 		$path = preg_split('![/\\\]!', untrailingslashit($to));
-		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
+		for ($i = count($path); $i >= 0; $i--) {
+			if (empty($path[$i]))
 				continue;
 
-			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			$dir = implode('/', array_slice($path, 0, $i + 1));
+			if (preg_match('!^[a-z]:$!i', $dir)) // Skip it if it looks like a Windows Drive letter.
 				continue;
 
-			if ( ! $wp_filesystem->is_dir($dir) )
+			if ( ! $wp_filesystem->is_dir($dir))
 				$needed_dirs[] = $dir;
 			else
 				break; // A folder exists, therefor, we dont need the check the levels below this
@@ -589,12 +589,12 @@ 
 	 *
 	 * @param bool $ziparchive Whether to use ZipArchive. Default true.
 	 */
-	if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
+	if (class_exists('ZipArchive', false) && apply_filters('unzip_file_use_ziparchive', true)) {
 		$result = _unzip_file_ziparchive($file, $to, $needed_dirs);
-		if ( true === $result ) {
+		if (true === $result) {
 			return $result;
-		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
+		} elseif (is_wp_error($result)) {
+			if ('incompatible_archive' != $result->get_error_code())
 				return $result;
 		}
 	}
@@ -617,30 +617,30 @@ 
  * @param array $needed_dirs A partial list of required folders needed to be created.
  * @return mixed WP_Error on failure, True on success
  */
-function _unzip_file_ziparchive($file, $to, $needed_dirs = array() ) {
+function _unzip_file_ziparchive($file, $to, $needed_dirs = array()) {
 	global $wp_filesystem;
 
 	$z = new ZipArchive();
 
-	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
-		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	$zopen = $z->open($file, ZIPARCHIVE::CHECKCONS);
+	if (true !== $zopen)
+		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), array('ziparchive_error' => $zopen));
 
 	$uncompressed_size = 0;
 
-	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+	for ($i = 0; $i < $z->numFiles; $i++) {
+		if ( ! $info = $z->statIndex($i))
+			return new WP_Error('stat_failed_ziparchive', __('Could not retrieve file from archive.'));
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ('__MACOSX/' === substr($info['name'], 0, 9)) // Skip the OS X-created __MACOSX directory
 			continue;
 
 		$uncompressed_size += $info['size'];
 
-		if ( '/' == substr($info['name'], -1) ) // directory
-			$needed_dirs[] = $to . untrailingslashit($info['name']);
+		if ('/' == substr($info['name'], -1)) // directory
+			$needed_dirs[] = $to.untrailingslashit($info['name']);
 		else
-			$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+			$needed_dirs[] = $to.untrailingslashit(dirname($info['name']));
 	}
 
 	/*
@@ -648,22 +648,22 @@ 
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+	if (defined('DOING_CRON') && DOING_CRON) {
+		$available_space = @disk_free_space(WP_CONTENT_DIR);
+		if ($available_space && ($uncompressed_size * 2.1) > $available_space)
+			return new WP_Error('disk_full_unzip_file', __('Could not copy files. You may have run out of disk space.'), compact('uncompressed_size', 'available_space'));
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
+	foreach ($needed_dirs as $dir) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if (untrailingslashit($to) == $dir) // Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		if (strpos($dir, $to) === false) // If the directory is not within the working directory, Skip it
 			continue;
 
 		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
+		while ( ! empty($parent_folder) && untrailingslashit($to) != $parent_folder && ! in_array($parent_folder, $needed_dirs)) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname($parent_folder);
 		}
@@ -671,30 +671,30 @@ 
 	asort($needed_dirs);
 
 	// Create those directories if need be:
-	foreach ( $needed_dirs as $_dir ) {
+	foreach ($needed_dirs as $_dir) {
 		// Only check to see if the Dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
-			return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir)) {
+			return new WP_Error('mkdir_failed_ziparchive', __('Could not create directory.'), substr($_dir, strlen($to)));
 		}
 	}
 	unset($needed_dirs);
 
-	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+	for ($i = 0; $i < $z->numFiles; $i++) {
+		if ( ! $info = $z->statIndex($i))
+			return new WP_Error('stat_failed_ziparchive', __('Could not retrieve file from archive.'));
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ('/' == substr($info['name'], -1)) // directory
 			continue;
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ('__MACOSX/' === substr($info['name'], 0, 9)) // Don't extract the OS X-created __MACOSX directory files
 			continue;
 
 		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
-			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		if (false === $contents)
+			return new WP_Error('extract_failed_ziparchive', __('Could not extract file from archive.'), $info['name']);
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		if ( ! $wp_filesystem->put_contents($to.$info['name'], $contents, FS_CHMOD_FILE))
+			return new WP_Error('copy_failed_ziparchive', __('Could not copy file.'), $info['name']);
 	}
 
 	$z->close();
@@ -722,7 +722,7 @@ 
 
 	mbstring_binary_safe_encoding();
 
-	require_once(ABSPATH . 'wp-admin/includes/class-pclzip.php');
+	require_once(ABSPATH.'wp-admin/includes/class-pclzip.php');
 
 	$archive = new PclZip($file);
 
@@ -731,22 +731,22 @@ 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
+	if ( ! is_array($archive_files))
 		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
 
-	if ( 0 == count($archive_files) )
-		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	if (0 == count($archive_files))
+		return new WP_Error('empty_archive_pclzip', __('Empty archive.'));
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
-	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+	foreach ($archive_files as $file) {
+		if ('__MACOSX/' === substr($file['filename'], 0, 9)) // Skip the OS X-created __MACOSX directory
 			continue;
 
 		$uncompressed_size += $file['size'];
 
-		$needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
+		$needed_dirs[] = $to.untrailingslashit($file['folder'] ? $file['filename'] : dirname($file['filename']));
 	}
 
 	/*
@@ -754,22 +754,22 @@ 
 	 * A disk that has zero free bytes has bigger problems.
 	 * Require we have enough space to unzip the file and copy its contents, with a 10% buffer.
 	 */
-	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+	if (defined('DOING_CRON') && DOING_CRON) {
+		$available_space = @disk_free_space(WP_CONTENT_DIR);
+		if ($available_space && ($uncompressed_size * 2.1) > $available_space)
+			return new WP_Error('disk_full_unzip_file', __('Could not copy files. You may have run out of disk space.'), compact('uncompressed_size', 'available_space'));
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
-	foreach ( $needed_dirs as $dir ) {
+	foreach ($needed_dirs as $dir) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if (untrailingslashit($to) == $dir) // Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		if (strpos($dir, $to) === false) // If the directory is not within the working directory, Skip it
 			continue;
 
 		$parent_folder = dirname($dir);
-		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
+		while ( ! empty($parent_folder) && untrailingslashit($to) != $parent_folder && ! in_array($parent_folder, $needed_dirs)) {
 			$needed_dirs[] = $parent_folder;
 			$parent_folder = dirname($parent_folder);
 		}
@@ -777,23 +777,23 @@ 
 	asort($needed_dirs);
 
 	// Create those directories if need be:
-	foreach ( $needed_dirs as $_dir ) {
+	foreach ($needed_dirs as $_dir) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir($_dir, FS_CHMOD_DIR) && ! $wp_filesystem->is_dir($_dir))
+			return new WP_Error('mkdir_failed_pclzip', __('Could not create directory.'), substr($_dir, strlen($to)));
 	}
 	unset($needed_dirs);
 
 	// Extract the files from the zip
-	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
+	foreach ($archive_files as $file) {
+		if ($file['folder'])
 			continue;
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ('__MACOSX/' === substr($file['filename'], 0, 9)) // Don't extract the OS X-created __MACOSX directory files
 			continue;
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents($to.$file['filename'], $file['content'], FS_CHMOD_FILE))
+			return new WP_Error('copy_failed_pclzip', __('Could not copy file.'), $file['filename']);
 	}
 	return true;
 }
@@ -811,7 +811,7 @@ 
  * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to, $skip_list = array() ) {
+function copy_dir($from, $to, $skip_list = array()) {
 	global $wp_filesystem;
 
 	$dirlist = $wp_filesystem->dirlist($from);
@@ -819,32 +819,32 @@ 
 	$from = trailingslashit($from);
 	$to = trailingslashit($to);
 
-	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
+	foreach ((array) $dirlist as $filename => $fileinfo) {
+		if (in_array($filename, $skip_list))
 			continue;
 
-		if ( 'f' == $fileinfo['type'] ) {
-			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+		if ('f' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE)) {
 				// If copy failed, chmod file to 0644 and try again.
-				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				$wp_filesystem->chmod($to.$filename, FS_CHMOD_FILE);
+				if ( ! $wp_filesystem->copy($from.$filename, $to.$filename, true, FS_CHMOD_FILE))
+					return new WP_Error('copy_failed_copy_dir', __('Could not copy file.'), $to.$filename);
 			}
-		} elseif ( 'd' == $fileinfo['type'] ) {
-			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+		} elseif ('d' == $fileinfo['type']) {
+			if ( ! $wp_filesystem->is_dir($to.$filename)) {
+				if ( ! $wp_filesystem->mkdir($to.$filename, FS_CHMOD_DIR))
+					return new WP_Error('mkdir_failed_copy_dir', __('Could not create directory.'), $to.$filename);
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
-			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+			foreach ($skip_list as $skip_item) {
+				if (0 === strpos($skip_item, $filename.'/'))
+					$sub_skip_list[] = preg_replace('!^'.preg_quote($filename, '!').'/!i', '', $skip_item);
 			}
 
-			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
+			$result = copy_dir($from.$filename, $to.$filename, $sub_skip_list);
+			if (is_wp_error($result))
 				return $result;
 		}
 	}
@@ -868,17 +868,17 @@ 
  * @param bool         $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
  * @return null|bool false on failure, true on success.
  */
-function WP_Filesystem( $args = false, $context = false, $allow_relaxed_file_ownership = false ) {
+function WP_Filesystem($args = false, $context = false, $allow_relaxed_file_ownership = false) {
 	global $wp_filesystem;
 
-	require_once(ABSPATH . 'wp-admin/includes/class-wp-filesystem-base.php');
+	require_once(ABSPATH.'wp-admin/includes/class-wp-filesystem-base.php');
 
-	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
+	$method = get_filesystem_method($args, $context, $allow_relaxed_file_ownership);
 
-	if ( ! $method )
+	if ( ! $method)
 		return false;
 
-	if ( ! class_exists( "WP_Filesystem_$method" ) ) {
+	if ( ! class_exists("WP_Filesystem_$method")) {
 
 		/**
 		 * Filter the path for a specific filesystem method class file.
@@ -890,9 +890,9 @@ 
 		 * @param string $path   Path to the specific filesystem method class file.
 		 * @param string $method The filesystem method to use.
 		 */
-		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
+		$abstraction_file = apply_filters('filesystem_method_file', ABSPATH.'wp-admin/includes/class-wp-filesystem-'.$method.'.php', $method);
 
-		if ( ! file_exists($abstraction_file) )
+		if ( ! file_exists($abstraction_file))
 			return;
 
 		require_once($abstraction_file);
@@ -902,22 +902,22 @@ 
 	$wp_filesystem = new $method($args);
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
+	if ( ! defined('FS_CONNECT_TIMEOUT'))
 		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
+	if ( ! defined('FS_TIMEOUT'))
 		define('FS_TIMEOUT', 30);
 
-	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 false;
 
-	if ( !$wp_filesystem->connect() )
+	if ( ! $wp_filesystem->connect())
 		return false; //There was an error connecting to the server.
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined('FS_CHMOD_DIR'))
+		define('FS_CHMOD_DIR', (fileperms(ABSPATH) & 0777 | 0755));
+	if ( ! defined('FS_CHMOD_FILE'))
+		define('FS_CHMOD_FILE', (fileperms(ABSPATH.'index.php') & 0777 | 0644));
 
 	return true;
 }
@@ -948,39 +948,39 @@ 
  *                                             Default false.
  * @return string The transport to use, see description for valid return values.
  */
-function get_filesystem_method( $args = array(), $context = false, $allow_relaxed_file_ownership = false ) {
+function get_filesystem_method($args = array(), $context = false, $allow_relaxed_file_ownership = false) {
 	$method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
 
-	if ( ! $context ) {
+	if ( ! $context) {
 		$context = WP_CONTENT_DIR;
 	}
 
 	// If the directory doesn't exist (wp-content/languages) then use the parent directory as we'll create it.
-	if ( WP_LANG_DIR == $context && ! is_dir( $context ) ) {
-		$context = dirname( $context );
+	if (WP_LANG_DIR == $context && ! is_dir($context)) {
+		$context = dirname($context);
 	}
 
-	$context = trailingslashit( $context );
+	$context = trailingslashit($context);
 
-	if ( ! $method ) {
+	if ( ! $method) {
 
-		$temp_file_name = $context . 'temp-write-test-' . time();
+		$temp_file_name = $context.'temp-write-test-'.time();
 		$temp_handle = @fopen($temp_file_name, 'w');
-		if ( $temp_handle ) {
+		if ($temp_handle) {
 
 			// Attempt to determine the file owner of the WordPress files, and that of newly created files
 			$wp_file_owner = $temp_file_owner = false;
-			if ( function_exists('fileowner') ) {
-				$wp_file_owner = @fileowner( __FILE__ );
-				$temp_file_owner = @fileowner( $temp_file_name );
+			if (function_exists('fileowner')) {
+				$wp_file_owner = @fileowner(__FILE__);
+				$temp_file_owner = @fileowner($temp_file_name);
 			}
 
-			if ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
+			if ($wp_file_owner !== false && $wp_file_owner === $temp_file_owner) {
 				// WordPress is creating files as the same owner as the WordPress files,
 				// this means it's safe to modify & create new files via PHP.
 				$method = 'direct';
 				$GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
-			} elseif ( $allow_relaxed_file_ownership ) {
+			} elseif ($allow_relaxed_file_ownership) {
 				// The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
 				// safely in this directory. This mode doesn't create new files, only alter existing ones.
 				$method = 'direct';
@@ -992,9 +992,9 @@ 
 		}
  	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents')) $method = 'ssh2';
+	if ( ! $method && extension_loaded('ftp')) $method = 'ftpext';
+	if ( ! $method && (extension_loaded('sockets') || function_exists('fsockopen'))) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
 	/**
 	 * Filter the filesystem method to use.
@@ -1006,7 +1006,7 @@ 
 	 * @param string $context Full path to the directory that is tested for being writable.
 	 * @param bool   $allow_relaxed_file_ownership Whether to allow Group/World writable.
 	 */
-	return apply_filters( 'filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership );
+	return apply_filters('filesystem_method', $method, $args, $context, $allow_relaxed_file_ownership);
 }
 
 /**
@@ -1038,7 +1038,7 @@ 
  *
  * @return bool False on failure, true on success.
  */
-function request_filesystem_credentials( $form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false ) {
+function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false) {
 	global $pagenow;
 
 	/**
@@ -1060,87 +1060,87 @@ 
 	 *                                             Default false.
 	 * @param array  $extra_fields                 Extra POST fields.
 	 */
-	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
+	$req_cred = apply_filters('request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership);
+	if ('' !== $req_cred)
 		return $req_cred;
 
-	if ( empty($type) ) {
-		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
+	if (empty($type)) {
+		$type = get_filesystem_method(array(), $context, $allow_relaxed_file_ownership);
 	}
 
-	if ( 'direct' == $type )
+	if ('direct' == $type)
 		return true;
 
-	if ( is_null( $extra_fields ) )
-		$extra_fields = array( 'version', 'locale' );
+	if (is_null($extra_fields))
+		$extra_fields = array('version', 'locale');
 
-	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
+	$credentials = get_option('ftp_credentials', array('hostname' => '', 'username' => ''));
 
 	// If defined, set it to that, Else, If POST'd, set it to that, If not, Set it to whatever it previously was(saved details in option)
-	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? wp_unslash( $_POST['hostname'] ) : $credentials['hostname']);
-	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? wp_unslash( $_POST['username'] ) : $credentials['username']);
-	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? wp_unslash( $_POST['password'] ) : '');
+	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : ( ! empty($_POST['hostname']) ? wp_unslash($_POST['hostname']) : $credentials['hostname']);
+	$credentials['username'] = defined('FTP_USER') ? FTP_USER : ( ! empty($_POST['username']) ? wp_unslash($_POST['username']) : $credentials['username']);
+	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : ( ! empty($_POST['password']) ? wp_unslash($_POST['password']) : '');
 
 	// Check to see if we are setting the public/private keys for ssh
-	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : '');
-	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
+	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : ( ! empty($_POST['public_key']) ? wp_unslash($_POST['public_key']) : '');
+	$credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : ( ! empty($_POST['private_key']) ? wp_unslash($_POST['private_key']) : '');
 
 	// Sanitize the hostname, Some people might pass in odd-data:
 	$credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
 
-	if ( strpos($credentials['hostname'], ':') ) {
-		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
+	if (strpos($credentials['hostname'], ':')) {
+		list($credentials['hostname'], $credentials['port']) = explode(':', $credentials['hostname'], 2);
+		if ( ! is_numeric($credentials['port']))
 			unset($credentials['port']);
 	} else {
 		unset($credentials['port']);
 	}
 
-	if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
+	if ((defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh2' == FS_METHOD)) {
 		$credentials['connection_type'] = 'ssh';
-	} elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
+	} elseif ((defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type) { //Only the FTP Extension understands SSL
 		$credentials['connection_type'] = 'ftps';
-	} elseif ( ! empty( $_POST['connection_type'] ) ) {
-		$credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
-	} elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
+	} elseif ( ! empty($_POST['connection_type'])) {
+		$credentials['connection_type'] = wp_unslash($_POST['connection_type']);
+	} elseif ( ! isset($credentials['connection_type'])) { //All else fails (And it's not defaulted to something else saved), Default to FTP
 		$credentials['connection_type'] = 'ftp';
 	}
 	if ( ! $error &&
 			(
-				( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) ||
-				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
-			) ) {
+				( ! empty($credentials['password']) && ! empty($credentials['username']) && ! empty($credentials['hostname'])) ||
+				('ssh' == $credentials['connection_type'] && ! empty($credentials['public_key']) && ! empty($credentials['private_key']))
+			)) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
-			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		if ( ! empty($stored_credentials['port'])) //save port as part of hostname to simplify above code.
+			$stored_credentials['hostname'] .= ':'.$stored_credentials['port'];
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
-		if ( ! wp_installing() ) {
-			update_option( 'ftp_credentials', $stored_credentials );
+		if ( ! wp_installing()) {
+			update_option('ftp_credentials', $stored_credentials);
 		}
 		return $credentials;
 	}
-	$hostname = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
-	$username = isset( $credentials['username'] ) ? $credentials['username'] : '';
-	$public_key = isset( $credentials['public_key'] ) ? $credentials['public_key'] : '';
-	$private_key = isset( $credentials['private_key'] ) ? $credentials['private_key'] : '';
-	$port = isset( $credentials['port'] ) ? $credentials['port'] : '';
-	$connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
-
-	if ( $error ) {
+	$hostname = isset($credentials['hostname']) ? $credentials['hostname'] : '';
+	$username = isset($credentials['username']) ? $credentials['username'] : '';
+	$public_key = isset($credentials['public_key']) ? $credentials['public_key'] : '';
+	$private_key = isset($credentials['private_key']) ? $credentials['private_key'] : '';
+	$port = isset($credentials['port']) ? $credentials['port'] : '';
+	$connection_type = isset($credentials['connection_type']) ? $credentials['connection_type'] : '';
+
+	if ($error) {
 		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = esc_html( $error->get_error_message() );
-		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
+		if (is_wp_error($error))
+			$error_string = esc_html($error->get_error_message());
+		echo '<div id="message" class="error"><p>'.$error_string.'</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
-		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	if (extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen'))
+		$types['ftp'] = __('FTP');
+	if (extension_loaded('ftp')) //Only this supports FTPS
+		$types['ftps'] = __('FTPS (SSL)');
+	if (extension_loaded('ssh2') && function_exists('stream_get_contents'))
+		$types['ssh'] = __('SSH2');
 
 	/**
 	 * Filter the connection types to output to the filesystem credentials form.
@@ -1154,7 +1154,7 @@ 
 	 * @param string $context     Full path to the directory that is tested
 	 *                            for being writable.
 	 */
-	$types = apply_filters( 'fs_ftp_connection_types', $types, $credentials, $type, $error, $context );
+	$types = apply_filters('fs_ftp_connection_types', $types, $credentials, $type, $error, $context);
 
 ?>
 <script type="text/javascript">
@@ -1170,23 +1170,23 @@ 
 });
 -->
 </script>
-<form action="<?php echo esc_url( $form_post ) ?>" method="post">
+<form action="<?php echo esc_url($form_post) ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
 <?php
 // Print a H1 heading in the FTP credentials modal dialog, default is a H2.
 $heading_tag = 'h2';
-if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
+if ('plugins.php' === $pagenow || 'plugin-install.php' === $pagenow) {
 	$heading_tag = 'h1';
 }
-echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
+echo "<$heading_tag id='request-filesystem-credentials-title'>".__('Connection Information')."</$heading_tag>";
 ?>
 <p id="request-filesystem-credentials-desc"><?php
 	$label_user = __('Username');
 	$label_pass = __('Password');
 	_e('To perform the requested action, WordPress needs to access your web server.');
 	echo ' ';
-	if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
-		if ( isset( $types['ssh'] ) ) {
+	if ((isset($types['ftp']) || isset($types['ftps']))) {
+		if (isset($types['ssh'])) {
 			_e('Please enter your FTP or SSH credentials to proceed.');
 			$label_user = __('FTP/SSH Username');
 			$label_pass = __('FTP/SSH Password');
@@ -1200,41 +1200,41 @@ 
 	_e('If you do not remember your credentials, you should contact your web host.');
 ?></p>
 <label for="hostname">
-	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<span class="field-title"><?php _e('Hostname') ?></span>
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e('example: www.wordpress.org') ?>" value="<?php echo esc_attr($hostname); if ( ! empty($port)) echo ":$port"; ?>"<?php disabled(defined('FTP_HOST')); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
 		<span class="field-title"><?php echo $label_user; ?></span>
-		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled( defined('FTP_USER') ); ?> />
+		<input name="username" type="text" id="username" value="<?php echo esc_attr($username) ?>"<?php disabled(defined('FTP_USER')); ?> />
 	</label>
 </div>
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php if (defined('FTP_PASS')) echo '*****'; ?>"<?php disabled(defined('FTP_PASS')); ?> />
+		<em><?php if ( ! defined('FTP_PASS')) _e('This password will not be stored on the server.'); ?></em>
 	</label>
 </div>
-<?php if ( isset($types['ssh']) ) : ?>
+<?php if (isset($types['ssh'])) : ?>
 <fieldset>
-<legend><?php _e( 'Authentication Keys' ); ?></legend>
+<legend><?php _e('Authentication Keys'); ?></legend>
 <label for="public_key">
 	<span class="field-title"><?php _e('Public Key:') ?></span>
-	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled( defined('FTP_PUBKEY') ); ?> />
+	<input name="public_key" type="text" id="public_key" aria-describedby="auth-keys-desc" value="<?php echo esc_attr($public_key) ?>"<?php disabled(defined('FTP_PUBKEY')); ?> />
 </label>
 <label for="private_key">
 	<span class="field-title"><?php _e('Private Key:') ?></span>
-	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
+	<input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled(defined('FTP_PRIKEY')); ?> />
 </label>
 </fieldset>
 <span id="auth-keys-desc"><?php _e('Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.') ?></span>
 <?php endif; ?>
 <fieldset>
-<legend><?php _e( 'Connection Type' ); ?></legend>
+<legend><?php _e('Connection Type'); ?></legend>
 <?php
-	$disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );
-	foreach ( $types as $name => $text ) : ?>
+	$disabled = disabled((defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false);
+	foreach ($types as $name => $text) : ?>
 	<label for="<?php echo esc_attr($name) ?>">
 		<input type="radio" name="connection_type" id="<?php echo esc_attr($name) ?>" value="<?php echo esc_attr($name) ?>"<?php checked($name, $connection_type); echo $disabled; ?> />
 		<?php echo $text ?>
@@ -1242,14 +1242,14 @@ 
 	<?php endforeach; ?>
 </fieldset>
 <?php
-foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $_POST[ $field ] ) )
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+foreach ((array) $extra_fields as $field) {
+	if (isset($_POST[$field]))
+		echo '<input type="hidden" name="'.esc_attr($field).'" value="'.esc_attr(wp_unslash($_POST[$field])).'" />';
 }
 ?>
 	<p class="request-filesystem-credentials-action-buttons">
-		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>
-		<?php submit_button( __( 'Proceed' ), 'button', 'upgrade', false ); ?>
+		<button class="button cancel-button" data-js-action="close" type="button"><?php _e('Cancel'); ?></button>
+		<?php submit_button(__('Proceed'), 'button', 'upgrade', false); ?>
 	</p>
 </div>
 </form>
@@ -1265,10 +1265,10 @@ 
 function wp_print_request_filesystem_credentials_modal() {
 	$filesystem_method = get_filesystem_method();
 	ob_start();
-	$filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
+	$filesystem_credentials_are_stored = request_filesystem_credentials(self_admin_url());
 	ob_end_clean();
-	$request_filesystem_credentials = ( $filesystem_method != 'direct' && ! $filesystem_credentials_are_stored );
-	if ( ! $request_filesystem_credentials ) {
+	$request_filesystem_credentials = ($filesystem_method != 'direct' && ! $filesystem_credentials_are_stored);
+	if ( ! $request_filesystem_credentials) {
 		return;
 	}
 	?>
@@ -1276,7 +1276,7 @@ 
 		<div class="notification-dialog-background"></div>
 		<div class="notification-dialog" role="dialog" aria-labelledby="request-filesystem-credentials-title" tabindex="0">
 			<div class="request-filesystem-credentials-dialog-content">
-				<?php request_filesystem_credentials( site_url() ); ?>
+				<?php request_filesystem_credentials(site_url()); ?>
 			</div>
 		</div>
 	</div>

Braces +213 added lines, -122 removed lines

@@ -118,23 +118,27 @@ 
  * @return bool|array False on failure, Else array of files
  */
 function list_files( $folder = '', $levels = 100 ) {
-	if ( empty($folder) )
-		return false;
+	if ( empty($folder) ) {
+			return false;
+	}
 
-	if ( ! $levels )
-		return false;
+	if ( ! $levels ) {
+			return false;
+	}
 
 	$files = array();
 	if ( $dir = @opendir( $folder ) ) {
 		while (($file = readdir( $dir ) ) !== false ) {
-			if ( in_array($file, array('.', '..') ) )
-				continue;
+			if ( in_array($file, array('.', '..') ) ) {
+							continue;
+			}
 			if ( is_dir( $folder . '/' . $file ) ) {
 				$files2 = list_files( $folder . '/' . $file, $levels - 1);
-				if ( $files2 )
-					$files = array_merge($files, $files2 );
-				else
-					$files[] = $folder . '/' . $file . '/';
+				if ( $files2 ) {
+									$files = array_merge($files, $files2 );
+				} else {
+									$files[] = $folder . '/' . $file . '/';
+				}
 			} else {
 				$files[] = $folder . '/' . $file;
 			}
@@ -205,8 +209,9 @@ 
 function validate_file_to_edit( $file, $allowed_files = '' ) {
 	$code = validate_file( $file, $allowed_files );
 
-	if (!$code )
-		return $file;
+	if (!$code ) {
+			return $file;
+	}
 
 	switch ( $code ) {
 		case 1 :
@@ -480,12 +485,14 @@ 
  */
 function download_url( $url, $timeout = 300 ) {
 	//WARNING: The file is not automatically deleted, The script must unlink() the file.
-	if ( ! $url )
-		return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	if ( ! $url ) {
+			return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+	}
 
 	$tmpfname = wp_tempnam($url);
-	if ( ! $tmpfname )
-		return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	if ( ! $tmpfname ) {
+			return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+	}
 
 	$response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
 
@@ -521,17 +528,20 @@ 
  * @return bool|object WP_Error on failure, true on success, false when the MD5 format is unknown/unexpected
  */
 function verify_file_md5( $filename, $expected_md5 ) {
-	if ( 32 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = pack( 'H*', $expected_md5 );
-	elseif ( 24 == strlen( $expected_md5 ) )
-		$expected_raw_md5 = base64_decode( $expected_md5 );
-	else
-		return false; // unknown format
+	if ( 32 == strlen( $expected_md5 ) ) {
+			$expected_raw_md5 = pack( 'H*', $expected_md5 );
+	} elseif ( 24 == strlen( $expected_md5 ) ) {
+			$expected_raw_md5 = base64_decode( $expected_md5 );
+	} else {
+			return false;
+	}
+	// unknown format
 
 	$file_md5 = md5_file( $filename, true );
 
-	if ( $file_md5 === $expected_raw_md5 )
-		return true;
+	if ( $file_md5 === $expected_raw_md5 ) {
+			return true;
+	}
 
 	return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
 }
@@ -554,8 +564,9 @@ 
 function unzip_file($file, $to) {
 	global $wp_filesystem;
 
-	if ( ! $wp_filesystem || !is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! $wp_filesystem || !is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
 	// Unzip can use a lot of memory, but not this much hopefully
 	/** This filter is documented in wp-admin/admin.php */
@@ -568,17 +579,22 @@ 
 	if ( ! $wp_filesystem->is_dir($to) ) { //Only do parents if no children exist
 		$path = preg_split('![/\\\]!', untrailingslashit($to));
 		for ( $i = count($path); $i >= 0; $i-- ) {
-			if ( empty($path[$i]) )
-				continue;
+			if ( empty($path[$i]) ) {
+							continue;
+			}
 
 			$dir = implode('/', array_slice($path, 0, $i+1) );
-			if ( preg_match('!^[a-z]:$!i', $dir) ) // Skip it if it looks like a Windows Drive letter.
+			if ( preg_match('!^[a-z]:$!i', $dir) ) {
+				// Skip it if it looks like a Windows Drive letter.
 				continue;
+			}
 
-			if ( ! $wp_filesystem->is_dir($dir) )
-				$needed_dirs[] = $dir;
-			else
-				break; // A folder exists, therefor, we dont need the check the levels below this
+			if ( ! $wp_filesystem->is_dir($dir) ) {
+							$needed_dirs[] = $dir;
+			} else {
+							break;
+			}
+			// A folder exists, therefor, we dont need the check the levels below this
 		}
 	}
 
@@ -594,8 +610,9 @@ 
 		if ( true === $result ) {
 			return $result;
 		} elseif ( is_wp_error($result) ) {
-			if ( 'incompatible_archive' != $result->get_error_code() )
-				return $result;
+			if ( 'incompatible_archive' != $result->get_error_code() ) {
+							return $result;
+			}
 		}
 	}
 	// Fall through to PclZip if ZipArchive is not available, or encountered an error opening the file.
@@ -623,24 +640,30 @@ 
 	$z = new ZipArchive();
 
 	$zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
-	if ( true !== $zopen )
-		return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	if ( true !== $zopen ) {
+			return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+	}
 
 	$uncompressed_size = 0;
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		if ( ! $info = $z->statIndex($i) ) {
+					return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) {
+			// Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $info['size'];
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr($info['name'], -1) ) {
+			// directory
 			$needed_dirs[] = $to . untrailingslashit($info['name']);
-		else
-			$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+		} else {
+					$needed_dirs[] = $to . untrailingslashit(dirname($info['name']));
+		}
 	}
 
 	/*
@@ -650,17 +673,22 @@ 
 	 */
 	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
+					return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		}
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if ( untrailingslashit($to) == $dir ) {
+			// Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		}
+		if ( strpos($dir, $to) === false ) {
+			// If the directory is not within the working directory, Skip it
 			continue;
+		}
 
 		$parent_folder = dirname($dir);
 		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
@@ -680,21 +708,28 @@ 
 	unset($needed_dirs);
 
 	for ( $i = 0; $i < $z->numFiles; $i++ ) {
-		if ( ! $info = $z->statIndex($i) )
-			return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		if ( ! $info = $z->statIndex($i) ) {
+					return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+		}
 
-		if ( '/' == substr($info['name'], -1) ) // directory
+		if ( '/' == substr($info['name'], -1) ) {
+			// directory
 			continue;
+		}
 
-		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr($info['name'], 0, 9) ) {
+			// Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
 		$contents = $z->getFromIndex($i);
-		if ( false === $contents )
-			return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		if ( false === $contents ) {
+					return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) ) {
+					return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+		}
 	}
 
 	$z->close();
@@ -731,18 +766,22 @@ 
 	reset_mbstring_encoding();
 
 	// Is the archive valid?
-	if ( !is_array($archive_files) )
-		return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	if ( !is_array($archive_files) ) {
+			return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+	}
 
-	if ( 0 == count($archive_files) )
-		return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	if ( 0 == count($archive_files) ) {
+			return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+	}
 
 	$uncompressed_size = 0;
 
 	// Determine any children directories needed (From within the archive)
 	foreach ( $archive_files as $file ) {
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) {
+			// Skip the OS X-created __MACOSX directory
 			continue;
+		}
 
 		$uncompressed_size += $file['size'];
 
@@ -756,17 +795,22 @@ 
 	 */
 	if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 		$available_space = @disk_free_space( WP_CONTENT_DIR );
-		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-			return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space ) {
+					return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+		}
 	}
 
 	$needed_dirs = array_unique($needed_dirs);
 	foreach ( $needed_dirs as $dir ) {
 		// Check the parent folders of the folders all exist within the creation array.
-		if ( untrailingslashit($to) == $dir ) // Skip over the working directory, We know this exists (or will exist)
+		if ( untrailingslashit($to) == $dir ) {
+			// Skip over the working directory, We know this exists (or will exist)
 			continue;
-		if ( strpos($dir, $to) === false ) // If the directory is not within the working directory, Skip it
+		}
+		if ( strpos($dir, $to) === false ) {
+			// If the directory is not within the working directory, Skip it
 			continue;
+		}
 
 		$parent_folder = dirname($dir);
 		while ( !empty($parent_folder) && untrailingslashit($to) != $parent_folder && !in_array($parent_folder, $needed_dirs) ) {
@@ -779,21 +823,26 @@ 
 	// Create those directories if need be:
 	foreach ( $needed_dirs as $_dir ) {
 		// Only check to see if the dir exists upon creation failure. Less I/O this way.
-		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-			return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
+					return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+		}
 	}
 	unset($needed_dirs);
 
 	// Extract the files from the zip
 	foreach ( $archive_files as $file ) {
-		if ( $file['folder'] )
-			continue;
+		if ( $file['folder'] ) {
+					continue;
+		}
 
-		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+		if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) {
+			// Don't extract the OS X-created __MACOSX directory files
 			continue;
+		}
 
-		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-			return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) ) {
+					return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+		}
 	}
 	return true;
 }
@@ -820,32 +869,37 @@ 
 	$to = trailingslashit($to);
 
 	foreach ( (array) $dirlist as $filename => $fileinfo ) {
-		if ( in_array( $filename, $skip_list ) )
-			continue;
+		if ( in_array( $filename, $skip_list ) ) {
+					continue;
+		}
 
 		if ( 'f' == $fileinfo['type'] ) {
 			if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
 				// If copy failed, chmod file to 0644 and try again.
 				$wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
-				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-					return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
+									return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+				}
 			}
 		} elseif ( 'd' == $fileinfo['type'] ) {
 			if ( !$wp_filesystem->is_dir($to . $filename) ) {
-				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-					return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) ) {
+									return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+				}
 			}
 
 			// generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
 			$sub_skip_list = array();
 			foreach ( $skip_list as $skip_item ) {
-				if ( 0 === strpos( $skip_item, $filename . '/' ) )
-					$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				if ( 0 === strpos( $skip_item, $filename . '/' ) ) {
+									$sub_skip_list[] = preg_replace( '!^' . preg_quote( $filename, '!' ) . '/!i', '', $skip_item );
+				}
 			}
 
 			$result = copy_dir($from . $filename, $to . $filename, $sub_skip_list);
-			if ( is_wp_error($result) )
-				return $result;
+			if ( is_wp_error($result) ) {
+							return $result;
+			}
 		}
 	}
 	return true;
@@ -875,8 +929,9 @@ 
 
 	$method = get_filesystem_method( $args, $context, $allow_relaxed_file_ownership );
 
-	if ( ! $method )
-		return false;
+	if ( ! $method ) {
+			return false;
+	}
 
 	if ( ! class_exists( "WP_Filesystem_$method" ) ) {
 
@@ -892,8 +947,9 @@ 
 		 */
 		$abstraction_file = apply_filters( 'filesystem_method_file', ABSPATH . 'wp-admin/includes/class-wp-filesystem-' . $method . '.php', $method );
 
-		if ( ! file_exists($abstraction_file) )
-			return;
+		if ( ! file_exists($abstraction_file) ) {
+					return;
+		}
 
 		require_once($abstraction_file);
 	}
@@ -902,22 +958,29 @@ 
 	$wp_filesystem = new $method($args);
 
 	//Define the timeouts for the connections. Only available after the construct is called to allow for per-transport overriding of the default.
-	if ( ! defined('FS_CONNECT_TIMEOUT') )
-		define('FS_CONNECT_TIMEOUT', 30);
-	if ( ! defined('FS_TIMEOUT') )
-		define('FS_TIMEOUT', 30);
+	if ( ! defined('FS_CONNECT_TIMEOUT') ) {
+			define('FS_CONNECT_TIMEOUT', 30);
+	}
+	if ( ! defined('FS_TIMEOUT') ) {
+			define('FS_TIMEOUT', 30);
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return false;
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return false;
+	}
 
-	if ( !$wp_filesystem->connect() )
-		return false; //There was an error connecting to the server.
+	if ( !$wp_filesystem->connect() ) {
+			return false;
+	}
+	//There was an error connecting to the server.
 
 	// Set the permission constants if not already set.
-	if ( ! defined('FS_CHMOD_DIR') )
-		define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
-	if ( ! defined('FS_CHMOD_FILE') )
-		define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	if ( ! defined('FS_CHMOD_DIR') ) {
+			define('FS_CHMOD_DIR', ( fileperms( ABSPATH ) & 0777 | 0755 ) );
+	}
+	if ( ! defined('FS_CHMOD_FILE') ) {
+			define('FS_CHMOD_FILE', ( fileperms( ABSPATH . 'index.php' ) & 0777 | 0644 ) );
+	}
 
 	return true;
 }
@@ -992,9 +1055,16 @@ 
 		}
  	}
 
-	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) $method = 'ssh2';
-	if ( ! $method && extension_loaded('ftp') ) $method = 'ftpext';
-	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) $method = 'ftpsockets'; //Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
+	if ( ! $method && isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh2') && function_exists('stream_get_contents') ) {
+		$method = 'ssh2';
+	}
+	if ( ! $method && extension_loaded('ftp') ) {
+		$method = 'ftpext';
+	}
+	if ( ! $method && ( extension_loaded('sockets') || function_exists('fsockopen') ) ) {
+		$method = 'ftpsockets';
+	}
+	//Sockets: Socket extension; PHP Mode: FSockopen / fwrite / fread
 
 	/**
 	 * Filter the filesystem method to use.
@@ -1061,18 +1131,21 @@ 
 	 * @param array  $extra_fields                 Extra POST fields.
 	 */
 	$req_cred = apply_filters( 'request_filesystem_credentials', '', $form_post, $type, $error, $context, $extra_fields, $allow_relaxed_file_ownership );
-	if ( '' !== $req_cred )
-		return $req_cred;
+	if ( '' !== $req_cred ) {
+			return $req_cred;
+	}
 
 	if ( empty($type) ) {
 		$type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
 	}
 
-	if ( 'direct' == $type )
-		return true;
+	if ( 'direct' == $type ) {
+			return true;
+	}
 
-	if ( is_null( $extra_fields ) )
-		$extra_fields = array( 'version', 'locale' );
+	if ( is_null( $extra_fields ) ) {
+			$extra_fields = array( 'version', 'locale' );
+	}
 
 	$credentials = get_option('ftp_credentials', array( 'hostname' => '', 'username' => ''));
 
@@ -1090,8 +1163,9 @@ 
 
 	if ( strpos($credentials['hostname'], ':') ) {
 		list( $credentials['hostname'], $credentials['port'] ) = explode(':', $credentials['hostname'], 2);
-		if ( ! is_numeric($credentials['port']) )
-			unset($credentials['port']);
+		if ( ! is_numeric($credentials['port']) ) {
+					unset($credentials['port']);
+		}
 	} else {
 		unset($credentials['port']);
 	}
@@ -1111,8 +1185,10 @@ 
 				( 'ssh' == $credentials['connection_type'] && !empty($credentials['public_key']) && !empty($credentials['private_key']) )
 			) ) {
 		$stored_credentials = $credentials;
-		if ( !empty($stored_credentials['port']) ) //save port as part of hostname to simplify above code.
+		if ( !empty($stored_credentials['port']) ) {
+			//save port as part of hostname to simplify above code.
 			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
+		}
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
 		if ( ! wp_installing() ) {
@@ -1129,18 +1205,23 @@ 
 
 	if ( $error ) {
 		$error_string = __('<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.');
-		if ( is_wp_error($error) )
-			$error_string = esc_html( $error->get_error_message() );
+		if ( is_wp_error($error) ) {
+					$error_string = esc_html( $error->get_error_message() );
+		}
 		echo '<div id="message" class="error"><p>' . $error_string . '</p></div>';
 	}
 
 	$types = array();
-	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') )
-		$types[ 'ftp' ] = __('FTP');
-	if ( extension_loaded('ftp') ) //Only this supports FTPS
+	if ( extension_loaded('ftp') || extension_loaded('sockets') || function_exists('fsockopen') ) {
+			$types[ 'ftp' ] = __('FTP');
+	}
+	if ( extension_loaded('ftp') ) {
+		//Only this supports FTPS
 		$types[ 'ftps' ] = __('FTPS (SSL)');
-	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') )
-		$types[ 'ssh' ] = __('SSH2');
+	}
+	if ( extension_loaded('ssh2') && function_exists('stream_get_contents') ) {
+			$types[ 'ssh' ] = __('SSH2');
+	}
 
 	/**
 	 * Filter the connection types to output to the filesystem credentials form.
@@ -1201,7 +1282,10 @@ 
 ?></p>
 <label for="hostname">
 	<span class="field-title"><?php _e( 'Hostname' ) ?></span>
-	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) echo ":$port"; ?>"<?php disabled( defined('FTP_HOST') ); ?> />
+	<input name="hostname" type="text" id="hostname" aria-describedby="request-filesystem-credentials-desc" class="code" placeholder="<?php esc_attr_e( 'example: www.wordpress.org' ) ?>" value="<?php echo esc_attr($hostname); if ( !empty($port) ) {
+	echo ":$port";
+}
+?>"<?php disabled( defined('FTP_HOST') ); ?> />
 </label>
 <div class="ftp-username">
 	<label for="username">
@@ -1212,8 +1296,14 @@ 
 <div class="ftp-password">
 	<label for="password">
 		<span class="field-title"><?php echo $label_pass; ?></span>
-		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php disabled( defined('FTP_PASS') ); ?> />
-		<em><?php if ( ! defined('FTP_PASS') ) _e( 'This password will not be stored on the server.' ); ?></em>
+		<input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) {
+	echo '*****';
+}
+?>"<?php disabled( defined('FTP_PASS') ); ?> />
+		<em><?php if ( ! defined('FTP_PASS') ) {
+	_e( 'This password will not be stored on the server.' );
+}
+?></em>
 	</label>
 </div>
 <?php if ( isset($types['ssh']) ) : ?>
@@ -1243,9 +1333,10 @@ 
 </fieldset>
 <?php
 foreach ( (array) $extra_fields as $field ) {
-	if ( isset( $_POST[ $field ] ) )
-		echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
-}
+	if ( isset( $_POST[ $field ] ) ) {
+			echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( wp_unslash( $_POST[ $field ] ) ) . '" />';
+	}
+	}
 ?>
 	<p class="request-filesystem-credentials-action-buttons">
 		<button class="button cancel-button" data-js-action="close" type="button"><?php _e( 'Cancel' ); ?></button>

src/wp-admin/includes/image-edit.php

Doc Comments +2 added lines, -2 removed lines

@@ -341,7 +341,7 @@ 
  * @ignore
  * @param int $w Image width in pixels.
  * @param int $h Image height in pixels.
- * @return float|int Image preview ratio.
+ * @return integer Image preview ratio.
  */
 function _image_get_preview_ratio($w, $h) {
 	$max = max($w, $h);
@@ -356,7 +356,7 @@ 
  * @ignore
  * @param resource  $img   Image resource.
  * @param float|int $angle Image rotation angle, in degrees.
- * @return resource|false GD image resource, false otherwise.
+ * @return resource GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
 	_deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::rotate' ) );

Indentation +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Image Editor
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Image Editor
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Loads the WP image-editing interface.
@@ -520,7 +520,7 @@ 
 		 * @since 3.5.0
 		 *
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
- 		 * @param array           $changes Array of change operations.
+		 * @param array           $changes Array of change operations.
 		 */
 		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
 	} elseif ( is_resource( $image ) ) {
@@ -532,7 +532,7 @@ 
 		 * @deprecated 3.5.0 Use wp_image_editor_before_change instead.
 		 *
 		 * @param resource $image   GD image resource.
- 		 * @param array    $changes Array of change operations.
+		 * @param array    $changes Array of change operations.
 		 */
 		$image = apply_filters( 'image_edit_before_change', $image, $changes );
 	}

Spacing +220 added lines, -220 removed lines

@@ -20,22 +20,22 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
+	if (isset($meta['width'], $meta['height']))
+		$big = max($meta['width'], $meta['height']);
 	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+		die(__('Image data does not exist. Please re-upload the image.'));
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
-	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty($backup_sizes) && isset($backup_sizes['full-orig'], $meta['file']))
+		$can_restore = $backup_sizes['full-orig']['file'] != basename($meta['file']);
 
-	if ( $msg ) {
-		if ( isset($msg->error) )
+	if ($msg) {
+		if (isset($msg->error))
 			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
+		elseif (isset($msg->msg))
 			$note = "<div class='updated'><p>$msg->msg</p></div>";
 	}
 
@@ -46,28 +46,28 @@ 
 	<div class="imgedit-settings">
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Scale Image' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Scale Image Help' ); ?></span></button>
+		<h2><?php _e('Scale Image'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Scale Image Help'); ?></span></button>
 		<div class="imgedit-help">
 		<p><?php _e('You can proportionally scale the original image. For best results, scaling should be done before you crop, flip, or rotate. Images can only be scaled down, not up.'); ?></p>
 		</div>
-		<?php if ( isset( $meta['width'], $meta['height'] ) ): ?>
-		<p><?php printf( __('Original dimensions %s'), $meta['width'] . ' &times; ' . $meta['height'] ); ?></p>
+		<?php if (isset($meta['width'], $meta['height'])): ?>
+		<p><?php printf(__('Original dimensions %s'), $meta['width'].' &times; '.$meta['height']); ?></p>
 		<?php endif ?>
 		<div class="imgedit-submit">
 
 		<fieldset class="imgedit-scale">
-		<legend><?php _e( 'New dimensions:' ); ?></legend>
+		<legend><?php _e('New dimensions:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'scale width' ); ?></span>
-		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
+		<label><span class="screen-reader-text"><?php _e('scale width'); ?></span>
+		<input type="text" id="imgedit-scale-width-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 1)" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
 		</label>
 		<span class="imgedit-separator">&times;</span>
-		<label><span class="screen-reader-text"><?php _e( 'scale height' ); ?></span>
-		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<label><span class="screen-reader-text"><?php _e('scale height'); ?></span>
+		<input type="text" id="imgedit-scale-height-<?php echo $post_id; ?>" onkeyup="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" onblur="imageEdit.scaleChanged(<?php echo $post_id; ?>, 0)" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 		</label>
 		<span class="imgedit-scale-warn" id="imgedit-scale-warn-<?php echo $post_id; ?>">!</span>
-		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e( 'Scale' ); ?>" />
+		<input id="imgedit-scale-button" type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'scale')" class="button button-primary" value="<?php esc_attr_e('Scale'); ?>" />
  		</div>
 		</fieldset>
 
@@ -75,20 +75,20 @@ 
 	</div>
 	</div>
 
-<?php if ( $can_restore ) { ?>
+<?php if ($can_restore) { ?>
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e( 'Restore Original Image' ); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
+		<h2><button type="button" onclick="imageEdit.toggleHelp(this);" class="button-link"><?php _e('Restore Original Image'); ?> <span class="dashicons dashicons-arrow-down imgedit-help-toggle"></span></button></h2>
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
+		if ( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE)
 			echo ' '.__('Previously edited copies of the image will not be deleted.');
 
 		?></p>
 		<div class="imgedit-submit">
-		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e( 'Restore image' ); ?>" <?php echo $can_restore; ?> />
+		<input type="button" onclick="imageEdit.action(<?php echo "$post_id, '$nonce'"; ?>, 'restore')" class="button button-primary" value="<?php esc_attr_e('Restore image'); ?>" <?php echo $can_restore; ?> />
 		</div>
 		</div>
 	</div>
@@ -98,8 +98,8 @@ 
 
 	<div class="imgedit-group">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Image Crop' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Image Crop Help' ); ?></span></button>
+		<h2><?php _e('Image Crop'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Image Crop Help'); ?></span></button>
 
 		<div class="imgedit-help">
 		<p><?php _e('To crop the image, click on it and drag to make your selection.'); ?></p>
@@ -113,26 +113,26 @@ 
 	</div>
 
 	<fieldset class="imgedit-crop-ratio">
-		<legend><?php _e( 'Aspect ratio:' ); ?></legend>
+		<legend><?php _e('Aspect ratio:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'crop ratio width' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('crop ratio width'); ?></span>
 		<input type="text" id="imgedit-crop-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 0, this)" />
 		</label>
 		<span class="imgedit-separator">:</span>
-		<label><span class="screen-reader-text"><?php _e( 'crop ratio height' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('crop ratio height'); ?></span>
 		<input type="text" id="imgedit-crop-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setRatioSelection(<?php echo $post_id; ?>, 1, this)" />
 		</label>
 		</div>
 	</fieldset>
 
 	<fieldset id="imgedit-crop-sel-<?php echo $post_id; ?>" class="imgedit-crop-sel">
-		<legend><?php _e( 'Selection:' ); ?></legend>
+		<legend><?php _e('Selection:'); ?></legend>
 		<div class="nowrap">
-		<label><span class="screen-reader-text"><?php _e( 'selection width' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('selection width'); ?></span>
 		<input type="text" id="imgedit-sel-width-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>)" />
 		</label>
 		<span class="imgedit-separator">&times;</span>
-		<label><span class="screen-reader-text"><?php _e( 'selection height' ); ?></span>
+		<label><span class="screen-reader-text"><?php _e('selection height'); ?></span>
 		<input type="text" id="imgedit-sel-height-<?php echo $post_id; ?>" onkeyup="imageEdit.setNumSelection(<?php echo $post_id; ?>)" />
 		</label>
 		</div>
@@ -140,25 +140,25 @@ 
 
 	</div>
 
-	<?php if ( $thumb && $sub_sizes ) {
-		$thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
+	<?php if ($thumb && $sub_sizes) {
+		$thumb_img = wp_constrain_dimensions($thumb['width'], $thumb['height'], 160, 120);
 	?>
 
 	<div class="imgedit-group imgedit-applyto">
 	<div class="imgedit-group-top">
-		<h2><?php _e( 'Thumbnail Settings' ); ?></h2>
-		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e( 'Thumbnail Settings Help' ); ?></span></button>
+		<h2><?php _e('Thumbnail Settings'); ?></h2>
+		<button type="button" class="dashicons dashicons-editor-help imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" aria-expanded="false"><span class="screen-reader-text"><?php esc_html_e('Thumbnail Settings Help'); ?></span></button>
 		<p class="imgedit-help"><?php _e('You can edit the image while preserving the thumbnail. For example, you may wish to have a square thumbnail that displays just a section of the image.'); ?></p>
 	</div>
 
 	<figure class="imgedit-thumbnail-preview">
 		<img src="<?php echo $thumb['url']; ?>" width="<?php echo $thumb_img[0]; ?>" height="<?php echo $thumb_img[1]; ?>" class="imgedit-size-preview" alt="" draggable="false" />
-		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e( 'Current thumbnail' ); ?></figcaption>
+		<figcaption class="imgedit-thumbnail-preview-caption"><?php _e('Current thumbnail'); ?></figcaption>
 	</figure>
 
 	<div id="imgedit-save-target-<?php echo $post_id; ?>" class="imgedit-save-target">
 	<fieldset>
-		<legend><strong><?php _e( 'Apply changes to:' ); ?></strong></legend>
+		<legend><strong><?php _e('Apply changes to:'); ?></strong></legend>
 
 		<label class="imgedit-label">
 		<input type="radio" name="imgedit-target-<?php echo $post_id; ?>" value="all" checked="checked" />
@@ -182,26 +182,26 @@ 
 	<div class="imgedit-panel-content wp-clearfix">
 		<?php echo $note; ?>
 		<div class="imgedit-menu wp-clearfix">
-			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Crop' ); ?></span></button><?php
+			<button type="button" onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Crop'); ?></span></button><?php
 
 		// On some setups GD library does not provide imagerotate() - Ticket #11536
-		if ( wp_image_editor_supports( array( 'mime_type' => get_post_mime_type( $post_id ), 'methods' => array( 'rotate' ) ) ) ) {
+		if (wp_image_editor_supports(array('mime_type' => get_post_mime_type($post_id), 'methods' => array('rotate')))) {
 			$note_no_rotate = '';
 	?>
-			<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate counter-clockwise' ); ?></span></button>
-			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e( 'Rotate clockwise' ); ?></span></button>
+			<button type="button" class="imgedit-rleft button" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e('Rotate counter-clockwise'); ?></span></button>
+			<button type="button" class="imgedit-rright button" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)"><span class="screen-reader-text"><?php esc_html_e('Rotate clockwise'); ?></span></button>
 	<?php } else {
-			$note_no_rotate = '<p class="note-no-rotate"><em>' . __( 'Image rotation is not supported by your web host.' ) . '</em></p>';
+			$note_no_rotate = '<p class="note-no-rotate"><em>'.__('Image rotation is not supported by your web host.').'</em></p>';
 	?>
 			<button type="button" class="imgedit-rleft button disabled" disabled></button>
 			<button type="button" class="imgedit-rright button disabled" disabled></button>
 	<?php } ?>
 
-			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e( 'Flip vertically' ); ?></span></button>
-			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e( 'Flip horizontally' ); ?></span></button>
+			<button type="button" onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-flipv button"><span class="screen-reader-text"><?php esc_html_e('Flip vertically'); ?></span></button>
+			<button type="button" onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-fliph button"><span class="screen-reader-text"><?php esc_html_e('Flip horizontally'); ?></span></button>
 
-			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Undo' ); ?></span></button>
-			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e( 'Redo' ); ?></span></button>
+			<button type="button" id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-undo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Undo'); ?></span></button>
+			<button type="button" id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-redo button disabled" disabled><span class="screen-reader-text"><?php esc_html_e('Redo'); ?></span></button>
 			<?php echo $note_no_rotate; ?>
 		</div>
 
@@ -209,16 +209,16 @@ 
 		<input type="hidden" id="imgedit-history-<?php echo $post_id; ?>" value="" />
 		<input type="hidden" id="imgedit-undone-<?php echo $post_id; ?>" value="0" />
 		<input type="hidden" id="imgedit-selection-<?php echo $post_id; ?>" value="" />
-		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset( $meta['width'] ) ? $meta['width'] : 0; ?>" />
-		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset( $meta['height'] ) ? $meta['height'] : 0; ?>" />
+		<input type="hidden" id="imgedit-x-<?php echo $post_id; ?>" value="<?php echo isset($meta['width']) ? $meta['width'] : 0; ?>" />
+		<input type="hidden" id="imgedit-y-<?php echo $post_id; ?>" value="<?php echo isset($meta['height']) ? $meta['height'] : 0; ?>" />
 
 		<div id="imgedit-crop-<?php echo $post_id; ?>" class="imgedit-crop-wrap">
-		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
+		<img id="image-preview-<?php echo $post_id; ?>" onload="imageEdit.imgLoaded('<?php echo $post_id; ?>')" src="<?php echo admin_url('admin-ajax.php', 'relative'); ?>?action=imgedit-preview&amp;_ajax_nonce=<?php echo $nonce; ?>&amp;postid=<?php echo $post_id; ?>&amp;rand=<?php echo rand(1, 99999); ?>" alt="" />
 		</div>
 
 		<div class="imgedit-submit">
-			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e( 'Cancel' ); ?>" />
-			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e( 'Save' ); ?>" />
+			<input type="button" onclick="imageEdit.close(<?php echo $post_id; ?>, 1)" class="button imgedit-cancel-btn" value="<?php esc_attr_e('Cancel'); ?>" />
+			<input type="button" onclick="imageEdit.save(<?php echo "$post_id, '$nonce'"; ?>)" disabled="disabled" class="button button-primary imgedit-submit-btn" value="<?php esc_attr_e('Save'); ?>" />
 		</div>
 	</div>
 
@@ -239,8 +239,8 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_stream_image( $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_stream_image($image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filter the WP_Image_Editor instance for the image to be streamed to the browser.
@@ -250,14 +250,14 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
 		 * @param int             $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
+		if (is_wp_error($image->stream($mime_type)))
 			return false;
 
 		return true;
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5', __('$image needs to be an WP_Image_Editor object'));
 
 		/**
 		 * Filter the GD image resource to be streamed to the browser.
@@ -268,18 +268,18 @@ 
 		 * @param resource $image   Image resource to be streamed.
 		 * @param int      $post_id Post ID.
 		 */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
-				header( 'Content-Type: image/jpeg' );
-				return imagejpeg( $image, null, 90 );
+				header('Content-Type: image/jpeg');
+				return imagejpeg($image, null, 90);
 			case 'image/png':
-				header( 'Content-Type: image/png' );
-				return imagepng( $image );
+				header('Content-Type: image/png');
+				return imagepng($image);
 			case 'image/gif':
-				header( 'Content-Type: image/gif' );
-				return imagegif( $image );
+				header('Content-Type: image/gif');
+				return imagegif($image);
 			default:
 				return false;
 		}
@@ -295,11 +295,11 @@ 
  * @param int $post_id
  * @return bool
  */
-function wp_save_image_file( $filename, $image, $mime_type, $post_id ) {
-	if ( $image instanceof WP_Image_Editor ) {
+function wp_save_image_file($filename, $image, $mime_type, $post_id) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
+		$image = apply_filters('image_editor_save_pre', $image, $post_id);
 
 		/**
 		 * Filter whether to skip saving the image file.
@@ -315,17 +315,17 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		return $image->save( $filename, $mime_type );
+		return $image->save($filename, $mime_type);
 	} else {
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+		_deprecated_argument(__FUNCTION__, '3.5', __('$image needs to be an WP_Image_Editor object'));
 
 		/** This filter is documented in wp-admin/includes/image-edit.php */
-		$image = apply_filters( 'image_save_pre', $image, $post_id );
+		$image = apply_filters('image_save_pre', $image, $post_id);
 
 		/**
 		 * Filter whether to skip saving the image file.
@@ -342,20 +342,20 @@ 
 		 * @param string          $mime_type Image mime type.
 		 * @param int             $post_id   Post ID.
 		 */
-		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
+		$saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
 
-		if ( null !== $saved )
+		if (null !== $saved)
 			return $saved;
 
-		switch ( $mime_type ) {
+		switch ($mime_type) {
 			case 'image/jpeg':
 
 				/** This filter is documented in wp-includes/class-wp-image-editor.php */
-				return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
+				return imagejpeg($image, $filename, apply_filters('jpeg_quality', 90, 'edit_image'));
 			case 'image/png':
-				return imagepng( $image, $filename );
+				return imagepng($image, $filename);
 			case 'image/gif':
-				return imagegif( $image, $filename );
+				return imagegif($image, $filename);
 			default:
 				return false;
 		}
@@ -388,10 +388,10 @@ 
  * @return resource|false GD image resource, false otherwise.
  */
 function _rotate_image_resource($img, $angle) {
-	_deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::rotate' ) );
-	if ( function_exists('imagerotate') ) {
+	_deprecated_function(__FUNCTION__, '3.5', __('Use WP_Image_Editor::rotate'));
+	if (function_exists('imagerotate')) {
 		$rotated = imagerotate($img, $angle, 0);
-		if ( is_resource($rotated) ) {
+		if (is_resource($rotated)) {
 			imagedestroy($img);
 			$img = $rotated;
 		}
@@ -411,17 +411,17 @@ 
  * @return resource (maybe) flipped image resource.
  */
 function _flip_image_resource($img, $horz, $vert) {
-	_deprecated_function( __FUNCTION__, '3.5', __( 'Use WP_Image_Editor::flip' ) );
+	_deprecated_function(__FUNCTION__, '3.5', __('Use WP_Image_Editor::flip'));
 	$w = imagesx($img);
 	$h = imagesy($img);
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
+	if (is_resource($dst)) {
 		$sx = $vert ? ($w - 1) : 0;
 		$sy = $horz ? ($h - 1) : 0;
 		$sw = $vert ? -$w : $w;
 		$sh = $horz ? -$h : $h;
 
-		if ( imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh) ) {
+		if (imagecopyresampled($dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -444,8 +444,8 @@ 
  */
 function _crop_image_resource($img, $x, $y, $w, $h) {
 	$dst = wp_imagecreatetruecolor($w, $h);
-	if ( is_resource($dst) ) {
-		if ( imagecopy($dst, $img, 0, 0, $x, $y, $w, $h) ) {
+	if (is_resource($dst)) {
+		if (imagecopy($dst, $img, 0, 0, $x, $y, $w, $h)) {
 			imagedestroy($img);
 			$img = $dst;
 		}
@@ -462,24 +462,24 @@ 
  * @param array           $changes Array of change operations.
  * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied.
  */
-function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+function image_edit_apply_changes($image, $changes) {
+	if (is_resource($image))
+		_deprecated_argument(__FUNCTION__, '3.5', __('$image needs to be an WP_Image_Editor object'));
 
-	if ( !is_array($changes) )
+	if ( ! is_array($changes))
 		return $image;
 
 	// Expand change operations.
-	foreach ( $changes as $key => $obj ) {
-		if ( isset($obj->r) ) {
+	foreach ($changes as $key => $obj) {
+		if (isset($obj->r)) {
 			$obj->type = 'rotate';
 			$obj->angle = $obj->r;
 			unset($obj->r);
-		} elseif ( isset($obj->f) ) {
+		} elseif (isset($obj->f)) {
 			$obj->type = 'flip';
 			$obj->axis = $obj->f;
 			unset($obj->f);
-		} elseif ( isset($obj->c) ) {
+		} elseif (isset($obj->c)) {
 			$obj->type = 'crop';
 			$obj->sel = $obj->c;
 			unset($obj->c);
@@ -488,12 +488,12 @@ 
 	}
 
 	// Combine operations.
-	if ( count($changes) > 1 ) {
+	if (count($changes) > 1) {
 		$filtered = array($changes[0]);
-		for ( $i = 0, $j = 1, $c = count( $changes ); $j < $c; $j++ ) {
+		for ($i = 0, $j = 1, $c = count($changes); $j < $c; $j++) {
 			$combined = false;
-			if ( $filtered[$i]->type == $changes[$j]->type ) {
-				switch ( $filtered[$i]->type ) {
+			if ($filtered[$i]->type == $changes[$j]->type) {
+				switch ($filtered[$i]->type) {
 					case 'rotate':
 						$filtered[$i]->angle += $changes[$j]->angle;
 						$combined = true;
@@ -504,7 +504,7 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
+			if ( ! $combined)
 				$filtered[++$i] = $changes[$j];
 		}
 		$changes = $filtered;
@@ -512,7 +512,7 @@ 
 	}
 
 	// Image resource before applying the changes.
-	if ( $image instanceof WP_Image_Editor ) {
+	if ($image instanceof WP_Image_Editor) {
 
 		/**
 		 * Filter the WP_Image_Editor instance before applying changes to the image.
@@ -522,8 +522,8 @@ 
 		 * @param WP_Image_Editor $image   WP_Image_Editor instance.
  		 * @param array           $changes Array of change operations.
 		 */
-		$image = apply_filters( 'wp_image_editor_before_change', $image, $changes );
-	} elseif ( is_resource( $image ) ) {
+		$image = apply_filters('wp_image_editor_before_change', $image, $changes);
+	} elseif (is_resource($image)) {
 
 		/**
 		 * Filter the GD image resource before applying changes to the image.
@@ -534,39 +534,39 @@ 
 		 * @param resource $image   GD image resource.
  		 * @param array    $changes Array of change operations.
 		 */
-		$image = apply_filters( 'image_edit_before_change', $image, $changes );
+		$image = apply_filters('image_edit_before_change', $image, $changes);
 	}
 
-	foreach ( $changes as $operation ) {
-		switch ( $operation->type ) {
+	foreach ($changes as $operation) {
+		switch ($operation->type) {
 			case 'rotate':
-				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
+				if ($operation->angle != 0) {
+					if ($image instanceof WP_Image_Editor)
+						$image->rotate($operation->angle);
 					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+						$image = _rotate_image_resource($image, $operation->angle);
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
-						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
+				if ($operation->axis != 0)
+					if ($image instanceof WP_Image_Editor)
+						$image->flip(($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+						$image = _flip_image_resource($image, ($operation->axis & 1) != 0, ($operation->axis & 2) != 0);
 				break;
 			case 'crop':
 				$sel = $operation->sel;
 
-				if ( $image instanceof WP_Image_Editor ) {
+				if ($image instanceof WP_Image_Editor) {
 					$size = $image->get_size();
 					$w = $size['width'];
 					$h = $size['height'];
 
-					$scale = 1 / _image_get_preview_ratio( $w, $h ); // discard preview scaling
-					$image->crop( $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio($w, $h); // discard preview scaling
+					$image->crop($sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				} else {
-					$scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // discard preview scaling
-					$image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
+					$scale = 1 / _image_get_preview_ratio(imagesx($image), imagesy($image)); // discard preview scaling
+					$image = _crop_image_resource($image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale);
 				}
 				break;
 		}
@@ -583,35 +583,35 @@ 
  * @param int $post_id
  * @return bool
  */
-function stream_preview_image( $post_id ) {
-	$post = get_post( $post_id );
+function stream_preview_image($post_id) {
+	$post = get_post($post_id);
 
 	/** This filter is documented in wp-admin/admin.php */
-	@ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+	@ini_set('memory_limit', apply_filters('admin_memory_limit', WP_MAX_MEMORY_LIMIT));
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id));
 
-	if ( is_wp_error( $img ) ) {
+	if (is_wp_error($img)) {
 		return false;
 	}
 
-	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	$changes = ! empty($_REQUEST['history']) ? json_decode(wp_unslash($_REQUEST['history'])) : null;
+	if ($changes)
+		$img = image_edit_apply_changes($img, $changes);
 
 	// Scale the image.
 	$size = $img->get_size();
 	$w = $size['width'];
 	$h = $size['height'];
 
-	$ratio = _image_get_preview_ratio( $w, $h );
-	$w2 = max ( 1, $w * $ratio );
-	$h2 = max ( 1, $h * $ratio );
+	$ratio = _image_get_preview_ratio($w, $h);
+	$w2 = max(1, $w * $ratio);
+	$h2 = max(1, $h * $ratio);
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
+	if (is_wp_error($img->resize($w2, $h2)))
 		return false;
 
-	return wp_stream_image( $img, $post->post_mime_type, $post_id );
+	return wp_stream_image($img, $post->post_mime_type, $post_id);
 }
 
 /**
@@ -625,30 +625,30 @@ 
 function wp_restore_image($post_id) {
 	$meta = wp_get_attachment_metadata($post_id);
 	$file = get_attached_file($post_id);
-	$backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = $old_backup_sizes = get_post_meta($post_id, '_wp_attachment_backup_sizes', true);
 	$restored = false;
 	$msg = new stdClass;
 
-	if ( !is_array($backup_sizes) ) {
+	if ( ! is_array($backup_sizes)) {
 		$msg->error = __('Cannot load image metadata.');
 		return $msg;
 	}
 
 	$parts = pathinfo($file);
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 	$default_sizes = get_intermediate_image_sizes();
 
-	if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
+	if (isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig'])) {
 		$data = $backup_sizes['full-orig'];
 
-		if ( $parts['basename'] != $data['file'] ) {
-			if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+		if ($parts['basename'] != $data['file']) {
+			if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 				// Delete only if it's an edited image.
-				if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
-					wp_delete_file( $file );
+				if (preg_match('/-e[0-9]{13}\./', $parts['basename'])) {
+					wp_delete_file($file);
 				}
-			} elseif ( isset( $meta['width'], $meta['height'] ) ) {
+			} elseif (isset($meta['width'], $meta['height'])) {
 				$backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
 			}
 		}
@@ -656,21 +656,21 @@ 
 		$restored_file = path_join($parts['dirname'], $data['file']);
 		$restored = update_attached_file($post_id, $restored_file);
 
-		$meta['file'] = _wp_relative_upload_path( $restored_file );
+		$meta['file'] = _wp_relative_upload_path($restored_file);
 		$meta['width'] = $data['width'];
 		$meta['height'] = $data['height'];
 	}
 
-	foreach ( $default_sizes as $default_size ) {
-		if ( isset($backup_sizes["$default_size-orig"]) ) {
+	foreach ($default_sizes as $default_size) {
+		if (isset($backup_sizes["$default_size-orig"])) {
 			$data = $backup_sizes["$default_size-orig"];
-			if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
-				if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
+			if (isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file']) {
+				if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE) {
 
 					// Delete only if it's an edited image.
-					if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
-						$delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
-						wp_delete_file( $delete_file );
+					if (preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file'])) {
+						$delete_file = path_join($parts['dirname'], $meta['sizes'][$default_size]['file']);
+						wp_delete_file($delete_file);
 					}
 				} else {
 					$backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
@@ -683,14 +683,14 @@ 
 		}
 	}
 
-	if ( ! wp_update_attachment_metadata( $post_id, $meta ) ||
-		( $old_backup_sizes !== $backup_sizes && ! update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes ) ) ) {
+	if ( ! wp_update_attachment_metadata($post_id, $meta) ||
+		($old_backup_sizes !== $backup_sizes && ! update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes))) {
 
 		$msg->error = __('Cannot save image metadata.');
 		return $msg;
 	}
 
-	if ( !$restored )
+	if ( ! $restored)
 		$msg->error = __('Image metadata is inconsistent.');
 	else
 		$msg->msg = __('Image restored successfully.');
@@ -707,25 +707,25 @@ 
  * @param int $post_id
  * @return \stdClass
  */
-function wp_save_image( $post_id ) {
+function wp_save_image($post_id) {
 	global $_wp_additional_image_sizes;
 
 	$return = new stdClass;
 	$success = $delete = $scaled = $nocrop = false;
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	$img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
-	if ( is_wp_error( $img ) ) {
-		$return->error = esc_js( __('Unable to create new image.') );
+	$img = wp_get_image_editor(_load_image_to_edit_path($post_id, 'full'));
+	if (is_wp_error($img)) {
+		$return->error = esc_js(__('Unable to create new image.'));
 		return $return;
 	}
 
-	$fwidth = !empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
-	$fheight = !empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
-	$target = !empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
-	$scale = !empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
+	$fwidth = ! empty($_REQUEST['fwidth']) ? intval($_REQUEST['fwidth']) : 0;
+	$fheight = ! empty($_REQUEST['fheight']) ? intval($_REQUEST['fheight']) : 0;
+	$target = ! empty($_REQUEST['target']) ? preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['target']) : '';
+	$scale = ! empty($_REQUEST['do']) && 'scale' == $_REQUEST['do'];
 
-	if ( $scale && $fwidth > 0 && $fheight > 0 ) {
+	if ($scale && $fwidth > 0 && $fheight > 0) {
 		$size = $img->get_size();
 		$sX = $size['width'];
 		$sY = $size['height'];
@@ -734,54 +734,54 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
+			if ($img->resize($fwidth, $fheight))
 				$scaled = true;
 		}
 
-		if ( !$scaled ) {
-			$return->error = esc_js( __('Error while saving the scaled image. Please reload the page and try again.') );
+		if ( ! $scaled) {
+			$return->error = esc_js(__('Error while saving the scaled image. Please reload the page and try again.'));
 			return $return;
 		}
-	} elseif ( !empty($_REQUEST['history']) ) {
-		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
+	} elseif ( ! empty($_REQUEST['history'])) {
+		$changes = json_decode(wp_unslash($_REQUEST['history']));
+		if ($changes)
 			$img = image_edit_apply_changes($img, $changes);
 	} else {
-		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
+		$return->error = esc_js(__('Nothing to save, the image has not changed.'));
 		return $return;
 	}
 
 	$meta = wp_get_attachment_metadata($post_id);
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
 
-	if ( !is_array($meta) ) {
-		$return->error = esc_js( __('Image data does not exist. Please re-upload the image.') );
+	if ( ! is_array($meta)) {
+		$return->error = esc_js(__('Image data does not exist. Please re-upload the image.'));
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
+	if ( ! is_array($backup_sizes))
 		$backup_sizes = array();
 
 	// Generate new filename.
 	$path = get_attached_file($post_id);
-	$path_parts = pathinfo( $path );
+	$path_parts = pathinfo($path);
 	$filename = $path_parts['filename'];
-	$suffix = time() . rand(100, 999);
+	$suffix = time().rand(100, 999);
 
-	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
-		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+	if (defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
+		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename']) {
 
-		if ( 'thumbnail' == $target )
+		if ('thumbnail' == $target)
 			$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
 		else
 			$new_path = $path;
 	} else {
-		while( true ) {
-			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
+		while (true) {
+			$filename = preg_replace('/-e([0-9]+)$/', '', $filename);
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$path_parts['extension']}";
 			$new_path = "{$path_parts['dirname']}/$new_filename";
-			if ( file_exists($new_path) )
+			if (file_exists($new_path))
 				$suffix++;
 			else
 				break;
@@ -789,92 +789,92 @@ 
 	}
 
 	// Save the full-size file, also needed to create sub-sizes.
-	if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
-		$return->error = esc_js( __('Unable to save the image.') );
+	if ( ! wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id)) {
+		$return->error = esc_js(__('Unable to save the image.'));
 		return $return;
 	}
 
-	if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
+	if ('nothumb' == $target || 'all' == $target || 'full' == $target || $scaled) {
 		$tag = false;
-		if ( isset($backup_sizes['full-orig']) ) {
-			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
+		if (isset($backup_sizes['full-orig'])) {
+			if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes['full-orig']['file'] != $path_parts['basename'])
 				$tag = "full-$suffix";
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag )
+		if ($tag)
 			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
-		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
+		$success = ($path === $new_path) || update_attached_file($post_id, $new_path);
 
-		$meta['file'] = _wp_relative_upload_path( $new_path );
+		$meta['file'] = _wp_relative_upload_path($new_path);
 
 		$size = $img->get_size();
 		$meta['width'] = $size['width'];
 		$meta['height'] = $size['height'];
 
-		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
+		if ($success && ('nothumb' == $target || 'all' == $target)) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ('nothumb' == $target)
+				$sizes = array_diff($sizes, array('thumbnail'));
 		}
 
 		$return->fw = $meta['width'];
 		$return->fh = $meta['height'];
-	} elseif ( 'thumbnail' == $target ) {
-		$sizes = array( 'thumbnail' );
+	} elseif ('thumbnail' == $target) {
+		$sizes = array('thumbnail');
 		$success = $delete = $nocrop = true;
 	}
 
-	if ( isset( $sizes ) ) {
+	if (isset($sizes)) {
 		$_sizes = array();
 
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$tag = false;
-			if ( isset( $meta['sizes'][$size] ) ) {
-				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
+			if (isset($meta['sizes'][$size])) {
+				if (isset($backup_sizes["$size-orig"])) {
+					if (( ! defined('IMAGE_EDIT_OVERWRITE') || ! IMAGE_EDIT_OVERWRITE) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'])
 						$tag = "$size-$suffix";
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
+				if ($tag)
 					$backup_sizes[$tag] = $meta['sizes'][$size];
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
-				$width  = intval( $_wp_additional_image_sizes[ $size ]['width'] );
-				$height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
-				$crop   = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
+			if (isset($_wp_additional_image_sizes[$size])) {
+				$width  = intval($_wp_additional_image_sizes[$size]['width']);
+				$height = intval($_wp_additional_image_sizes[$size]['height']);
+				$crop   = ($nocrop) ? false : $_wp_additional_image_sizes[$size]['crop'];
 			} else {
-				$height = get_option( "{$size}_size_h" );
-				$width  = get_option( "{$size}_size_w" );
-				$crop   = ( $nocrop ) ? false : get_option( "{$size}_crop" );
+				$height = get_option("{$size}_size_h");
+				$width  = get_option("{$size}_size_w");
+				$crop   = ($nocrop) ? false : get_option("{$size}_crop");
 			}
 
-			$_sizes[ $size ] = array( 'width' => $width, 'height' => $height, 'crop' => $crop );
+			$_sizes[$size] = array('width' => $width, 'height' => $height, 'crop' => $crop);
 		}
 
-		$meta['sizes'] = array_merge( $meta['sizes'], $img->multi_resize( $_sizes ) );
+		$meta['sizes'] = array_merge($meta['sizes'], $img->multi_resize($_sizes));
 	}
 
-	unset( $img );
+	unset($img);
 
-	if ( $success ) {
-		wp_update_attachment_metadata( $post_id, $meta );
-		update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
+	if ($success) {
+		wp_update_attachment_metadata($post_id, $meta);
+		update_post_meta($post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
-		if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
+		if ($target == 'thumbnail' || $target == 'all' || $target == 'full') {
 			// Check if it's an image edit from attachment edit screen
-			if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
-				$thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
+			if ( ! empty($_REQUEST['context']) && 'edit-attachment' == $_REQUEST['context']) {
+				$thumb_url = wp_get_attachment_image_src($post_id, array(900, 600), true);
 				$return->thumbnail = $thumb_url[0];
 			} else {
 				$file_url = wp_get_attachment_url($post_id);
-				if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
-					$return->thumbnail = path_join( dirname($file_url), $thumb['file'] );
+				if ( ! empty($meta['sizes']['thumbnail']) && $thumb = $meta['sizes']['thumbnail']) {
+					$return->thumbnail = path_join(dirname($file_url), $thumb['file']);
 				} else {
 					$return->thumbnail = "$file_url?w=128&h=128";
 				}
@@ -884,10 +884,10 @@ 
 		$delete = true;
 	}
 
-	if ( $delete ) {
-		wp_delete_file( $new_path );
+	if ($delete) {
+		wp_delete_file($new_path);
 	}
 
-	$return->msg = esc_js( __('Image saved') );
+	$return->msg = esc_js(__('Image saved'));
 	return $return;
 }

Braces +89 added lines, -64 removed lines

@@ -20,23 +20,26 @@ 
 	$sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
 	$note = '';
 
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$big = max( $meta['width'], $meta['height'] );
-	else
-		die( __('Image data does not exist. Please re-upload the image.') );
+	if ( isset( $meta['width'], $meta['height'] ) ) {
+			$big = max( $meta['width'], $meta['height'] );
+	} else {
+			die( __('Image data does not exist. Please re-upload the image.') );
+	}
 
 	$sizer = $big > 400 ? 400 / $big : 1;
 
 	$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
 	$can_restore = false;
-	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) )
-		$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
+			$can_restore = $backup_sizes['full-orig']['file'] != basename( $meta['file'] );
+	}
 
 	if ( $msg ) {
-		if ( isset($msg->error) )
-			$note = "<div class='error'><p>$msg->error</p></div>";
-		elseif ( isset($msg->msg) )
-			$note = "<div class='updated'><p>$msg->msg</p></div>";
+		if ( isset($msg->error) ) {
+					$note = "<div class='error'><p>$msg->error</p></div>";
+		} elseif ( isset($msg->msg) ) {
+					$note = "<div class='updated'><p>$msg->msg</p></div>";
+		}
 	}
 
 	?>
@@ -83,8 +86,9 @@ 
 		<div class="imgedit-help">
 		<p><?php _e('Discard any changes and restore the original image.');
 
-		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
-			echo ' '.__('Previously edited copies of the image will not be deleted.');
+		if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) {
+					echo ' '.__('Previously edited copies of the image will not be deleted.');
+		}
 
 		?></p>
 		<div class="imgedit-submit">
@@ -252,8 +256,9 @@ 
 		 */
 		$image = apply_filters( 'image_editor_save_pre', $image, $post_id );
 
-		if ( is_wp_error( $image->stream( $mime_type ) ) )
-			return false;
+		if ( is_wp_error( $image->stream( $mime_type ) ) ) {
+					return false;
+		}
 
 		return true;
 	} else {
@@ -317,8 +322,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_editor_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		return $image->save( $filename, $mime_type );
 	} else {
@@ -344,8 +350,9 @@ 
 		 */
 		$saved = apply_filters( 'wp_save_image_file', null, $filename, $image, $mime_type, $post_id );
 
-		if ( null !== $saved )
-			return $saved;
+		if ( null !== $saved ) {
+					return $saved;
+		}
 
 		switch ( $mime_type ) {
 			case 'image/jpeg':
@@ -463,11 +470,13 @@ 
  * @return WP_Image_Editor {@see WP_Image_Editor} instance with changes applied.
  */
 function image_edit_apply_changes( $image, $changes ) {
-	if ( is_resource( $image ) )
-		_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+	if ( is_resource( $image ) ) {
+			_deprecated_argument( __FUNCTION__, '3.5', __( '$image needs to be an WP_Image_Editor object' ) );
+	}
 
-	if ( !is_array($changes) )
-		return $image;
+	if ( !is_array($changes) ) {
+			return $image;
+	}
 
 	// Expand change operations.
 	foreach ( $changes as $key => $obj ) {
@@ -504,8 +513,9 @@ 
 						break;
 				}
 			}
-			if ( !$combined )
-				$filtered[++$i] = $changes[$j];
+			if ( !$combined ) {
+							$filtered[++$i] = $changes[$j];
+			}
 		}
 		$changes = $filtered;
 		unset($filtered);
@@ -541,18 +551,20 @@ 
 		switch ( $operation->type ) {
 			case 'rotate':
 				if ( $operation->angle != 0 ) {
-					if ( $image instanceof WP_Image_Editor )
-						$image->rotate( $operation->angle );
-					else
-						$image = _rotate_image_resource( $image, $operation->angle );
+					if ( $image instanceof WP_Image_Editor ) {
+											$image->rotate( $operation->angle );
+					} else {
+											$image = _rotate_image_resource( $image, $operation->angle );
+					}
 				}
 				break;
 			case 'flip':
-				if ( $operation->axis != 0 )
-					if ( $image instanceof WP_Image_Editor )
+				if ( $operation->axis != 0 ) {
+									if ( $image instanceof WP_Image_Editor )
 						$image->flip( ($operation->axis & 1) != 0, ($operation->axis & 2) != 0 );
-					else
-						$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+				} else {
+											$image = _flip_image_resource( $image, ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
+					}
 				break;
 			case 'crop':
 				$sel = $operation->sel;
@@ -596,8 +608,9 @@ 
 	}
 
 	$changes = !empty($_REQUEST['history']) ? json_decode( wp_unslash($_REQUEST['history']) ) : null;
-	if ( $changes )
-		$img = image_edit_apply_changes( $img, $changes );
+	if ( $changes ) {
+			$img = image_edit_apply_changes( $img, $changes );
+	}
 
 	// Scale the image.
 	$size = $img->get_size();
@@ -608,8 +621,9 @@ 
 	$w2 = max ( 1, $w * $ratio );
 	$h2 = max ( 1, $h * $ratio );
 
-	if ( is_wp_error( $img->resize( $w2, $h2 ) ) )
-		return false;
+	if ( is_wp_error( $img->resize( $w2, $h2 ) ) ) {
+			return false;
+	}
 
 	return wp_stream_image( $img, $post->post_mime_type, $post_id );
 }
@@ -690,10 +704,11 @@ 
 		return $msg;
 	}
 
-	if ( !$restored )
-		$msg->error = __('Image metadata is inconsistent.');
-	else
-		$msg->msg = __('Image restored successfully.');
+	if ( !$restored ) {
+			$msg->error = __('Image metadata is inconsistent.');
+	} else {
+			$msg->msg = __('Image restored successfully.');
+	}
 
 	return $msg;
 }
@@ -734,8 +749,9 @@ 
 		$diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
 		if ( -0.1 < $diff && $diff < 0.1 ) {
 			// Scale the full size image.
-			if ( $img->resize( $fwidth, $fheight ) )
-				$scaled = true;
+			if ( $img->resize( $fwidth, $fheight ) ) {
+							$scaled = true;
+			}
 		}
 
 		if ( !$scaled ) {
@@ -744,8 +760,9 @@ 
 		}
 	} elseif ( !empty($_REQUEST['history']) ) {
 		$changes = json_decode( wp_unslash($_REQUEST['history']) );
-		if ( $changes )
-			$img = image_edit_apply_changes($img, $changes);
+		if ( $changes ) {
+					$img = image_edit_apply_changes($img, $changes);
+		}
 	} else {
 		$return->error = esc_js( __('Nothing to save, the image has not changed.') );
 		return $return;
@@ -759,8 +776,9 @@ 
 		return $return;
 	}
 
-	if ( !is_array($backup_sizes) )
-		$backup_sizes = array();
+	if ( !is_array($backup_sizes) ) {
+			$backup_sizes = array();
+	}
 
 	// Generate new filename.
 	$path = get_attached_file($post_id);
@@ -771,20 +789,22 @@ 
 	if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE &&
 		isset($backup_sizes['full-orig']) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
 
-		if ( 'thumbnail' == $target )
-			$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
-		else
-			$new_path = $path;
+		if ( 'thumbnail' == $target ) {
+					$new_path = "{$path_parts['dirname']}/{$filename}-temp.{$path_parts['extension']}";
+		} else {
+					$new_path = $path;
+		}
 	} else {
 		while( true ) {
 			$filename = preg_replace( '/-e([0-9]+)$/', '', $filename );
 			$filename .= "-e{$suffix}";
 			$new_filename = "{$filename}.{$path_parts['extension']}";
 			$new_path = "{$path_parts['dirname']}/$new_filename";
-			if ( file_exists($new_path) )
-				$suffix++;
-			else
-				break;
+			if ( file_exists($new_path) ) {
+							$suffix++;
+			} else {
+							break;
+			}
 		}
 	}
 
@@ -797,14 +817,16 @@ 
 	if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
 		$tag = false;
 		if ( isset($backup_sizes['full-orig']) ) {
-			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
-				$tag = "full-$suffix";
+			if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes['full-orig']['file'] != $path_parts['basename'] ) {
+							$tag = "full-$suffix";
+			}
 		} else {
 			$tag = 'full-orig';
 		}
 
-		if ( $tag )
-			$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+		if ( $tag ) {
+					$backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+		}
 
 		$success = ( $path === $new_path ) || update_attached_file( $post_id, $new_path );
 
@@ -816,8 +838,9 @@ 
 
 		if ( $success && ('nothumb' == $target || 'all' == $target) ) {
 			$sizes = get_intermediate_image_sizes();
-			if ( 'nothumb' == $target )
-				$sizes = array_diff( $sizes, array('thumbnail') );
+			if ( 'nothumb' == $target ) {
+							$sizes = array_diff( $sizes, array('thumbnail') );
+			}
 		}
 
 		$return->fw = $meta['width'];
@@ -834,14 +857,16 @@ 
 			$tag = false;
 			if ( isset( $meta['sizes'][$size] ) ) {
 				if ( isset($backup_sizes["$size-orig"]) ) {
-					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
-						$tag = "$size-$suffix";
+					if ( ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) && $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] ) {
+											$tag = "$size-$suffix";
+					}
 				} else {
 					$tag = "$size-orig";
 				}
 
-				if ( $tag )
-					$backup_sizes[$tag] = $meta['sizes'][$size];
+				if ( $tag ) {
+									$backup_sizes[$tag] = $meta['sizes'][$size];
+				}
 			}
 
 			if ( isset( $_wp_additional_image_sizes[ $size ] ) ) {

src/wp-admin/includes/media.php

Doc Comments +1 added lines, -1 removed lines

@@ -2960,7 +2960,7 @@
  * @since 3.6.0
  *
  * @param string $file Path to file.
- * @return array|bool Returns array of metadata, if found.
+ * @return string Returns array of metadata, if found.
  */
 function wp_read_video_metadata( $file ) {
 	if ( ! file_exists( $file ) )

Indentation +33 added lines, -33 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Administration Media API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Media API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Defines the default media upload tabs
@@ -1901,11 +1901,11 @@ 
 <div id="plupload-upload-ui" class="hide-if-no-js">
 <?php
 /**
- * Fires before the upload interface loads.
- *
- * @since 2.6.0 As 'pre-flash-upload-ui'
- * @since 3.3.0
- */
+	 * Fires before the upload interface loads.
+	 *
+	 * @since 2.6.0 As 'pre-flash-upload-ui'
+	 * @since 3.3.0
+	 */
 do_action( 'pre-plupload-upload-ui' ); ?>
 <div id="drag-drop-area">
 	<div class="drag-drop-inside">
@@ -1916,11 +1916,11 @@ 
 </div>
 <?php
 /**
- * Fires after the upload interface loads.
- *
- * @since 2.6.0 As 'post-flash-upload-ui'
- * @since 3.3.0
- */
+	 * Fires after the upload interface loads.
+	 *
+	 * @since 2.6.0 As 'post-flash-upload-ui'
+	 * @since 3.3.0
+	 */
 do_action( 'post-plupload-upload-ui' ); ?>
 </div>
 
@@ -1942,10 +1942,10 @@ 
 	<div class="clear"></div>
 <?php
 /**
- * Fires after the upload button in the media upload interface.
- *
- * @since 2.6.0
- */
+	 * Fires after the upload button in the media upload interface.
+	 *
+	 * @since 2.6.0
+	 */
 do_action( 'post-html-upload-ui' );
 ?>
 </div>
@@ -2161,12 +2161,12 @@ 
 <div class="media-item media-blank">
 <?php
 /**
- * Filter the insert media from URL form HTML.
- *
- * @since 3.3.0
- *
- * @param string $form_html The insert from URL form HTML.
- */
+		 * Filter the insert media from URL form HTML.
+		 *
+		 * @since 3.3.0
+		 *
+		 * @param string $form_html The insert from URL form HTML.
+		 */
 echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
 ?>
 </div>
@@ -2414,14 +2414,14 @@ 
 	$type_links[] = '<li><a href="' . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
 }
 /**
- * Filter the media upload mime type list items.
- *
- * Returned values should begin with an `<li>` tag.
- *
- * @since 3.1.0
- *
- * @param array $type_links An array of list items containing mime type link HTML.
- */
+	 * Filter the media upload mime type list items.
+	 *
+	 * Returned values should begin with an `<li>` tag.
+	 *
+	 * @since 3.1.0
+	 *
+	 * @param array $type_links An array of list items containing mime type link HTML.
+	 */
 echo implode(' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
 unset($type_links);
 ?>

Spacing +708 added lines, -708 removed lines

@@ -28,7 +28,7 @@ 
 	 *
 	 * @param array $_default_tabs An array of media tabs.
 	 */
-	return apply_filters( 'media_upload_tabs', $_default_tabs );
+	return apply_filters('media_upload_tabs', $_default_tabs);
 }
 
 /**
@@ -44,17 +44,17 @@ 
 function update_gallery_tab($tabs) {
 	global $wpdb;
 
-	if ( !isset($_REQUEST['post_id']) ) {
+	if ( ! isset($_REQUEST['post_id'])) {
 		unset($tabs['gallery']);
 		return $tabs;
 	}
 
 	$post_id = intval($_REQUEST['post_id']);
 
-	if ( $post_id )
-		$attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
+	if ($post_id)
+		$attachments = intval($wpdb->get_var($wpdb->prepare("SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id)));
 
-	if ( empty($attachments) ) {
+	if (empty($attachments)) {
 		unset($tabs['gallery']);
 		return $tabs;
 	}
@@ -76,26 +76,26 @@ 
 	$tabs = media_upload_tabs();
 	$default = 'type';
 
-	if ( !empty($tabs) ) {
+	if ( ! empty($tabs)) {
 		echo "<ul id='sidemenu'>\n";
-		if ( isset($redir_tab) && array_key_exists($redir_tab, $tabs) ) {
+		if (isset($redir_tab) && array_key_exists($redir_tab, $tabs)) {
 			$current = $redir_tab;
-		} elseif ( isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs) ) {
+		} elseif (isset($_GET['tab']) && array_key_exists($_GET['tab'], $tabs)) {
 			$current = $_GET['tab'];
 		} else {
 			/** This filter is documented in wp-admin/media-upload.php */
-			$current = apply_filters( 'media_upload_default_tab', $default );
+			$current = apply_filters('media_upload_default_tab', $default);
 		}
 
-		foreach ( $tabs as $callback => $text ) {
+		foreach ($tabs as $callback => $text) {
 			$class = '';
 
-			if ( $current == $callback )
+			if ($current == $callback)
 				$class = " class='current'";
 
 			$href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
-			$link = "<a href='" . esc_url($href) . "'$class>$text</a>";
-			echo "\t<li id='" . esc_attr("tab-$callback") . "'>$link</li>\n";
+			$link = "<a href='".esc_url($href)."'$class>$text</a>";
+			echo "\t<li id='".esc_attr("tab-$callback")."'>$link</li>\n";
 		}
 		echo "</ul>\n";
 	}
@@ -117,18 +117,18 @@ 
  * @param string       $alt     Optional. Image alt attribute. Default empty.
  * @return string The HTML output to insert into the editor.
  */
-function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = '', $size = 'medium', $alt = '' ) {
+function get_image_send_to_editor($id, $caption, $title, $align, $url = '', $rel = '', $size = 'medium', $alt = '') {
 
 	$html = get_image_tag($id, $alt, '', $align, $size);
 
-	if ( ! $rel ) {
-		$rel = ' rel="attachment wp-att-' . esc_attr( $id ) . '"';
+	if ( ! $rel) {
+		$rel = ' rel="attachment wp-att-'.esc_attr($id).'"';
 	} else {
-		$rel = ' rel="' . esc_attr( $rel ) . '"';
+		$rel = ' rel="'.esc_attr($rel).'"';
 	}
 
-	if ( $url )
-		$html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
+	if ($url)
+		$html = '<a href="'.esc_attr($url)."\"$rel>$html</a>";
 
 	/**
 	 * Filter the image HTML markup to send to the editor.
@@ -145,7 +145,7 @@ 
 	 *                              (in that order). Default 'medium'.
 	 * @param string       $alt     The image alternative, or alt, text.
 	 */
-	$html = apply_filters( 'image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt );
+	$html = apply_filters('image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt);
 
 	return $html;
 }
@@ -165,7 +165,7 @@ 
  * @param string $alt image alt attribute
  * @return string
  */
-function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) {
+function image_add_caption($html, $id, $caption, $title, $align, $url, $size, $alt = '') {
 
 	/**
 	 * Filter the caption text.
@@ -181,7 +181,7 @@ 
 	 * @param string $caption The original caption text.
 	 * @param int    $id      The attachment ID.
 	 */
-	$caption = apply_filters( 'image_add_caption_text', $caption, $id );
+	$caption = apply_filters('image_add_caption_text', $caption, $id);
 
 	/**
 	 * Filter whether to disable captions.
@@ -193,27 +193,27 @@ 
 	 * @param bool $bool Whether to disable appending captions. Returning true to the filter
 	 *                   will disable captions. Default empty string.
 	 */
-	if ( empty($caption) || apply_filters( 'disable_captions', '' ) )
+	if (empty($caption) || apply_filters('disable_captions', ''))
 		return $html;
 
-	$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
+	$id = (0 < (int) $id) ? 'attachment_'.$id : '';
 
-	if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
+	if ( ! preg_match('/width=["\']([0-9]+)/', $html, $matches))
 		return $html;
 
 	$width = $matches[1];
 
-	$caption = str_replace( array("\r\n", "\r"), "\n", $caption);
-	$caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
+	$caption = str_replace(array("\r\n", "\r"), "\n", $caption);
+	$caption = preg_replace_callback('/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption);
 
 	// Convert any remaining line breaks to <br>.
-	$caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
+	$caption = preg_replace('/[ \n\t]*\n[ \t]*/', '<br />', $caption);
 
-	$html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
-	if ( empty($align) )
+	$html = preg_replace('/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html);
+	if (empty($align))
 		$align = 'none';
 
-	$shcode = '[caption id="' . $id . '" align="align' . $align	. '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
+	$shcode = '[caption id="'.$id.'" align="align'.$align.'" width="'.$width.'"]'.$html.' '.$caption.'[/caption]';
 
 	/**
 	 * Filter the image HTML markup including the caption shortcode.
@@ -223,7 +223,7 @@ 
 	 * @param string $shcode The image HTML markup with caption shortcode.
 	 * @param string $html   The image HTML markup.
 	 */
-	return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
+	return apply_filters('image_add_caption_shortcode', $shcode, $html);
 }
 
 /**
@@ -232,9 +232,9 @@ 
  * @access private
  * @since 3.4.0
  */
-function _cleanup_image_add_caption( $matches ) {
+function _cleanup_image_add_caption($matches) {
 	// Remove any line breaks from inside the tags.
-	return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] );
+	return preg_replace('/[\r\n\t]+/', ' ', $matches[0]);
 }
 
 /**
@@ -248,7 +248,7 @@ 
 ?>
 <script type="text/javascript">
 var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
+win.send_to_editor( <?php echo wp_json_encode($html); ?> );
 </script>
 <?php
 	exit;
@@ -266,22 +266,22 @@ 
  * @param array  $overrides Override the {@link wp_handle_upload()} behavior. Optional.
  * @return int|WP_Error ID of the attachment or a WP_Error object on failure.
  */
-function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
+function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array('test_form' => false)) {
 
 	$time = current_time('mysql');
-	if ( $post = get_post($post_id) ) {
-		if ( substr( $post->post_date, 0, 4 ) > 0 )
+	if ($post = get_post($post_id)) {
+		if (substr($post->post_date, 0, 4) > 0)
 			$time = $post->post_date;
 	}
 
 	$name = $_FILES[$file_id]['name'];
 	$file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
 
-	if ( isset($file['error']) )
-		return new WP_Error( 'upload_error', $file['error'] );
+	if (isset($file['error']))
+		return new WP_Error('upload_error', $file['error']);
 
 	$name_parts = pathinfo($name);
-	$name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
+	$name = trim(substr($name, 0, -(1 + strlen($name_parts['extension']))));
 
 	$url = $file['url'];
 	$type = $file['type'];
@@ -290,85 +290,85 @@ 
 	$content = '';
 	$excerpt = '';
 
-	if ( preg_match( '#^audio#', $type ) ) {
-		$meta = wp_read_audio_metadata( $file );
+	if (preg_match('#^audio#', $type)) {
+		$meta = wp_read_audio_metadata($file);
 
-		if ( ! empty( $meta['title'] ) ) {
+		if ( ! empty($meta['title'])) {
 			$title = $meta['title'];
 		}
 
-		if ( ! empty( $title ) ) {
+		if ( ! empty($title)) {
 
-			if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
+			if ( ! empty($meta['album']) && ! empty($meta['artist'])) {
 				/* translators: 1: audio track title, 2: album title, 3: artist name */
-				$content .= sprintf( __( '"%1$s" from %2$s by %3$s.' ), $title, $meta['album'], $meta['artist'] );
-			} elseif ( ! empty( $meta['album'] ) ) {
+				$content .= sprintf(__('"%1$s" from %2$s by %3$s.'), $title, $meta['album'], $meta['artist']);
+			} elseif ( ! empty($meta['album'])) {
 				/* translators: 1: audio track title, 2: album title */
-				$content .= sprintf( __( '"%1$s" from %2$s.' ), $title, $meta['album'] );
-			} elseif ( ! empty( $meta['artist'] ) ) {
+				$content .= sprintf(__('"%1$s" from %2$s.'), $title, $meta['album']);
+			} elseif ( ! empty($meta['artist'])) {
 				/* translators: 1: audio track title, 2: artist name */
-				$content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
+				$content .= sprintf(__('"%1$s" by %2$s.'), $title, $meta['artist']);
 			} else {
-				$content .= sprintf( __( '"%s".' ), $title );
+				$content .= sprintf(__('"%s".'), $title);
 			}
 
-		} elseif ( ! empty( $meta['album'] ) ) {
+		} elseif ( ! empty($meta['album'])) {
 
-			if ( ! empty( $meta['artist'] ) ) {
+			if ( ! empty($meta['artist'])) {
 				/* translators: 1: audio album title, 2: artist name */
-				$content .= sprintf( __( '%1$s by %2$s.' ), $meta['album'], $meta['artist'] );
+				$content .= sprintf(__('%1$s by %2$s.'), $meta['album'], $meta['artist']);
 			} else {
-				$content .= $meta['album'] . '.';
+				$content .= $meta['album'].'.';
 			}
 
-		} elseif ( ! empty( $meta['artist'] ) ) {
+		} elseif ( ! empty($meta['artist'])) {
 
-			$content .= $meta['artist'] . '.';
+			$content .= $meta['artist'].'.';
 
 		}
 
-		if ( ! empty( $meta['year'] ) )
-			$content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
+		if ( ! empty($meta['year']))
+			$content .= ' '.sprintf(__('Released: %d.'), $meta['year']);
 
-		if ( ! empty( $meta['track_number'] ) ) {
-			$track_number = explode( '/', $meta['track_number'] );
-			if ( isset( $track_number[1] ) )
-				$content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
+		if ( ! empty($meta['track_number'])) {
+			$track_number = explode('/', $meta['track_number']);
+			if (isset($track_number[1]))
+				$content .= ' '.sprintf(__('Track %1$s of %2$s.'), number_format_i18n($track_number[0]), number_format_i18n($track_number[1]));
 			else
-				$content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
+				$content .= ' '.sprintf(__('Track %1$s.'), number_format_i18n($track_number[0]));
 		}
 
-		if ( ! empty( $meta['genre'] ) )
-			$content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
+		if ( ! empty($meta['genre']))
+			$content .= ' '.sprintf(__('Genre: %s.'), $meta['genre']);
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
-		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+	} elseif (0 === strpos($type, 'image/') && $image_meta = @wp_read_image_metadata($file)) {
+		if (trim($image_meta['title']) && ! is_numeric(sanitize_title($image_meta['title']))) {
 			$title = $image_meta['title'];
 		}
 
-		if ( trim( $image_meta['caption'] ) ) {
+		if (trim($image_meta['caption'])) {
 			$excerpt = $image_meta['caption'];
 		}
 	}
 
 	// Construct the attachment array
-	$attachment = array_merge( array(
+	$attachment = array_merge(array(
 		'post_mime_type' => $type,
 		'guid' => $url,
 		'post_parent' => $post_id,
 		'post_title' => $title,
 		'post_content' => $content,
 		'post_excerpt' => $excerpt,
-	), $post_data );
+	), $post_data);
 
 	// This should never be set as it would then overwrite an existing attachment.
-	unset( $attachment['ID'] );
+	unset($attachment['ID']);
 
 	// Save the data
 	$id = wp_insert_attachment($attachment, $file, $post_id);
-	if ( !is_wp_error($id) ) {
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	if ( ! is_wp_error($id)) {
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $file));
 	}
 
 	return $id;
@@ -389,15 +389,15 @@ 
 function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
 	$overrides = array('test_form'=>false);
 
-	$time = current_time( 'mysql' );
-	if ( $post = get_post( $post_id ) ) {
-		if ( substr( $post->post_date, 0, 4 ) > 0 )
+	$time = current_time('mysql');
+	if ($post = get_post($post_id)) {
+		if (substr($post->post_date, 0, 4) > 0)
 			$time = $post->post_date;
 	}
 
-	$file = wp_handle_sideload( $file_array, $overrides, $time );
-	if ( isset($file['error']) )
-		return new WP_Error( 'upload_error', $file['error'] );
+	$file = wp_handle_sideload($file_array, $overrides, $time);
+	if (isset($file['error']))
+		return new WP_Error('upload_error', $file['error']);
 
 	$url = $file['url'];
 	$type = $file['type'];
@@ -406,32 +406,32 @@ 
 	$content = '';
 
 	// Use image exif/iptc data for title and caption defaults if possible.
-	if ( $image_meta = @wp_read_image_metadata($file) ) {
-		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
+	if ($image_meta = @wp_read_image_metadata($file)) {
+		if (trim($image_meta['title']) && ! is_numeric(sanitize_title($image_meta['title'])))
 			$title = $image_meta['title'];
-		if ( trim( $image_meta['caption'] ) )
+		if (trim($image_meta['caption']))
 			$content = $image_meta['caption'];
 	}
 
-	if ( isset( $desc ) )
+	if (isset($desc))
 		$title = $desc;
 
 	// Construct the attachment array.
-	$attachment = array_merge( array(
+	$attachment = array_merge(array(
 		'post_mime_type' => $type,
 		'guid' => $url,
 		'post_parent' => $post_id,
 		'post_title' => $title,
 		'post_content' => $content,
-	), $post_data );
+	), $post_data);
 
 	// This should never be set as it would then overwrite an existing attachment.
-	unset( $attachment['ID'] );
+	unset($attachment['ID']);
 
 	// Save the attachment metadata
 	$id = wp_insert_attachment($attachment, $file, $post_id);
-	if ( !is_wp_error($id) )
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	if ( ! is_wp_error($id))
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $file));
 
 	return $id;
 }
@@ -451,41 +451,41 @@ 
 <title><?php bloginfo('name') ?> &rsaquo; <?php _e('Uploads'); ?> &#8212; <?php _e('WordPress'); ?></title>
 <?php
 
-wp_enqueue_style( 'colors' );
+wp_enqueue_style('colors');
 // Check callback name for 'media'
-if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
-	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
-	wp_enqueue_style( 'deprecated-media' );
-wp_enqueue_style( 'ie' );
+if ((is_array($content_func) && ! empty($content_func[1]) && 0 === strpos((string) $content_func[1], 'media'))
+	|| ( ! is_array($content_func) && 0 === strpos($content_func, 'media')))
+	wp_enqueue_style('deprecated-media');
+wp_enqueue_style('ie');
 ?>
 <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();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
 isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <?php
 	/** This action is documented in wp-admin/admin-header.php */
-	do_action( 'admin_enqueue_scripts', 'media-upload-popup' );
+	do_action('admin_enqueue_scripts', 'media-upload-popup');
 
 	/**
 	 * Fires when admin styles enqueued for the legacy (pre-3.5.0) media upload popup are printed.
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'admin_print_styles-media-upload-popup' );
+	do_action('admin_print_styles-media-upload-popup');
 
 	/** This action is documented in wp-admin/admin-header.php */
-	do_action( 'admin_print_styles' );
+	do_action('admin_print_styles');
 
 	/**
 	 * Fires when admin scripts enqueued for the legacy (pre-3.5.0) media upload popup are printed.
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'admin_print_scripts-media-upload-popup' );
+	do_action('admin_print_scripts-media-upload-popup');
 
 	/** This action is documented in wp-admin/admin-header.php */
-	do_action( 'admin_print_scripts' );
+	do_action('admin_print_scripts');
 
 	/**
 	 * Fires when scripts enqueued for the admin header for the legacy (pre-3.5.0)
@@ -493,12 +493,12 @@ 
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'admin_head-media-upload-popup' );
+	do_action('admin_head-media-upload-popup');
 
 	/** This action is documented in wp-admin/admin-header.php */
-	do_action( 'admin_head' );
+	do_action('admin_head');
 
-if ( is_string( $content_func ) ) {
+if (is_string($content_func)) {
 	/**
 	 * Fires in the admin header for each specific form tab in the legacy
 	 * (pre-3.5.0) media upload popup.
@@ -510,11 +510,11 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( "admin_head_{$content_func}" );
+	do_action("admin_head_{$content_func}");
 }
 ?>
 </head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-core-ui no-js">
+<body<?php if (isset($GLOBALS['body_id'])) echo ' id="'.$GLOBALS['body_id'].'"'; ?> class="wp-core-ui no-js">
 <script type="text/javascript">
 document.body.className = document.body.className.replace('no-js', 'js');
 </script>
@@ -524,7 +524,7 @@ 
 	call_user_func_array($content_func, $args);
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 ?>
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
@@ -548,20 +548,20 @@ 
 	$instance++;
 
 	$post = get_post();
-	if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
+	if ( ! $post && ! empty($GLOBALS['post_ID']))
 		$post = $GLOBALS['post_ID'];
 
-	wp_enqueue_media( array(
+	wp_enqueue_media(array(
 		'post' => $post
-	) );
+	));
 
 	$img = '<span class="wp-media-buttons-icon"></span> ';
 
 	$id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
-	printf( '<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
+	printf('<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
 		$id_attribute,
-		esc_attr( $editor_id ),
-		$img . __( 'Add Media' )
+		esc_attr($editor_id),
+		$img.__('Add Media')
 	);
 	/**
 	 * Filter the legacy (pre-3.5.0) media buttons.
@@ -571,11 +571,11 @@ 
 	 *
 	 * @param string $string Media buttons context. Default empty.
 	 */
-	$legacy_filter = apply_filters( 'media_buttons_context', '' );
+	$legacy_filter = apply_filters('media_buttons_context', '');
 
-	if ( $legacy_filter ) {
+	if ($legacy_filter) {
 		// #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.
-		if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) )
+		if (0 === stripos(trim($legacy_filter), '</a>'))
 			$legacy_filter .= '</a>';
 		echo $legacy_filter;
 	}
@@ -589,18 +589,18 @@ 
  * @param string $tab
  * @return string
  */
-function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
+function get_upload_iframe_src($type = null, $post_id = null, $tab = null) {
 	global $post_ID;
 
-	if ( empty( $post_id ) )
+	if (empty($post_id))
 		$post_id = $post_ID;
 
-	$upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') );
+	$upload_iframe_src = add_query_arg('post_id', (int) $post_id, admin_url('media-upload.php'));
 
-	if ( $type && 'media' != $type )
+	if ($type && 'media' != $type)
 		$upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
 
-	if ( ! empty( $tab ) )
+	if ( ! empty($tab))
 		$upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
 
 	/**
@@ -613,7 +613,7 @@ 
 	 *
 	 * @param string $upload_iframe_src The upload iframe source URL by type.
 	 */
-	$upload_iframe_src = apply_filters( $type . '_upload_iframe_src', $upload_iframe_src );
+	$upload_iframe_src = apply_filters($type.'_upload_iframe_src', $upload_iframe_src);
 
 	return add_query_arg('TB_iframe', true, $upload_iframe_src);
 }
@@ -630,28 +630,28 @@ 
 
 	$errors = null;
 
-	if ( isset($_POST['send']) ) {
-		$keys = array_keys( $_POST['send'] );
-		$send_id = (int) reset( $keys );
+	if (isset($_POST['send'])) {
+		$keys = array_keys($_POST['send']);
+		$send_id = (int) reset($keys);
 	}
 
-	if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
+	if ( ! empty($_POST['attachments'])) foreach ($_POST['attachments'] as $attachment_id => $attachment) {
 		$post = $_post = get_post($attachment_id, ARRAY_A);
 
-		if ( !current_user_can( 'edit_post', $attachment_id ) )
+		if ( ! current_user_can('edit_post', $attachment_id))
 			continue;
 
-		if ( isset($attachment['post_content']) )
+		if (isset($attachment['post_content']))
 			$post['post_content'] = $attachment['post_content'];
-		if ( isset($attachment['post_title']) )
+		if (isset($attachment['post_title']))
 			$post['post_title'] = $attachment['post_title'];
-		if ( isset($attachment['post_excerpt']) )
+		if (isset($attachment['post_excerpt']))
 			$post['post_excerpt'] = $attachment['post_excerpt'];
-		if ( isset($attachment['menu_order']) )
+		if (isset($attachment['menu_order']))
 			$post['menu_order'] = $attachment['menu_order'];
 
-		if ( isset($send_id) && $attachment_id == $send_id ) {
-			if ( isset($attachment['post_parent']) )
+		if (isset($send_id) && $attachment_id == $send_id) {
+			if (isset($attachment['post_parent']))
 				$post['post_parent'] = $attachment['post_parent'];
 		}
 
@@ -665,33 +665,33 @@ 
 		 * @param array $post       An array of post data.
 		 * @param array $attachment An array of attachment metadata.
 		 */
-		$post = apply_filters( 'attachment_fields_to_save', $post, $attachment );
+		$post = apply_filters('attachment_fields_to_save', $post, $attachment);
 
-		if ( isset($attachment['image_alt']) ) {
-			$image_alt = wp_unslash( $attachment['image_alt'] );
-			if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) {
-				$image_alt = wp_strip_all_tags( $image_alt, true );
+		if (isset($attachment['image_alt'])) {
+			$image_alt = wp_unslash($attachment['image_alt']);
+			if ($image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true)) {
+				$image_alt = wp_strip_all_tags($image_alt, true);
 
 				// Update_meta expects slashed.
-				update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				update_post_meta($attachment_id, '_wp_attachment_image_alt', wp_slash($image_alt));
 			}
 		}
 
-		if ( isset($post['errors']) ) {
+		if (isset($post['errors'])) {
 			$errors[$attachment_id] = $post['errors'];
 			unset($post['errors']);
 		}
 
-		if ( $post != $_post )
+		if ($post != $_post)
 			wp_update_post($post);
 
-		foreach ( get_attachment_taxonomies($post) as $t ) {
-			if ( isset($attachment[$t]) )
+		foreach (get_attachment_taxonomies($post) as $t) {
+			if (isset($attachment[$t]))
 				wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false);
 		}
 	}
 
-	if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?>
+	if (isset($_POST['insert-gallery']) || isset($_POST['update-gallery'])) { ?>
 		<script type="text/javascript">
 		var win = window.dialogArguments || opener || parent || top;
 		win.tb_remove();
@@ -700,14 +700,14 @@ 
 		exit;
 	}
 
-	if ( isset($send_id) ) {
-		$attachment = wp_unslash( $_POST['attachments'][$send_id] );
+	if (isset($send_id)) {
+		$attachment = wp_unslash($_POST['attachments'][$send_id]);
 
-		$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
-		if ( !empty($attachment['url']) ) {
+		$html = isset($attachment['post_title']) ? $attachment['post_title'] : '';
+		if ( ! empty($attachment['url'])) {
 			$rel = '';
-			if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
-				$rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'";
+			if (strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'])
+				$rel = " rel='attachment wp-att-".esc_attr($send_id)."'";
 			$html = "<a href='{$attachment['url']}'$rel>$html</a>";
 		}
 
@@ -722,7 +722,7 @@ 
 		 * @param int    $send_id    The first key from the $_POST['send'] data.
 		 * @param array  $attachment Array of attachment metadata.
 		 */
-		$html = apply_filters( 'media_send_to_editor', $html, $send_id, $attachment );
+		$html = apply_filters('media_send_to_editor', $html, $send_id, $attachment);
 		return media_send_to_editor($html);
 	}
 
@@ -740,33 +740,33 @@ 
 	$errors = array();
 	$id = 0;
 
-	if ( isset($_POST['html-upload']) && !empty($_FILES) ) {
+	if (isset($_POST['html-upload']) && ! empty($_FILES)) {
 		check_admin_referer('media-form');
 		// Upload File button was clicked
 		$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
 		unset($_FILES);
-		if ( is_wp_error($id) ) {
+		if (is_wp_error($id)) {
 			$errors['upload_error'] = $id;
 			$id = false;
 		}
 	}
 
-	if ( !empty($_POST['insertonlybutton']) ) {
+	if ( ! empty($_POST['insertonlybutton'])) {
 		$src = $_POST['src'];
-		if ( !empty($src) && !strpos($src, '://') )
+		if ( ! empty($src) && ! strpos($src, '://'))
 			$src = "http://$src";
 
-		if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
-			$title = esc_html( wp_unslash( $_POST['title'] ) );
-			if ( empty( $title ) )
-				$title = esc_html( basename( $src ) );
+		if (isset($_POST['media_type']) && 'image' != $_POST['media_type']) {
+			$title = esc_html(wp_unslash($_POST['title']));
+			if (empty($title))
+				$title = esc_html(basename($src));
 
-			if ( $title && $src )
-				$html = "<a href='" . esc_url($src) . "'>$title</a>";
+			if ($title && $src)
+				$html = "<a href='".esc_url($src)."'>$title</a>";
 
 			$type = 'file';
-			if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-				&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
+			if (($ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $src)) && ($ext_type = wp_ext2type($ext))
+				&& ('audio' == $ext_type || 'video' == $ext_type))
 					$type = $ext_type;
 
 			/**
@@ -781,16 +781,16 @@ 
 			 * @param string $src   Media source URL.
 			 * @param string $title Media title.
 			 */
-			$html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
+			$html = apply_filters($type.'_send_to_editor_url', $html, esc_url_raw($src), $title);
 		} else {
 			$align = '';
-			$alt = esc_attr( wp_unslash( $_POST['alt'] ) );
-			if ( isset($_POST['align']) ) {
-				$align = esc_attr( wp_unslash( $_POST['align'] ) );
+			$alt = esc_attr(wp_unslash($_POST['alt']));
+			if (isset($_POST['align'])) {
+				$align = esc_attr(wp_unslash($_POST['align']));
 				$class = " class='align$align'";
 			}
-			if ( !empty($src) )
-				$html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
+			if ( ! empty($src))
+				$html = "<img src='".esc_url($src)."' alt='$alt'$class />";
 
 			/**
 			 * Filter the image URL sent to the editor.
@@ -803,34 +803,34 @@ 
 			 * @param string $align The image alignment. Default 'alignnone'. Possible values include
 			 *                      'alignleft', 'aligncenter', 'alignright', 'alignnone'.
 			 */
-			$html = apply_filters( 'image_send_to_editor_url', $html, esc_url_raw( $src ), $alt, $align );
+			$html = apply_filters('image_send_to_editor_url', $html, esc_url_raw($src), $alt, $align);
 		}
 
 		return media_send_to_editor($html);
 	}
 
-	if ( isset( $_POST['save'] ) ) {
+	if (isset($_POST['save'])) {
 		$errors['upload_notice'] = __('Saved.');
-		wp_enqueue_script( 'admin-gallery' );
- 		return wp_iframe( 'media_upload_gallery_form', $errors );
+		wp_enqueue_script('admin-gallery');
+ 		return wp_iframe('media_upload_gallery_form', $errors);
 
-	} elseif ( ! empty( $_POST ) ) {
+	} elseif ( ! empty($_POST)) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
+		if (is_string($return))
 			return $return;
-		if ( is_array($return) )
+		if (is_array($return))
 			$errors = $return;
 	}
 
-	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) {
+	if (isset($_GET['tab']) && $_GET['tab'] == 'type_url') {
 		$type = 'image';
-		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) )
+		if (isset($_GET['type']) && in_array($_GET['type'], array('video', 'audio', 'file')))
 			$type = $_GET['type'];
-		return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
+		return wp_iframe('media_upload_type_url_form', $type, $errors, $id);
 	}
 
-	return wp_iframe( 'media_upload_type_form', 'image', $errors, $id );
+	return wp_iframe('media_upload_type_form', 'image', $errors, $id);
 }
 
 /**
@@ -845,49 +845,49 @@ 
  * @param string $return  Optional. Accepts 'html' (image tag html) or 'src' (URL). Default 'html'.
  * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise.
  */
-function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {
-	if ( ! empty( $file ) ) {
+function media_sideload_image($file, $post_id, $desc = null, $return = 'html') {
+	if ( ! empty($file)) {
 
 		// Set variables for storage, fix file filename for query strings.
-		preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
-		if ( ! $matches ) {
-			return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
+		preg_match('/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches);
+		if ( ! $matches) {
+			return new WP_Error('image_sideload_failed', __('Invalid image URL'));
 		}
 
 		$file_array = array();
-		$file_array['name'] = basename( $matches[0] );
+		$file_array['name'] = basename($matches[0]);
 
 		// Download file to temp location.
-		$file_array['tmp_name'] = download_url( $file );
+		$file_array['tmp_name'] = download_url($file);
 
 		// If error storing temporarily, return the error.
-		if ( is_wp_error( $file_array['tmp_name'] ) ) {
+		if (is_wp_error($file_array['tmp_name'])) {
 			return $file_array['tmp_name'];
 		}
 
 		// Do the validation and storage stuff.
-		$id = media_handle_sideload( $file_array, $post_id, $desc );
+		$id = media_handle_sideload($file_array, $post_id, $desc);
 
 		// If error storing permanently, unlink.
-		if ( is_wp_error( $id ) ) {
-			@unlink( $file_array['tmp_name'] );
+		if (is_wp_error($id)) {
+			@unlink($file_array['tmp_name']);
 			return $id;
 		}
 
-		$src = wp_get_attachment_url( $id );
+		$src = wp_get_attachment_url($id);
 	}
 
 	// Finally, check to make sure the file has been saved, then return the HTML.
-	if ( ! empty( $src ) ) {
-		if ( $return === 'src' ) {
+	if ( ! empty($src)) {
+		if ($return === 'src') {
 			return $src;
 		}
 
-		$alt = isset( $desc ) ? esc_attr( $desc ) : '';
+		$alt = isset($desc) ? esc_attr($desc) : '';
 		$html = "<img src='$src' alt='$alt' />";
 		return $html;
 	} else {
-		return new WP_Error( 'image_sideload_failed' );
+		return new WP_Error('image_sideload_failed');
 	}
 }
 
@@ -901,17 +901,17 @@ 
 function media_upload_gallery() {
 	$errors = array();
 
-	if ( !empty($_POST) ) {
+	if ( ! empty($_POST)) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
+		if (is_string($return))
 			return $return;
-		if ( is_array($return) )
+		if (is_array($return))
 			$errors = $return;
 	}
 
 	wp_enqueue_script('admin-gallery');
-	return wp_iframe( 'media_upload_gallery_form', $errors );
+	return wp_iframe('media_upload_gallery_form', $errors);
 }
 
 /**
@@ -923,16 +923,16 @@ 
  */
 function media_upload_library() {
 	$errors = array();
-	if ( !empty($_POST) ) {
+	if ( ! empty($_POST)) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
+		if (is_string($return))
 			return $return;
-		if ( is_array($return) )
+		if (is_array($return))
 			$errors = $return;
 	}
 
-	return wp_iframe( 'media_upload_library_form', $errors );
+	return wp_iframe('media_upload_library_form', $errors);
 }
 
 /**
@@ -944,20 +944,20 @@ 
  * @param string $checked
  * @return string
  */
-function image_align_input_fields( $post, $checked = '' ) {
+function image_align_input_fields($post, $checked = '') {
 
-	if ( empty($checked) )
+	if (empty($checked))
 		$checked = get_user_setting('align', 'none');
 
 	$alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right'));
-	if ( !array_key_exists( (string) $checked, $alignments ) )
+	if ( ! array_key_exists((string) $checked, $alignments))
 		$checked = 'none';
 
 	$out = array();
-	foreach ( $alignments as $name => $label ) {
+	foreach ($alignments as $name => $label) {
 		$name = esc_attr($name);
 		$out[] = "<input type='radio' name='attachments[{$post->ID}][align]' id='image-align-{$name}-{$post->ID}' value='$name'".
-			( $checked == $name ? " checked='checked'" : "" ) .
+			($checked == $name ? " checked='checked'" : "").
 			" /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
 	}
 	return join("\n", $out);
@@ -972,7 +972,7 @@ 
  * @param bool|string $check
  * @return array
  */
-function image_size_input_fields( $post, $check = '' ) {
+function image_size_input_fields($post, $check = '') {
 	/**
 	 * Filter the names and labels of the default image sizes.
 	 *
@@ -981,34 +981,34 @@ 
 	 * @param array $size_names Array of image sizes and their names. Default values
 	 *                          include 'Thumbnail', 'Medium', 'Large', 'Full Size'.
 	 */
-	$size_names = apply_filters( 'image_size_names_choose', array(
-		'thumbnail' => __( 'Thumbnail' ),
-		'medium'    => __( 'Medium' ),
-		'large'     => __( 'Large' ),
-		'full'      => __( 'Full Size' )
-	) );
-
-	if ( empty( $check ) ) {
+	$size_names = apply_filters('image_size_names_choose', array(
+		'thumbnail' => __('Thumbnail'),
+		'medium'    => __('Medium'),
+		'large'     => __('Large'),
+		'full'      => __('Full Size')
+	));
+
+	if (empty($check)) {
 		$check = get_user_setting('imgsize', 'medium');
 	}
 	$out = array();
 
-	foreach ( $size_names as $size => $label ) {
-		$downsize = image_downsize( $post->ID, $size );
+	foreach ($size_names as $size => $label) {
+		$downsize = image_downsize($post->ID, $size);
 		$checked = '';
 
 		// Is this size selectable?
-		$enabled = ( $downsize[3] || 'full' == $size );
+		$enabled = ($downsize[3] || 'full' == $size);
 		$css_id = "image-size-{$size}-{$post->ID}";
 
 		// If this size is the default but that's not available, don't select it.
-		if ( $size == $check ) {
-			if ( $enabled ) {
+		if ($size == $check) {
+			if ($enabled) {
 				$checked = " checked='checked'";
 			} else {
 				$check = '';
 			}
-		} elseif ( ! $check && $enabled && 'thumbnail' != $size ) {
+		} elseif ( ! $check && $enabled && 'thumbnail' != $size) {
 			/*
 			 * If $check is not enabled, default to the first available size
 			 * that's bigger than a thumbnail.
@@ -1017,13 +1017,13 @@ 
 			$checked = " checked='checked'";
 		}
 
-		$html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
+		$html = "<div class='image-size-item'><input type='radio' ".disabled($enabled, false, false)."name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
 
 		$html .= "<label for='{$css_id}'>$label</label>";
 
 		// Only show the dimensions if that choice is available.
-		if ( $enabled ) {
-			$html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2] ). "</label>";
+		if ($enabled) {
+			$html .= " <label for='{$css_id}' class='help'>".sprintf("(%d&nbsp;&times;&nbsp;%d)", $downsize[1], $downsize[2])."</label>";
 		}
 		$html .= '</div>';
 
@@ -1031,9 +1031,9 @@ 
 	}
 
 	return array(
-		'label' => __( 'Size' ),
+		'label' => __('Size'),
 		'input' => 'html',
-		'html'  => join( "\n", $out ),
+		'html'  => join("\n", $out),
 	);
 }
 
@@ -1051,20 +1051,20 @@ 
 	$file = wp_get_attachment_url($post->ID);
 	$link = get_attachment_link($post->ID);
 
-	if ( empty($url_type) )
+	if (empty($url_type))
 		$url_type = get_user_setting('urlbutton', 'post');
 
 	$url = '';
-	if ( $url_type == 'file' )
+	if ($url_type == 'file')
 		$url = $file;
-	elseif ( $url_type == 'post' )
+	elseif ($url_type == 'post')
 		$url = $link;
 
 	return "
-	<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
-	<button type='button' class='button urlnone' data-link-url=''>" . __('None') . "</button>
-	<button type='button' class='button urlfile' data-link-url='" . esc_attr($file) . "'>" . __('File URL') . "</button>
-	<button type='button' class='button urlpost' data-link-url='" . esc_attr($link) . "'>" . __('Attachment Post URL') . "</button>
+	<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='".esc_attr($url)."' /><br />
+	<button type='button' class='button urlnone' data-link-url=''>" . __('None')."</button>
+	<button type='button' class='button urlfile' data-link-url='" . esc_attr($file)."'>".__('File URL')."</button>
+	<button type='button' class='button urlpost' data-link-url='" . esc_attr($link)."'>".__('Attachment Post URL')."</button>
 ";
 }
 
@@ -1080,7 +1080,7 @@ 
 	// Post data is already escaped.
 	$name = "attachments[{$edit_post->ID}][post_excerpt]";
 
-	return '<textarea name="' . $name . '" id="' . $name . '">' . $edit_post->post_excerpt . '</textarea>';
+	return '<textarea name="'.$name.'" id="'.$name.'">'.$edit_post->post_excerpt.'</textarea>';
 }
 
 /**
@@ -1105,7 +1105,7 @@ 
  * @param WP_Post $post        The WP_Post attachment object.
  * @return array Filtered attachment form fields.
  */
-function media_single_attachment_fields_to_edit( $form_fields, $post ) {
+function media_single_attachment_fields_to_edit($form_fields, $post) {
 	unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']);
 	return $form_fields;
 }
@@ -1119,7 +1119,7 @@ 
  * @param WP_Post $post        The WP_Post attachment object.
  * @return array Filtered attachment form fields.
  */
-function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
+function media_post_single_attachment_fields_to_edit($form_fields, $post) {
 	unset($form_fields['image_url']);
 	return $form_fields;
 }
@@ -1137,12 +1137,12 @@ 
  * @param array $attachment An array of attachment metadata.
  * @return array Filtered attachment post object.
  */
-function image_attachment_fields_to_save( $post, $attachment ) {
-	if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) {
-		if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
-			$attachment_url = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
-			$post['post_title'] = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
-			$post['errors']['post_title']['errors'][] = __( 'Empty Title filled from filename.' );
+function image_attachment_fields_to_save($post, $attachment) {
+	if (substr($post['post_mime_type'], 0, 5) == 'image') {
+		if (strlen(trim($post['post_title'])) == 0) {
+			$attachment_url = (isset($post['attachment_url'])) ? $post['attachment_url'] : $post['guid'];
+			$post['post_title'] = preg_replace('/\.\w+$/', '', wp_basename($attachment_url));
+			$post['errors']['post_title']['errors'][] = __('Empty Title filled from filename.');
 		}
 	}
 
@@ -1161,12 +1161,12 @@ 
  */
 function image_media_send_to_editor($html, $attachment_id, $attachment) {
 	$post = get_post($attachment_id);
-	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
+	if (substr($post->post_mime_type, 0, 5) == 'image') {
 		$url = $attachment['url'];
-		$align = !empty($attachment['align']) ? $attachment['align'] : 'none';
-		$size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
-		$alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
-		$rel = ( $url == get_attachment_link($attachment_id) );
+		$align = ! empty($attachment['align']) ? $attachment['align'] : 'none';
+		$size = ! empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
+		$alt = ! empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
+		$rel = ($url == get_attachment_link($attachment_id));
 
 		return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
 	}
@@ -1184,10 +1184,10 @@ 
  * @return array
  */
 function get_attachment_fields_to_edit($post, $errors = null) {
-	if ( is_int($post) )
+	if (is_int($post))
 		$post = get_post($post);
-	if ( is_array($post) )
-		$post = new WP_Post( (object) $post );
+	if (is_array($post))
+		$post = new WP_Post((object) $post);
 
 	$image_url = wp_get_attachment_url($post->ID);
 
@@ -1222,28 +1222,28 @@ 
 		'image_url'	=> array(
 			'label'      => __('File URL'),
 			'input'      => 'html',
-			'html'       => "<input type='text' class='text urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='" . esc_attr($image_url) . "' /><br />",
+			'html'       => "<input type='text' class='text urlfield' readonly='readonly' name='attachments[$post->ID][url]' value='".esc_attr($image_url)."' /><br />",
 			'value'      => wp_get_attachment_url($post->ID),
 			'helps'      => __('Location of the uploaded file.')
 		)
 	);
 
-	foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
+	foreach (get_attachment_taxonomies($post) as $taxonomy) {
 		$t = (array) get_taxonomy($taxonomy);
-		if ( ! $t['public'] || ! $t['show_ui'] )
+		if ( ! $t['public'] || ! $t['show_ui'])
 			continue;
-		if ( empty($t['label']) )
+		if (empty($t['label']))
 			$t['label'] = $taxonomy;
-		if ( empty($t['args']) )
+		if (empty($t['args']))
 			$t['args'] = array();
 
 		$terms = get_object_term_cache($post->ID, $taxonomy);
-		if ( false === $terms )
+		if (false === $terms)
 			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
 		$values = array();
 
-		foreach ( $terms as $term )
+		foreach ($terms as $term)
 			$values[] = $term->slug;
 		$t['value'] = join(', ', $values);
 
@@ -1255,9 +1255,9 @@ 
 	$form_fields = array_merge_recursive($form_fields, (array) $errors);
 
 	// This was formerly in image_attachment_fields_to_edit().
-	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
+	if (substr($post->post_mime_type, 0, 5) == 'image') {
 		$alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
-		if ( empty($alt) )
+		if (empty($alt))
 			$alt = '';
 
 		$form_fields['post_title']['required'] = true;
@@ -1274,10 +1274,10 @@ 
 			'html'  => image_align_input_fields($post, get_option('image_default_align')),
 		);
 
-		$form_fields['image-size'] = image_size_input_fields( $post, get_option('image_default_size', 'medium') );
+		$form_fields['image-size'] = image_size_input_fields($post, get_option('image_default_size', 'medium'));
 
 	} else {
-		unset( $form_fields['image_alt'] );
+		unset($form_fields['image_alt']);
 	}
 
 	/**
@@ -1288,7 +1288,7 @@ 
 	 * @param array   $form_fields An array of attachment form fields.
 	 * @param WP_Post $post        The WP_Post attachment object.
 	 */
-	$form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
+	$form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
 
 	return $form_fields;
 }
@@ -1308,25 +1308,25 @@ 
  * @param array $errors Errors for attachment, if any.
  * @return string
  */
-function get_media_items( $post_id, $errors ) {
+function get_media_items($post_id, $errors) {
 	$attachments = array();
-	if ( $post_id ) {
+	if ($post_id) {
 		$post = get_post($post_id);
-		if ( $post && $post->post_type == 'attachment' )
+		if ($post && $post->post_type == 'attachment')
 			$attachments = array($post->ID => $post);
 		else
-			$attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') );
+			$attachments = get_children(array('post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC'));
 	} else {
-		if ( is_array($GLOBALS['wp_the_query']->posts) )
-			foreach ( $GLOBALS['wp_the_query']->posts as $attachment )
+		if (is_array($GLOBALS['wp_the_query']->posts))
+			foreach ($GLOBALS['wp_the_query']->posts as $attachment)
 				$attachments[$attachment->ID] = $attachment;
 	}
 
 	$output = '';
-	foreach ( (array) $attachments as $id => $attachment ) {
-		if ( $attachment->post_status == 'trash' )
+	foreach ((array) $attachments as $id => $attachment) {
+		if ($attachment->post_status == 'trash')
 			continue;
-		if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
+		if ($item = get_media_item($id, array('errors' => isset($errors[$id]) ? $errors[$id] : null)))
 			$output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
 	}
 
@@ -1344,25 +1344,25 @@ 
  * @param string|array $args Optional. Override defaults.
  * @return string HTML form for attachment.
  */
-function get_media_item( $attachment_id, $args = null ) {
+function get_media_item($attachment_id, $args = null) {
 	global $redir_tab;
 
-	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) )
+	if (($attachment_id = intval($attachment_id)) && $thumb_url = wp_get_attachment_image_src($attachment_id, 'thumbnail', true))
 		$thumb_url = $thumb_url[0];
 	else
 		$thumb_url = false;
 
-	$post = get_post( $attachment_id );
-	$current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
+	$post = get_post($attachment_id);
+	$current_post_id = ! empty($_GET['post_id']) ? (int) $_GET['post_id'] : 0;
 
 	$default_args = array(
 		'errors' => null,
-		'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true,
+		'send' => $current_post_id ? post_type_supports(get_post_type($current_post_id), 'editor') : true,
 		'delete' => true,
 		'toggle' => true,
 		'show_title' => true
 	);
-	$args = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args($args, $default_args);
 
 	/**
 	 * Filter the arguments used to retrieve an image for the edit image form.
@@ -1373,24 +1373,24 @@ 
 	 *
 	 * @param array $args An array of arguments.
 	 */
-	$r = apply_filters( 'get_media_item_args', $args );
+	$r = apply_filters('get_media_item_args', $args);
 
-	$toggle_on  = __( 'Show' );
-	$toggle_off = __( 'Hide' );
+	$toggle_on  = __('Show');
+	$toggle_off = __('Hide');
 
-	$file = get_attached_file( $post->ID );
-	$filename = esc_html( wp_basename( $file ) );
-	$title = esc_attr( $post->post_title );
+	$file = get_attached_file($post->ID);
+	$filename = esc_html(wp_basename($file));
+	$title = esc_attr($post->post_title);
 
 	$post_mime_types = get_post_mime_types();
-	$keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
-	$type = reset( $keys );
-	$type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
+	$keys = array_keys(wp_match_mime_types(array_keys($post_mime_types), $post->post_mime_type));
+	$type = reset($keys);
+	$type_html = "<input type='hidden' id='type-of-$attachment_id' value='".esc_attr($type)."' />";
 
-	$form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
+	$form_fields = get_attachment_fields_to_edit($post, $r['errors']);
 
-	if ( $r['toggle'] ) {
-		$class = empty( $r['errors'] ) ? 'startclosed' : 'startopen';
+	if ($r['toggle']) {
+		$class = empty($r['errors']) ? 'startclosed' : 'startopen';
 		$toggle_links = "
 	<a class='toggle describe-toggle-on' href='#'>$toggle_on</a>
 	<a class='toggle describe-toggle-off' href='#'>$toggle_off</a>";
@@ -1399,27 +1399,27 @@ 
 		$toggle_links = '';
 	}
 
-	$display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case
-	$display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '&hellip;' ) . "</span></div>" : '';
+	$display_title = ( ! empty($title)) ? $title : $filename; // $title shouldn't ever be empty, but just in case
+	$display_title = $r['show_title'] ? "<div class='filename new'><span class='title'>".wp_html_excerpt($display_title, 60, '&hellip;')."</span></div>" : '';
 
-	$gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
+	$gallery = ((isset($_REQUEST['tab']) && 'gallery' == $_REQUEST['tab']) || (isset($redir_tab) && 'gallery' == $redir_tab));
 	$order = '';
 
-	foreach ( $form_fields as $key => $val ) {
-		if ( 'menu_order' == $key ) {
-			if ( $gallery )
-				$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ). "' /></div>";
+	foreach ($form_fields as $key => $val) {
+		if ('menu_order' == $key) {
+			if ($gallery)
+				$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='".esc_attr($val['value'])."' /></div>";
 			else
-				$order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' />";
+				$order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='".esc_attr($val['value'])."' />";
 
-			unset( $form_fields['menu_order'] );
+			unset($form_fields['menu_order']);
 			break;
 		}
 	}
 
 	$media_dims = '';
-	$meta = wp_get_attachment_metadata( $post->ID );
-	if ( isset( $meta['width'], $meta['height'] ) )
+	$meta = wp_get_attachment_metadata($post->ID);
+	if (isset($meta['width'], $meta['height']))
 		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
 
 	/**
@@ -1430,15 +1430,15 @@ 
 	 * @param string  $media_dims The HTML markup containing the media dimensions.
 	 * @param WP_Post $post       The WP_Post attachment object.
 	 */
-	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
+	$media_dims = apply_filters('media_meta', $media_dims, $post);
 
 	$image_edit_button = '';
-	if ( wp_attachment_is_image( $post->ID ) && wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
-		$nonce = wp_create_nonce( "image_editor-$post->ID" );
-		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
+	if (wp_attachment_is_image($post->ID) && wp_image_editor_supports(array('mime_type' => $post->post_mime_type))) {
+		$nonce = wp_create_nonce("image_editor-$post->ID");
+		$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='".esc_attr__('Edit Image')."' /> <span class='spinner'></span>";
 	}
 
-	$attachment_url = get_permalink( $attachment_id );
+	$attachment_url = get_permalink($attachment_id);
 
 	$item = "
 	$type_html
@@ -1453,11 +1453,11 @@ 
 			<p>$image_edit_button</p>
 			</td>
 			<td>
-			<p><strong>" . __('File name:') . "</strong> $filename</p>
-			<p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
-			<p><strong>" . __('Upload date:') . "</strong> " . mysql2date( __( 'F j, Y' ), $post->post_date ). '</p>';
-			if ( !empty( $media_dims ) )
-				$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
+			<p><strong>".__('File name:')."</strong> $filename</p>
+			<p><strong>".__('File type:')."</strong> $post->post_mime_type</p>
+			<p><strong>".__('Upload date:')."</strong> ".mysql2date(__('F j, Y'), $post->post_date).'</p>';
+			if ( ! empty($media_dims))
+				$item .= "<p><strong>".__('Dimensions:')."</strong> $media_dims</p>\n";
 
 			$item .= "</td></tr>\n";
 
@@ -1466,7 +1466,7 @@ 
 		<tbody>
 		<tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>\n
 		<tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n
-		<tr><td colspan='2'><p class='media-types media-types-required-info'>" . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . "</p></td></tr>\n";
+		<tr><td colspan='2'><p class='media-types media-types-required-info'>".sprintf(__('Required fields are marked %s'), '<span class="required">*</span>')."</p></td></tr>\n";
 
 	$defaults = array(
 		'input'      => 'text',
@@ -1475,25 +1475,25 @@ 
 		'extra_rows' => array(),
 	);
 
-	if ( $r['send'] ) {
-		$r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+	if ($r['send']) {
+		$r['send'] = get_submit_button(__('Insert into Post'), 'button', "send[$attachment_id]", false);
 	}
 
-	$delete = empty( $r['delete'] ) ? '' : $r['delete'];
-	if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
-		if ( !EMPTY_TRASH_DAYS ) {
-			$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
-		} elseif ( !MEDIA_TRASH ) {
-			$delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
-			 <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" .
+	$delete = empty($r['delete']) ? '' : $r['delete'];
+	if ($delete && current_user_can('delete_post', $attachment_id)) {
+		if ( ! EMPTY_TRASH_DAYS) {
+			$delete = "<a href='".wp_nonce_url("post.php?action=delete&amp;post=$attachment_id", 'delete-post_'.$attachment_id)."' id='del[$attachment_id]' class='delete-permanently'>".__('Delete Permanently').'</a>';
+		} elseif ( ! MEDIA_TRASH) {
+			$delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">".__('Delete')."</a>
+			 <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>".
 			 /* translators: %s: file name */
-			'<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
-			 <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
-			 <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
+			'<p>'.sprintf(__('You are about to delete %s.'), '<strong>'.$filename.'</strong>')."</p>
+			 <a href='" . wp_nonce_url("post.php?action=delete&amp;post=$attachment_id", 'delete-post_'.$attachment_id)."' id='del[$attachment_id]' class='button'>".__('Continue')."</a>
+			 <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __('Cancel')."</a>
 			 </div>";
 		} else {
-			$delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
-			<a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
+			$delete = "<a href='".wp_nonce_url("post.php?action=trash&amp;post=$attachment_id", 'trash-post_'.$attachment_id)."' id='del[$attachment_id]' class='delete'>".__('Move to Trash')."</a>
+			<a href='" . wp_nonce_url("post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_'.$attachment_id)."' id='undo[$attachment_id]' class='undo hidden'>".__('Undo')."</a>";
 		}
 	} else {
 		$delete = '';
@@ -1501,39 +1501,39 @@ 
 
 	$thumbnail = '';
 	$calling_post_id = 0;
-	if ( isset( $_GET['post_id'] ) ) {
-		$calling_post_id = absint( $_GET['post_id'] );
-	} elseif ( isset( $_POST ) && count( $_POST ) ) {// Like for async-upload where $_GET['post_id'] isn't set
+	if (isset($_GET['post_id'])) {
+		$calling_post_id = absint($_GET['post_id']);
+	} elseif (isset($_POST) && count($_POST)) {// Like for async-upload where $_GET['post_id'] isn't set
 		$calling_post_id = $post->post_parent;
 	}
-	if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
-		&& post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
+	if ('image' == $type && $calling_post_id && current_theme_supports('post-thumbnails', get_post_type($calling_post_id))
+		&& post_type_supports(get_post_type($calling_post_id), 'thumbnail') && get_post_thumbnail_id($calling_post_id) != $attachment_id) {
 
-		$calling_post = get_post( $calling_post_id );
-		$calling_post_type_object = get_post_type_object( $calling_post->post_type );
+		$calling_post = get_post($calling_post_id);
+		$calling_post_type_object = get_post_type_object($calling_post->post_type);
 
-		$ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
-		$thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html( $calling_post_type_object->labels->use_featured_image ) . "</a>";
+		$ajax_nonce = wp_create_nonce("set_post_thumbnail-$calling_post_id");
+		$thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-".$attachment_id."' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>".esc_html($calling_post_type_object->labels->use_featured_image)."</a>";
 	}
 
-	if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) {
-		$form_fields['buttons'] = array( 'tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>" . $r['send'] . " $thumbnail $delete</td></tr>\n" );
+	if (($r['send'] || $thumbnail || $delete) && ! isset($form_fields['buttons'])) {
+		$form_fields['buttons'] = array('tr' => "\t\t<tr class='submit'><td></td><td class='savesend'>".$r['send']." $thumbnail $delete</td></tr>\n");
 	}
 	$hidden_fields = array();
 
-	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' )
+	foreach ($form_fields as $id => $field) {
+		if ($id[0] == '_')
 			continue;
 
-		if ( !empty( $field['tr'] ) ) {
+		if ( ! empty($field['tr'])) {
 			$item .= $field['tr'];
 			continue;
 		}
 
-		$field = array_merge( $defaults, $field );
+		$field = array_merge($defaults, $field);
 		$name = "attachments[$attachment_id][$id]";
 
-		if ( $field['input'] == 'hidden' ) {
+		if ($field['input'] == 'hidden') {
 			$hidden_fields[$name] = $field['value'];
 			continue;
 		}
@@ -1545,47 +1545,47 @@ 
 		$class .= $field['required'] ? ' form-required' : '';
 
 		$item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
-		if ( !empty( $field[ $field['input'] ] ) )
-			$item .= $field[ $field['input'] ];
-		elseif ( $field['input'] == 'textarea' ) {
-			if ( 'post_content' == $id && user_can_richedit() ) {
+		if ( ! empty($field[$field['input']]))
+			$item .= $field[$field['input']];
+		elseif ($field['input'] == 'textarea') {
+			if ('post_content' == $id && user_can_richedit()) {
 				// Sanitize_post() skips the post_content when user_can_richedit.
-				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
+				$field['value'] = htmlspecialchars($field['value'], ENT_QUOTES);
 			}
 			// Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit().
-			$item .= "<textarea id='$name' name='$name'{$required_attr}{$aria_required}>" . $field['value'] . '</textarea>';
+			$item .= "<textarea id='$name' name='$name'{$required_attr}{$aria_required}>".$field['value'].'</textarea>';
 		} else {
-			$item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr}{$aria_required} />";
+			$item .= "<input type='text' class='text' id='$name' name='$name' value='".esc_attr($field['value'])."'{$required_attr}{$aria_required} />";
 		}
-		if ( !empty( $field['helps'] ) )
-			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		if ( ! empty($field['helps']))
+			$item .= "<p class='help'>".join("</p>\n<p class='help'>", array_unique((array) $field['helps'])).'</p>';
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
 
-		if ( !empty( $field['errors'] ) )
-			foreach ( array_unique( (array) $field['errors'] ) as $error )
+		if ( ! empty($field['errors']))
+			foreach (array_unique((array) $field['errors']) as $error)
 				$extra_rows['error'][] = $error;
 
-		if ( !empty( $field['extra_rows'] ) )
-			foreach ( $field['extra_rows'] as $class => $rows )
-				foreach ( (array) $rows as $html )
+		if ( ! empty($field['extra_rows']))
+			foreach ($field['extra_rows'] as $class => $rows)
+				foreach ((array) $rows as $html)
 					$extra_rows[$class][] = $html;
 
-		foreach ( $extra_rows as $class => $rows )
-			foreach ( $rows as $html )
+		foreach ($extra_rows as $class => $rows)
+			foreach ($rows as $html)
 				$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
 	}
 
-	if ( !empty( $form_fields['_final'] ) )
+	if ( ! empty($form_fields['_final']))
 		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
 	$item .= "\t</tbody>\n";
 	$item .= "\t</table>\n";
 
-	foreach ( $hidden_fields as $name => $value )
-		$item .= "\t<input type='hidden' name='$name' id='$name' value='" . esc_attr( $value ) . "' />\n";
+	foreach ($hidden_fields as $name => $value)
+		$item .= "\t<input type='hidden' name='$name' id='$name' value='".esc_attr($value)."' />\n";
 
-	if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) {
+	if ($post->post_parent < 1 && isset($_REQUEST['post_id'])) {
 		$parent = (int) $_REQUEST['post_id'];
 		$parent_name = "attachments[$attachment_id][post_parent]";
 		$item .= "\t<input type='hidden' name='$parent_name' id='$parent_name' value='$parent' />\n";
@@ -1601,40 +1601,40 @@ 
  * @param array $args
  * @return array
  */
-function get_compat_media_markup( $attachment_id, $args = null ) {
-	$post = get_post( $attachment_id );
+function get_compat_media_markup($attachment_id, $args = null) {
+	$post = get_post($attachment_id);
 
 	$default_args = array(
 		'errors' => null,
 		'in_modal' => false,
 	);
 
-	$user_can_edit = current_user_can( 'edit_post', $attachment_id );
+	$user_can_edit = current_user_can('edit_post', $attachment_id);
 
-	$args = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args($args, $default_args);
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$args = apply_filters( 'get_media_item_args', $args );
+	$args = apply_filters('get_media_item_args', $args);
 
 	$form_fields = array();
 
-	if ( $args['in_modal'] ) {
-		foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
+	if ($args['in_modal']) {
+		foreach (get_attachment_taxonomies($post) as $taxonomy) {
 			$t = (array) get_taxonomy($taxonomy);
-			if ( ! $t['public'] || ! $t['show_ui'] )
+			if ( ! $t['public'] || ! $t['show_ui'])
 				continue;
-			if ( empty($t['label']) )
+			if (empty($t['label']))
 				$t['label'] = $taxonomy;
-			if ( empty($t['args']) )
+			if (empty($t['args']))
 				$t['args'] = array();
 
 			$terms = get_object_term_cache($post->ID, $taxonomy);
-			if ( false === $terms )
+			if (false === $terms)
 				$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
 
 			$values = array();
 
-			foreach ( $terms as $term )
+			foreach ($terms as $term)
 				$values[] = $term->slug;
 			$t['value'] = join(', ', $values);
 			$t['taxonomy'] = true;
@@ -1645,17 +1645,17 @@ 
 
 	// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
 	// The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
-	$form_fields = array_merge_recursive($form_fields, (array) $args['errors'] );
+	$form_fields = array_merge_recursive($form_fields, (array) $args['errors']);
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$form_fields = apply_filters( 'attachment_fields_to_edit', $form_fields, $post );
+	$form_fields = apply_filters('attachment_fields_to_edit', $form_fields, $post);
 
-	unset( $form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
+	unset($form_fields['image-size'], $form_fields['align'], $form_fields['image_alt'],
 		$form_fields['post_title'], $form_fields['post_excerpt'], $form_fields['post_content'],
-		$form_fields['url'], $form_fields['menu_order'], $form_fields['image_url'] );
+		$form_fields['url'], $form_fields['menu_order'], $form_fields['image_url']);
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$media_meta = apply_filters( 'media_meta', '', $post );
+	$media_meta = apply_filters('media_meta', '', $post);
 
 	$defaults = array(
 		'input'         => 'text',
@@ -1669,85 +1669,85 @@ 
 	$hidden_fields = array();
 
 	$item = '';
-	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' )
+	foreach ($form_fields as $id => $field) {
+		if ($id[0] == '_')
 			continue;
 
 		$name = "attachments[$attachment_id][$id]";
 		$id_attr = "attachments-$attachment_id-$id";
 
-		if ( !empty( $field['tr'] ) ) {
+		if ( ! empty($field['tr'])) {
 			$item .= $field['tr'];
 			continue;
 		}
 
-		$field = array_merge( $defaults, $field );
+		$field = array_merge($defaults, $field);
 
-		if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) )
+		if (( ! $field['show_in_edit'] && ! $args['in_modal']) || ( ! $field['show_in_modal'] && $args['in_modal']))
 			continue;
 
-		if ( $field['input'] == 'hidden' ) {
+		if ($field['input'] == 'hidden') {
 			$hidden_fields[$name] = $field['value'];
 			continue;
 		}
 
-		$readonly      = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : '';
+		$readonly      = ! $user_can_edit && ! empty($field['taxonomy']) ? " readonly='readonly' " : '';
 		$required      = $field['required'] ? '<span class="required">*</span>' : '';
 		$required_attr = $field['required'] ? ' required' : '';
 		$aria_required = $field['required'] ? " aria-required='true'" : '';
-		$class  = 'compat-field-' . $id;
+		$class  = 'compat-field-'.$id;
 		$class .= $field['required'] ? ' form-required' : '';
 
 		$item .= "\t\t<tr class='$class'>";
 		$item .= "\t\t\t<th scope='row' class='label'><label for='$id_attr'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
 		$item .= "</th>\n\t\t\t<td class='field'>";
 
-		if ( !empty( $field[ $field['input'] ] ) )
-			$item .= $field[ $field['input'] ];
-		elseif ( $field['input'] == 'textarea' ) {
-			if ( 'post_content' == $id && user_can_richedit() ) {
+		if ( ! empty($field[$field['input']]))
+			$item .= $field[$field['input']];
+		elseif ($field['input'] == 'textarea') {
+			if ('post_content' == $id && user_can_richedit()) {
 				// sanitize_post() skips the post_content when user_can_richedit.
-				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
+				$field['value'] = htmlspecialchars($field['value'], ENT_QUOTES);
 			}
-			$item .= "<textarea id='$id_attr' name='$name'{$required_attr}{$aria_required}>" . $field['value'] . '</textarea>';
+			$item .= "<textarea id='$id_attr' name='$name'{$required_attr}{$aria_required}>".$field['value'].'</textarea>';
 		} else {
-			$item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr}{$aria_required} />";
+			$item .= "<input type='text' class='text' id='$id_attr' name='$name' value='".esc_attr($field['value'])."' $readonly{$required_attr}{$aria_required} />";
 		}
-		if ( !empty( $field['helps'] ) )
-			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		if ( ! empty($field['helps']))
+			$item .= "<p class='help'>".join("</p>\n<p class='help'>", array_unique((array) $field['helps'])).'</p>';
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
 
-		if ( !empty( $field['errors'] ) )
-			foreach ( array_unique( (array) $field['errors'] ) as $error )
+		if ( ! empty($field['errors']))
+			foreach (array_unique((array) $field['errors']) as $error)
 				$extra_rows['error'][] = $error;
 
-		if ( !empty( $field['extra_rows'] ) )
-			foreach ( $field['extra_rows'] as $class => $rows )
-				foreach ( (array) $rows as $html )
+		if ( ! empty($field['extra_rows']))
+			foreach ($field['extra_rows'] as $class => $rows)
+				foreach ((array) $rows as $html)
 					$extra_rows[$class][] = $html;
 
-		foreach ( $extra_rows as $class => $rows )
-			foreach ( $rows as $html )
+		foreach ($extra_rows as $class => $rows)
+			foreach ($rows as $html)
 				$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
 	}
 
-	if ( !empty( $form_fields['_final'] ) )
+	if ( ! empty($form_fields['_final']))
 		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
 
-	if ( $item ) {
-		$item = '<p class="media-types media-types-required-info">' .
-			sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
-			<table class="compat-attachment-fields">' . $item . '</table>';
+	if ($item) {
+		$item = '<p class="media-types media-types-required-info">'.
+			sprintf(__('Required fields are marked %s'), '<span class="required">*</span>').'</p>
+			<table class="compat-attachment-fields">' . $item.'</table>';
 	}
 
-	foreach ( $hidden_fields as $hidden_field => $value ) {
-		$item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
+	foreach ($hidden_fields as $hidden_field => $value) {
+		$item .= '<input type="hidden" name="'.esc_attr($hidden_field).'" value="'.esc_attr($value).'" />'."\n";
 	}
 
-	if ( $item )
-		$item = '<input type="hidden" name="attachments[' . $attachment_id . '][menu_order]" value="' . esc_attr( $post->menu_order ) . '" />' . $item;
+	if ($item)
+		$item = '<input type="hidden" name="attachments['.$attachment_id.'][menu_order]" value="'.esc_attr($post->menu_order).'" />'.$item;
 
 	return array(
 		'item'   => $item,
@@ -1761,10 +1761,10 @@ 
  * @since 2.5.0
  */
 function media_upload_header() {
-	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
 
-	echo '<script type="text/javascript">post_id = ' . $post_id . ';</script>';
-	if ( empty( $_GET['chromeless'] ) ) {
+	echo '<script type="text/javascript">post_id = '.$post_id.';</script>';
+	if (empty($_GET['chromeless'])) {
 		echo '<div id="media-upload-header">';
 		the_media_upload_tabs();
 		echo '</div>';
@@ -1783,11 +1783,11 @@ 
  *
  * @param array $errors
  */
-function media_upload_form( $errors = null ) {
+function media_upload_form($errors = null) {
 	global $type, $tab, $is_IE, $is_opera;
 
-	if ( ! _device_can_upload() ) {
-		echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ) . '</p>';
+	if ( ! _device_can_upload()) {
+		echo '<p>'.sprintf(__('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/').'</p>';
 		return;
 	}
 
@@ -1797,14 +1797,14 @@ 
 	$_tab = isset($tab) ? $tab : '';
 
 	$max_upload_size = wp_max_upload_size();
-	if ( ! $max_upload_size ) {
+	if ( ! $max_upload_size) {
 		$max_upload_size = 0;
 	}
 ?>
 
 <div id="media-upload-notice"><?php
 
-	if (isset($errors['upload_notice']) )
+	if (isset($errors['upload_notice']))
 		echo $errors['upload_notice'];
 
 ?></div>
@@ -1815,13 +1815,13 @@ 
 
 ?></div>
 <?php
-if ( is_multisite() && !is_upload_space_available() ) {
+if (is_multisite() && ! is_upload_space_available()) {
 	/**
 	 * Fires when an upload will exceed the defined upload space quota for a network site.
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'upload_ui_over_quota' );
+	do_action('upload_ui_over_quota');
 	return;
 }
 
@@ -1830,7 +1830,7 @@ 
  *
  * @since 2.6.0
  */
-do_action( 'pre-upload-ui' );
+do_action('pre-upload-ui');
 
 $post_params = array(
 	"post_id" => $post_id,
@@ -1848,7 +1848,7 @@ 
  *
  * @param array $post_params An array of media upload parameters used by Plupload.
  */
-$post_params = apply_filters( 'upload_post_params', $post_params );
+$post_params = apply_filters('upload_post_params', $post_params);
 
 $plupload_init = array(
 	'runtimes'            => 'html5,flash,silverlight,html4',
@@ -1857,18 +1857,18 @@ 
 	'drop_element'        => 'drag-drop-area',
 	'file_data_name'      => 'async-upload',
 	'url'                 => $upload_action_url,
-	'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
-	'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
+	'flash_swf_url'       => includes_url('js/plupload/plupload.flash.swf'),
+	'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
 	'filters' => array(
-		'max_file_size'   => $max_upload_size . 'b',
+		'max_file_size'   => $max_upload_size.'b',
 	),
 	'multipart_params'    => $post_params,
 );
 
 // Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
 // when enabled. See #29602.
-if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-	strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+if (wp_is_mobile() && strpos($_SERVER['HTTP_USER_AGENT'], 'OS 7_') !== false &&
+	strpos($_SERVER['HTTP_USER_AGENT'], 'like Mac OS X') !== false) {
 
 	$plupload_init['multi_selection'] = false;
 }
@@ -1880,22 +1880,22 @@ 
  *
  * @param array $plupload_init An array of default settings used by Plupload.
  */
-$plupload_init = apply_filters( 'plupload_init', $plupload_init );
+$plupload_init = apply_filters('plupload_init', $plupload_init);
 
 ?>
 
 <script type="text/javascript">
 <?php
 // Verify size is an int. If not return default value.
-$large_size_h = absint( get_option('large_size_h') );
-if( !$large_size_h )
+$large_size_h = absint(get_option('large_size_h'));
+if ( ! $large_size_h)
 	$large_size_h = 1024;
-$large_size_w = absint( get_option('large_size_w') );
-if( !$large_size_w )
+$large_size_w = absint(get_option('large_size_w'));
+if ( ! $large_size_w)
 	$large_size_w = 1024;
 ?>
 var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
-wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
+wpUploaderInit = <?php echo wp_json_encode($plupload_init); ?>;
 </script>
 
 <div id="plupload-upload-ui" class="hide-if-no-js">
@@ -1906,7 +1906,7 @@ 
  * @since 2.6.0 As 'pre-flash-upload-ui'
  * @since 3.3.0
  */
-do_action( 'pre-plupload-upload-ui' ); ?>
+do_action('pre-plupload-upload-ui'); ?>
 <div id="drag-drop-area">
 	<div class="drag-drop-inside">
 	<p class="drag-drop-info"><?php _e('Drop files here'); ?></p>
@@ -1921,7 +1921,7 @@ 
  * @since 2.6.0 As 'post-flash-upload-ui'
  * @since 3.3.0
  */
-do_action( 'post-plupload-upload-ui' ); ?>
+do_action('post-plupload-upload-ui'); ?>
 </div>
 
 <div id="html-upload-ui" class="hide-if-js">
@@ -1931,12 +1931,12 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'pre-html-upload-ui' );
+	do_action('pre-html-upload-ui');
 	?>
 	<p id="async-upload-wrap">
 		<label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
 		<input type="file" name="async-upload" id="async-upload" />
-		<?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
+		<?php submit_button(__('Upload'), 'primary', 'html-upload', false); ?>
 		<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
 	</p>
 	<div class="clear"></div>
@@ -1946,11 +1946,11 @@ 
  *
  * @since 2.6.0
  */
-do_action( 'post-html-upload-ui' );
+do_action('post-html-upload-ui');
 ?>
 </div>
 
-<p class="max-upload-size"><?php printf( __( 'Maximum upload file size: %s.' ), esc_html( size_format( $max_upload_size ) ) ); ?></p>
+<p class="max-upload-size"><?php printf(__('Maximum upload file size: %s.'), esc_html(size_format($max_upload_size))); ?></p>
 <?php
 
 	/**
@@ -1960,7 +1960,7 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'post-upload-ui' );
+	do_action('post-upload-ui');
 }
 
 /**
@@ -1976,7 +1976,7 @@ 
 
 	media_upload_header();
 
-	$post_id = isset( $_REQUEST['post_id'] )? intval( $_REQUEST['post_id'] ) : 0;
+	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
 
 	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
 
@@ -1988,21 +1988,21 @@ 
 	 * @param string $form_action_url The media upload form action URL.
 	 * @param string $type            The type of media. Default 'file'.
 	 */
-	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
+	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
 	$form_class = 'media-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
+	if (get_user_setting('uploader'))
 		$form_class .= ' html-uploader';
 ?>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
-<?php submit_button( '', 'hidden', 'save', false ); ?>
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+<?php submit_button('', 'hidden', 'save', false); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
 
 <h3 class="media-title"><?php _e('Add media files from your computer'); ?></h3>
 
-<?php media_upload_form( $errors ); ?>
+<?php media_upload_form($errors); ?>
 
 <script type="text/javascript">
 jQuery(function($){
@@ -2015,10 +2015,10 @@ 
 </script>
 <div id="media-items"><?php
 
-if ( $id ) {
-	if ( !is_wp_error($id) ) {
+if ($id) {
+	if ( ! is_wp_error($id)) {
 		add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
-		echo get_media_items( $id, $errors );
+		echo get_media_items($id, $errors);
 	} else {
 		echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div></div>';
 		exit;
@@ -2027,7 +2027,7 @@ 
 ?></div>
 
 <p class="savebutton ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
+<?php submit_button(__('Save all changes'), 'button', 'save', false); ?>
 </p>
 </form>
 <?php
@@ -2043,23 +2043,23 @@ 
  * @param integer $id
  */
 function media_upload_type_url_form($type = null, $errors = null, $id = null) {
-	if ( null === $type )
+	if (null === $type)
 		$type = 'image';
 
 	media_upload_header();
 
-	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
 
 	$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
 	/** This filter is documented in wp-admin/includes/media.php */
-	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
+	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
 	$form_class = 'media-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
+	if (get_user_setting('uploader'))
 		$form_class .= ' html-uploader';
 ?>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url($form_action_url); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 <?php wp_nonce_field('media-form'); ?>
 
@@ -2083,7 +2083,7 @@ 
 
 <?php
 	/** This filter is documented in wp-admin/includes/media.php */
-	if ( ! apply_filters( 'disable_captions', '' ) ) {
+	if ( ! apply_filters('disable_captions', '')) {
 		?>
 		if ( f.caption.value ) {
 			caption = f.caption.value.replace(/\r\n|\r/g, '\n');
@@ -2119,7 +2119,7 @@ 
 		document.getElementById('go_button').style.color = '#bbb';
 		if ( ! document.forms[0].src.value )
 			document.getElementById('status_img').innerHTML = '';
-		else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
+		else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url(admin_url('images/no.png')); ?>" alt="" />';
 	},
 
 	updateImageData : function() {
@@ -2128,7 +2128,7 @@ 
 		t.width = t.preloadImg.width;
 		t.height = t.preloadImg.height;
 		document.getElementById('go_button').style.color = '#333';
-		document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/yes.png' ) ); ?>" alt="" />';
+		document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url(admin_url('images/yes.png')); ?>" alt="" />';
 	},
 
 	getImageData : function() {
@@ -2142,7 +2142,7 @@ 
 			return false;
 		}
 
-		document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" alt="" width="16" height="16" />';
+		document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url(admin_url('images/spinner-2x.gif')); ?>" alt="" width="16" height="16" />';
 		t.preloadImg = new Image();
 		t.preloadImg.onload = t.updateImageData;
 		t.preloadImg.onerror = t.resetImageData;
@@ -2167,7 +2167,7 @@ 
  *
  * @param string $form_html The insert from URL form HTML.
  */
-echo apply_filters( 'type_url_form_media', wp_media_insert_url_form( $type ) );
+echo apply_filters('type_url_form_media', wp_media_insert_url_form($type));
 ?>
 </div>
 </div>
@@ -2195,10 +2195,10 @@ 
 	$post_id = intval($_REQUEST['post_id']);
 	$form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
 	/** This filter is documented in wp-admin/includes/media.php */
-	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
+	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
 	$form_class = 'media-upload-form validate';
 
-	if ( get_user_setting('uploader') )
+	if (get_user_setting('uploader'))
 		$form_class .= ' html-uploader';
 ?>
 
@@ -2222,7 +2222,7 @@ 
 <a href="#" id="desc"><?php _e('Descending'); ?></a> |
 <a href="#" id="clear"><?php _ex('Clear', 'verb'); ?></a>
 </div>
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url($form_action_url); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
 <table class="widefat">
@@ -2238,10 +2238,10 @@ 
 </div>
 
 <p class="ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
+<?php submit_button(__('Save all changes'), 'button savebutton', 'save', false, array('id' => 'save-all', 'style' => 'display: none;')); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
+<input type="hidden" name="type" value="<?php echo esc_attr($GLOBALS['type']); ?>" />
+<input type="hidden" name="tab" value="<?php echo esc_attr($GLOBALS['tab']); ?>" />
 </p>
 
 <div id="gallery-settings" style="display:none;">
@@ -2316,8 +2316,8 @@ 
 </tbody></table>
 
 <p class="ml-submit">
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e( 'Insert gallery' ); ?>" />
-<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e( 'Update gallery settings' ); ?>" />
+<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="insert-gallery" id="insert-gallery" value="<?php esc_attr_e('Insert gallery'); ?>" />
+<input type="button" class="button" style="display:none;" onMouseDown="wpgallery.update();" name="update-gallery" id="update-gallery" value="<?php esc_attr_e('Update gallery settings'); ?>" />
 </p>
 </div>
 </form>
@@ -2343,42 +2343,42 @@ 
 
 	media_upload_header();
 
-	$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
+	$post_id = isset($_REQUEST['post_id']) ? intval($_REQUEST['post_id']) : 0;
 
 	$form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id");
 	/** This filter is documented in wp-admin/includes/media.php */
-	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
+	$form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
 	$form_class = 'media-upload-form validate';
 
-	if ( get_user_setting('uploader') )
+	if (get_user_setting('uploader'))
 		$form_class .= ' html-uploader';
 
 	$q = $_GET;
 	$q['posts_per_page'] = 10;
-	$q['paged'] = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0;
-	if ( $q['paged'] < 1 ) {
+	$q['paged'] = isset($q['paged']) ? intval($q['paged']) : 0;
+	if ($q['paged'] < 1) {
 		$q['paged'] = 1;
 	}
-	$q['offset'] = ( $q['paged'] - 1 ) * 10;
-	if ( $q['offset'] < 1 ) {
+	$q['offset'] = ($q['paged'] - 1) * 10;
+	if ($q['offset'] < 1) {
 		$q['offset'] = 0;
 	}
 
-	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $q );
+	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query($q);
 
 ?>
 
 <form id="filter" method="get">
-<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
-<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
+<input type="hidden" name="type" value="<?php echo esc_attr($type); ?>" />
+<input type="hidden" name="tab" value="<?php echo esc_attr($tab); ?>" />
 <input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
-<input type="hidden" name="post_mime_type" value="<?php echo isset( $_GET['post_mime_type'] ) ? esc_attr( $_GET['post_mime_type'] ) : ''; ?>" />
-<input type="hidden" name="context" value="<?php echo isset( $_GET['context'] ) ? esc_attr( $_GET['context'] ) : ''; ?>" />
+<input type="hidden" name="post_mime_type" value="<?php echo isset($_GET['post_mime_type']) ? esc_attr($_GET['post_mime_type']) : ''; ?>" />
+<input type="hidden" name="context" value="<?php echo isset($_GET['context']) ? esc_attr($_GET['context']) : ''; ?>" />
 
 <p id="media-search" class="search-box">
-	<label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
+	<label class="screen-reader-text" for="media-search-input"><?php _e('Search Media'); ?>:</label>
 	<input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
-	<?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
+	<?php submit_button(__('Search Media'), 'button', '', false); ?>
 </p>
 
 <ul class="subsubsub">
@@ -2386,32 +2386,32 @@ 
 $type_links = array();
 $_num_posts = (array) wp_count_attachments();
 $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
-foreach ( $matches as $_type => $reals )
-	foreach ( $reals as $real )
-		if ( isset($num_posts[$_type]) )
+foreach ($matches as $_type => $reals)
+	foreach ($reals as $real)
+		if (isset($num_posts[$_type]))
 			$num_posts[$_type] += $_num_posts[$real];
 		else
 			$num_posts[$_type] = $_num_posts[$real];
 // If available type specified by media button clicked, filter by that type
-if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
+if (empty($_GET['post_mime_type']) && ! empty($num_posts[$type])) {
 	$_GET['post_mime_type'] = $type;
 	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
 }
-if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
+if (empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all')
 	$class = ' class="current"';
 else
 	$class = '';
-$type_links[] = '<li><a href="' . esc_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . '"' . $class . '>' . __('All Types') . '</a>';
-foreach ( $post_mime_types as $mime_type => $label ) {
+$type_links[] = '<li><a href="'.esc_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))).'"'.$class.'>'.__('All Types').'</a>';
+foreach ($post_mime_types as $mime_type => $label) {
 	$class = '';
 
-	if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
+	if ( ! wp_match_mime_types($mime_type, $avail_post_mime_types))
 		continue;
 
-	if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
+	if (isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']))
 		$class = ' class="current"';
 
-	$type_links[] = '<li><a href="' . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
+	$type_links[] = '<li><a href="'.esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))).'"'.$class.'>'.sprintf(translate_nooped_plural($label[2], $num_posts[$mime_type]), '<span id="'.$mime_type.'-counter">'.number_format_i18n($num_posts[$mime_type]).'</span>').'</a>';
 }
 /**
  * Filter the media upload mime type list items.
@@ -2422,7 +2422,7 @@ 
  *
  * @param array $type_links An array of list items containing mime type link HTML.
  */
-echo implode(' | </li>', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . '</li>';
+echo implode(' | </li>', apply_filters('media_upload_mime_type_links', $type_links)).'</li>';
 unset($type_links);
 ?>
 </ul>
@@ -2430,8 +2430,8 @@ 
 <div class="tablenav">
 
 <?php
-$page_links = paginate_links( array(
-	'base' => add_query_arg( 'paged', '%#%' ),
+$page_links = paginate_links(array(
+	'base' => add_query_arg('paged', '%#%'),
 	'format' => '',
 	'prev_text' => __('&laquo;'),
 	'next_text' => __('&raquo;'),
@@ -2439,7 +2439,7 @@ 
 	'current' => $q['paged'],
 ));
 
-if ( $page_links )
+if ($page_links)
 	echo "<div class='tablenav-pages'>$page_links</div>";
 ?>
 
@@ -2448,34 +2448,34 @@ 
 
 $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'attachment' ORDER BY post_date DESC";
 
-$arc_result = $wpdb->get_results( $arc_query );
+$arc_result = $wpdb->get_results($arc_query);
 
 $month_count = count($arc_result);
-$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0;
+$selected_month = isset($_GET['m']) ? $_GET['m'] : 0;
 
-if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?>
+if ($month_count && ! (1 == $month_count && 0 == $arc_result[0]->mmonth)) { ?>
 <select name='m'>
-<option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
+<option<?php selected($selected_month, 0); ?> value='0'><?php _e('All dates'); ?></option>
 <?php
 foreach ($arc_result as $arc_row) {
-	if ( $arc_row->yyear == 0 )
+	if ($arc_row->yyear == 0)
 		continue;
-	$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
+	$arc_row->mmonth = zeroise($arc_row->mmonth, 2);
 
-	if ( $arc_row->yyear . $arc_row->mmonth == $selected_month )
+	if ($arc_row->yyear.$arc_row->mmonth == $selected_month)
 		$default = ' selected="selected"';
 	else
 		$default = '';
 
-	echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
-	echo esc_html( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" );
+	echo "<option$default value='".esc_attr($arc_row->yyear.$arc_row->mmonth)."'>";
+	echo esc_html($wp_locale->get_month($arc_row->mmonth)." $arc_row->yyear");
 	echo "</option>\n";
 }
 ?>
 </select>
 <?php } ?>
 
-<?php submit_button( __( 'Filter &#187;' ), 'button', 'post-query-submit', false ); ?>
+<?php submit_button(__('Filter &#187;'), 'button', 'post-query-submit', false); ?>
 
 </div>
 
@@ -2483,7 +2483,7 @@ 
 </div>
 </form>
 
-<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
+<form enctype="multipart/form-data" method="post" action="<?php echo esc_url($form_action_url); ?>" class="<?php echo $form_class; ?>" id="library-form">
 
 <?php wp_nonce_field('media-form'); ?>
 <?php //media_upload_form( $errors ); ?>
@@ -2505,7 +2505,7 @@ 
 <?php echo get_media_items(null, $errors); ?>
 </div>
 <p class="ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false ); ?>
+<?php submit_button(__('Save all changes'), 'button savebutton', 'save', false); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
 </p>
 </form>
@@ -2520,13 +2520,13 @@ 
  * @param string $default_view
  * @return string the form html
  */
-function wp_media_insert_url_form( $default_view = 'image' ) {
+function wp_media_insert_url_form($default_view = 'image') {
 	/** This filter is documented in wp-admin/includes/media.php */
-	if ( ! apply_filters( 'disable_captions', '' ) ) {
+	if ( ! apply_filters('disable_captions', '')) {
 		$caption = '
 		<tr class="image-only">
 			<th scope="row" class="label">
-				<label for="caption"><span class="alignleft">' . __('Image Caption') . '</span></label>
+				<label for="caption"><span class="alignleft">' . __('Image Caption').'</span></label>
 			</th>
 			<td class="field"><textarea id="caption" name="caption"></textarea></td>
 		</tr>
@@ -2536,10 +2536,10 @@ 
 	}
 
 	$default_align = get_option('image_default_align');
-	if ( empty($default_align) )
+	if (empty($default_align))
 		$default_align = 'none';
 
-	if ( 'image' == $default_view ) {
+	if ('image' == $default_view) {
 		$view = 'image-only';
 		$table_class = '';
 	} else {
@@ -2547,12 +2547,12 @@ 
 	}
 
 	return '
-	<p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
-	<p class="media-types media-types-required-info">' . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
-	<table class="describe ' . $table_class . '"><tbody>
+	<p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked('image-only', $view, false).' /> '.__('Image').'</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"'.checked('not-image', $view, false).' /> '.__('Audio, Video, or Other File').'</label></p>
+	<p class="media-types media-types-required-info">' . sprintf(__('Required fields are marked %s'), '<span class="required">*</span>').'</p>
+	<table class="describe ' . $table_class.'"><tbody>
 		<tr>
 			<th scope="row" class="label" style="width:130px;">
-				<label for="src"><span class="alignleft">' . __( 'URL' ) . '</span> <span class="required">*</span></label>
+				<label for="src"><span class="alignleft">' . __('URL').'</span> <span class="required">*</span></label>
 				<span class="alignright" id="status_img"></span>
 			</th>
 			<td class="field"><input id="src" name="src" value="" type="text" required aria-required="true" onblur="addExtImage.getImageData()" /></td>
@@ -2560,55 +2560,55 @@ 
 
 		<tr>
 			<th scope="row" class="label">
-				<label for="title"><span class="alignleft">' . __( 'Title' ) . '</span> <span class="required">*</span></label>
+				<label for="title"><span class="alignleft">' . __('Title').'</span> <span class="required">*</span></label>
 			</th>
 			<td class="field"><input id="title" name="title" value="" type="text" required aria-required="true" /></td>
 		</tr>
 
-		<tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;') . '</p></td></tr>
+		<tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. &#8220;Ransom Demands (PDF)&#8221;').'</p></td></tr>
 
 		<tr class="image-only">
 			<th scope="row" class="label">
-				<label for="alt"><span class="alignleft">' . __('Alternative Text') . '</span></label>
+				<label for="alt"><span class="alignleft">' . __('Alternative Text').'</span></label>
 			</th>
 			<td class="field"><input id="alt" name="alt" value="" type="text" aria-required="true" />
-			<p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;') . '</p></td>
+			<p class="help">' . __('Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;').'</p></td>
 		</tr>
-		' . $caption . '
+		' . $caption.'
 		<tr class="align image-only">
-			<th scope="row" class="label"><p><label for="align">' . __('Alignment') . '</label></p></th>
+			<th scope="row" class="label"><p><label for="align">' . __('Alignment').'</label></p></th>
 			<td class="field">
 				<input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'none' ? ' checked="checked"' : '').' />
-				<label for="align-none" class="align image-align-none-label">' . __('None') . '</label>
+				<label for="align-none" class="align image-align-none-label">' . __('None').'</label>
 				<input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'left' ? ' checked="checked"' : '').' />
-				<label for="align-left" class="align image-align-left-label">' . __('Left') . '</label>
+				<label for="align-left" class="align image-align-left-label">' . __('Left').'</label>
 				<input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'center' ? ' checked="checked"' : '').' />
-				<label for="align-center" class="align image-align-center-label">' . __('Center') . '</label>
+				<label for="align-center" class="align image-align-center-label">' . __('Center').'</label>
 				<input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ($default_align == 'right' ? ' checked="checked"' : '').' />
-				<label for="align-right" class="align image-align-right-label">' . __('Right') . '</label>
+				<label for="align-right" class="align image-align-right-label">' . __('Right').'</label>
 			</td>
 		</tr>
 
 		<tr class="image-only">
 			<th scope="row" class="label">
-				<label for="url"><span class="alignleft">' . __('Link Image To:') . '</span></label>
+				<label for="url"><span class="alignleft">' . __('Link Image To:').'</span></label>
 			</th>
 			<td class="field"><input id="url" name="url" value="" type="text" /><br />
 
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None') . '</button>
-			<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image') . '</button>
-			<p class="help">' . __('Enter a link URL or click above for presets.') . '</p></td>
+			<button type="button" class="button" value="" onclick="document.forms[0].url.value=null">' . __('None').'</button>
+			<button type="button" class="button" value="" onclick="document.forms[0].url.value=document.forms[0].src.value">' . __('Link to image').'</button>
+			<p class="help">' . __('Enter a link URL or click above for presets.').'</p></td>
 		</tr>
 		<tr class="image-only">
 			<td></td>
 			<td>
-				<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post') . '" />
+				<input type="button" class="button" id="go_button" style="color:#bbb;" onclick="addExtImage.insert()" value="' . esc_attr__('Insert into Post').'" />
 			</td>
 		</tr>
 		<tr class="not-image">
 			<td></td>
 			<td>
-				' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
+				' . get_submit_button(__('Insert into Post'), 'button', 'insertonlybutton', false).'
 			</td>
 		</tr>
 	</tbody></table>
@@ -2624,16 +2624,16 @@ 
  * @global int $post_ID
  */
 function media_upload_flash_bypass() {
-	$browser_uploader = admin_url( 'media-new.php?browser-uploader' );
+	$browser_uploader = admin_url('media-new.php?browser-uploader');
 
-	if ( $post = get_post() )
-		$browser_uploader .= '&amp;post_id=' . intval( $post->ID );
-	elseif ( ! empty( $GLOBALS['post_ID'] ) )
-		$browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
+	if ($post = get_post())
+		$browser_uploader .= '&amp;post_id='.intval($post->ID);
+	elseif ( ! empty($GLOBALS['post_ID']))
+		$browser_uploader .= '&amp;post_id='.intval($GLOBALS['post_ID']);
 
 	?>
 	<p class="upload-flash-bypass">
-	<?php printf( __( 'You are using the multi-file uploader. Problems? Try the <a href="%1$s" target="%2$s">browser uploader</a> instead.' ), $browser_uploader, '_blank' ); ?>
+	<?php printf(__('You are using the multi-file uploader. Problems? Try the <a href="%1$s" target="%2$s">browser uploader</a> instead.'), $browser_uploader, '_blank'); ?>
 	</p>
 	<?php
 }
@@ -2667,8 +2667,8 @@ 
 	$checked = get_user_setting('upload_resize') ? ' checked="true"' : '';
 	$a = $end = '';
 
-	if ( current_user_can( 'manage_options' ) ) {
-		$a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
+	if (current_user_can('manage_options')) {
+		$a = '<a href="'.esc_url(admin_url('options-media.php')).'" target="_blank">';
 		$end = '</a>';
 	}
 ?>
@@ -2676,7 +2676,7 @@ 
 <input name="image_resize" type="checkbox" id="image_resize" value="true"<?php echo $checked; ?> />
 <?php
 	/* translators: %1$s is link start tag, %2$s is link end tag, %3$d is width, %4$d is height*/
-	printf( __( 'Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).' ), $a, $end, (int) get_option( 'large_size_w', '1024' ), (int) get_option( 'large_size_h', '1024' ) );
+	printf(__('Scale images to match the large size selected in %1$simage options%2$s (%3$d &times; %4$d).'), $a, $end, (int) get_option('large_size_w', '1024'), (int) get_option('large_size_h', '1024'));
 ?>
 </label></p>
 <?php
@@ -2688,7 +2688,7 @@ 
  * @since 3.5.0
  */
 function multisite_over_quota_message() {
-	echo '<p>' . sprintf( __( 'Sorry, you have used all of your storage quota of %s MB.' ), get_space_allowed() ) . '</p>';
+	echo '<p>'.sprintf(__('Sorry, you have used all of your storage quota of %s MB.'), get_space_allowed()).'</p>';
 }
 
 /**
@@ -2698,86 +2698,86 @@ 
  *
  * @param WP_Post $post A post object.
  */
-function edit_form_image_editor( $post ) {
-	$open = isset( $_GET['image-editor'] );
-	if ( $open )
-		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+function edit_form_image_editor($post) {
+	$open = isset($_GET['image-editor']);
+	if ($open)
+		require_once ABSPATH.'wp-admin/includes/image-edit.php';
 
 	$thumb_url = false;
-	if ( $attachment_id = intval( $post->ID ) )
-		$thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
+	if ($attachment_id = intval($post->ID))
+		$thumb_url = wp_get_attachment_image_src($attachment_id, array(900, 450), true);
 
-	$alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
+	$alt_text = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
 
-	$att_url = wp_get_attachment_url( $post->ID ); ?>
+	$att_url = wp_get_attachment_url($post->ID); ?>
 	<div class="wp_attachment_holder wp-clearfix">
 	<?php
-	if ( wp_attachment_is_image( $post->ID ) ) :
+	if (wp_attachment_is_image($post->ID)) :
 		$image_edit_button = '';
-		if ( wp_image_editor_supports( array( 'mime_type' => $post->post_mime_type ) ) ) {
-			$nonce = wp_create_nonce( "image_editor-$post->ID" );
-			$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
+		if (wp_image_editor_supports(array('mime_type' => $post->post_mime_type))) {
+			$nonce = wp_create_nonce("image_editor-$post->ID");
+			$image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='".esc_attr__('Edit Image')."' /> <span class='spinner'></span>";
 		}
 	?>
 
 		<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
 
-		<div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
-			<p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
+		<div<?php if ($open) echo ' style="display:none"'; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
+			<p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme($thumb_url[0]); ?>" style="max-width:100%" alt="" /></p>
 			<p><?php echo $image_edit_button; ?></p>
 		</div>
-		<div<?php if ( ! $open ) echo ' style="display:none"'; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
-			<?php if ( $open ) wp_image_editor( $attachment_id ); ?>
+		<div<?php if ( ! $open) echo ' style="display:none"'; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
+			<?php if ($open) wp_image_editor($attachment_id); ?>
 		</div>
 	<?php
-	elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ):
+	elseif ($attachment_id && wp_attachment_is('audio', $post)):
 
-		wp_maybe_generate_attachment_metadata( $post );
+		wp_maybe_generate_attachment_metadata($post);
 
-		echo wp_audio_shortcode( array( 'src' => $att_url ) );
+		echo wp_audio_shortcode(array('src' => $att_url));
 
-	elseif ( $attachment_id && wp_attachment_is( 'video', $post ) ):
+	elseif ($attachment_id && wp_attachment_is('video', $post)):
 
-		wp_maybe_generate_attachment_metadata( $post );
+		wp_maybe_generate_attachment_metadata($post);
 
-		$meta = wp_get_attachment_metadata( $attachment_id );
-		$w = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0;
-		$h = ! empty( $meta['height'] ) ? $meta['height'] : 0;
-		if ( $h && $w < $meta['width'] ) {
-			$h = round( ( $meta['height'] * $w ) / $meta['width'] );
+		$meta = wp_get_attachment_metadata($attachment_id);
+		$w = ! empty($meta['width']) ? min($meta['width'], 640) : 0;
+		$h = ! empty($meta['height']) ? $meta['height'] : 0;
+		if ($h && $w < $meta['width']) {
+			$h = round(($meta['height'] * $w) / $meta['width']);
 		}
 
-		$attr = array( 'src' => $att_url );
-		if ( ! empty( $w ) && ! empty( $h ) ) {
+		$attr = array('src' => $att_url);
+		if ( ! empty($w) && ! empty($h)) {
 			$attr['width'] = $w;
 			$attr['height'] = $h;
 		}
 
-		$thumb_id = get_post_thumbnail_id( $attachment_id );
-		if ( ! empty( $thumb_id ) ) {
-			$attr['poster'] = wp_get_attachment_url( $thumb_id );
+		$thumb_id = get_post_thumbnail_id($attachment_id);
+		if ( ! empty($thumb_id)) {
+			$attr['poster'] = wp_get_attachment_url($thumb_id);
 		}
 
-		echo wp_video_shortcode( $attr );
+		echo wp_video_shortcode($attr);
 
 	endif; ?>
 	</div>
 	<div class="wp_attachment_details edit-form-section">
 		<p>
-			<label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong></label><br />
+			<label for="attachment_caption"><strong><?php _e('Caption'); ?></strong></label><br />
 			<textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
 		</p>
 
 
-	<?php if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) : ?>
+	<?php if ('image' === substr($post->post_mime_type, 0, 5)) : ?>
 		<p>
-			<label for="attachment_alt"><strong><?php _e( 'Alternative Text' ); ?></strong></label><br />
-			<input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" value="<?php echo esc_attr( $alt_text ); ?>" />
+			<label for="attachment_alt"><strong><?php _e('Alternative Text'); ?></strong></label><br />
+			<input type="text" class="widefat" name="_wp_attachment_image_alt" id="attachment_alt" value="<?php echo esc_attr($alt_text); ?>" />
 		</p>
 	<?php endif; ?>
 
 	<?php
-		$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
+		$quicktags_settings = array('buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close');
 		$editor_args = array(
 			'textarea_name' => 'content',
 			'textarea_rows' => 5,
@@ -2787,17 +2787,17 @@ 
 		);
 	?>
 
-	<label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong><?php
-	if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
-		echo ': ' . __( 'Displayed on attachment pages.' );
+	<label for="attachment_content"><strong><?php _e('Description'); ?></strong><?php
+	if (preg_match('#^(audio|video)/#', $post->post_mime_type)) {
+		echo ': '.__('Displayed on attachment pages.');
 	} ?></label>
-	<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
+	<?php wp_editor($post->post_content, 'attachment_content', $editor_args); ?>
 
 	</div>
 	<?php
-	$extras = get_compat_media_markup( $post->ID );
+	$extras = get_compat_media_markup($post->ID);
 	echo $extras['item'];
-	echo '<input type="hidden" id="image-edit-context" value="edit-attachment" />' . "\n";
+	echo '<input type="hidden" id="image-edit-context" value="edit-attachment" />'."\n";
 }
 
 /**
@@ -2808,37 +2808,37 @@ 
 function attachment_submitbox_metadata() {
 	$post = get_post();
 
-	$file = get_attached_file( $post->ID );
-	$filename = esc_html( wp_basename( $file ) );
+	$file = get_attached_file($post->ID);
+	$filename = esc_html(wp_basename($file));
 
 	$media_dims = '';
-	$meta = wp_get_attachment_metadata( $post->ID );
-	if ( isset( $meta['width'], $meta['height'] ) )
+	$meta = wp_get_attachment_metadata($post->ID);
+	if (isset($meta['width'], $meta['height']))
 		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
 	/** This filter is documented in wp-admin/includes/media.php */
-	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
+	$media_dims = apply_filters('media_meta', $media_dims, $post);
 
-	$att_url = wp_get_attachment_url( $post->ID );
+	$att_url = wp_get_attachment_url($post->ID);
 ?>
 	<div class="misc-pub-section misc-pub-attachment">
-		<label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
-		<input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
+		<label for="attachment_url"><?php _e('File URL:'); ?></label>
+		<input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr($att_url); ?>" />
 	</div>
 	<div class="misc-pub-section misc-pub-filename">
-		<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
+		<?php _e('File name:'); ?> <strong><?php echo $filename; ?></strong>
 	</div>
 	<div class="misc-pub-section misc-pub-filetype">
-		<?php _e( 'File type:' ); ?> <strong><?php
-			if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
-				echo esc_html( strtoupper( $matches[1] ) );
-				list( $mime_type ) = explode( '/', $post->post_mime_type );
-				if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
-					if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
-						echo ' (' . $meta['mime_type'] . ')';
+		<?php _e('File type:'); ?> <strong><?php
+			if (preg_match('/^.*?\.(\w+)$/', get_attached_file($post->ID), $matches)) {
+				echo esc_html(strtoupper($matches[1]));
+				list($mime_type) = explode('/', $post->post_mime_type);
+				if ($mime_type !== 'image' && ! empty($meta['mime_type'])) {
+					if ($meta['mime_type'] !== "$mime_type/".strtolower($matches[1])) {
+						echo ' ('.$meta['mime_type'].')';
 					}
 				}
 			} else {
-				echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
+				echo strtoupper(str_replace('image/', '', $post->post_mime_type));
 			}
 		?></strong>
 	</div>
@@ -2846,19 +2846,19 @@ 
 	<?php
 		$file_size = false;
 
-		if ( isset( $meta['filesize'] ) )
+		if (isset($meta['filesize']))
 			$file_size = $meta['filesize'];
-		elseif ( file_exists( $file ) )
-			$file_size = filesize( $file );
+		elseif (file_exists($file))
+			$file_size = filesize($file);
 
-		if ( ! empty( $file_size ) ) : ?>
+		if ( ! empty($file_size)) : ?>
 			<div class="misc-pub-section misc-pub-filesize">
-				<?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
+				<?php _e('File size:'); ?> <strong><?php echo size_format($file_size); ?></strong>
 			</div>
 			<?php
 		endif;
 
-	if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
+	if (preg_match('#^(audio|video)/#', $post->post_mime_type)) {
 
 		/**
 		 * Filter the audio and video metadata fields to be shown in the publish meta box.
@@ -2870,27 +2870,27 @@ 
 		 *
 		 * @param array $fields An array of the attachment metadata keys and labels.
 		 */
-		$fields = apply_filters( 'media_submitbox_misc_sections', array(
-			'length_formatted' => __( 'Length:' ),
-			'bitrate'          => __( 'Bitrate:' ),
-		) );
+		$fields = apply_filters('media_submitbox_misc_sections', array(
+			'length_formatted' => __('Length:'),
+			'bitrate'          => __('Bitrate:'),
+		));
 
-		foreach ( $fields as $key => $label ) {
-			if ( empty( $meta[ $key ] ) ) {
+		foreach ($fields as $key => $label) {
+			if (empty($meta[$key])) {
 				continue;
 			}
 	?>
-		<div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class( $key ); ?>">
+		<div class="misc-pub-section misc-pub-mime-meta misc-pub-<?php echo sanitize_html_class($key); ?>">
 			<?php echo $label ?> <strong><?php
-				switch ( $key ) {
+				switch ($key) {
 					case 'bitrate' :
-						echo round( $meta['bitrate'] / 1000 ) . 'kb/s';
-						if ( ! empty( $meta['bitrate_mode'] ) ) {
-							echo ' ' . strtoupper( esc_html( $meta['bitrate_mode'] ) );
+						echo round($meta['bitrate'] / 1000).'kb/s';
+						if ( ! empty($meta['bitrate_mode'])) {
+							echo ' '.strtoupper(esc_html($meta['bitrate_mode']));
 						}
 						break;
 					default:
-						echo esc_html( $meta[ $key ] );
+						echo esc_html($meta[$key]);
 						break;
 				}
 			?></strong>
@@ -2908,27 +2908,27 @@ 
 		 *
 		 * @param array $fields An array of the attachment metadata keys and labels.
 		 */
-		$audio_fields = apply_filters( 'audio_submitbox_misc_sections', array(
-			'dataformat' => __( 'Audio Format:' ),
-			'codec'      => __( 'Audio Codec:' )
-		) );
+		$audio_fields = apply_filters('audio_submitbox_misc_sections', array(
+			'dataformat' => __('Audio Format:'),
+			'codec'      => __('Audio Codec:')
+		));
 
-		foreach ( $audio_fields as $key => $label ) {
-			if ( empty( $meta['audio'][ $key ] ) ) {
+		foreach ($audio_fields as $key => $label) {
+			if (empty($meta['audio'][$key])) {
 				continue;
 			}
 	?>
-		<div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-			<?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][$key] ); ?></strong>
+		<div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class($key); ?>">
+			<?php echo $label; ?> <strong><?php echo esc_html($meta['audio'][$key]); ?></strong>
 		</div>
 	<?php
 		}
 
 	}
 
-	if ( $media_dims ) : ?>
+	if ($media_dims) : ?>
 	<div class="misc-pub-section misc-pub-dimensions">
-		<?php _e( 'Dimensions:' ); ?> <strong><?php echo $media_dims; ?></strong>
+		<?php _e('Dimensions:'); ?> <strong><?php echo $media_dims; ?></strong>
 	</div>
 <?php
 	endif;
@@ -2942,24 +2942,24 @@ 
  * @param array $metadata An existing array with data
  * @param array $data Data supplied by ID3 tags
  */
-function wp_add_id3_tag_data( &$metadata, $data ) {
-	foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
-		if ( ! empty( $data[$version]['comments'] ) ) {
-			foreach ( $data[$version]['comments'] as $key => $list ) {
-				if ( 'length' !== $key && ! empty( $list ) ) {
-					$metadata[$key] = reset( $list );
+function wp_add_id3_tag_data(&$metadata, $data) {
+	foreach (array('id3v2', 'id3v1') as $version) {
+		if ( ! empty($data[$version]['comments'])) {
+			foreach ($data[$version]['comments'] as $key => $list) {
+				if ('length' !== $key && ! empty($list)) {
+					$metadata[$key] = reset($list);
 					// Fix bug in byte stream analysis.
-					if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
-						$metadata[$key] = 'Cop' . $metadata[$key];
+					if ('terms_of_use' === $key && 0 === strpos($metadata[$key], 'yright notice.'))
+						$metadata[$key] = 'Cop'.$metadata[$key];
 				}
 			}
 			break;
 		}
 	}
 
-	if ( ! empty( $data['id3v2']['APIC'] ) ) {
-		$image = reset( $data['id3v2']['APIC']);
-		if ( ! empty( $image['data'] ) ) {
+	if ( ! empty($data['id3v2']['APIC'])) {
+		$image = reset($data['id3v2']['APIC']);
+		if ( ! empty($image['data'])) {
 			$metadata['image'] = array(
 				'data' => $image['data'],
 				'mime' => $image['image_mime'],
@@ -2967,9 +2967,9 @@ 
 				'height' => $image['image_height']
 			);
 		}
-	} elseif ( ! empty( $data['comments']['picture'] ) ) {
-		$image = reset( $data['comments']['picture'] );
-		if ( ! empty( $image['data'] ) ) {
+	} elseif ( ! empty($data['comments']['picture'])) {
+		$image = reset($data['comments']['picture']);
+		if ( ! empty($image['data'])) {
 			$metadata['image'] = array(
 				'data' => $image['data'],
 				'mime' => $image['image_mime']
@@ -2986,56 +2986,56 @@ 
  * @param string $file Path to file.
  * @return array|bool Returns array of metadata, if found.
  */
-function wp_read_video_metadata( $file ) {
-	if ( ! file_exists( $file ) ) {
+function wp_read_video_metadata($file) {
+	if ( ! file_exists($file)) {
 		return false;
 	}
 
 	$metadata = array();
 
-	if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
-		define( 'GETID3_TEMP_DIR', get_temp_dir() );
+	if ( ! defined('GETID3_TEMP_DIR')) {
+		define('GETID3_TEMP_DIR', get_temp_dir());
 	}
 
-	if ( ! class_exists( 'getID3', false ) ) {
-		require( ABSPATH . WPINC . '/ID3/getid3.php' );
+	if ( ! class_exists('getID3', false)) {
+		require(ABSPATH.WPINC.'/ID3/getid3.php');
 	}
 	$id3 = new getID3();
-	$data = $id3->analyze( $file );
+	$data = $id3->analyze($file);
 
-	if ( isset( $data['video']['lossless'] ) )
+	if (isset($data['video']['lossless']))
 		$metadata['lossless'] = $data['video']['lossless'];
-	if ( ! empty( $data['video']['bitrate'] ) )
+	if ( ! empty($data['video']['bitrate']))
 		$metadata['bitrate'] = (int) $data['video']['bitrate'];
-	if ( ! empty( $data['video']['bitrate_mode'] ) )
+	if ( ! empty($data['video']['bitrate_mode']))
 		$metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
-	if ( ! empty( $data['filesize'] ) )
+	if ( ! empty($data['filesize']))
 		$metadata['filesize'] = (int) $data['filesize'];
-	if ( ! empty( $data['mime_type'] ) )
+	if ( ! empty($data['mime_type']))
 		$metadata['mime_type'] = $data['mime_type'];
-	if ( ! empty( $data['playtime_seconds'] ) )
-		$metadata['length'] = (int) round( $data['playtime_seconds'] );
-	if ( ! empty( $data['playtime_string'] ) )
+	if ( ! empty($data['playtime_seconds']))
+		$metadata['length'] = (int) round($data['playtime_seconds']);
+	if ( ! empty($data['playtime_string']))
 		$metadata['length_formatted'] = $data['playtime_string'];
-	if ( ! empty( $data['video']['resolution_x'] ) )
+	if ( ! empty($data['video']['resolution_x']))
 		$metadata['width'] = (int) $data['video']['resolution_x'];
-	if ( ! empty( $data['video']['resolution_y'] ) )
+	if ( ! empty($data['video']['resolution_y']))
 		$metadata['height'] = (int) $data['video']['resolution_y'];
-	if ( ! empty( $data['fileformat'] ) )
+	if ( ! empty($data['fileformat']))
 		$metadata['fileformat'] = $data['fileformat'];
-	if ( ! empty( $data['video']['dataformat'] ) )
+	if ( ! empty($data['video']['dataformat']))
 		$metadata['dataformat'] = $data['video']['dataformat'];
-	if ( ! empty( $data['video']['encoder'] ) )
+	if ( ! empty($data['video']['encoder']))
 		$metadata['encoder'] = $data['video']['encoder'];
-	if ( ! empty( $data['video']['codec'] ) )
+	if ( ! empty($data['video']['codec']))
 		$metadata['codec'] = $data['video']['codec'];
 
-	if ( ! empty( $data['audio'] ) ) {
-		unset( $data['audio']['streams'] );
+	if ( ! empty($data['audio'])) {
+		unset($data['audio']['streams']);
 		$metadata['audio'] = $data['audio'];
 	}
 
-	wp_add_id3_tag_data( $metadata, $data );
+	wp_add_id3_tag_data($metadata, $data);
 
 	return $metadata;
 }
@@ -3048,39 +3048,39 @@ 
  * @param string $file Path to file.
  * @return array|bool Returns array of metadata, if found.
  */
-function wp_read_audio_metadata( $file ) {
-	if ( ! file_exists( $file ) ) {
+function wp_read_audio_metadata($file) {
+	if ( ! file_exists($file)) {
 		return false;
 	}
 	$metadata = array();
 
-	if ( ! defined( 'GETID3_TEMP_DIR' ) ) {
-		define( 'GETID3_TEMP_DIR', get_temp_dir() );
+	if ( ! defined('GETID3_TEMP_DIR')) {
+		define('GETID3_TEMP_DIR', get_temp_dir());
 	}
 
-	if ( ! class_exists( 'getID3', false ) ) {
-		require( ABSPATH . WPINC . '/ID3/getid3.php' );
+	if ( ! class_exists('getID3', false)) {
+		require(ABSPATH.WPINC.'/ID3/getid3.php');
 	}
 	$id3 = new getID3();
-	$data = $id3->analyze( $file );
+	$data = $id3->analyze($file);
 
-	if ( ! empty( $data['audio'] ) ) {
-		unset( $data['audio']['streams'] );
+	if ( ! empty($data['audio'])) {
+		unset($data['audio']['streams']);
 		$metadata = $data['audio'];
 	}
 
-	if ( ! empty( $data['fileformat'] ) )
+	if ( ! empty($data['fileformat']))
 		$metadata['fileformat'] = $data['fileformat'];
-	if ( ! empty( $data['filesize'] ) )
+	if ( ! empty($data['filesize']))
 		$metadata['filesize'] = (int) $data['filesize'];
-	if ( ! empty( $data['mime_type'] ) )
+	if ( ! empty($data['mime_type']))
 		$metadata['mime_type'] = $data['mime_type'];
-	if ( ! empty( $data['playtime_seconds'] ) )
-		$metadata['length'] = (int) round( $data['playtime_seconds'] );
-	if ( ! empty( $data['playtime_string'] ) )
+	if ( ! empty($data['playtime_seconds']))
+		$metadata['length'] = (int) round($data['playtime_seconds']);
+	if ( ! empty($data['playtime_string']))
 		$metadata['length_formatted'] = $data['playtime_string'];
 
-	wp_add_id3_tag_data( $metadata, $data );
+	wp_add_id3_tag_data($metadata, $data);
 
 	return $metadata;
 }
@@ -3096,51 +3096,51 @@ 
  * @param string $action    Optional. Attach/detach action. Accepts 'attach' or 'detach'.
  *                          Default 'attach'.
  */
-function wp_media_attach_action( $parent_id, $action = 'attach' ) {
+function wp_media_attach_action($parent_id, $action = 'attach') {
 	global $wpdb;
 
-	if ( ! $parent_id ) {
+	if ( ! $parent_id) {
 		return;
 	}
 
-	if ( ! current_user_can( 'edit_post', $parent_id ) ) {
-		wp_die( __( 'You are not allowed to edit this post.' ) );
+	if ( ! current_user_can('edit_post', $parent_id)) {
+		wp_die(__('You are not allowed to edit this post.'));
 	}
 	$ids = array();
-	foreach ( (array) $_REQUEST['media'] as $att_id ) {
+	foreach ((array) $_REQUEST['media'] as $att_id) {
 		$att_id = (int) $att_id;
 
-		if ( ! current_user_can( 'edit_post', $att_id ) ) {
+		if ( ! current_user_can('edit_post', $att_id)) {
 			continue;
 		}
 
 		$ids[] = $att_id;
 	}
 
-	if ( ! empty( $ids ) ) {
-		$ids_string = implode( ',', $ids );
-		if ( 'attach' === $action ) {
-			$result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
+	if ( ! empty($ids)) {
+		$ids_string = implode(',', $ids);
+		if ('attach' === $action) {
+			$result = $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id));
 		} else {
-			$result = $wpdb->query( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )" );
+			$result = $wpdb->query("UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )");
 		}
 
-		foreach ( $ids as $att_id ) {
-			clean_attachment_cache( $att_id );
+		foreach ($ids as $att_id) {
+			clean_attachment_cache($att_id);
 		}
 	}
 
-	if ( isset( $result ) ) {
+	if (isset($result)) {
 		$location = 'upload.php';
-		if ( $referer = wp_get_referer() ) {
-			if ( false !== strpos( $referer, 'upload.php' ) ) {
-				$location = remove_query_arg( array( 'attached', 'detach' ), $referer );
+		if ($referer = wp_get_referer()) {
+			if (false !== strpos($referer, 'upload.php')) {
+				$location = remove_query_arg(array('attached', 'detach'), $referer);
 			}
 		}
 
 		$key = 'attach' === $action ? 'attached' : 'detach';
-		$location = add_query_arg( array( $key => $result ), $location );
-		wp_redirect( $location );
+		$location = add_query_arg(array($key => $result), $location);
+		wp_redirect($location);
 		exit;
 	}
 }

Braces +418 added lines, -278 removed lines

@@ -51,8 +51,9 @@ 
 
 	$post_id = intval($_REQUEST['post_id']);
 
-	if ( $post_id )
-		$attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
+	if ( $post_id ) {
+			$attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
+	}
 
 	if ( empty($attachments) ) {
 		unset($tabs['gallery']);
@@ -90,8 +91,9 @@ 
 		foreach ( $tabs as $callback => $text ) {
 			$class = '';
 
-			if ( $current == $callback )
-				$class = " class='current'";
+			if ( $current == $callback ) {
+							$class = " class='current'";
+			}
 
 			$href = add_query_arg(array('tab' => $callback, 's' => false, 'paged' => false, 'post_mime_type' => false, 'm' => false));
 			$link = "<a href='" . esc_url($href) . "'$class>$text</a>";
@@ -127,8 +129,9 @@ 
 		$rel = ' rel="' . esc_attr( $rel ) . '"';
 	}
 
-	if ( $url )
-		$html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
+	if ( $url ) {
+			$html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
+	}
 
 	/**
 	 * Filter the image HTML markup to send to the editor.
@@ -193,13 +196,15 @@ 
 	 * @param bool $bool Whether to disable appending captions. Returning true to the filter
 	 *                   will disable captions. Default empty string.
 	 */
-	if ( empty($caption) || apply_filters( 'disable_captions', '' ) )
-		return $html;
+	if ( empty($caption) || apply_filters( 'disable_captions', '' ) ) {
+			return $html;
+	}
 
 	$id = ( 0 < (int) $id ) ? 'attachment_' . $id : '';
 
-	if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) )
-		return $html;
+	if ( ! preg_match( '/width=["\']([0-9]+)/', $html, $matches ) ) {
+			return $html;
+	}
 
 	$width = $matches[1];
 
@@ -210,8 +215,9 @@ 
 	$caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
 
 	$html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
-	if ( empty($align) )
-		$align = 'none';
+	if ( empty($align) ) {
+			$align = 'none';
+	}
 
 	$shcode = '[caption id="' . $id . '" align="align' . $align	. '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
 
@@ -270,15 +276,17 @@ 
 
 	$time = current_time('mysql');
 	if ( $post = get_post($post_id) ) {
-		if ( substr( $post->post_date, 0, 4 ) > 0 )
-			$time = $post->post_date;
+		if ( substr( $post->post_date, 0, 4 ) > 0 ) {
+					$time = $post->post_date;
+		}
 	}
 
 	$name = $_FILES[$file_id]['name'];
 	$file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
 
-	if ( isset($file['error']) )
-		return new WP_Error( 'upload_error', $file['error'] );
+	if ( isset($file['error']) ) {
+			return new WP_Error( 'upload_error', $file['error'] );
+	}
 
 	$name_parts = pathinfo($name);
 	$name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
@@ -327,19 +335,22 @@ 
 
 		}
 
-		if ( ! empty( $meta['year'] ) )
-			$content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
+		if ( ! empty( $meta['year'] ) ) {
+					$content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
+		}
 
 		if ( ! empty( $meta['track_number'] ) ) {
 			$track_number = explode( '/', $meta['track_number'] );
-			if ( isset( $track_number[1] ) )
-				$content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
-			else
-				$content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
+			if ( isset( $track_number[1] ) ) {
+							$content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
+			} else {
+							$content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
+			}
 		}
 
-		if ( ! empty( $meta['genre'] ) )
-			$content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
+		if ( ! empty( $meta['genre'] ) ) {
+					$content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
+		}
 
 	// Use image exif/iptc data for title and caption defaults if possible.
 	} elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
@@ -391,13 +402,15 @@ 
 
 	$time = current_time( 'mysql' );
 	if ( $post = get_post( $post_id ) ) {
-		if ( substr( $post->post_date, 0, 4 ) > 0 )
-			$time = $post->post_date;
+		if ( substr( $post->post_date, 0, 4 ) > 0 ) {
+					$time = $post->post_date;
+		}
 	}
 
 	$file = wp_handle_sideload( $file_array, $overrides, $time );
-	if ( isset($file['error']) )
-		return new WP_Error( 'upload_error', $file['error'] );
+	if ( isset($file['error']) ) {
+			return new WP_Error( 'upload_error', $file['error'] );
+	}
 
 	$url = $file['url'];
 	$type = $file['type'];
@@ -407,14 +420,17 @@ 
 
 	// Use image exif/iptc data for title and caption defaults if possible.
 	if ( $image_meta = @wp_read_image_metadata($file) ) {
-		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
-			$title = $image_meta['title'];
-		if ( trim( $image_meta['caption'] ) )
-			$content = $image_meta['caption'];
+		if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+					$title = $image_meta['title'];
+		}
+		if ( trim( $image_meta['caption'] ) ) {
+					$content = $image_meta['caption'];
+		}
 	}
 
-	if ( isset( $desc ) )
-		$title = $desc;
+	if ( isset( $desc ) ) {
+			$title = $desc;
+	}
 
 	// Construct the attachment array.
 	$attachment = array_merge( array(
@@ -430,8 +446,9 @@ 
 
 	// Save the attachment metadata
 	$id = wp_insert_attachment($attachment, $file, $post_id);
-	if ( !is_wp_error($id) )
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	if ( !is_wp_error($id) ) {
+			wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
+	}
 
 	return $id;
 }
@@ -454,8 +471,9 @@ 
 wp_enqueue_style( 'colors' );
 // Check callback name for 'media'
 if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
-	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
+	|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) ) {
 	wp_enqueue_style( 'deprecated-media' );
+}
 wp_enqueue_style( 'ie' );
 ?>
 <script type="text/javascript">
@@ -514,7 +532,10 @@ 
 }
 ?>
 </head>
-<body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?> class="wp-core-ui no-js">
+<body<?php if ( isset($GLOBALS['body_id']) ) {
+	echo ' id="' . $GLOBALS['body_id'] . '"';
+}
+?> class="wp-core-ui no-js">
 <script type="text/javascript">
 document.body.className = document.body.className.replace('no-js', 'js');
 </script>
@@ -548,8 +569,9 @@ 
 	$instance++;
 
 	$post = get_post();
-	if ( ! $post && ! empty( $GLOBALS['post_ID'] ) )
-		$post = $GLOBALS['post_ID'];
+	if ( ! $post && ! empty( $GLOBALS['post_ID'] ) ) {
+			$post = $GLOBALS['post_ID'];
+	}
 
 	wp_enqueue_media( array(
 		'post' => $post
@@ -575,8 +597,9 @@ 
 
 	if ( $legacy_filter ) {
 		// #WP22559. Close <a> if a plugin started by closing <a> to open their own <a> tag.
-		if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) )
-			$legacy_filter .= '</a>';
+		if ( 0 === stripos( trim( $legacy_filter ), '</a>' ) ) {
+					$legacy_filter .= '</a>';
+		}
 		echo $legacy_filter;
 	}
 }
@@ -592,16 +615,19 @@ 
 function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
 	global $post_ID;
 
-	if ( empty( $post_id ) )
-		$post_id = $post_ID;
+	if ( empty( $post_id ) ) {
+			$post_id = $post_ID;
+	}
 
 	$upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url('media-upload.php') );
 
-	if ( $type && 'media' != $type )
-		$upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
+	if ( $type && 'media' != $type ) {
+			$upload_iframe_src = add_query_arg('type', $type, $upload_iframe_src);
+	}
 
-	if ( ! empty( $tab ) )
-		$upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
+	if ( ! empty( $tab ) ) {
+			$upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
+	}
 
 	/**
 	 * Filter the upload iframe source URL for a specific media type.
@@ -635,24 +661,32 @@ 
 		$send_id = (int) reset( $keys );
 	}
 
-	if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
+	if ( !empty($_POST['attachments']) ) {
+		foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
 		$post = $_post = get_post($attachment_id, ARRAY_A);
+	}
 
-		if ( !current_user_can( 'edit_post', $attachment_id ) )
-			continue;
+		if ( !current_user_can( 'edit_post', $attachment_id ) ) {
+					continue;
+		}
 
-		if ( isset($attachment['post_content']) )
-			$post['post_content'] = $attachment['post_content'];
-		if ( isset($attachment['post_title']) )
-			$post['post_title'] = $attachment['post_title'];
-		if ( isset($attachment['post_excerpt']) )
-			$post['post_excerpt'] = $attachment['post_excerpt'];
-		if ( isset($attachment['menu_order']) )
-			$post['menu_order'] = $attachment['menu_order'];
+		if ( isset($attachment['post_content']) ) {
+					$post['post_content'] = $attachment['post_content'];
+		}
+		if ( isset($attachment['post_title']) ) {
+					$post['post_title'] = $attachment['post_title'];
+		}
+		if ( isset($attachment['post_excerpt']) ) {
+					$post['post_excerpt'] = $attachment['post_excerpt'];
+		}
+		if ( isset($attachment['menu_order']) ) {
+					$post['menu_order'] = $attachment['menu_order'];
+		}
 
 		if ( isset($send_id) && $attachment_id == $send_id ) {
-			if ( isset($attachment['post_parent']) )
-				$post['post_parent'] = $attachment['post_parent'];
+			if ( isset($attachment['post_parent']) ) {
+							$post['post_parent'] = $attachment['post_parent'];
+			}
 		}
 
 		/**
@@ -682,12 +716,14 @@ 
 			unset($post['errors']);
 		}
 
-		if ( $post != $_post )
-			wp_update_post($post);
+		if ( $post != $_post ) {
+					wp_update_post($post);
+		}
 
 		foreach ( get_attachment_taxonomies($post) as $t ) {
-			if ( isset($attachment[$t]) )
-				wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false);
+			if ( isset($attachment[$t]) ) {
+							wp_set_object_terms($attachment_id, array_map('trim', preg_split('/,+/', $attachment[$t])), $t, false);
+			}
 		}
 	}
 
@@ -706,8 +742,9 @@ 
 		$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
 		if ( !empty($attachment['url']) ) {
 			$rel = '';
-			if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] )
-				$rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'";
+			if ( strpos($attachment['url'], 'attachment_id') || get_attachment_link($send_id) == $attachment['url'] ) {
+							$rel = " rel='attachment wp-att-" . esc_attr($send_id) . "'";
+			}
 			$html = "<a href='{$attachment['url']}'$rel>$html</a>";
 		}
 
@@ -753,21 +790,25 @@ 
 
 	if ( !empty($_POST['insertonlybutton']) ) {
 		$src = $_POST['src'];
-		if ( !empty($src) && !strpos($src, '://') )
-			$src = "http://$src";
+		if ( !empty($src) && !strpos($src, '://') ) {
+					$src = "http://$src";
+		}
 
 		if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
 			$title = esc_html( wp_unslash( $_POST['title'] ) );
-			if ( empty( $title ) )
-				$title = esc_html( basename( $src ) );
+			if ( empty( $title ) ) {
+							$title = esc_html( basename( $src ) );
+			}
 
-			if ( $title && $src )
-				$html = "<a href='" . esc_url($src) . "'>$title</a>";
+			if ( $title && $src ) {
+							$html = "<a href='" . esc_url($src) . "'>$title</a>";
+			}
 
 			$type = 'file';
 			if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-				&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
-					$type = $ext_type;
+				&& ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
+								$type = $ext_type;
+			}
 
 			/**
 			 * Filter the URL sent to the editor for a specific media type.
@@ -789,8 +830,9 @@ 
 				$align = esc_attr( wp_unslash( $_POST['align'] ) );
 				$class = " class='align$align'";
 			}
-			if ( !empty($src) )
-				$html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
+			if ( !empty($src) ) {
+							$html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
+			}
 
 			/**
 			 * Filter the image URL sent to the editor.
@@ -817,16 +859,19 @@ 
 	} elseif ( ! empty( $_POST ) ) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
+		if ( is_string($return) ) {
+					return $return;
+		}
+		if ( is_array($return) ) {
+					$errors = $return;
+		}
 	}
 
 	if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) {
 		$type = 'image';
-		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) )
-			$type = $_GET['type'];
+		if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
+					$type = $_GET['type'];
+		}
 		return wp_iframe( 'media_upload_type_url_form', $type, $errors, $id );
 	}
 
@@ -904,10 +949,12 @@ 
 	if ( !empty($_POST) ) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
+		if ( is_string($return) ) {
+					return $return;
+		}
+		if ( is_array($return) ) {
+					$errors = $return;
+		}
 	}
 
 	wp_enqueue_script('admin-gallery');
@@ -926,10 +973,12 @@ 
 	if ( !empty($_POST) ) {
 		$return = media_upload_form_handler();
 
-		if ( is_string($return) )
-			return $return;
-		if ( is_array($return) )
-			$errors = $return;
+		if ( is_string($return) ) {
+					return $return;
+		}
+		if ( is_array($return) ) {
+					$errors = $return;
+		}
 	}
 
 	return wp_iframe( 'media_upload_library_form', $errors );
@@ -946,12 +995,14 @@ 
  */
 function image_align_input_fields( $post, $checked = '' ) {
 
-	if ( empty($checked) )
-		$checked = get_user_setting('align', 'none');
+	if ( empty($checked) ) {
+			$checked = get_user_setting('align', 'none');
+	}
 
 	$alignments = array('none' => __('None'), 'left' => __('Left'), 'center' => __('Center'), 'right' => __('Right'));
-	if ( !array_key_exists( (string) $checked, $alignments ) )
-		$checked = 'none';
+	if ( !array_key_exists( (string) $checked, $alignments ) ) {
+			$checked = 'none';
+	}
 
 	$out = array();
 	foreach ( $alignments as $name => $label ) {
@@ -1051,14 +1102,16 @@ 
 	$file = wp_get_attachment_url($post->ID);
 	$link = get_attachment_link($post->ID);
 
-	if ( empty($url_type) )
-		$url_type = get_user_setting('urlbutton', 'post');
+	if ( empty($url_type) ) {
+			$url_type = get_user_setting('urlbutton', 'post');
+	}
 
 	$url = '';
-	if ( $url_type == 'file' )
-		$url = $file;
-	elseif ( $url_type == 'post' )
-		$url = $link;
+	if ( $url_type == 'file' ) {
+			$url = $file;
+	} elseif ( $url_type == 'post' ) {
+			$url = $link;
+	}
 
 	return "
 	<input type='text' class='text urlfield' name='attachments[$post->ID][url]' value='" . esc_attr($url) . "' /><br />
@@ -1184,10 +1237,12 @@ 
  * @return array
  */
 function get_attachment_fields_to_edit($post, $errors = null) {
-	if ( is_int($post) )
-		$post = get_post($post);
-	if ( is_array($post) )
-		$post = new WP_Post( (object) $post );
+	if ( is_int($post) ) {
+			$post = get_post($post);
+	}
+	if ( is_array($post) ) {
+			$post = new WP_Post( (object) $post );
+	}
 
 	$image_url = wp_get_attachment_url($post->ID);
 
@@ -1230,21 +1285,26 @@ 
 
 	foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
 		$t = (array) get_taxonomy($taxonomy);
-		if ( ! $t['public'] || ! $t['show_ui'] )
-			continue;
-		if ( empty($t['label']) )
-			$t['label'] = $taxonomy;
-		if ( empty($t['args']) )
-			$t['args'] = array();
+		if ( ! $t['public'] || ! $t['show_ui'] ) {
+					continue;
+		}
+		if ( empty($t['label']) ) {
+					$t['label'] = $taxonomy;
+		}
+		if ( empty($t['args']) ) {
+					$t['args'] = array();
+		}
 
 		$terms = get_object_term_cache($post->ID, $taxonomy);
-		if ( false === $terms )
-			$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+		if ( false === $terms ) {
+					$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+		}
 
 		$values = array();
 
-		foreach ( $terms as $term )
-			$values[] = $term->slug;
+		foreach ( $terms as $term ) {
+					$values[] = $term->slug;
+		}
 		$t['value'] = join(', ', $values);
 
 		$form_fields[$taxonomy] = $t;
@@ -1257,8 +1317,9 @@ 
 	// This was formerly in image_attachment_fields_to_edit().
 	if ( substr($post->post_mime_type, 0, 5) == 'image' ) {
 		$alt = get_post_meta($post->ID, '_wp_attachment_image_alt', true);
-		if ( empty($alt) )
-			$alt = '';
+		if ( empty($alt) ) {
+					$alt = '';
+		}
 
 		$form_fields['post_title']['required'] = true;
 
@@ -1312,22 +1373,26 @@ 
 	$attachments = array();
 	if ( $post_id ) {
 		$post = get_post($post_id);
-		if ( $post && $post->post_type == 'attachment' )
-			$attachments = array($post->ID => $post);
-		else
-			$attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') );
+		if ( $post && $post->post_type == 'attachment' ) {
+					$attachments = array($post->ID => $post);
+		} else {
+					$attachments = get_children( array( 'post_parent' => $post_id, 'post_type' => 'attachment', 'orderby' => 'menu_order ASC, ID', 'order' => 'DESC') );
+		}
 	} else {
-		if ( is_array($GLOBALS['wp_the_query']->posts) )
-			foreach ( $GLOBALS['wp_the_query']->posts as $attachment )
+		if ( is_array($GLOBALS['wp_the_query']->posts) ) {
+					foreach ( $GLOBALS['wp_the_query']->posts as $attachment )
 				$attachments[$attachment->ID] = $attachment;
+		}
 	}
 
 	$output = '';
 	foreach ( (array) $attachments as $id => $attachment ) {
-		if ( $attachment->post_status == 'trash' )
-			continue;
-		if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) )
-			$output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
+		if ( $attachment->post_status == 'trash' ) {
+					continue;
+		}
+		if ( $item = get_media_item( $id, array( 'errors' => isset($errors[$id]) ? $errors[$id] : null) ) ) {
+					$output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
+		}
 	}
 
 	return $output;
@@ -1347,10 +1412,11 @@ 
 function get_media_item( $attachment_id, $args = null ) {
 	global $redir_tab;
 
-	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) )
-		$thumb_url = $thumb_url[0];
-	else
-		$thumb_url = false;
+	if ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) ) {
+			$thumb_url = $thumb_url[0];
+	} else {
+			$thumb_url = false;
+	}
 
 	$post = get_post( $attachment_id );
 	$current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0;
@@ -1407,10 +1473,11 @@ 
 
 	foreach ( $form_fields as $key => $val ) {
 		if ( 'menu_order' == $key ) {
-			if ( $gallery )
-				$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ). "' /></div>";
-			else
-				$order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' />";
+			if ( $gallery ) {
+							$order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ). "' /></div>";
+			} else {
+							$order = "<input type='hidden' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' />";
+			}
 
 			unset( $form_fields['menu_order'] );
 			break;
@@ -1419,8 +1486,9 @@ 
 
 	$media_dims = '';
 	$meta = wp_get_attachment_metadata( $post->ID );
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+	if ( isset( $meta['width'], $meta['height'] ) ) {
+			$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+	}
 
 	/**
 	 * Filter the media metadata.
@@ -1456,8 +1524,9 @@ 
 			<p><strong>" . __('File name:') . "</strong> $filename</p>
 			<p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
 			<p><strong>" . __('Upload date:') . "</strong> " . mysql2date( __( 'F j, Y' ), $post->post_date ). '</p>';
-			if ( !empty( $media_dims ) )
-				$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
+			if ( !empty( $media_dims ) ) {
+							$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
+			}
 
 			$item .= "</td></tr>\n";
 
@@ -1522,8 +1591,9 @@ 
 	$hidden_fields = array();
 
 	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' )
-			continue;
+		if ( $id[0] == '_' ) {
+					continue;
+		}
 
 		if ( !empty( $field['tr'] ) ) {
 			$item .= $field['tr'];
@@ -1545,9 +1615,9 @@ 
 		$class .= $field['required'] ? ' form-required' : '';
 
 		$item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
-		if ( !empty( $field[ $field['input'] ] ) )
-			$item .= $field[ $field['input'] ];
-		elseif ( $field['input'] == 'textarea' ) {
+		if ( !empty( $field[ $field['input'] ] ) ) {
+					$item .= $field[ $field['input'] ];
+		} elseif ( $field['input'] == 'textarea' ) {
 			if ( 'post_content' == $id && user_can_richedit() ) {
 				// Sanitize_post() skips the post_content when user_can_richedit.
 				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
@@ -1557,33 +1627,39 @@ 
 		} else {
 			$item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr}{$aria_required} />";
 		}
-		if ( !empty( $field['helps'] ) )
-			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		if ( !empty( $field['helps'] ) ) {
+					$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		}
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
 
-		if ( !empty( $field['errors'] ) )
-			foreach ( array_unique( (array) $field['errors'] ) as $error )
+		if ( !empty( $field['errors'] ) ) {
+					foreach ( array_unique( (array) $field['errors'] ) as $error )
 				$extra_rows['error'][] = $error;
+		}
 
-		if ( !empty( $field['extra_rows'] ) )
-			foreach ( $field['extra_rows'] as $class => $rows )
+		if ( !empty( $field['extra_rows'] ) ) {
+					foreach ( $field['extra_rows'] as $class => $rows )
 				foreach ( (array) $rows as $html )
 					$extra_rows[$class][] = $html;
+		}
 
-		foreach ( $extra_rows as $class => $rows )
-			foreach ( $rows as $html )
+		foreach ( $extra_rows as $class => $rows ) {
+					foreach ( $rows as $html )
 				$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
+		}
 	}
 
-	if ( !empty( $form_fields['_final'] ) )
-		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+	if ( !empty( $form_fields['_final'] ) ) {
+			$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+	}
 	$item .= "\t</tbody>\n";
 	$item .= "\t</table>\n";
 
-	foreach ( $hidden_fields as $name => $value )
-		$item .= "\t<input type='hidden' name='$name' id='$name' value='" . esc_attr( $value ) . "' />\n";
+	foreach ( $hidden_fields as $name => $value ) {
+			$item .= "\t<input type='hidden' name='$name' id='$name' value='" . esc_attr( $value ) . "' />\n";
+	}
 
 	if ( $post->post_parent < 1 && isset( $_REQUEST['post_id'] ) ) {
 		$parent = (int) $_REQUEST['post_id'];
@@ -1621,21 +1697,26 @@ 
 	if ( $args['in_modal'] ) {
 		foreach ( get_attachment_taxonomies($post) as $taxonomy ) {
 			$t = (array) get_taxonomy($taxonomy);
-			if ( ! $t['public'] || ! $t['show_ui'] )
-				continue;
-			if ( empty($t['label']) )
-				$t['label'] = $taxonomy;
-			if ( empty($t['args']) )
-				$t['args'] = array();
+			if ( ! $t['public'] || ! $t['show_ui'] ) {
+							continue;
+			}
+			if ( empty($t['label']) ) {
+							$t['label'] = $taxonomy;
+			}
+			if ( empty($t['args']) ) {
+							$t['args'] = array();
+			}
 
 			$terms = get_object_term_cache($post->ID, $taxonomy);
-			if ( false === $terms )
-				$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+			if ( false === $terms ) {
+							$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
+			}
 
 			$values = array();
 
-			foreach ( $terms as $term )
-				$values[] = $term->slug;
+			foreach ( $terms as $term ) {
+							$values[] = $term->slug;
+			}
 			$t['value'] = join(', ', $values);
 			$t['taxonomy'] = true;
 
@@ -1670,8 +1751,9 @@ 
 
 	$item = '';
 	foreach ( $form_fields as $id => $field ) {
-		if ( $id[0] == '_' )
-			continue;
+		if ( $id[0] == '_' ) {
+					continue;
+		}
 
 		$name = "attachments[$attachment_id][$id]";
 		$id_attr = "attachments-$attachment_id-$id";
@@ -1683,8 +1765,9 @@ 
 
 		$field = array_merge( $defaults, $field );
 
-		if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) )
-			continue;
+		if ( ( ! $field['show_in_edit'] && ! $args['in_modal'] ) || ( ! $field['show_in_modal'] && $args['in_modal'] ) ) {
+					continue;
+		}
 
 		if ( $field['input'] == 'hidden' ) {
 			$hidden_fields[$name] = $field['value'];
@@ -1702,9 +1785,9 @@ 
 		$item .= "\t\t\t<th scope='row' class='label'><label for='$id_attr'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label>";
 		$item .= "</th>\n\t\t\t<td class='field'>";
 
-		if ( !empty( $field[ $field['input'] ] ) )
-			$item .= $field[ $field['input'] ];
-		elseif ( $field['input'] == 'textarea' ) {
+		if ( !empty( $field[ $field['input'] ] ) ) {
+					$item .= $field[ $field['input'] ];
+		} elseif ( $field['input'] == 'textarea' ) {
 			if ( 'post_content' == $id && user_can_richedit() ) {
 				// sanitize_post() skips the post_content when user_can_richedit.
 				$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
@@ -1713,28 +1796,33 @@ 
 		} else {
 			$item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr}{$aria_required} />";
 		}
-		if ( !empty( $field['helps'] ) )
-			$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		if ( !empty( $field['helps'] ) ) {
+					$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
+		}
 		$item .= "</td>\n\t\t</tr>\n";
 
 		$extra_rows = array();
 
-		if ( !empty( $field['errors'] ) )
-			foreach ( array_unique( (array) $field['errors'] ) as $error )
+		if ( !empty( $field['errors'] ) ) {
+					foreach ( array_unique( (array) $field['errors'] ) as $error )
 				$extra_rows['error'][] = $error;
+		}
 
-		if ( !empty( $field['extra_rows'] ) )
-			foreach ( $field['extra_rows'] as $class => $rows )
+		if ( !empty( $field['extra_rows'] ) ) {
+					foreach ( $field['extra_rows'] as $class => $rows )
 				foreach ( (array) $rows as $html )
 					$extra_rows[$class][] = $html;
+		}
 
-		foreach ( $extra_rows as $class => $rows )
-			foreach ( $rows as $html )
+		foreach ( $extra_rows as $class => $rows ) {
+					foreach ( $rows as $html )
 				$item .= "\t\t<tr><td></td><td class='$class'>$html</td></tr>\n";
+		}
 	}
 
-	if ( !empty( $form_fields['_final'] ) )
-		$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+	if ( !empty( $form_fields['_final'] ) ) {
+			$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
+	}
 
 	if ( $item ) {
 		$item = '<p class="media-types media-types-required-info">' .
@@ -1746,8 +1834,9 @@ 
 		$item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
 	}
 
-	if ( $item )
-		$item = '<input type="hidden" name="attachments[' . $attachment_id . '][menu_order]" value="' . esc_attr( $post->menu_order ) . '" />' . $item;
+	if ( $item ) {
+			$item = '<input type="hidden" name="attachments[' . $attachment_id . '][menu_order]" value="' . esc_attr( $post->menu_order ) . '" />' . $item;
+	}
 
 	return array(
 		'item'   => $item,
@@ -1804,14 +1893,16 @@ 
 
 <div id="media-upload-notice"><?php
 
-	if (isset($errors['upload_notice']) )
-		echo $errors['upload_notice'];
+	if (isset($errors['upload_notice']) ) {
+			echo $errors['upload_notice'];
+	}
 
 ?></div>
 <div id="media-upload-error"><?php
 
-	if (isset($errors['upload_error']) && is_wp_error($errors['upload_error']))
-		echo $errors['upload_error']->get_error_message();
+	if (isset($errors['upload_error']) && is_wp_error($errors['upload_error'])) {
+			echo $errors['upload_error']->get_error_message();
+	}
 
 ?></div>
 <?php
@@ -1888,11 +1979,13 @@ 
 <?php
 // Verify size is an int. If not return default value.
 $large_size_h = absint( get_option('large_size_h') );
-if( !$large_size_h )
+if( !$large_size_h ) {
 	$large_size_h = 1024;
+}
 $large_size_w = absint( get_option('large_size_w') );
-if( !$large_size_w )
+if( !$large_size_w ) {
 	$large_size_w = 1024;
+}
 ?>
 var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
 wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
@@ -1991,9 +2084,10 @@ 
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
 	$form_class = 'media-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
-		$form_class .= ' html-uploader';
-?>
+	if ( get_user_setting('uploader') ) {
+			$form_class .= ' html-uploader';
+	}
+	?>
 
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
 <?php submit_button( '', 'hidden', 'save', false ); ?>
@@ -2043,8 +2137,9 @@ 
  * @param integer $id
  */
 function media_upload_type_url_form($type = null, $errors = null, $id = null) {
-	if ( null === $type )
-		$type = 'image';
+	if ( null === $type ) {
+			$type = 'image';
+	}
 
 	media_upload_header();
 
@@ -2055,9 +2150,10 @@ 
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
 	$form_class = 'media-upload-form type-form validate';
 
-	if ( get_user_setting('uploader') )
-		$form_class .= ' html-uploader';
-?>
+	if ( get_user_setting('uploader') ) {
+			$form_class .= ' html-uploader';
+	}
+	?>
 
 <form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="<?php echo $type; ?>-form">
 <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
@@ -2198,9 +2294,10 @@ 
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
 	$form_class = 'media-upload-form validate';
 
-	if ( get_user_setting('uploader') )
-		$form_class .= ' html-uploader';
-?>
+	if ( get_user_setting('uploader') ) {
+			$form_class .= ' html-uploader';
+	}
+	?>
 
 <script type="text/javascript">
 jQuery(function($){
@@ -2350,8 +2447,9 @@ 
 	$form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
 	$form_class = 'media-upload-form validate';
 
-	if ( get_user_setting('uploader') )
-		$form_class .= ' html-uploader';
+	if ( get_user_setting('uploader') ) {
+			$form_class .= ' html-uploader';
+	}
 
 	$q = $_GET;
 	$q['posts_per_page'] = 10;
@@ -2386,30 +2484,35 @@ 
 $type_links = array();
 $_num_posts = (array) wp_count_attachments();
 $matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
-foreach ( $matches as $_type => $reals )
+foreach ( $matches as $_type => $reals ) {
 	foreach ( $reals as $real )
 		if ( isset($num_posts[$_type]) )
 			$num_posts[$_type] += $_num_posts[$real];
-		else
-			$num_posts[$_type] = $_num_posts[$real];
-// If available type specified by media button clicked, filter by that type
+}
+		else {
+					$num_posts[$_type] = $_num_posts[$real];
+		}
+		// If available type specified by media button clicked, filter by that type
 if ( empty($_GET['post_mime_type']) && !empty($num_posts[$type]) ) {
 	$_GET['post_mime_type'] = $type;
 	list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
 }
-if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' )
+if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' ) {
 	$class = ' class="current"';
-else
+} else {
 	$class = '';
+}
 $type_links[] = '<li><a href="' . esc_url(add_query_arg(array('post_mime_type'=>'all', 'paged'=>false, 'm'=>false))) . '"' . $class . '>' . __('All Types') . '</a>';
 foreach ( $post_mime_types as $mime_type => $label ) {
 	$class = '';
 
-	if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
-		continue;
+	if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) ) {
+			continue;
+	}
 
-	if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) )
-		$class = ' class="current"';
+	if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) {
+			$class = ' class="current"';
+	}
 
 	$type_links[] = '<li><a href="' . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
 }
@@ -2439,8 +2542,9 @@ 
 	'current' => $q['paged'],
 ));
 
-if ( $page_links )
+if ( $page_links ) {
 	echo "<div class='tablenav-pages'>$page_links</div>";
+}
 ?>
 
 <div class="alignleft actions">
@@ -2458,14 +2562,16 @@ 
 <option<?php selected( $selected_month, 0 ); ?> value='0'><?php _e( 'All dates' ); ?></option>
 <?php
 foreach ($arc_result as $arc_row) {
-	if ( $arc_row->yyear == 0 )
-		continue;
+	if ( $arc_row->yyear == 0 ) {
+			continue;
+	}
 	$arc_row->mmonth = zeroise( $arc_row->mmonth, 2 );
 
-	if ( $arc_row->yyear . $arc_row->mmonth == $selected_month )
-		$default = ' selected="selected"';
-	else
-		$default = '';
+	if ( $arc_row->yyear . $arc_row->mmonth == $selected_month ) {
+			$default = ' selected="selected"';
+	} else {
+			$default = '';
+	}
 
 	echo "<option$default value='" . esc_attr( $arc_row->yyear . $arc_row->mmonth ) . "'>";
 	echo esc_html( $wp_locale->get_month($arc_row->mmonth) . " $arc_row->yyear" );
@@ -2536,8 +2642,9 @@ 
 	}
 
 	$default_align = get_option('image_default_align');
-	if ( empty($default_align) )
-		$default_align = 'none';
+	if ( empty($default_align) ) {
+			$default_align = 'none';
+	}
 
 	if ( 'image' == $default_view ) {
 		$view = 'image-only';
@@ -2626,10 +2733,11 @@ 
 function media_upload_flash_bypass() {
 	$browser_uploader = admin_url( 'media-new.php?browser-uploader' );
 
-	if ( $post = get_post() )
-		$browser_uploader .= '&amp;post_id=' . intval( $post->ID );
-	elseif ( ! empty( $GLOBALS['post_ID'] ) )
-		$browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
+	if ( $post = get_post() ) {
+			$browser_uploader .= '&amp;post_id=' . intval( $post->ID );
+	} elseif ( ! empty( $GLOBALS['post_ID'] ) ) {
+			$browser_uploader .= '&amp;post_id=' . intval( $GLOBALS['post_ID'] );
+	}
 
 	?>
 	<p class="upload-flash-bypass">
@@ -2700,12 +2808,14 @@ 
  */
 function edit_form_image_editor( $post ) {
 	$open = isset( $_GET['image-editor'] );
-	if ( $open )
-		require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+	if ( $open ) {
+			require_once ABSPATH . 'wp-admin/includes/image-edit.php';
+	}
 
 	$thumb_url = false;
-	if ( $attachment_id = intval( $post->ID ) )
-		$thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
+	if ( $attachment_id = intval( $post->ID ) ) {
+			$thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
+	}
 
 	$alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
 
@@ -2722,12 +2832,21 @@ 
 
 		<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
 
-		<div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
+		<div<?php if ( $open ) {
+	echo ' style="display:none"';
+}
+?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
 			<p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
 			<p><?php echo $image_edit_button; ?></p>
 		</div>
-		<div<?php if ( ! $open ) echo ' style="display:none"'; ?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
-			<?php if ( $open ) wp_image_editor( $attachment_id ); ?>
+		<div<?php if ( ! $open ) {
+	echo ' style="display:none"';
+}
+?> class="image-editor" id="image-editor-<?php echo $attachment_id; ?>">
+			<?php if ( $open ) {
+	wp_image_editor( $attachment_id );
+}
+?>
 		</div>
 	<?php
 	elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ):
@@ -2813,8 +2932,9 @@ 
 
 	$media_dims = '';
 	$meta = wp_get_attachment_metadata( $post->ID );
-	if ( isset( $meta['width'], $meta['height'] ) )
-		$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+	if ( isset( $meta['width'], $meta['height'] ) ) {
+			$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']}&nbsp;&times;&nbsp;{$meta['height']}</span> ";
+	}
 	/** This filter is documented in wp-admin/includes/media.php */
 	$media_dims = apply_filters( 'media_meta', $media_dims, $post );
 
@@ -2846,10 +2966,11 @@ 
 	<?php
 		$file_size = false;
 
-		if ( isset( $meta['filesize'] ) )
-			$file_size = $meta['filesize'];
-		elseif ( file_exists( $file ) )
-			$file_size = filesize( $file );
+		if ( isset( $meta['filesize'] ) ) {
+					$file_size = $meta['filesize'];
+		} elseif ( file_exists( $file ) ) {
+					$file_size = filesize( $file );
+		}
 
 		if ( ! empty( $file_size ) ) : ?>
 			<div class="misc-pub-section misc-pub-filesize">
@@ -2949,8 +3070,9 @@ 
 				if ( 'length' !== $key && ! empty( $list ) ) {
 					$metadata[$key] = reset( $list );
 					// Fix bug in byte stream analysis.
-					if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
-						$metadata[$key] = 'Cop' . $metadata[$key];
+					if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) ) {
+											$metadata[$key] = 'Cop' . $metadata[$key];
+					}
 				}
 			}
 			break;
@@ -3003,32 +3125,45 @@ 
 	$id3 = new getID3();
 	$data = $id3->analyze( $file );
 
-	if ( isset( $data['video']['lossless'] ) )
-		$metadata['lossless'] = $data['video']['lossless'];
-	if ( ! empty( $data['video']['bitrate'] ) )
-		$metadata['bitrate'] = (int) $data['video']['bitrate'];
-	if ( ! empty( $data['video']['bitrate_mode'] ) )
-		$metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
-	if ( ! empty( $data['filesize'] ) )
-		$metadata['filesize'] = (int) $data['filesize'];
-	if ( ! empty( $data['mime_type'] ) )
-		$metadata['mime_type'] = $data['mime_type'];
-	if ( ! empty( $data['playtime_seconds'] ) )
-		$metadata['length'] = (int) round( $data['playtime_seconds'] );
-	if ( ! empty( $data['playtime_string'] ) )
-		$metadata['length_formatted'] = $data['playtime_string'];
-	if ( ! empty( $data['video']['resolution_x'] ) )
-		$metadata['width'] = (int) $data['video']['resolution_x'];
-	if ( ! empty( $data['video']['resolution_y'] ) )
-		$metadata['height'] = (int) $data['video']['resolution_y'];
-	if ( ! empty( $data['fileformat'] ) )
-		$metadata['fileformat'] = $data['fileformat'];
-	if ( ! empty( $data['video']['dataformat'] ) )
-		$metadata['dataformat'] = $data['video']['dataformat'];
-	if ( ! empty( $data['video']['encoder'] ) )
-		$metadata['encoder'] = $data['video']['encoder'];
-	if ( ! empty( $data['video']['codec'] ) )
-		$metadata['codec'] = $data['video']['codec'];
+	if ( isset( $data['video']['lossless'] ) ) {
+			$metadata['lossless'] = $data['video']['lossless'];
+	}
+	if ( ! empty( $data['video']['bitrate'] ) ) {
+			$metadata['bitrate'] = (int) $data['video']['bitrate'];
+	}
+	if ( ! empty( $data['video']['bitrate_mode'] ) ) {
+			$metadata['bitrate_mode'] = $data['video']['bitrate_mode'];
+	}
+	if ( ! empty( $data['filesize'] ) ) {
+			$metadata['filesize'] = (int) $data['filesize'];
+	}
+	if ( ! empty( $data['mime_type'] ) ) {
+			$metadata['mime_type'] = $data['mime_type'];
+	}
+	if ( ! empty( $data['playtime_seconds'] ) ) {
+			$metadata['length'] = (int) round( $data['playtime_seconds'] );
+	}
+	if ( ! empty( $data['playtime_string'] ) ) {
+			$metadata['length_formatted'] = $data['playtime_string'];
+	}
+	if ( ! empty( $data['video']['resolution_x'] ) ) {
+			$metadata['width'] = (int) $data['video']['resolution_x'];
+	}
+	if ( ! empty( $data['video']['resolution_y'] ) ) {
+			$metadata['height'] = (int) $data['video']['resolution_y'];
+	}
+	if ( ! empty( $data['fileformat'] ) ) {
+			$metadata['fileformat'] = $data['fileformat'];
+	}
+	if ( ! empty( $data['video']['dataformat'] ) ) {
+			$metadata['dataformat'] = $data['video']['dataformat'];
+	}
+	if ( ! empty( $data['video']['encoder'] ) ) {
+			$metadata['encoder'] = $data['video']['encoder'];
+	}
+	if ( ! empty( $data['video']['codec'] ) ) {
+			$metadata['codec'] = $data['video']['codec'];
+	}
 
 	if ( ! empty( $data['audio'] ) ) {
 		unset( $data['audio']['streams'] );
@@ -3069,16 +3204,21 @@ 
 		$metadata = $data['audio'];
 	}
 
-	if ( ! empty( $data['fileformat'] ) )
-		$metadata['fileformat'] = $data['fileformat'];
-	if ( ! empty( $data['filesize'] ) )
-		$metadata['filesize'] = (int) $data['filesize'];
-	if ( ! empty( $data['mime_type'] ) )
-		$metadata['mime_type'] = $data['mime_type'];
-	if ( ! empty( $data['playtime_seconds'] ) )
-		$metadata['length'] = (int) round( $data['playtime_seconds'] );
-	if ( ! empty( $data['playtime_string'] ) )
-		$metadata['length_formatted'] = $data['playtime_string'];
+	if ( ! empty( $data['fileformat'] ) ) {
+			$metadata['fileformat'] = $data['fileformat'];
+	}
+	if ( ! empty( $data['filesize'] ) ) {
+			$metadata['filesize'] = (int) $data['filesize'];
+	}
+	if ( ! empty( $data['mime_type'] ) ) {
+			$metadata['mime_type'] = $data['mime_type'];
+	}
+	if ( ! empty( $data['playtime_seconds'] ) ) {
+			$metadata['length'] = (int) round( $data['playtime_seconds'] );
+	}
+	if ( ! empty( $data['playtime_string'] ) ) {
+			$metadata['length_formatted'] = $data['playtime_string'];
+	}
 
 	wp_add_id3_tag_data( $metadata, $data );
 

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 +188 added lines, -188 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,52 +101,52 @@ 
  * @param array|string $insertion The new content to insert.
  * @return bool True on write success, false on failure.
  */
-function insert_with_markers( $filename, $marker, $insertion ) {
-	if ( ! file_exists( $filename ) ) {
-		if ( ! is_writable( dirname( $filename ) ) ) {
+function insert_with_markers($filename, $marker, $insertion) {
+	if ( ! file_exists($filename)) {
+		if ( ! is_writable(dirname($filename))) {
 			return false;
 		}
-		if ( ! touch( $filename ) ) {
+		if ( ! touch($filename)) {
 			return false;
 		}
-	} elseif ( ! is_writeable( $filename ) ) {
+	} elseif ( ! is_writeable($filename)) {
 		return false;
 	}
 
-	if ( ! is_array( $insertion ) ) {
-		$insertion = explode( "\n", $insertion );
+	if ( ! is_array($insertion)) {
+		$insertion = explode("\n", $insertion);
 	}
 
 	$start_marker = "# BEGIN {$marker}";
 	$end_marker   = "# END {$marker}";
 
-	$fp = fopen( $filename, 'r+' );
-	if ( ! $fp ) {
+	$fp = fopen($filename, 'r+');
+	if ( ! $fp) {
 		return false;
 	}
 
 	// Attempt to get a lock. If the filesystem supports locking, this will block until the lock is acquired.
-	flock( $fp, LOCK_EX );
+	flock($fp, LOCK_EX);
 
 	$lines = array();
-	while ( ! feof( $fp ) ) {
-		$lines[] = rtrim( fgets( $fp ), "\r\n" );
+	while ( ! feof($fp)) {
+		$lines[] = rtrim(fgets($fp), "\r\n");
 	}
 
 	// Split out the existing file into the preceeding lines, and those that appear after the marker
 	$pre_lines = $post_lines = $existing_lines = array();
 	$found_marker = $found_end_marker = false;
-	foreach ( $lines as $line ) {
-		if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
+	foreach ($lines as $line) {
+		if ( ! $found_marker && false !== strpos($line, $start_marker)) {
 			$found_marker = true;
 			continue;
-		} elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
+		} elseif ( ! $found_end_marker && false !== strpos($line, $end_marker)) {
 			$found_end_marker = true;
 			continue;
 		}
-		if ( ! $found_marker ) {
+		if ( ! $found_marker) {
 			$pre_lines[] = $line;
-		} elseif ( $found_marker && $found_end_marker ) {
+		} elseif ($found_marker && $found_end_marker) {
 			$post_lines[] = $line;
 		} else {
 			$existing_lines[] = $line;
@@ -154,31 +154,31 @@ 
 	}
 
 	// Check to see if there was a change
-	if ( $existing_lines === $insertion ) {
-		flock( $fp, LOCK_UN );
-		fclose( $fp );
+	if ($existing_lines === $insertion) {
+		flock($fp, LOCK_UN);
+		fclose($fp);
 
 		return true;
 	}
 
 	// Generate the new file data
-	$new_file_data = implode( "\n", array_merge(
+	$new_file_data = implode("\n", array_merge(
 		$pre_lines,
-		array( $start_marker ),
+		array($start_marker),
 		$insertion,
-		array( $end_marker ),
+		array($end_marker),
 		$post_lines
-	) );
+	));
 
 	// Write to the start of the file, and truncate it to that length
-	fseek( $fp, 0 );
-	$bytes = fwrite( $fp, $new_file_data );
-	if ( $bytes ) {
-		ftruncate( $fp, ftell( $fp ) );
+	fseek($fp, 0);
+	$bytes = fwrite($fp, $new_file_data);
+	if ($bytes) {
+		ftruncate($fp, ftell($fp));
 	}
-	fflush( $fp );
-	flock( $fp, LOCK_UN );
-	fclose( $fp );
+	fflush($fp);
+	flock($fp, LOCK_UN);
+	fclose($fp);
 
 	return (bool) $bytes;
 }
@@ -194,7 +194,7 @@ 
  * @global WP_Rewrite $wp_rewrite
  */
 function save_mod_rewrite_rules() {
-	if ( is_multisite() )
+	if (is_multisite())
 		return;
 
 	global $wp_rewrite;
@@ -206,10 +206,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);
 		}
 	}
 
@@ -226,19 +226,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);
@@ -254,19 +254,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);
 }
 
 /**
@@ -277,12 +277,12 @@ 
  * @param string $old_value
  * @param string $value
  */
-function update_home_siteurl( $old_value, $value ) {
-	if ( wp_installing() )
+function update_home_siteurl($old_value, $value) {
+	if (wp_installing())
 		return;
 
-	if ( is_multisite() && ms_is_switched() ) {
-		delete_option( 'rewrite_rules' );
+	if (is_multisite() && ms_is_switched()) {
+		delete_option('rewrite_rules');
 	} else {
 		flush_rewrite_rules();
 	}
@@ -300,16 +300,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];
 		}
 	}
 }
@@ -322,9 +322,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();
 	}
@@ -339,25 +339,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
@@ -365,8 +365,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.
@@ -375,13 +375,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;
 	}
@@ -396,28 +396,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':
@@ -432,7 +432,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:
@@ -453,21 +453,21 @@ 
 				 * @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);
 
-		$url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
-		if ( isset( $_POST['mode'] ) ) {
-			$url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
+		$url = remove_query_arg(array('pagenum', 'apage', 'paged'), wp_get_referer());
+		if (isset($_POST['mode'])) {
+			$url = add_query_arg(array('mode' => $_POST['mode']), $url);
 		}
 
-		wp_safe_redirect( $url );
+		wp_safe_redirect($url);
 		exit;
 	}
 }
@@ -481,18 +481,18 @@ 
  * @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', false ) ) {
+	if ( ! class_exists('DOMDocument', false)) {
 		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;
@@ -508,21 +508,21 @@ 
  */
 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', false ) ) {
+	if ( ! class_exists('DOMDocument', false)) {
 		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);
@@ -542,13 +542,13 @@ 
  * @return bool
  */
 function iis7_add_rewrite_rule($filename, $rewrite_rule) {
-	if ( ! class_exists( 'DOMDocument', false ) ) {
+	if ( ! class_exists('DOMDocument', false)) {
 		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);
 	}
@@ -556,25 +556,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 {
@@ -582,7 +582,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 {
@@ -590,7 +590,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 {
@@ -638,42 +638,42 @@ 
  *
  * @param int $user_id User ID.
  */
-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
 					}
 
@@ -697,30 +697,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' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' );
+		$icon_colors = array('base' => '#82878c', '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
@@ -737,18 +737,18 @@ 
  * @param string $screen_id The screen id.
  * @return array The Heartbeat response.
  */
-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;
@@ -756,7 +756,7 @@ 
 		}
 	}
 
-	if ( ! empty( $checked ) )
+	if ( ! empty($checked))
 		$response['wp-check-locked-posts'] = $checked;
 
 	return $response;
@@ -772,31 +772,31 @@ 
  * @param string $screen_id The screen id.
  * @return array The Heartbeat response.
  */
-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;
@@ -815,16 +815,16 @@ 
  * @param string $screen_id The screen id.
  * @return array The Heartbeat response.
  */
-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;
 		}
 
@@ -833,10 +833,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'),
 		);
 	}
 
@@ -853,10 +853,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';
 	}
 
@@ -872,19 +872,19 @@ 
  * @param array $data     The $_POST data sent.
  * @return array The Heartbeat response.
  */
-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)));
 		}
 	}
 
@@ -904,7 +904,7 @@ 
 function post_form_autocomplete_off() {
 	global $is_safari, $is_chrome;
 
-	if ( $is_safari || $is_chrome ) {
+	if ($is_safari || $is_chrome) {
 		echo ' autocomplete="off"';
 	}
 }
@@ -920,15 +920,15 @@ 
 function wp_admin_canonical_url() {
 	$removable_query_args = wp_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 +99 added lines, -69 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;
+			}
 		}
 	}
 
@@ -194,8 +197,9 @@ 
  * @global WP_Rewrite $wp_rewrite
  */
 function save_mod_rewrite_rules() {
-	if ( is_multisite() )
-		return;
+	if ( is_multisite() ) {
+			return;
+	}
 
 	global $wp_rewrite;
 
@@ -227,8 +231,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;
 
@@ -261,8 +266,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;
 	}
@@ -278,8 +284,9 @@ 
  * @param string $value
  */
 function update_home_siteurl( $old_value, $value ) {
-	if ( wp_installing() )
-		return;
+	if ( wp_installing() ) {
+			return;
+	}
 
 	if ( is_multisite() && ms_is_switched() ) {
 		delete_option( 'rewrite_rules' );
@@ -323,10 +330,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();
@@ -340,11 +348,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 );
@@ -381,8 +391,9 @@ 
 
 	$out = array();
 	foreach ( $functions as $function ) {
-		if ( in_array( $function, $ignore_functions ) )
-			continue;
+		if ( in_array( $function, $ignore_functions ) ) {
+					continue;
+		}
 		$out[] = $function;
 	}
 
@@ -399,23 +410,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':
@@ -432,8 +446,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:
 
@@ -455,8 +470,9 @@ 
 				 */
 				$value = apply_filters( 'set-screen-option', false, $option, $value );
 
-				if ( false === $value )
-					return;
+				if ( false === $value ) {
+									return;
+				}
 				break;
 		}
 
@@ -481,22 +497,25 @@ 
  * @param string $filename The file path to the configuration file
  */
 function iis7_rewrite_rule_exists($filename) {
-	if ( ! file_exists($filename) )
-		return false;
+	if ( ! file_exists($filename) ) {
+			return false;
+	}
 	if ( ! class_exists( 'DOMDocument', false ) ) {
 		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
@@ -508,8 +527,9 @@ 
  */
 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', false ) ) {
 		return false;
@@ -518,8 +538,9 @@ 
 	$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 ) {
@@ -556,15 +577,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');
@@ -742,22 +765,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;
 }
@@ -777,11 +803,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(
@@ -789,14 +817,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 +272 added lines, -272 removed lines

@@ -15,33 +15,33 @@ 
  * @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 ) / KB_IN_BYTES ) );
+	$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) / KB_IN_BYTES));
 	}
 
-	if ( $file_size > ( KB_IN_BYTES * 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 ($file_size > (KB_IN_BYTES * 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 (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;
@@ -57,16 +57,16 @@ 
  * @param int  $blog_id Site ID.
  * @param bool $drop    True if site's database tables 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 site is deleted.
 	 *
@@ -75,42 +75,42 @@ 
 	 * @param int  $blog_id The site ID.
 	 * @param bool $drop    True if site'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_get_upload_dir();
 
-		$tables = $wpdb->tables( 'blog' );
+		$tables = $wpdb->tables('blog');
 		/**
 		 * Filter the tables to drop when the site is deleted.
 		 *
@@ -119,13 +119,13 @@ 
 		 * @param array $tables  The site tables to be dropped.
 		 * @param int   $blog_id The ID of the site 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 site is deleted.
@@ -135,43 +135,43 @@ 
 		 * @param string $uploads['basedir'] Uploads path without subdirectory. @see wp_upload_dir()
 		 * @param int    $blog_id            The site 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();
 }
 
@@ -187,22 +187,22 @@ 
  * @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;
 
-	if ( ! is_numeric( $id ) ) {
+	if ( ! is_numeric($id)) {
 		return false;
 	}
 
 	$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;
 	}
 
@@ -213,42 +213,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;
 }
@@ -261,19 +261,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.
@@ -305,16 +305,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( self_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(self_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);
 }
 
 /**
@@ -328,33 +328,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_user_meta( $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_user_meta($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_user_meta( $current_user->ID, '_new_email', $new_user_email );
+		update_user_meta($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.
 
@@ -385,15 +385,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;
 	}
 }
@@ -408,9 +408,9 @@ 
  */
 function new_user_email_admin_notice() {
 	global $pagenow;
-	if ( 'profile.php' === $pagenow && isset( $_GET['updated'] ) && $email = get_user_meta( get_current_user_id(), '_new_email', true ) ) {
+	if ('profile.php' === $pagenow && isset($_GET['updated']) && $email = get_user_meta(get_current_user_id(), '_new_email', true)) {
 		/* translators: %s: New email address */
-		echo '<div class="notice notice-info"><p>' . sprintf( __( 'Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.' ), '<code>' . esc_html( $email['newemail'] ) . '</code>' ) . '</p></div>';
+		echo '<div class="notice notice-info"><p>'.sprintf(__('Your email address has not been updated yet. Please check your inbox at %s for a confirmation email.'), '<code>'.esc_html($email['newemail']).'</code>').'</p></div>';
 	}
 }
 
@@ -422,19 +422,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 ( ! is_numeric( $space_allowed ) ) {
+	if ( ! 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;
@@ -450,19 +450,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 / KB_IN_BYTES );
+	if ($space_allowed > 1000) {
+		$space = number_format($space_allowed / KB_IN_BYTES);
 		/* 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
 }
 
@@ -474,12 +474,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);
 }
 
 /**
@@ -489,20 +489,20 @@ 
  *
  * @param int $id The ID of the site 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
@@ -524,19 +524,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.
 			 *
@@ -544,7 +544,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.
@@ -553,7 +553,7 @@ 
 			 *
 			 * @param int $id ID of the user marked as HAM.
 			 */
-			do_action( 'make_ham_user', $id );
+			do_action('make_ham_user', $id);
 		}
 	}
 
@@ -568,13 +568,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;
 }
@@ -588,8 +588,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',
@@ -601,7 +601,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.
@@ -611,8 +611,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);
 }
 
 /**
@@ -627,12 +627,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;
@@ -646,36 +646,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);
 }
 
 /**
@@ -686,8 +686,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;
 }
@@ -701,33 +701,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.
@@ -738,9 +738,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);
 }
 
 /**
@@ -756,16 +756,16 @@ 
 function site_admin_notice() {
 	global $wp_db_version, $pagenow;
 
-	if ( ! is_super_admin() ) {
+	if ( ! is_super_admin()) {
 		return false;
 	}
 
-	if ( 'upgrade.php' == $pagenow ) {
+	if ('upgrade.php' == $pagenow) {
 		return;
 	}
 
-	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>";
 	}
 }
 
@@ -781,23 +781,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;
@@ -816,31 +816,31 @@ 
 	<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";
 		}
@@ -862,9 +862,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;
 	}
 
@@ -875,15 +875,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.
@@ -892,7 +892,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;
@@ -909,9 +909,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;
 	}
 
@@ -922,16 +922,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.
@@ -940,7 +940,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;
 		}
 	}
@@ -960,10 +960,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;
@@ -976,7 +976,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);
 }
 
 /**
@@ -989,7 +989,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
 }
@@ -998,77 +998,77 @@ 
  *
  * @param array $users
  */
-function confirm_delete_users( $users ) {
+function confirm_delete_users($users) {
 	$current_user = wp_get_current_user();
-	if ( ! is_array( $users ) || empty( $users ) ) {
+	if ( ! is_array($users) || empty($users)) {
 		return false;
 	}
 	?>
-	<h1><?php esc_html_e( 'Users' ); ?></h1>
+	<h1><?php esc_html_e('Users'); ?></h1>
 
-	<?php if ( 1 == count( $users ) ) : ?>
-		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
+	<?php if (1 == count($users)) : ?>
+		<p><?php _e('You have chosen to delete the user from all networks and sites.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+		<p><?php _e('You have chosen to delete the following users from all networks and sites.'); ?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
 	<input type="hidden" name="dodelete" />
 	<?php
-	wp_nonce_field( 'ms-users-delete' );
+	wp_nonce_field('ms-users-delete');
 	$site_admins = get_super_admins();
-	$admin_out = '<option value="' . esc_attr( $current_user->ID ) . '">' . $current_user->user_login . '</option>'; ?>
+	$admin_out = '<option value="'.esc_attr($current_user->ID).'">'.$current_user->user_login.'</option>'; ?>
 	<table class="form-table">
-	<?php foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
-		if ( $user_id != '' && $user_id != '0' ) {
-			$delete_user = get_userdata( $user_id );
+	<?php foreach (($allusers = (array) $_POST['allusers']) as $user_id) {
+		if ($user_id != '' && $user_id != '0') {
+			$delete_user = get_userdata($user_id);
 
-			if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
-				wp_die( sprintf( __( 'Warning! User %s cannot be deleted.' ), $delete_user->user_login ) );
+			if ( ! current_user_can('delete_user', $delete_user->ID)) {
+				wp_die(sprintf(__('Warning! User %s cannot be deleted.'), $delete_user->user_login));
 			}
 
-			if ( in_array( $delete_user->user_login, $site_admins ) ) {
-				wp_die( sprintf( __( 'Warning! User cannot be deleted. The user %s is a network administrator.' ), '<em>' . $delete_user->user_login . '</em>' ) );
+			if (in_array($delete_user->user_login, $site_admins)) {
+				wp_die(sprintf(__('Warning! User cannot be deleted. The user %s is a network administrator.'), '<em>'.$delete_user->user_login.'</em>'));
 			}
 			?>
 			<tr>
 				<th scope="row"><?php echo $delete_user->user_login; ?>
-					<?php echo '<input type="hidden" name="user[]" value="' . esc_attr( $user_id ) . '" />' . "\n"; ?>
+					<?php echo '<input type="hidden" name="user[]" value="'.esc_attr($user_id).'" />'."\n"; ?>
 				</th>
-			<?php $blogs = get_blogs_of_user( $user_id, true );
+			<?php $blogs = get_blogs_of_user($user_id, true);
 
-			if ( ! empty( $blogs ) ) {
+			if ( ! empty($blogs)) {
 				?>
 				<td><fieldset><p><legend><?php printf(
 					/* translators: user login */
-					__( 'What should be done with content owned by %s?' ),
-					'<em>' . $delete_user->user_login . '</em>'
+					__('What should be done with content owned by %s?'),
+					'<em>'.$delete_user->user_login.'</em>'
 				); ?></legend></p>
 				<?php
-				foreach ( (array) $blogs as $key => $details ) {
-					$blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
-					if ( is_array( $blog_users ) && !empty( $blog_users ) ) {
-						$user_site = "<a href='" . esc_url( get_home_url( $details->userblog_id ) ) . "'>{$details->blogname}</a>";
-						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">' . __( 'Select a user' ) . '</label>';
+				foreach ((array) $blogs as $key => $details) {
+					$blog_users = get_users(array('blog_id' => $details->userblog_id, 'fields' => array('ID', 'user_login')));
+					if (is_array($blog_users) && ! empty($blog_users)) {
+						$user_site = "<a href='".esc_url(get_home_url($details->userblog_id))."'>{$details->blogname}</a>";
+						$user_dropdown = '<label for="reassign_user" class="screen-reader-text">'.__('Select a user').'</label>';
 						$user_dropdown .= "<select name='blog[$user_id][$key]' id='reassign_user'>";
 						$user_list = '';
-						foreach ( $blog_users as $user ) {
-							if ( ! in_array( $user->ID, $allusers ) ) {
+						foreach ($blog_users as $user) {
+							if ( ! in_array($user->ID, $allusers)) {
 								$user_list .= "<option value='{$user->ID}'>{$user->user_login}</option>";
 							}
 						}
-						if ( '' == $user_list ) {
+						if ('' == $user_list) {
 							$user_list = $admin_out;
 						}
 						$user_dropdown .= $user_list;
 						$user_dropdown .= "</select>\n";
 						?>
 						<ul style="list-style:none;">
-							<li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
-							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
-							<?php _e( 'Delete all content.' ); ?></label></li>
-							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
-							<?php _e( 'Attribute all content to:' ); ?></label>
+							<li><?php printf(__('Site: %s'), $user_site); ?></li>
+							<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id.']['.$delete_user->ID ?>]" value="delete" checked="checked" />
+							<?php _e('Delete all content.'); ?></label></li>
+							<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id.']['.$delete_user->ID ?>]" value="reassign" />
+							<?php _e('Attribute all content to:'); ?></label>
 							<?php echo $user_dropdown; ?></li>
 						</ul>
 						<?php
@@ -1077,7 +1077,7 @@ 
 				echo "</fieldset></td></tr>";
 			} else {
 				?>
-				<td><fieldset><p><legend><?php _e( 'User has no sites or content and will be deleted.' ); ?></legend></p>
+				<td><fieldset><p><legend><?php _e('User has no sites or content and will be deleted.'); ?></legend></p>
 			<?php } ?>
 			</tr>
 		<?php
@@ -1088,15 +1088,15 @@ 
 	</table>
 	<?php
 	/** This action is documented in wp-admin/users.php */
-	do_action( 'delete_user_form', $current_user, $allusers );
+	do_action('delete_user_form', $current_user, $allusers);
 
-	if ( 1 == count( $users ) ) : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
+	if (1 == count($users)) : ?>
+		<p><?php _e('Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+		<p><?php _e('Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.'); ?></p>
 	<?php endif;
 
-	submit_button( __('Confirm Deletion'), 'primary' );
+	submit_button(__('Confirm Deletion'), 'primary');
 	?>
 	</form>
 	<?php

Braces +100 added lines, -62 removed lines

@@ -16,14 +16,18 @@ 
  * @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();
 
@@ -148,8 +152,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;
@@ -164,16 +169,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.
@@ -197,8 +204,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();
@@ -231,8 +239,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();
@@ -240,8 +249,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 ) );
 
@@ -262,8 +272,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(
@@ -328,11 +339,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'] ) ) {
@@ -423,8 +436,9 @@ 
  * @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 ( ! is_numeric( $space_allowed ) ) {
@@ -433,8 +447,9 @@ 
 	$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;
@@ -494,8 +509,9 @@ 
 	$quota = get_option( 'blog_upload_space' );
 	restore_current_blog();
 
-	if ( !$quota )
-		$quota = '';
+	if ( !$quota ) {
+			$quota = '';
+	}
 
 	?>
 	<tr>
@@ -527,8 +543,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 ) );
 
@@ -571,8 +588,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 );
 
@@ -646,18 +664,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>';
@@ -687,8 +708,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.
@@ -723,8 +745,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' );
@@ -782,14 +806,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;
@@ -826,8 +854,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>
@@ -839,8 +868,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";
 		}
@@ -963,10 +994,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.
@@ -1008,8 +1040,11 @@ 
 
 	<?php if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'You have chosen to delete the user from all networks and sites.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'You have chosen to delete the following users from all networks and sites.' );
+}
+?></p>
 	<?php endif; ?>
 
 	<form action="users.php?action=dodelete" method="post">
@@ -1092,8 +1127,11 @@ 
 
 	if ( 1 == count( $users ) ) : ?>
 		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, the user will be permanently removed.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'Once you hit &#8220;Confirm Deletion&#8221;, these users will be permanently removed.' );
+}
+?></p>
 	<?php endif;
 
 	submit_button( __('Confirm Deletion'), 'primary' );

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' ) );

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Core Navigation Menu API
- *
- * @package WordPress
- * @subpackage Nav_Menus
- * @since 3.0.0
- */
+	 * Core Navigation Menu API
+	 *
+	 * @package WordPress
+	 * @subpackage Nav_Menus
+	 * @since 3.0.0
+	 */
 
 /** Walker_Nav_Menu_Edit class */
 require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );

Spacing +269 added lines, -269 removed lines

@@ -8,10 +8,10 @@ 
  */
 
 /** Walker_Nav_Menu_Edit class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-edit.php');
 
 /** Walker_Nav_Menu_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-checklist.php');
 
 /**
  * Prints the appropriate response to a menu quick search.
@@ -20,41 +20,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,
@@ -68,21 +68,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(),
@@ -93,17 +93,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,
@@ -126,17 +126,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);
 	}
 }
@@ -151,17 +151,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-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
+	$initial_meta_boxes = array('add-post-type-page', 'add-post-type-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'];
 				}
@@ -170,7 +170,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);
 }
 
 /**
@@ -179,12 +179,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.
@@ -197,12 +197,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-post-type-{$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-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type);
 		}
 	}
 }
@@ -213,17 +213,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);
 		}
 	}
 }
@@ -238,13 +238,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);
 }
 
 /**
@@ -264,18 +264,18 @@ 
 	<div class="customlinkdiv" id="customlinkdiv">
 		<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
 		<p id="menu-item-url-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+			<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
 		</p>
 
 		<p id="menu-item-name-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+			<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 			<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" />
 		</p>
 
 		<p class="button-controls wp-clearfix">
 			<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>
@@ -295,15 +295,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,
@@ -316,23 +316,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,
@@ -346,18 +346,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';
 	}
 
@@ -373,30 +373,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;
 
 				/**
@@ -411,50 +411,50 @@ 
 				 * @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();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="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>
@@ -467,15 +467,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,
@@ -486,15 +486,15 @@ 
 							'post_type' => 'nav_menu_item',
 							'type' => 'custom',
 							'url' => home_url('/'),
-						) );
+						));
 					}
 				}
 
-				$post_type = get_post_type_object( $post_type_name );
-				$archive_link = get_post_type_archive_link( $post_type_name );
-				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-					array_unshift( $posts, (object) array(
+				$post_type = get_post_type_object($post_type_name);
+				$archive_link = get_post_type_archive_link($post_type_name);
+				if ($post_type->has_archive) {
+					$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+					array_unshift($posts, (object) array(
 						'ID' => 0,
 						'object_id' => $_nav_menu_placeholder,
 						'object'     => $post_type_name,
@@ -503,8 +503,8 @@ 
 						'post_title' => $post_type->labels->archives,
 						'post_type' => 'nav_menu_item',
 						'type' => 'post_type_archive',
-						'url' => get_post_type_archive_link( $post_type_name ),
-					) );
+						'url' => get_post_type_archive_link($post_type_name),
+					));
 				}
 
 				/**
@@ -522,10 +522,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);
 
 				}
@@ -533,7 +533,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>
@@ -543,18 +543,18 @@ 
 		<p class="button-controls wp-clearfix">
 			<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>
@@ -573,14 +573,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,
@@ -595,19 +595,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,
@@ -621,18 +621,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';
 	}
 
@@ -648,39 +648,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>
@@ -688,10 +688,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>
@@ -699,33 +699,33 @@ 
 		</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();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="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>
@@ -736,7 +736,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)
@@ -745,7 +745,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>
@@ -763,25 +763,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.
@@ -790,8 +790,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;
@@ -800,22 +800,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);
 
 		}
 	}
@@ -832,23 +832,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',
@@ -873,19 +873,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.
@@ -895,38 +895,38 @@ 
 		 * @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',
+			return new WP_Error('menu_walker_not_exist',
 				/* translators: %s: walker class name */
-				sprintf( __( 'The Walker class named %s does not exist.' ),
-					'<strong>' . $walker_class_name . '</strong>'
+				sprintf(__('The Walker class named %s does not exist.'),
+					'<strong>'.$walker_class_name.'</strong>'
 				)
 			);
 		}
 
 		$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;
 	}
 
@@ -941,13 +941,13 @@ 
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'_title'      => __( 'Show advanced menu properties' ),
+		'_title'      => __('Show advanced menu properties'),
 		'cb'          => '<input type="checkbox" />',
-		'link-target' => __( 'Link Target' ),
-		'attr-title'  => __( 'Title Attribute' ),
-		'css-classes' => __( 'CSS Classes' ),
-		'xfn'         => __( 'Link Relationship (XFN)' ),
-		'description' => __( 'Description' ),
+		'link-target' => __('Link Target'),
+		'attr-title'  => __('Title Attribute'),
+		'css-classes' => __('CSS Classes'),
+		'xfn'         => __('Link Relationship (XFN)'),
+		'description' => __('Description'),
 	);
 }
 
@@ -961,13 +961,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);
 }
 
 /**
@@ -979,12 +979,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(
@@ -994,66 +994,66 @@ 
 		'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>' .
+	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.
 		/* translators: %s: nav menu title */
-		sprintf( __( '%s has been updated.' ),
-			'<strong>' . $nav_menu_selected_title . '</strong>'
-		) . '</p></div>';
+		sprintf(__('%s has been updated.'),
+			'<strong>'.$nav_menu_selected_title.'</strong>'
+		).'</p></div>';
 
-	unset( $menu_items, $unsorted_menu_items );
+	unset($menu_items, $unsorted_menu_items);
 
 	return $messages;
 }

Braces +82 added lines, -45 removed lines

@@ -75,8 +75,9 @@ 
 				'post_type' => $matches[2],
 				's' => $query,
 			));
-			if ( ! have_posts() )
-				return;
+			if ( ! have_posts() ) {
+							return;
+			}
 			while ( have_posts() ) {
 				the_post();
 				if ( 'markup' == $response_format ) {
@@ -98,8 +99,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 );
@@ -151,8 +153,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-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
 	$hidden_meta_boxes = array();
@@ -181,8 +184,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 ) {
 		/**
@@ -215,8 +219,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 */
@@ -241,8 +246,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 );
 }
@@ -316,8 +322,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;
@@ -374,17 +381,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>
@@ -649,17 +665,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>
@@ -884,8 +909,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.
@@ -910,17 +936,21 @@ 
 
 		$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 ) );
@@ -966,9 +996,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
@@ -984,8 +1015,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',
@@ -1000,12 +1032,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 );
 
@@ -1029,14 +1063,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/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 ) {

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Template WordPress Administration API.
- *
- * A Big Mess. Also some neat functions that are nicely written.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Template WordPress Administration API.
+	 *
+	 * A Big Mess. Also some neat functions that are nicely written.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** Walker_Category_Checklist class */
 require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );

Spacing +457 added lines, -457 removed lines

@@ -9,10 +9,10 @@ 
  */
 
 /** Walker_Category_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-category-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-category-checklist.php');
 
 /** WP_Internal_Pointers class */
-require_once( ABSPATH . 'wp-admin/includes/class-wp-internal-pointers.php' );
+require_once(ABSPATH.'wp-admin/includes/class-wp-internal-pointers.php');
 
 //
 // Category Checklists
@@ -37,15 +37,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
-	) );
+	));
 }
 
 /**
@@ -74,7 +74,7 @@ 
  *                                        of echoing it. 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,
@@ -95,11 +95,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'];
@@ -108,64 +108,64 @@ 
 	$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'));
 	}
 
 	$output = '';
 
-	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
-		$output .= call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
+		$output .= call_user_func_array(array($walker, 'walk'), array($checked_categories, 0, $args));
 	}
 	// Then the rest of them
-	$output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+	$output .= call_user_func_array(array($walker, 'walk'), array($categories, 0, $args));
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 
@@ -188,33 +188,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>
@@ -231,32 +231,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>";
 	}
 }
@@ -270,71 +270,71 @@ 
  */
 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="hidden" id="inline_' . $post->ID.'">
+	<div class="post_title">' . $title.'</div>'.
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	'<div class="post_name">' . apply_filters( 'editable_slug', $post->post_name, $post ) . '</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="post_name">'.apply_filters('editable_slug', $post->post_name, $post).'</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) {
 
-			$terms_to_edit = get_terms_to_edit( $post->ID, $taxonomy_name );
-			if ( ! is_string( $terms_to_edit ) ) {
+			$terms_to_edit = get_terms_to_edit($post->ID, $taxonomy_name);
+			if ( ! is_string($terms_to_edit)) {
 				$terms_to_edit = '';
 			}
 
 			echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
-				. esc_html( str_replace( ',', ', ', $terms_to_edit ) ) . '</div>';
+				. esc_html(str_replace(',', ', ', $terms_to_edit)).'</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>';
 }
@@ -351,7 +351,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
@@ -368,15 +368,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');
@@ -385,29 +385,29 @@ 
 
 ?>
 <form method="get">
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" 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; ?>
 	<fieldset class="comment-reply">
 	<legend>
-		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
-		<span class="hidden" id="replyhead"><?php _e( 'Reply to Comment' ); ?></span>
-		<span class="hidden" id="addhead"><?php _e( 'Add new Comment' ); ?></span>
+		<span class="hidden" id="editlegend"><?php _e('Edit Comment'); ?></span>
+		<span class="hidden" id="replyhead"><?php _e('Reply to Comment'); ?></span>
+		<span class="hidden" id="addhead"><?php _e('Add new Comment'); ?></span>
 	</legend>
 
 	<div id="replycontainer">
-	<label for="replycontent" class="screen-reader-text"><?php _e( 'Comment' ); ?></label>
+	<label for="replycontent" class="screen-reader-text"><?php _e('Comment'); ?></label>
 	<?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>
 
 	<div id="edithead" style="display:none;">
 		<div class="inside">
-		<label for="author-name"><?php _e( 'Name' ) ?></label>
+		<label for="author-name"><?php _e('Name') ?></label>
 		<input type="text" name="newcomment_author" size="50" value="" id="author-name" />
 		</div>
 
@@ -440,12 +440,12 @@ 
 	<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);
 	?>
 	</fieldset>
-<?php if ( $table_row ) : ?>
+<?php if ($table_row) : ?>
 </td></tr></tbody></table>
 <?php else : ?>
 </div></div>
@@ -477,15 +477,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">
@@ -499,14 +499,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>
@@ -524,22 +524,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;
@@ -548,23 +548,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;
 }
 
@@ -577,9 +577,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 values for the meta key dropdown in the Custom Fields meta box.
@@ -592,9 +592,9 @@ 
 	 * @param array|null $keys Pre-defined meta keys to be used in place of a postmeta query. Default null.
 	 * @param WP_Post    $post The current post object.
 	 */
-	$keys = apply_filters( 'postmeta_form_keys', null, $post );
+	$keys = apply_filters('postmeta_form_keys', null, $post);
 
-	if ( null === $keys ) {
+	if (null === $keys) {
 		/**
 		 * Filter the number of custom fields to retrieve for the drop-down
 		 * in the Custom Fields meta box.
@@ -603,44 +603,44 @@ 
 		 *
 		 * @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 ) );
+		$keys = $wpdb->get_col($wpdb->prepare($sql, $wpdb->esc_like('_').'%', $limit));
 	}
 
-	if ( $keys ) {
-		natcasesort( $keys );
+	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>
@@ -657,9 +657,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>
@@ -681,15 +681,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;
 	$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?
@@ -697,56 +697,56 @@ 
 
 	$time_adj = current_time('timestamp');
 	$post_date = ($for_post) ? $post->post_date : get_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";
 	}
 ?>
 
@@ -764,12 +764,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>";
 	}
 }
 
@@ -788,22 +788,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, $post = null ) {
+function parent_dropdown($default = 0, $parent = 0, $level = 0, $post = null) {
 	global $wpdb;
-	$post = get_post( $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) );
+	$post = get_post($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));
 
-	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;
@@ -817,20 +817,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;
 }
 
 /**
@@ -840,7 +840,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.
@@ -851,22 +851,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'), 'primary' ); ?>
+<?php submit_button(__('Upload file and import'), 'primary'); ?>
 </form>
 <?php
 	endif;
@@ -900,75 +900,75 @@ 
  *                                              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_array( $screen ) ) {
-		foreach ( $screen as $single_screen ) {
-			add_meta_box( $id, $title, $callback, $single_screen, $context, $priority, $callback_args );
+	} elseif (is_string($screen)) {
+		$screen = convert_to_screen($screen);
+	} elseif (is_array($screen)) {
+		foreach ($screen as $single_screen) {
+			add_meta_box($id, $title, $callback, $single_screen, $context, $priority, $callback_args);
 		}
 	}
 
-	if ( ! isset( $screen->id ) ) {
+	if ( ! isset($screen->id)) {
 		return;
 	}
 
 	$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);
@@ -987,27 +987,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');
 				}
 			}
 		}
@@ -1017,23 +1017,23 @@ 
 
 	$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 id="'.$box['id'].'" class="postbox '.postbox_classes($box['id'], $page).$hidden_class.'" '.'>'."\n";
+					if ('dashboard_browser_nag' != $box['id']) {
 						echo '<button type="button" class="handlediv button-link" aria-expanded="true">';
-						echo '<span class="screen-reader-text">' . sprintf( __( 'Toggle panel: %s' ), $box['title'] ) . '</span>';
+						echo '<span class="screen-reader-text">'.sprintf(__('Toggle panel: %s'), $box['title']).'</span>';
 						echo '<span class="toggle-indicator" aria-hidden="true"></span>';
 						echo '</button>';
 					}
 					echo "<h2 class='hndle'><span>{$box['title']}</span></h2>\n";
-					echo '<div class="inside">' . "\n";
+					echo '<div class="inside">'."\n";
 					call_user_func($box['callback'], $object, $box);
 					echo "</div>\n";
 					echo "</div>\n";
@@ -1067,33 +1067,33 @@ 
  *                                        and 'side'. Menus meta boxes (accordion sections) all use
  *                                        the 'side' context. Global default is 'advanced'.
  */
-function remove_meta_box( $id, $screen, $context ) {
+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_array( $screen ) ) {
-		foreach ( $screen as $single_screen ) {
-			remove_meta_box( $id, $single_screen, $context );
+	} elseif (is_string($screen)) {
+		$screen = convert_to_screen($screen);
+	} elseif (is_array($screen)) {
+		foreach ($screen as $single_screen) {
+			remove_meta_box($id, $single_screen, $context);
 		}
 	}
 
-	if ( ! isset( $screen->id ) ) {
+	if ( ! isset($screen->id)) {
 		return;
 	}
 
 	$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;
 }
 
@@ -1113,19 +1113,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">
@@ -1133,29 +1133,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 open this section' ); ?></span>
+							<?php echo esc_html($box['title']); ?>
+							<span class="screen-reader-text"><?php _e('Press return or enter to open this section'); ?></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 -->
@@ -1196,13 +1196,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';
 	}
 
@@ -1247,13 +1247,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';
 	}
 
@@ -1273,23 +1273,23 @@ 
  *
  * @param string $page The slug name of the page whose 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 "<h2>{$section['title']}</h2>\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>';
 	}
 }
@@ -1311,22 +1311,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>';
@@ -1360,7 +1360,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(
@@ -1393,7 +1393,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;
 
 	/*
@@ -1401,24 +1401,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;
@@ -1453,20 +1453,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";
@@ -1485,26 +1485,26 @@ 
 ?>
 	<div id="find-posts" class="find-box" style="display: none;">
 		<div id="find-posts-head" class="find-box-head">
-			<?php _e( 'Attach to existing content' ); ?>
+			<?php _e('Attach to existing content'); ?>
 			<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>
@@ -1521,8 +1521,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);
 }
 
 /**
@@ -1536,11 +1536,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);
 }
 
 /**
@@ -1552,7 +1552,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'])) : '';
 }
 
 /**
@@ -1567,69 +1567,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;
@@ -1655,10 +1655,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>
@@ -1673,33 +1673,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)
 		$post_states['pending'] = _x('Pending', 'post status');
-	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 ( 'page' === get_option( 'show_on_front' ) ) {
-		if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) {
-			$post_states['page_on_front'] = __( 'Front Page' );
+	if ('page' === get_option('show_on_front')) {
+		if (intval(get_option('page_on_front')) === $post->ID) {
+			$post_states['page_on_front'] = __('Front Page');
 		}
 
-		if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
-			$post_states['page_for_posts'] = __( 'Posts Page' );
+		if (intval(get_option('page_for_posts')) === $post->ID) {
+			$post_states['page_for_posts'] = __('Posts Page');
 		}
 	}
 
@@ -1711,15 +1711,15 @@ 
 	 * @param array   $post_states An array of post display states.
 	 * @param WP_Post $post        The current post object.
 	 */
-	$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 ' &mdash; ';
-		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>";
 		}
 	}
@@ -1730,28 +1730,28 @@ 
  *
  * @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');
 	}
 
-	if ( $post->ID == get_theme_mod( 'site_logo' ) ) {
-		$media_states[] = __( 'Logo' );
+	if ($post->ID == get_theme_mod('site_logo')) {
+		$media_states[] = __('Logo');
 	}
 
 	/**
@@ -1762,15 +1762,15 @@ 
 	 * @param array $media_states An array of media states. Default 'Header Image',
 	 *                            'Background Image', 'Site Icon', 'Logo'.
 	 */
-	$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 ' &mdash; ';
-		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>";
 		}
 	}
@@ -1861,8 +1861,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);
 }
 
 /**
@@ -1886,49 +1886,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;
@@ -1941,9 +1941,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');
 
 ?>
@@ -1955,13 +1955,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>
@@ -1977,13 +1977,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', false ) ) {
-		_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', false)) {
+		_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);
 }
 
 /**
@@ -2029,45 +2029,45 @@ 
  *                          of echoing it. Default true.
  * }
  */
-function wp_star_rating( $args = array() ) {
+function wp_star_rating($args = array()) {
 	$defaults = array(
 		'rating' => 0,
 		'type'   => 'rating',
 		'number' => 0,
 		'echo'   => true,
 	);
-	$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));
 	}
 
 	$output = '<div class="star-rating">';
-	$output .= '<span class="screen-reader-text">' . $title . '</span>';
-	$output .= str_repeat( '<div class="star star-full"></div>', $full_stars );
-	$output .= str_repeat( '<div class="star star-half"></div>', $half_stars );
-	$output .= str_repeat( '<div class="star star-empty"></div>', $empty_stars );
+	$output .= '<span class="screen-reader-text">'.$title.'</span>';
+	$output .= str_repeat('<div class="star star-full"></div>', $full_stars);
+	$output .= str_repeat('<div class="star star-half"></div>', $half_stars);
+	$output .= str_repeat('<div class="star star-empty"></div>', $empty_stars);
 	$output .= '</div>';
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 
@@ -2081,5 +2081,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 +212 added lines, -137 removed lines

@@ -191,10 +191,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 ) );
 
@@ -203,8 +204,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"' : '';
 		?>
@@ -248,8 +251,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;
@@ -270,8 +274,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 ) );
 
@@ -293,14 +298,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) {
@@ -330,11 +338,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>';
 }
@@ -387,9 +397,12 @@ 
 <form method="get">
 <?php if ( $table_row ) : ?>
 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" 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;
+}
+?>
 	<fieldset class="comment-reply">
 	<legend>
 		<span class="hidden" id="editlegend"><?php _e( 'Edit Comment' ); ?></span>
@@ -441,15 +454,19 @@ 
 	<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 );
+		}
 	?>
 	</fieldset>
 <?php if ( $table_row ) : ?>
 </td></tr></tbody></table>
-<?php else : ?>
+<?php else {
+	: ?>
 </div></div>
-<?php endif; ?>
+<?php endif;
+}
+?>
 </form>
 <?php
 }
@@ -505,9 +522,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
@@ -527,11 +545,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;
@@ -638,8 +658,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>";
 	}
 ?>
@@ -685,12 +706,14 @@ 
 	global $wp_locale;
 	$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 />';
@@ -731,7 +754,9 @@ 
 
 	echo '</div><input type="hidden" id="ss" name="ss" value="' . $ss . '" />';
 
-	if ( $multi ) return;
+	if ( $multi ) {
+		return;
+	}
 
 	echo "\n\n";
 	$map = array(
@@ -796,8 +821,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 );
@@ -825,10 +851,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;
 }
@@ -857,9 +885,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" />
@@ -919,23 +950,28 @@ 
 
 	$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
@@ -960,16 +996,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);
 }
@@ -991,10 +1030,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;
 
@@ -1021,8 +1061,9 @@ 
 		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";
@@ -1086,16 +1127,20 @@ 
 
 	$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
@@ -1118,10 +1163,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;
 
@@ -1137,8 +1183,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' : '';
 
@@ -1276,18 +1323,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 "<h2>{$section['title']}</h2>\n";
+		if ( $section['title'] ) {
+					echo "<h2>{$section['title']}</h2>\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>';
@@ -1311,8 +1362,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 = '';
@@ -1401,8 +1453,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' ) ) {
@@ -1411,15 +1464,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;
 	}
@@ -1455,13 +1510,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 ) {
@@ -1521,9 +1578,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.
@@ -1538,8 +1596,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 );
 }
 
@@ -1616,8 +1675,9 @@ 
 
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
 ?>
 </head>
@@ -1629,7 +1689,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;
@@ -1673,21 +1736,27 @@ 
  */
 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 )
-		$post_states['pending'] = _x('Pending', 'post status');
-	if ( is_sticky($post->ID) )
-		$post_states['sticky'] = __('Sticky');
+	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 ) {
+			$post_states['pending'] = _x('Pending', 'post status');
+	}
+	if ( is_sticky($post->ID) ) {
+			$post_states['sticky'] = __('Sticky');
+	}
 
 	if ( 'future' === $post->post_status ) {
 		$post_states['scheduled'] = __( 'Scheduled' );
@@ -1736,14 +1805,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' ) ) {
@@ -1887,20 +1958,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' );
 
@@ -1943,8 +2017,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>