ntwb / wordpress

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

Braces +17 added lines, -12 removed lines

@@ -39,8 +39,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();
 	}
 
@@ -107,16 +108,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);
+				}
 			}
 		}
 	}
@@ -126,8 +129,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();
@@ -138,8 +142,9 @@ 
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
-			return;
+		if ( empty($string) ) {
+					return;
+		}
 		show_message($string);
 	}
 

Spacing +28 added lines, -28 removed lines

@@ -34,7 +34,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);
 	}
 
@@ -42,8 +42,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,7 +61,7 @@ 
 	 *
 	 * @param string|bool|WP_Error $result The result of an upgrade.
 	 */
-	public function set_result( $result ) {
+	public function set_result($result) {
 		$this->result = $result;
 	}
 
@@ -81,37 +81,37 @@ 
 	 * @param bool   $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
 	 * @return bool False on failure, true on success.
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
+	public function request_filesystem_credentials($error = false, $context = '', $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;
@@ -123,14 +123,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);
 			}
@@ -142,19 +142,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);
 	}
@@ -177,22 +177,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>';

src/wp-admin/includes/class-file-upload-upgrader.php

Braces +17 added lines, -13 removed lines

@@ -56,16 +56,18 @@ 
 	 */
 	public function __construct( $form, $urlholder ) {
 
-		if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
-			wp_die(__('Please select a file'));
+		if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) ) {
+					wp_die(__('Please select a file'));
+		}
 
 		//Handle a newly uploaded file, Else assume it's already been uploaded
 		if ( ! empty($_FILES) ) {
 			$overrides = array( 'test_form' => false, 'test_type' => false );
 			$file = wp_handle_upload( $_FILES[$form], $overrides );
 
-			if ( isset( $file['error'] ) )
-				wp_die( $file['error'] );
+			if ( isset( $file['error'] ) ) {
+							wp_die( $file['error'] );
+			}
 
 			$this->filename = $_FILES[$form]['name'];
 			$this->package = $file['file'];
@@ -90,15 +92,17 @@ 
 			// Numeric Package = previously uploaded file, see above.
 			$this->id = (int) $_GET[$urlholder];
 			$attachment = get_post( $this->id );
-			if ( empty($attachment) )
-				wp_die(__('Please select a file'));
+			if ( empty($attachment) ) {
+							wp_die(__('Please select a file'));
+			}
 
 			$this->filename = $attachment->post_title;
 			$this->package = get_attached_file( $attachment->ID );
 		} else {
 			// Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
-			if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-				wp_die( $uploads['error'] );
+			if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) {
+							wp_die( $uploads['error'] );
+			}
 
 			$this->filename = $_GET[$urlholder];
 			$this->package = $uploads['basedir'] . '/' . $this->filename;
@@ -114,11 +118,11 @@ 
 	 * @return bool Whether the cleanup was successful.
 	 */
 	public function cleanup() {
-		if ( $this->id )
-			wp_delete_attachment( $this->id );
-
-		elseif ( file_exists( $this->package ) )
-			return @unlink( $this->package );
+		if ( $this->id ) {
+					wp_delete_attachment( $this->id );
+		} elseif ( file_exists( $this->package ) ) {
+					return @unlink( $this->package );
+		}
 
 		return true;
 	}

Spacing +23 added lines, -23 removed lines

@@ -54,18 +54,18 @@ 
 	 * @param string $form      The name of the form the file was uploaded from.
 	 * @param string $urlholder The name of the `GET` parameter that holds the filename.
 	 */
-	public function __construct( $form, $urlholder ) {
+	public function __construct($form, $urlholder) {
 
-		if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) )
+		if (empty($_FILES[$form]['name']) && empty($_GET[$urlholder]))
 			wp_die(__('Please select a file'));
 
 		//Handle a newly uploaded file, Else assume it's already been uploaded
-		if ( ! empty($_FILES) ) {
-			$overrides = array( 'test_form' => false, 'test_type' => false );
-			$file = wp_handle_upload( $_FILES[$form], $overrides );
+		if ( ! empty($_FILES)) {
+			$overrides = array('test_form' => false, 'test_type' => false);
+			$file = wp_handle_upload($_FILES[$form], $overrides);
 
-			if ( isset( $file['error'] ) )
-				wp_die( $file['error'] );
+			if (isset($file['error']))
+				wp_die($file['error']);
 
 			$this->filename = $_FILES[$form]['name'];
 			$this->package = $file['file'];
@@ -81,30 +81,30 @@ 
 			);
 
 			// Save the data.
-			$this->id = wp_insert_attachment( $object, $file['file'] );
+			$this->id = wp_insert_attachment($object, $file['file']);
 
 			// Schedule a cleanup for 2 hours from now in case of failed install.
-			wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
+			wp_schedule_single_event(time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array($this->id));
 
-		} elseif ( is_numeric( $_GET[$urlholder] ) ) {
+		} elseif (is_numeric($_GET[$urlholder])) {
 			// Numeric Package = previously uploaded file, see above.
 			$this->id = (int) $_GET[$urlholder];
-			$attachment = get_post( $this->id );
-			if ( empty($attachment) )
+			$attachment = get_post($this->id);
+			if (empty($attachment))
 				wp_die(__('Please select a file'));
 
 			$this->filename = $attachment->post_title;
-			$this->package = get_attached_file( $attachment->ID );
+			$this->package = get_attached_file($attachment->ID);
 		} else {
 			// Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
-			if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) )
-				wp_die( $uploads['error'] );
+			if ( ! (($uploads = wp_upload_dir()) && false === $uploads['error']))
+				wp_die($uploads['error']);
 
-			$this->filename = sanitize_file_name( $_GET[ $urlholder ] );
-			$this->package = $uploads['basedir'] . '/' . $this->filename;
+			$this->filename = sanitize_file_name($_GET[$urlholder]);
+			$this->package = $uploads['basedir'].'/'.$this->filename;
 
-			if ( 0 !== strpos( realpath( $this->package ), realpath( $uploads['basedir'] ) ) ) {
-				wp_die( __( 'Please select a file' ) );
+			if (0 !== strpos(realpath($this->package), realpath($uploads['basedir']))) {
+				wp_die(__('Please select a file'));
 			}
 		}
 	}
@@ -118,11 +118,11 @@ 
 	 * @return bool Whether the cleanup was successful.
 	 */
 	public function cleanup() {
-		if ( $this->id )
-			wp_delete_attachment( $this->id );
+		if ($this->id)
+			wp_delete_attachment($this->id);
 
-		elseif ( file_exists( $this->package ) )
-			return @unlink( $this->package );
+		elseif (file_exists($this->package))
+			return @unlink($this->package);
 
 		return true;
 	}

src/wp-admin/includes/class-bulk-upgrader-skin.php

Spacing +27 added lines, -27 removed lines

@@ -25,7 +25,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);
@@ -41,7 +41,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.');
 	}
 
@@ -49,21 +49,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";
@@ -88,20 +88,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>';
 	}
 
 	/**
@@ -124,9 +124,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();
 	}
 
@@ -136,19 +136,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();

Braces +22 added lines, -16 removed lines

@@ -49,8 +49,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();
@@ -61,12 +62,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";
+		}
 	}
 
 	/**
@@ -88,16 +91,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);
 		}
@@ -146,8 +151,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>';
 		}
 

src/wp-admin/includes/class-wp-ms-sites-list-table.php

Braces +12 added lines, -8 removed lines

@@ -94,10 +94,12 @@ 
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
 		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
-				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
-				$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			if ( !isset($_REQUEST['orderby']) ) {
+							$_GET['orderby'] = $_REQUEST['orderby'] = '';
+			}
+			if ( !isset($_REQUEST['order']) ) {
+							$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			}
 		}
 
 		$args = array(
@@ -199,8 +201,9 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
-			$actions['delete'] = __( 'Delete' );
+		if ( current_user_can( 'delete_sites' ) ) {
+					$actions['delete'] = __( 'Delete' );
+		}
 		$actions['spam'] = _x( 'Mark as Spam', 'site' );
 		$actions['notspam'] = _x( 'Not Spam', 'site' );
 
@@ -217,8 +220,9 @@ 
 
 		parent::pagination( $which );
 
-		if ( 'top' === $which )
-			$this->view_switcher( $mode );
+		if ( 'top' === $which ) {
+					$this->view_switcher( $mode );
+		}
 	}
 
 	/**

Spacing +137 added lines, -137 removed lines

@@ -36,18 +36,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$this->status_list = array(
-			'archived' => array( 'site-archived', __( 'Archived' ) ),
-			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) )
+			'archived' => array('site-archived', __('Archived')),
+			'spam'     => array('site-spammed', _x('Spam', 'site')),
+			'deleted'  => array('site-deleted', __('Deleted')),
+			'mature'   => array('site-mature', __('Mature'))
 		);
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'sites',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_sites' );
+		return current_user_can('manage_sites');
 	}
 
 	/**
@@ -70,20 +70,20 @@ 
 	public function prepare_items() {
 		global $s, $mode, $wpdb;
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if ( ! empty($_REQUEST['mode'])) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-			set_user_setting( 'sites_list_mode', $mode );
+			set_user_setting('sites_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'sites_list_mode', 'list' );
+			$mode = get_user_setting('sites_list_mode', 'list');
 		}
 
-		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
+		$per_page = $this->get_items_per_page('sites_network_per_page');
 
 		$pagenum = $this->get_pagenum();
 
-		$s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : '';
+		$s = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 		$wild = '';
-		if ( false !== strpos($s, '*') ) {
+		if (false !== strpos($s, '*')) {
 			$wild = '*';
 			$s = trim($s, '*');
 		}
@@ -92,66 +92,66 @@ 
 		 * If the network is large and a search is not being performed, show only
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
-		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
+		if ( ! $s && wp_is_large_network()) {
+			if ( ! isset($_REQUEST['orderby']))
 				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
+			if ( ! isset($_REQUEST['order']))
 				$_GET['order'] = $_REQUEST['order'] = 'DESC';
 		}
 
 		$args = array(
-			'number'     => intval( $per_page ),
-			'offset'     => intval( ( $pagenum - 1 ) * $per_page ),
+			'number'     => intval($per_page),
+			'offset'     => intval(($pagenum - 1) * $per_page),
 			'network_id' => get_current_network_id(),
 		);
 
-		if ( empty($s) ) {
+		if (empty($s)) {
 			// Nothing to do.
-		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+		} elseif (preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.$/', $s)) {
 			// IPv4 address
-			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
-			$reg_blog_ids = $wpdb->get_col( $sql );
+			$sql = $wpdb->prepare("SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like($s).( ! empty($wild) ? '%' : ''));
+			$reg_blog_ids = $wpdb->get_col($sql);
 
-			if ( $reg_blog_ids ) {
+			if ($reg_blog_ids) {
 				$args['site__in'] = $reg_blog_ids;
 			}
-		} elseif ( is_numeric( $s ) && empty( $wild ) ) {
+		} elseif (is_numeric($s) && empty($wild)) {
 			$args['ID'] = $s;
 		} else {
 			$args['search'] = $s;
 
-			if ( ! is_subdomain_install() ) {
-				$args['search_columns'] = array( 'path' );
+			if ( ! is_subdomain_install()) {
+				$args['search_columns'] = array('path');
 			}
 		}
 
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( 'registered' === $order_by ) {
+		$order_by = isset($_REQUEST['orderby']) ? $_REQUEST['orderby'] : '';
+		if ('registered' === $order_by) {
 			// registered is a valid field name.
-		} elseif ( 'lastupdated' === $order_by ) {
+		} elseif ('lastupdated' === $order_by) {
 			$order_by = 'last_updated';
-		} elseif ( 'blogname' === $order_by ) {
-			if ( is_subdomain_install() ) {
+		} elseif ('blogname' === $order_by) {
+			if (is_subdomain_install()) {
 				$order_by = 'domain';
 			} else {
 				$order_by = 'path';
 			}
-		} elseif ( 'blog_id' === $order_by ) {
+		} elseif ('blog_id' === $order_by) {
 			$order_by = 'id';
-		} elseif ( ! $order_by ) {
+		} elseif ( ! $order_by) {
 			$order_by = false;
 		}
 
 		$args['orderby'] = $order_by;
 
-		if ( $order_by ) {
-			$args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+		if ($order_by) {
+			$args['order'] = (isset($_REQUEST['order']) && 'DESC' === strtoupper($_REQUEST['order'])) ? "DESC" : "ASC";
 		}
 
-		if ( wp_is_large_network() ) {
+		if (wp_is_large_network()) {
 			$args['no_found_rows'] = true;
 		} else {
 			$args['no_found_rows'] = false;
@@ -164,32 +164,32 @@ 
 		 *
 		 * @param array $args An array of get_sites() arguments.
 		 */
-		$args = apply_filters( 'ms_sites_list_table_query_args', $args );
+		$args = apply_filters('ms_sites_list_table_query_args', $args);
 
-		$_sites = get_sites( $args );
-		if ( is_array( $_sites ) ) {
-			update_site_cache( $_sites );
+		$_sites = get_sites($args);
+		if (is_array($_sites)) {
+			update_site_cache($_sites);
 
-			$this->items = array_slice( $_sites, 0, $per_page );
+			$this->items = array_slice($_sites, 0, $per_page);
 		}
 
-		$total_sites = get_sites( array_merge( $args, array(
+		$total_sites = get_sites(array_merge($args, array(
 			'count' => true,
 			'offset' => 0,
 			'number' => 0,
-		) ) );
+		)));
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_sites,
 			'per_page' => $per_page,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No sites found.' );
+		_e('No sites found.');
 	}
 
 	/**
@@ -198,10 +198,10 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
-			$actions['delete'] = __( 'Delete' );
-		$actions['spam'] = _x( 'Mark as Spam', 'site' );
-		$actions['notspam'] = _x( 'Not Spam', 'site' );
+		if (current_user_can('delete_sites'))
+			$actions['delete'] = __('Delete');
+		$actions['spam'] = _x('Mark as Spam', 'site');
+		$actions['notspam'] = _x('Not Spam', 'site');
 
 		return $actions;
 	}
@@ -211,13 +211,13 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function pagination( $which ) {
+	protected function pagination($which) {
 		global $mode;
 
-		parent::pagination( $which );
+		parent::pagination($which);
 
-		if ( 'top' === $which )
-			$this->view_switcher( $mode );
+		if ('top' === $which)
+			$this->view_switcher($mode);
 	}
 
 	/**
@@ -226,14 +226,14 @@ 
 	public function get_columns() {
 		$sites_columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'blogname'    => __( 'URL' ),
-			'lastupdated' => __( 'Last Updated' ),
-			'registered'  => _x( 'Registered', 'site' ),
-			'users'       => __( 'Users' ),
+			'blogname'    => __('URL'),
+			'lastupdated' => __('Last Updated'),
+			'registered'  => _x('Registered', 'site'),
+			'users'       => __('Users'),
 		);
 
-		if ( has_filter( 'wpmublogsaction' ) ) {
-			$sites_columns['plugins'] = __( 'Actions' );
+		if (has_filter('wpmublogsaction')) {
+			$sites_columns['plugins'] = __('Actions');
 		}
 
 		/**
@@ -244,7 +244,7 @@ 
 		 * @param array $sites_columns An array of displayed site columns. Default 'cb',
 		 *                             'blogname', 'lastupdated', 'registered', 'users'.
 		 */
-		return apply_filters( 'wpmu_blogs_columns', $sites_columns );
+		return apply_filters('wpmu_blogs_columns', $sites_columns);
 	}
 
 	/**
@@ -266,14 +266,14 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_cb( $blog ) {
-		if ( ! is_main_site( $blog['blog_id'] ) ) :
-			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+	public function column_cb($blog) {
+		if ( ! is_main_site($blog['blog_id'])) :
+			$blogname = untrailingslashit($blog['domain'].$blog['path']);
 		?>
 			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php
-				printf( __( 'Select %s' ), $blogname );
+				printf(__('Select %s'), $blogname);
 			?></label>
-			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
+			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr($blog['blog_id']) ?>" />
 		<?php endif;
 	}
 
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_id( $blog ) {
+	public function column_id($blog) {
 		echo $blog['blog_id'];
 	}
 
@@ -299,41 +299,41 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_blogname( $blog ) {
+	public function column_blogname($blog) {
 		global $mode;
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'].$blog['path']);
 		$blog_states = array();
-		reset( $this->status_list );
+		reset($this->status_list);
 
-		foreach ( $this->status_list as $status => $col ) {
-			if ( $blog[ $status ] == 1 ) {
+		foreach ($this->status_list as $status => $col) {
+			if ($blog[$status] == 1) {
 				$blog_states[] = $col[1];
 			}
 		}
 		$blog_state = '';
-		if ( ! empty( $blog_states ) ) {
-			$state_count = count( $blog_states );
+		if ( ! empty($blog_states)) {
+			$state_count = count($blog_states);
 			$i = 0;
 			$blog_state .= ' - ';
-			foreach ( $blog_states as $state ) {
+			foreach ($blog_states as $state) {
 				++$i;
-				$sep = ( $i == $state_count ) ? '' : ', ';
+				$sep = ($i == $state_count) ? '' : ', ';
 				$blog_state .= "<span class='post-state'>$state$sep</span>";
 			}
 		}
 
 		?>
-		<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+		<a href="<?php echo esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])); ?>" class="edit"><?php echo $blogname.$blog_state; ?></a>
 		<?php
-		if ( 'list' !== $mode ) {
-			switch_to_blog( $blog['blog_id'] );
+		if ('list' !== $mode) {
+			switch_to_blog($blog['blog_id']);
 			echo '<p>';
 			printf(
 				/* translators: 1: site name, 2: site tagline. */
-				__( '%1$s &#8211; %2$s' ),
-				get_option( 'blogname' ),
-				'<em>' . get_option( 'blogdescription ' ) . '</em>'
+				__('%1$s &#8211; %2$s'),
+				get_option('blogname'),
+				'<em>'.get_option('blogdescription ').'</em>'
 			);
 			echo '</p>';
 			restore_current_blog();
@@ -348,16 +348,16 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_lastupdated( $blog ) {
+	public function column_lastupdated($blog) {
 		global $mode;
 
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' === $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+		echo ($blog['last_updated'] === '0000-00-00 00:00:00') ? __('Never') : mysql2date($date, $blog['last_updated']);
 	}
 
 	/**
@@ -368,19 +368,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_registered( $blog ) {
+	public function column_registered($blog) {
 		global $mode;
 
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' === $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
+		if ($blog['registered'] === '0000-00-00 00:00:00') {
 			echo '&#x2014;';
 		} else {
-			echo mysql2date( $date, $blog['registered'] );
+			echo mysql2date($date, $blog['registered']);
 		}
 	}
 
@@ -392,19 +392,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_users( $blog ) {
-		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
-		if ( ! $user_count ) {
-			$blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
-			$user_count = count( $blog_users );
-			unset( $blog_users );
-			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+	public function column_users($blog) {
+		$user_count = wp_cache_get($blog['blog_id'].'_user_count', 'blog-details');
+		if ( ! $user_count) {
+			$blog_users = get_users(array('blog_id' => $blog['blog_id'], 'fields' => 'ID'));
+			$user_count = count($blog_users);
+			unset($blog_users);
+			wp_cache_set($blog['blog_id'].'_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS);
 		}
 
 		printf(
 			'<a href="%s">%s</a>',
-			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
-			number_format_i18n( $user_count )
+			esc_url(network_admin_url('site-users.php?id='.$blog['blog_id'])),
+			number_format_i18n($user_count)
 		);
 	}
 
@@ -416,8 +416,8 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_plugins( $blog ) {
-		if ( has_filter( 'wpmublogsaction' ) ) {
+	public function column_plugins($blog) {
+		if (has_filter('wpmublogsaction')) {
 			/**
 			 * Fires inside the auxiliary 'Actions' column of the Sites list table.
 			 *
@@ -427,7 +427,7 @@ 
 			 *
 			 * @param int $blog_id The site ID.
 			 */
-			do_action( 'wpmublogsaction', $blog['blog_id'] );
+			do_action('wpmublogsaction', $blog['blog_id']);
 		}
 	}
 
@@ -440,7 +440,7 @@ 
 	 * @param array  $blog        Current site.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $blog, $column_name ) {
+	public function column_default($blog, $column_name) {
 		/**
 		 * Fires for each registered custom column in the Sites list table.
 		 *
@@ -449,7 +449,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $blog_id     The site ID.
 		 */
-		do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+		do_action('manage_sites_custom_column', $column_name, $blog['blog_id']);
 	}
 
 	/**
@@ -457,20 +457,20 @@ 
 	 * @global string $mode
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $blog ) {
+		foreach ($this->items as $blog) {
 			$blog = $blog->to_array();
 			$class = '';
-			reset( $this->status_list );
+			reset($this->status_list);
 
-			foreach ( $this->status_list as $status => $col ) {
-				if ( $blog[ $status ] == 1 ) {
+			foreach ($this->status_list as $status => $col) {
+				if ($blog[$status] == 1) {
 					$class = " class='{$col[0]}'";
 				}
 			}
 
 			echo "<tr{$class}>";
 
-			$this->single_row_columns( $blog );
+			$this->single_row_columns($blog);
 
 			echo '</tr>';
 		}
@@ -499,12 +499,12 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output.
 	 */
-	protected function handle_row_actions( $blog, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($blog, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return;
 		}
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'].$blog['path']);
 
 		// Preordered.
 		$actions = array(
@@ -516,33 +516,33 @@ 
 			'visit' => '',
 		);
 
-		$actions['edit']	= '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
-		$actions['backend']	= "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
-		if ( get_network()->site_id != $blog['blog_id'] ) {
-			if ( $blog['deleted'] == '1' ) {
-				$actions['activate']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+		$actions['edit'] = '<a href="'.esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])).'">'.__('Edit').'</a>';
+		$actions['backend'] = "<a href='".esc_url(get_admin_url($blog['blog_id']))."' class='edit'>".__('Dashboard').'</a>';
+		if (get_network()->site_id != $blog['blog_id']) {
+			if ($blog['deleted'] == '1') {
+				$actions['activate']   = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=activateblog&amp;id='.$blog['blog_id']), 'activateblog_'.$blog['blog_id'])).'">'.__('Activate').'</a>';
 			} else {
-				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+				$actions['deactivate'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deactivateblog&amp;id='.$blog['blog_id']), 'deactivateblog_'.$blog['blog_id'])).'">'.__('Deactivate').'</a>';
 			}
 
-			if ( $blog['archived'] == '1' ) {
-				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
+			if ($blog['archived'] == '1') {
+				$actions['unarchive'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unarchiveblog&amp;id='.$blog['blog_id']), 'unarchiveblog_'.$blog['blog_id'])).'">'.__('Unarchive').'</a>';
 			} else {
-				$actions['archive']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+				$actions['archive']   = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=archiveblog&amp;id='.$blog['blog_id']), 'archiveblog_'.$blog['blog_id'])).'">'._x('Archive', 'verb; site').'</a>';
 			}
 
-			if ( $blog['spam'] == '1' ) {
-				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
+			if ($blog['spam'] == '1') {
+				$actions['unspam'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unspamblog&amp;id='.$blog['blog_id']), 'unspamblog_'.$blog['blog_id'])).'">'._x('Not Spam', 'site').'</a>';
 			} else {
-				$actions['spam']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+				$actions['spam']   = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=spamblog&amp;id='.$blog['blog_id']), 'spamblog_'.$blog['blog_id'])).'">'._x('Spam', 'site').'</a>';
 			}
 
-			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
-				$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
+			if (current_user_can('delete_site', $blog['blog_id'])) {
+				$actions['delete'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deleteblog&amp;id='.$blog['blog_id']), 'deleteblog_'.$blog['blog_id'])).'">'.__('Delete').'</a>';
 			}
 		}
 
-		$actions['visit']	= "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='permalink'>" . __( 'Visit' ) . '</a>';
+		$actions['visit'] = "<a href='".esc_url(get_home_url($blog['blog_id'], '/'))."' rel='permalink'>".__('Visit').'</a>';
 
 		/**
 		 * Filters the action links displayed for each site in the Sites list table.
@@ -559,7 +559,7 @@ 
 		 * @param string $blogname Site path, formatted depending on whether it is a sub-domain
 		 *                         or subdirectory multisite install.
 		 */
-		$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
-		return $this->row_actions( $actions );
+		$actions = apply_filters('manage_sites_action_links', array_filter($actions), $blog['blog_id'], $blogname);
+		return $this->row_actions($actions);
 	}
 }

src/wp-admin/includes/class-theme-installer-skin.php

Spacing +24 added lines, -24 removed lines

@@ -22,7 +22,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'];
@@ -35,49 +35,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']);
 
 		/**
 		 * Filters the list of action links available following a single theme installation.
@@ -89,8 +89,8 @@ 
 		 * @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));
 	}
 }

Braces +23 added lines, -16 removed lines

@@ -35,20 +35,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'];
@@ -68,16 +71,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'] );
+		}
 
 		/**
 		 * Filters the list of action links available following a single theme installation.
@@ -90,7 +96,8 @@ 
 		 * @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));
+		}
 	}
 }

src/wp-admin/includes/user.php

Indentation +8 added lines, -8 removed lines

@@ -185,14 +185,14 @@
 		$notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
 
 		/**
-		  * Fires after a new user has been created.
-		  *
-		  * @since 4.4.0
-		  *
-		  * @param int    $user_id ID of the newly created user.
-		  * @param string $notify  Type of notification that should happen. See wp_send_new_user_notifications()
-		  *                        for more information on possible values.
-		  */
+		 * Fires after a new user has been created.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param int    $user_id ID of the newly created user.
+		 * @param string $notify  Type of notification that should happen. See wp_send_new_user_notifications()
+		 *                        for more information on possible values.
+		 */
 		do_action( 'edit_user_created_user', $user_id, $notify );
 	}
 	return $user_id;

Braces +84 added lines, -56 removed lines

@@ -39,31 +39,37 @@ 
 		$update = false;
 	}
 
-	if ( !$update && isset( $_POST['user_login'] ) )
-		$user->user_login = sanitize_user($_POST['user_login'], true);
+	if ( !$update && isset( $_POST['user_login'] ) ) {
+			$user->user_login = sanitize_user($_POST['user_login'], true);
+	}
 
 	$pass1 = $pass2 = '';
-	if ( isset( $_POST['pass1'] ) )
-		$pass1 = $_POST['pass1'];
-	if ( isset( $_POST['pass2'] ) )
-		$pass2 = $_POST['pass2'];
+	if ( isset( $_POST['pass1'] ) ) {
+			$pass1 = $_POST['pass1'];
+	}
+	if ( isset( $_POST['pass2'] ) ) {
+			$pass2 = $_POST['pass2'];
+	}
 
 	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
 		$new_role = sanitize_text_field( $_POST['role'] );
 		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
 		// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
 		// Multisite super admins can freely edit their blog roles -- they possess all caps.
-		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
-			$user->role = $new_role;
+		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) ) {
+					$user->role = $new_role;
+		}
 
 		// If the new role isn't editable by the logged-in user die with error
 		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
-			wp_die(__('You can’t give users that role.'));
+		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) ) {
+					wp_die(__('You can’t give users that role.'));
+		}
 	}
 
-	if ( isset( $_POST['email'] ))
-		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+	if ( isset( $_POST['email'] )) {
+			$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+	}
 	if ( isset( $_POST['url'] ) ) {
 		if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
 			$user->user_url = '';
@@ -73,21 +79,27 @@ 
 			$user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
 		}
 	}
-	if ( isset( $_POST['first_name'] ) )
-		$user->first_name = sanitize_text_field( $_POST['first_name'] );
-	if ( isset( $_POST['last_name'] ) )
-		$user->last_name = sanitize_text_field( $_POST['last_name'] );
-	if ( isset( $_POST['nickname'] ) )
-		$user->nickname = sanitize_text_field( $_POST['nickname'] );
-	if ( isset( $_POST['display_name'] ) )
-		$user->display_name = sanitize_text_field( $_POST['display_name'] );
+	if ( isset( $_POST['first_name'] ) ) {
+			$user->first_name = sanitize_text_field( $_POST['first_name'] );
+	}
+	if ( isset( $_POST['last_name'] ) ) {
+			$user->last_name = sanitize_text_field( $_POST['last_name'] );
+	}
+	if ( isset( $_POST['nickname'] ) ) {
+			$user->nickname = sanitize_text_field( $_POST['nickname'] );
+	}
+	if ( isset( $_POST['display_name'] ) ) {
+			$user->display_name = sanitize_text_field( $_POST['display_name'] );
+	}
 
-	if ( isset( $_POST['description'] ) )
-		$user->description = trim( $_POST['description'] );
+	if ( isset( $_POST['description'] ) ) {
+			$user->description = trim( $_POST['description'] );
+	}
 
 	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[$method] ))
-			$user->$method = sanitize_text_field( $_POST[$method] );
+		if ( isset( $_POST[$method] )) {
+					$user->$method = sanitize_text_field( $_POST[$method] );
+		}
 	}
 
 	if ( $update ) {
@@ -99,14 +111,16 @@ 
 	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
 
 	$user->use_ssl = 0;
-	if ( !empty($_POST['use_ssl']) )
-		$user->use_ssl = 1;
+	if ( !empty($_POST['use_ssl']) ) {
+			$user->use_ssl = 1;
+	}
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ( $user->user_login == '' )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	if ( $user->user_login == '' ) {
+			$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	}
 
 	/* checking that nickname has been typed */
 	if ( $update && empty( $user->nickname ) ) {
@@ -139,14 +153,17 @@ 
 		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
 	}
 
-	if ( !empty( $pass1 ) )
-		$user->user_pass = $pass1;
+	if ( !empty( $pass1 ) ) {
+			$user->user_pass = $pass1;
+	}
 
-	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) ) {
+			$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	}
 
-	if ( !$update && username_exists( $user->user_login ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	if ( !$update && username_exists( $user->user_login ) ) {
+			$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	}
 
 	/** This filter is documented in wp-includes/user.php */
 	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
@@ -175,8 +192,9 @@ 
 	 */
 	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
 
-	if ( $errors->get_error_codes() )
-		return $errors;
+	if ( $errors->get_error_codes() ) {
+			return $errors;
+	}
 
 	if ( $update ) {
 		$user_id = wp_update_user( $user );
@@ -240,8 +258,9 @@ 
 function get_user_to_edit( $user_id ) {
 	$user = get_userdata( $user_id );
 
-	if ( $user )
-		$user->filter = 'edit';
+	if ( $user ) {
+			$user->filter = 'edit';
+	}
 
 	return $user;
 }
@@ -297,8 +316,9 @@ 
 	$id = (int) $id;
 	$user = new WP_User( $id );
 
-	if ( !$user->exists() )
-		return false;
+	if ( !$user->exists() ) {
+			return false;
+	}
 
 	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
 	if ( 'novalue' === $reassign ) {
@@ -340,29 +360,33 @@ 
 		$post_types_to_delete = implode( "', '", $post_types_to_delete );
 		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
 		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id )
-				wp_delete_post( $post_id );
+			foreach ( $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) );
 
 		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);
+			}
 		}
 	} else {
 		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
 		$wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
 		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id )
-				clean_post_cache( $post_id );
+			foreach ( $post_ids as $post_id ) {
+							clean_post_cache( $post_id );
+			}
 		}
 		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
 		$wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
 		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id )
-				clean_bookmark_cache( $link_id );
+			foreach ( $link_ids as $link_id ) {
+							clean_bookmark_cache( $link_id );
+			}
 		}
 	}
 
@@ -371,8 +395,9 @@ 
 		remove_user_from_blog( $id, get_current_blog_id() );
 	} else {
 		$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 ) );
 	}
@@ -417,8 +442,9 @@ 
 function default_password_nag_handler($errors = false) {
 	global $user_ID;
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag') )
-		return;
+	if ( ! get_user_option('default_password_nag') ) {
+			return;
+	}
 
 	// get_user_setting = JS saved UI setting. else no-js-fallback code.
 	if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
@@ -435,8 +461,9 @@ 
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag', $user_ID) )
-		return;
+	if ( ! get_user_option('default_password_nag', $user_ID) ) {
+			return;
+	}
 
 	$new_data = get_userdata($user_ID);
 
@@ -455,8 +482,9 @@ 
 function default_password_nag() {
 	global $pagenow;
 	// Short-circuit it.
-	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
-		return;
+	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) {
+			return;
+	}
 
 	echo '<div class="error default-password-nag">';
 	echo '<p>';

Spacing +133 added lines, -133 removed lines

@@ -27,82 +27,82 @@ 
  * @param int $user_id Optional. User ID.
  * @return int|WP_Error user id of the updated user
  */
-function edit_user( $user_id = 0 ) {
+function edit_user($user_id = 0) {
 	$wp_roles = wp_roles();
 	$user = new stdClass;
-	if ( $user_id ) {
+	if ($user_id) {
 		$update = true;
 		$user->ID = (int) $user_id;
-		$userdata = get_userdata( $user_id );
-		$user->user_login = wp_slash( $userdata->user_login );
+		$userdata = get_userdata($user_id);
+		$user->user_login = wp_slash($userdata->user_login);
 	} else {
 		$update = false;
 	}
 
-	if ( !$update && isset( $_POST['user_login'] ) )
+	if ( ! $update && isset($_POST['user_login']))
 		$user->user_login = sanitize_user($_POST['user_login'], true);
 
 	$pass1 = $pass2 = '';
-	if ( isset( $_POST['pass1'] ) )
+	if (isset($_POST['pass1']))
 		$pass1 = $_POST['pass1'];
-	if ( isset( $_POST['pass2'] ) )
+	if (isset($_POST['pass2']))
 		$pass2 = $_POST['pass2'];
 
-	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
-		$new_role = sanitize_text_field( $_POST['role'] );
+	if (isset($_POST['role']) && current_user_can('edit_users')) {
+		$new_role = sanitize_text_field($_POST['role']);
 		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
 		// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
 		// Multisite super admins can freely edit their blog roles -- they possess all caps.
-		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
+		if ((is_multisite() && current_user_can('manage_sites')) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap('edit_users')))
 			$user->role = $new_role;
 
 		// If the new role isn't editable by the logged-in user die with error
 		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
+		if ( ! empty($new_role) && empty($editable_roles[$new_role]))
 			wp_die(__('You can’t give users that role.'));
 	}
 
-	if ( isset( $_POST['email'] ))
-		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
-	if ( isset( $_POST['url'] ) ) {
-		if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
+	if (isset($_POST['email']))
+		$user->user_email = sanitize_text_field(wp_unslash($_POST['email']));
+	if (isset($_POST['url'])) {
+		if (empty ($_POST['url']) || $_POST['url'] == 'http://') {
 			$user->user_url = '';
 		} else {
-			$user->user_url = esc_url_raw( $_POST['url'] );
-			$protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
-			$user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+			$user->user_url = esc_url_raw($_POST['url']);
+			$protocols = implode('|', array_map('preg_quote', wp_allowed_protocols()));
+			$user->user_url = preg_match('/^('.$protocols.'):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
 		}
 	}
-	if ( isset( $_POST['first_name'] ) )
-		$user->first_name = sanitize_text_field( $_POST['first_name'] );
-	if ( isset( $_POST['last_name'] ) )
-		$user->last_name = sanitize_text_field( $_POST['last_name'] );
-	if ( isset( $_POST['nickname'] ) )
-		$user->nickname = sanitize_text_field( $_POST['nickname'] );
-	if ( isset( $_POST['display_name'] ) )
-		$user->display_name = sanitize_text_field( $_POST['display_name'] );
-
-	if ( isset( $_POST['description'] ) )
-		$user->description = trim( $_POST['description'] );
-
-	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[$method] ))
-			$user->$method = sanitize_text_field( $_POST[$method] );
+	if (isset($_POST['first_name']))
+		$user->first_name = sanitize_text_field($_POST['first_name']);
+	if (isset($_POST['last_name']))
+		$user->last_name = sanitize_text_field($_POST['last_name']);
+	if (isset($_POST['nickname']))
+		$user->nickname = sanitize_text_field($_POST['nickname']);
+	if (isset($_POST['display_name']))
+		$user->display_name = sanitize_text_field($_POST['display_name']);
+
+	if (isset($_POST['description']))
+		$user->description = trim($_POST['description']);
+
+	foreach (wp_get_user_contact_methods($user) as $method => $name) {
+		if (isset($_POST[$method]))
+			$user->$method = sanitize_text_field($_POST[$method]);
 	}
 
-	if ( $update ) {
-		$user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
-		$user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
-		$user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+	if ($update) {
+		$user->rich_editing = isset($_POST['rich_editing']) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
+		$user->admin_color = isset($_POST['admin_color']) ? sanitize_text_field($_POST['admin_color']) : 'fresh';
+		$user->show_admin_bar_front = isset($_POST['admin_bar_front']) ? 'true' : 'false';
 		$user->locale = '';
 
-		if ( isset( $_POST['locale'] ) ) {
-			$locale = sanitize_text_field( $_POST['locale'] );
-			if ( 'site-default' === $locale ) {
+		if (isset($_POST['locale'])) {
+			$locale = sanitize_text_field($_POST['locale']);
+			if ('site-default' === $locale) {
 				$locale = '';
-			} elseif ( '' === $locale ) {
+			} elseif ('' === $locale) {
 				$locale = 'en_US';
-			} elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+			} elseif ( ! in_array($locale, get_available_languages(), true)) {
 				$locale = '';
 			}
 
@@ -110,21 +110,21 @@ 
 		}
 	}
 
-	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
+	$user->comment_shortcuts = isset($_POST['comment_shortcuts']) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
 
 	$user->use_ssl = 0;
-	if ( !empty($_POST['use_ssl']) )
+	if ( ! empty($_POST['use_ssl']))
 		$user->use_ssl = 1;
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ( $user->user_login == '' )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	if ($user->user_login == '')
+		$errors->add('user_login', __('<strong>ERROR</strong>: Please enter a username.'));
 
 	/* checking that nickname has been typed */
-	if ( $update && empty( $user->nickname ) ) {
-		$errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) );
+	if ($update && empty($user->nickname)) {
+		$errors->add('nickname', __('<strong>ERROR</strong>: Please enter a nickname.'));
 	}
 
 	/**
@@ -136,46 +136,46 @@ 
 	 * @param string &$pass1     The password, passed by reference.
 	 * @param string &$pass2     The confirmed password, passed by reference.
 	 */
-	do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
+	do_action_ref_array('check_passwords', array($user->user_login, &$pass1, &$pass2));
 
 	// Check for blank password when adding a user.
-	if ( ! $update && empty( $pass1 ) ) {
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+	if ( ! $update && empty($pass1)) {
+		$errors->add('pass', __('<strong>ERROR</strong>: Please enter a password.'), array('form-field' => 'pass1'));
 	}
 
 	// Check for "\" in password.
-	if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) {
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
+	if (false !== strpos(wp_unslash($pass1), "\\")) {
+		$errors->add('pass', __('<strong>ERROR</strong>: Passwords may not contain the character "\\".'), array('form-field' => 'pass1'));
 	}
 
 	// Checking the password has been typed twice the same.
-	if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+	if (($update || ! empty($pass1)) && $pass1 != $pass2) {
+		$errors->add('pass', __('<strong>ERROR</strong>: Please enter the same password in both password fields.'), array('form-field' => 'pass1'));
 	}
 
-	if ( !empty( $pass1 ) )
+	if ( ! empty($pass1))
 		$user->user_pass = $pass1;
 
-	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	if ( ! $update && isset($_POST['user_login']) && ! validate_username($_POST['user_login']))
+		$errors->add('user_login', __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'));
 
-	if ( !$update && username_exists( $user->user_login ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	if ( ! $update && username_exists($user->user_login))
+		$errors->add('user_login', __('<strong>ERROR</strong>: This username is already registered. Please choose another one.'));
 
 	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user->user_login), array_map('strtolower', $illegal_logins))) {
+		$errors->add('invalid_username', __('<strong>ERROR</strong>: Sorry, that username is not allowed.'));
 	}
 
 	/* checking email address */
-	if ( empty( $user->user_email ) ) {
-		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
-	} elseif ( !is_email( $user->user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
-	} elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
-		$errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
+	if (empty($user->user_email)) {
+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please enter an email address.'), array('form-field' => 'email'));
+	} elseif ( ! is_email($user->user_email)) {
+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.'), array('form-field' => 'email'));
+	} elseif (($owner_id = email_exists($user->user_email)) && ( ! $update || ($owner_id != $user->ID))) {
+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array('form-field' => 'email'));
 	}
 
 	/**
@@ -187,16 +187,16 @@ 
 	 * @param bool     $update  Whether this is a user update.
 	 * @param stdClass &$user   User object, passed by reference.
 	 */
-	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
+	do_action_ref_array('user_profile_update_errors', array(&$errors, $update, &$user));
 
-	if ( $errors->get_error_codes() )
+	if ($errors->get_error_codes())
 		return $errors;
 
-	if ( $update ) {
-		$user_id = wp_update_user( $user );
+	if ($update) {
+		$user_id = wp_update_user($user);
 	} else {
-		$user_id = wp_insert_user( $user );
-		$notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
+		$user_id = wp_insert_user($user);
+		$notify  = isset($_POST['send_user_notification']) ? 'both' : 'admin';
 
 		/**
 		  * Fires after a new user has been created.
@@ -207,7 +207,7 @@ 
 		  * @param string $notify  Type of notification that should happen. See wp_send_new_user_notifications()
 		  *                        for more information on possible values.
 		  */
-		do_action( 'edit_user_created_user', $user_id, $notify );
+		do_action('edit_user_created_user', $user_id, $notify);
 	}
 	return $user_id;
 }
@@ -238,7 +238,7 @@ 
 	 *
 	 * @param array $all_roles List of roles.
 	 */
-	$editable_roles = apply_filters( 'editable_roles', $all_roles );
+	$editable_roles = apply_filters('editable_roles', $all_roles);
 
 	return $editable_roles;
 }
@@ -251,10 +251,10 @@ 
  * @param int $user_id User ID.
  * @return WP_User|bool WP_User object on success, false on failure.
  */
-function get_user_to_edit( $user_id ) {
-	$user = get_userdata( $user_id );
+function get_user_to_edit($user_id) {
+	$user = get_userdata($user_id);
 
-	if ( $user )
+	if ($user)
 		$user->filter = 'edit';
 
 	return $user;
@@ -270,7 +270,7 @@ 
  * @param int $user_id User ID.
  * @return array
  */
-function get_users_drafts( $user_id ) {
+function get_users_drafts($user_id) {
 	global $wpdb;
 	$query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id);
 
@@ -281,8 +281,8 @@ 
 	 *
 	 * @param string $query The user's drafts query string.
 	 */
-	$query = apply_filters( 'get_users_drafts', $query );
-	return $wpdb->get_results( $query );
+	$query = apply_filters('get_users_drafts', $query);
+	return $wpdb->get_results($query);
 }
 
 /**
@@ -301,23 +301,23 @@ 
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
  */
-function wp_delete_user( $id, $reassign = null ) {
+function wp_delete_user($id, $reassign = null) {
 	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;
 
 	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
-	if ( 'novalue' === $reassign ) {
+	if ('novalue' === $reassign) {
 		$reassign = null;
-	} elseif ( null !== $reassign ) {
+	} elseif (null !== $reassign) {
 		$reassign = (int) $reassign;
 	}
 
@@ -330,14 +330,14 @@ 
 	 * @param int|null $reassign ID of the user to reassign posts and links to.
 	 *                           Default null, for no reassignment.
 	 */
-	do_action( 'delete_user', $id, $reassign );
+	do_action('delete_user', $id, $reassign);
 
-	if ( null === $reassign ) {
+	if (null === $reassign) {
 		$post_types_to_delete = array();
-		foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
-			if ( $post_type->delete_with_user ) {
+		foreach (get_post_types(array(), 'objects') as $post_type) {
+			if ($post_type->delete_with_user) {
 				$post_types_to_delete[] = $post_type->name;
-			} elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+			} elseif (null === $post_type->delete_with_user && post_type_supports($post_type->name, 'author')) {
 				$post_types_to_delete[] = $post_type->name;
 			}
 		}
@@ -350,48 +350,48 @@ 
 		 * @param array $post_types_to_delete Post types to delete.
 		 * @param int   $id                   User ID.
 		 */
-		$post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
-		$post_types_to_delete = implode( "', '", $post_types_to_delete );
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
-		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id )
-				wp_delete_post( $post_id );
+		$post_types_to_delete = apply_filters('post_types_to_delete_with_user', $post_types_to_delete, $id);
+		$post_types_to_delete = implode("', '", $post_types_to_delete);
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id));
+		if ($post_ids) {
+			foreach ($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 )
+		if ($link_ids) {
+			foreach ($link_ids as $link_id)
 				wp_delete_link($link_id);
 		}
 	} else {
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-		$wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
-		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id )
-				clean_post_cache( $post_id );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id));
+		$wpdb->update($wpdb->posts, array('post_author' => $reassign), array('post_author' => $id));
+		if ( ! empty($post_ids)) {
+			foreach ($post_ids as $post_id)
+				clean_post_cache($post_id);
 		}
-		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
-		$wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
-		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id )
-				clean_bookmark_cache( $link_id );
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
+		$wpdb->update($wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id));
+		if ( ! empty($link_ids)) {
+			foreach ($link_ids as $link_id)
+				clean_bookmark_cache($link_id);
 		}
 	}
 
 	// FINALLY, delete user
-	if ( is_multisite() ) {
-		remove_user_from_blog( $id, get_current_blog_id() );
+	if (is_multisite()) {
+		remove_user_from_blog($id, get_current_blog_id());
 	} else {
-		$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);
 
 	/**
 	 * Fires immediately after a user is deleted from the database.
@@ -402,7 +402,7 @@ 
 	 * @param int|null $reassign ID of the user to reassign posts and links to.
 	 *                           Default null, for no reassignment.
 	 */
-	do_action( 'deleted_user', $id, $reassign );
+	do_action('deleted_user', $id, $reassign);
 
 	return true;
 }
@@ -431,11 +431,11 @@ 
 function default_password_nag_handler($errors = false) {
 	global $user_ID;
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag') )
+	if ( ! get_user_option('default_password_nag'))
 		return;
 
 	// get_user_setting = JS saved UI setting. else no-js-fallback code.
-	if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
+	if ('hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag']) {
 		delete_user_setting('default_password_nag');
 		update_user_option($user_ID, 'default_password_nag', false, true);
 	}
@@ -449,13 +449,13 @@ 
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag', $user_ID) )
+	if ( ! get_user_option('default_password_nag', $user_ID))
 		return;
 
 	$new_data = get_userdata($user_ID);
 
 	// Remove the nag if the password has been changed.
-	if ( $new_data->user_pass != $old_data->user_pass ) {
+	if ($new_data->user_pass != $old_data->user_pass) {
 		delete_user_setting('default_password_nag');
 		update_user_option($user_ID, 'default_password_nag', false, true);
 	}
@@ -469,16 +469,16 @@ 
 function default_password_nag() {
 	global $pagenow;
 	// Short-circuit it.
-	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
+	if ('profile.php' == $pagenow || ! get_user_option('default_password_nag'))
 		return;
 
 	echo '<div class="error default-password-nag">';
 	echo '<p>';
-	echo '<strong>' . __('Notice:') . '</strong> ';
+	echo '<strong>'.__('Notice:').'</strong> ';
 	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it?');
 	echo '</p><p>';
-	printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url() . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
+	printf('<a href="%s">'.__('Yes, take me to my profile page').'</a> | ', get_edit_profile_url().'#password');
+	printf('<a href="%s" id="default-password-nag-no">'.__('No thanks, do not remind me again').'</a>', '?default_password_nag=0');
 	echo '</p></div>';
 }
 
@@ -524,16 +524,16 @@ 
  * @param string $text
  * @return string
  */
-function admin_created_user_email( $text ) {
+function admin_created_user_email($text) {
 	$roles = get_editable_roles();
-	$role = $roles[ $_REQUEST['role'] ];
+	$role = $roles[$_REQUEST['role']];
 	/* translators: 1: Site name, 2: site URL, 3: role */
-	return sprintf( __( 'Hi,
+	return sprintf(__('Hi,
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 If you do not want to join this site please ignore
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
-%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
+%%s' ), get_bloginfo('name'), home_url(), wp_specialchars_decode(translate_user_role($role['name'])));
 }

src/wp-admin/about.php

Indentation +3 added lines, -3 removed lines

@@ -203,15 +203,15 @@
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
 _n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
 
 /* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );

Spacing +81 added lines, -81 removed lines

@@ -7,75 +7,75 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! wp_is_mobile() ) {
-	wp_enqueue_style( 'wp-mediaelement' );
-	wp_enqueue_script( 'wp-mediaelement' );
-	wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
-		'pluginPath'        => includes_url( 'js/mediaelement/', 'relative' ),
+if ( ! wp_is_mobile()) {
+	wp_enqueue_style('wp-mediaelement');
+	wp_enqueue_script('wp-mediaelement');
+	wp_localize_script('mediaelement', '_wpmejsSettings', array(
+		'pluginPath'        => includes_url('js/mediaelement/', 'relative'),
 		'pauseOtherPlayers' => '',
-	) );
+	));
 }
 
 $video_url = 'https://videopress.com/embed/AHz0Ca46?hd=true';
-$lang_code = str_replace( '_', '-', get_user_locale() );
-list( $lang_code ) = explode( '-', $lang_code );
-if ( 'en' !== $lang_code ) {
-	$video_url = add_query_arg( 'defaultLangCode', $lang_code, $video_url );
+$lang_code = str_replace('_', '-', get_user_locale());
+list($lang_code) = explode('-', $lang_code);
+if ('en' !== $lang_code) {
+	$video_url = add_query_arg('defaultLangCode', $lang_code, $video_url);
 }
 
-$title = __( 'About' );
+$title = __('About');
 
-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+list($display_version) = explode('-', get_bloginfo('version'));
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 	<div class="wrap about-wrap">
-		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
+		<h1><?php printf(__('Welcome to WordPress&nbsp;%s'), $display_version); ?></h1>
 
-		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.' ), $display_version ); ?></p>
-		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+		<p class="about-text"><?php printf(__('Thank you for updating to the latest version! WordPress %s helps you get your site set up the way you want it.'), $display_version); ?></p>
+		<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
-			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="about.php" class="nav-tab nav-tab-active"><?php _e('What&#8217;s New'); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e('Credits'); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 		</h2>
 
 		<div class="headline-feature feature-video">
-			<iframe width="1050" height="591" src="<?php echo esc_url( $video_url ); ?>" frameborder="0" allowfullscreen></iframe>
+			<iframe width="1050" height="591" src="<?php echo esc_url($video_url); ?>" frameborder="0" allowfullscreen></iframe>
 			<script src="https://videopress.com/videopress-iframe.js"></script>
 		</div>
 
 		<hr />
 
 		<div class="feature-section one-col">
-			<h2><?php _e( 'Presenting Twenty Seventeen' ); ?></h2>
-			<p class="lead-description"><?php _e( 'A brand new default theme brings your site to life with immersive featured images and video headers.' ); ?></p>
+			<h2><?php _e('Presenting Twenty Seventeen'); ?></h2>
+			<p class="lead-description"><?php _e('A brand new default theme brings your site to life with immersive featured images and video headers.'); ?></p>
 			<picture>
 				<source media="(min-width: 450px)" srcset="https://s.w.org/images/core/4.7/twenty-seventeen-1600.jpg?v2 1600w, https://s.w.org/images/core/4.7/twenty-seventeen-493.jpg?v2 493w, https://s.w.org/images/core/4.7/twenty-seventeen-663.jpg?v2 663w, https://s.w.org/images/core/4.7/twenty-seventeen-804.jpg?v2 804w, https://s.w.org/images/core/4.7/twenty-seventeen-928.jpg?v2 928w, https://s.w.org/images/core/4.7/twenty-seventeen-1058.jpg?v2 1058w, https://s.w.org/images/core/4.7/twenty-seventeen-1173.jpg?v2 1173w, https://s.w.org/images/core/4.7/twenty-seventeen-1299.jpg?v2 1299w, https://s.w.org/images/core/4.7/twenty-seventeen-1410.jpg?v2 1410w, https://s.w.org/images/core/4.7/twenty-seventeen-1513.jpg?v2 1513w, https://s.w.org/images/core/4.7/twenty-seventeen-1595.jpg?v2 1595w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 782px) calc(100vw - 70px), (max-width: 959px) calc(100vw - 116px), (max-width: 1290px) calc(100vw - 240px), 1050px">
 				<source srcset="https://s.w.org/images/core/4.7/twenty-seventeen-mobile-564.jpg?v2 564w, https://s.w.org/images/core/4.7/twenty-seventeen-mobile-280.jpg?v2 280w, https://s.w.org/images/core/4.7/twenty-seventeen-mobile-372.jpg?v2 372w, https://s.w.org/images/core/4.7/twenty-seventeen-mobile-454.jpg?v2 454w, https://s.w.org/images/core/4.7/twenty-seventeen-mobile-541.jpg?v2 541w" sizes="calc(100vw - 40px)">
 				<img src="https://s.w.org/images/core/4.7/twenty-seventeen-1600.jpg?v2" srcset="https://s.w.org/images/core/4.7/twenty-seventeen-1600.jpg?v2 1600w, https://s.w.org/images/core/4.7/twenty-seventeen-280.jpg?v2 280w, https://s.w.org/images/core/4.7/twenty-seventeen-493.jpg?v2 493w, https://s.w.org/images/core/4.7/twenty-seventeen-663.jpg?v2 663w, https://s.w.org/images/core/4.7/twenty-seventeen-804.jpg?v2 804w, https://s.w.org/images/core/4.7/twenty-seventeen-928.jpg?v2 928w, https://s.w.org/images/core/4.7/twenty-seventeen-1058.jpg?v2 1058w, https://s.w.org/images/core/4.7/twenty-seventeen-1173.jpg?v2 1173w, https://s.w.org/images/core/4.7/twenty-seventeen-1299.jpg?v2 1299w, https://s.w.org/images/core/4.7/twenty-seventeen-1410.jpg?v2 1410w, https://s.w.org/images/core/4.7/twenty-seventeen-1513.jpg?v2 1513w, https://s.w.org/images/core/4.7/twenty-seventeen-1595.jpg?v2 1595w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 782px) calc(100vw - 70px), (max-width: 959px) calc(100vw - 116px), (max-width: 1290px) calc(100vw - 240px), 1050px" alt="" />
 			</picture>
-			<p><?php _e( 'Twenty Seventeen focuses on business sites and features a customizable front page with multiple sections. Personalize it with widgets, navigation, social menus, a logo, custom colors, and more. Our default theme for 2017 works great in many languages, on any device, and for a wide range of users.' ); ?></p>
+			<p><?php _e('Twenty Seventeen focuses on business sites and features a customizable front page with multiple sections. Personalize it with widgets, navigation, social menus, a logo, custom colors, and more. Our default theme for 2017 works great in many languages, on any device, and for a wide range of users.'); ?></p>
 		</div>
 
 		<hr />
 
 		<div class="feature-section one-col">
-			<h2><?php _e( 'Your Site, Your Way' ); ?></h2>
-			<p class="lead-description"><?php _e( 'WordPress 4.7 adds new features to the customizer to help take you through the initial setup of a theme, with non-destructive live previews of all your changes in one uninterrupted workflow.' ); ?></p>
+			<h2><?php _e('Your Site, Your Way'); ?></h2>
+			<p class="lead-description"><?php _e('WordPress 4.7 adds new features to the customizer to help take you through the initial setup of a theme, with non-destructive live previews of all your changes in one uninterrupted workflow.'); ?></p>
 		</div>
 
 		<div class="feature-section two-col">
 			<div class="col">
-				<h3><?php _e( 'Theme Starter Content' ); ?></h3>
-				<p><?php _e( 'To help give you a solid base to build from, individual themes can provide starter content that appears when you go to customize your brand new site. This can range from placing a business information widget in the best location to providing a sample menu with social icon links to a static front page complete with beautiful images. Don&#8217;t worry - nothing new will appear on the live site until you&#8217;re ready to save and publish your initial theme setup.' ); ?></p>
+				<h3><?php _e('Theme Starter Content'); ?></h3>
+				<p><?php _e('To help give you a solid base to build from, individual themes can provide starter content that appears when you go to customize your brand new site. This can range from placing a business information widget in the best location to providing a sample menu with social icon links to a static front page complete with beautiful images. Don&#8217;t worry - nothing new will appear on the live site until you&#8217;re ready to save and publish your initial theme setup.'); ?></p>
 			</div>
 			<div class="col">
 				<?php
-				echo wp_video_shortcode( array(
+				echo wp_video_shortcode(array(
 					'mp4'      => 'https://s.w.org/images/core/4.7/starter-content-v1.mp4',
 					'poster'   => 'https://s.w.org/images/core/4.7/starter-content.jpg?v2',
 					'loop'     => true,
@@ -83,16 +83,16 @@ 
 					'width'    => 1140,
 					'height'   => 624,
 					// 'class'    => 'wp-video-shortcode feature-video',
-				) );
+				));
 				?>
 			</div>
 		</div>
 
 		<div class="feature-section two-col">
 			<div class="col">
-				<h3><?php _e( 'Edit Shortcuts' ); ?></h3>
+				<h3><?php _e('Edit Shortcuts'); ?></h3>
 				<?php
-				echo wp_video_shortcode( array(
+				echo wp_video_shortcode(array(
 					'mp4'      => 'https://s.w.org/images/core/4.7/edit-shortcuts-v1.mp4',
 					'poster'   => 'https://s.w.org/images/core/4.7/edit-shortcuts.jpg?v2',
 					'loop'     => true,
@@ -100,14 +100,14 @@ 
 					'width'    => 2520,
 					'height'   => 1454,
 					// 'class'    => 'wp-video-shortcode feature-video',
-				) );
+				));
 				?>
-				<p><?php _e( 'Visible icons appear to show you which parts of your site can be customized while live previewing. Click on a shortcut and get straight to editing. Paired with starter content, getting started with customizing your site is faster than ever.' );?></p>
+				<p><?php _e('Visible icons appear to show you which parts of your site can be customized while live previewing. Click on a shortcut and get straight to editing. Paired with starter content, getting started with customizing your site is faster than ever.'); ?></p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Video Headers' ); ?></h3>
+				<h3><?php _e('Video Headers'); ?></h3>
 				<?php
-				echo wp_video_shortcode( array(
+				echo wp_video_shortcode(array(
 					'mp4'      => 'https://s.w.org/images/core/4.7/header-video-v1.mp4',
 					'poster'   => 'https://s.w.org/images/core/4.7/header-video.jpg?v2',
 					'loop'     => true,
@@ -115,22 +115,22 @@ 
 					'width'    => 2520,
 					'height'   => 1454,
 					// 'class'    => 'wp-video-shortcode feature-video',
-				) );
+				));
 				?>
-				<p><?php _e( 'Sometimes a big atmospheric video as a moving header image is just what you need to showcase your wares; go ahead and try it out with Twenty Seventeen. Need some video inspiration? Try searching for sites with video headers available for download and use.' ); ?></p>
+				<p><?php _e('Sometimes a big atmospheric video as a moving header image is just what you need to showcase your wares; go ahead and try it out with Twenty Seventeen. Need some video inspiration? Try searching for sites with video headers available for download and use.'); ?></p>
 			</div>
 		</div>
 
 		<div class="feature-section two-col">
 			<div class="col">
-				<h3><?php _e( 'Smoother Menu Building' ); ?></h3>
+				<h3><?php _e('Smoother Menu Building'); ?></h3>
 				<img src="https://s.w.org/images/core/4.7/nav-menus-760.jpg?v2" srcset="https://s.w.org/images/core/4.7/nav-menus-760.jpg?v2 760w, https://s.w.org/images/core/4.7/nav-menus-280.jpg?v2 280w, https://s.w.org/images/core/4.7/nav-menus-536.jpg?v2 536w, https://s.w.org/images/core/4.7/nav-menus-745.jpg?v2 745w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px" alt="" />
-				<p><?php _e( 'Many menus for sites contain links to the pages of your site, but what happens when you don&#8217;t have any pages yet? Now you can add new pages while building menus instead of leaving the customizer and abandoning your changes. Once you&#8217;ve published your customizations, you&#8217;ll have new pages ready for you to fill with content.' );?></p>
+				<p><?php _e('Many menus for sites contain links to the pages of your site, but what happens when you don&#8217;t have any pages yet? Now you can add new pages while building menus instead of leaving the customizer and abandoning your changes. Once you&#8217;ve published your customizations, you&#8217;ll have new pages ready for you to fill with content.'); ?></p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Custom CSS' ); ?></h3>
+				<h3><?php _e('Custom CSS'); ?></h3>
 				<img src="https://s.w.org/images/core/4.7/css-760.jpg?v2" srcset="https://s.w.org/images/core/4.7/css-760.jpg?v2 760w, https://s.w.org/images/core/4.7/css-280.jpg?v2 280w, https://s.w.org/images/core/4.7/css-547.jpg?v2 547w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px" alt="" />
-				<p><?php _e( 'Sometimes you just need a few visual tweaks to make your site perfect. WordPress 4.7 allows you to add custom CSS and instantly see how your changes affect your site. The live preview allows you to work quickly without page refreshes slowing you down.' ); ?></p>
+				<p><?php _e('Sometimes you just need a few visual tweaks to make your site perfect. WordPress 4.7 allows you to add custom CSS and instantly see how your changes affect your site. The live preview allows you to work quickly without page refreshes slowing you down.'); ?></p>
 			</div>
 		</div>
 
@@ -138,27 +138,27 @@ 
 
 		<div class="feature-section no-heading two-col">
 			<div class="col">
-				<h3><?php _e( 'PDF Thumbnail Previews' ); ?></h3>
+				<h3><?php _e('PDF Thumbnail Previews'); ?></h3>
 				<img src="https://s.w.org/images/core/4.7/pdf-760.jpg?v2" srcset="https://s.w.org/images/core/4.7/pdf-760.jpg?v2 760w, https://s.w.org/images/core/4.7/pdf-280.jpg?v2 280w, https://s.w.org/images/core/4.7/pdf-412.jpg?v2 412w, https://s.w.org/images/core/4.7/pdf-516.jpg?v2 516w, https://s.w.org/images/core/4.7/pdf-615.jpg?v2 615w, https://s.w.org/images/core/4.7/pdf-716.jpg?v2 716w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px" alt="" />
-				<p><?php _e( 'Managing your document collection is easier with WordPress 4.7. Uploading PDFs will generate thumbnail images so you can more easily distinguish between all your documents.' ); ?></p>
+				<p><?php _e('Managing your document collection is easier with WordPress 4.7. Uploading PDFs will generate thumbnail images so you can more easily distinguish between all your documents.'); ?></p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Dashboard in your language' ); ?></h3>
+				<h3><?php _e('Dashboard in your language'); ?></h3>
 				<img src="https://s.w.org/images/core/4.7/language-760.jpg?v2" srcset="https://s.w.org/images/core/4.7/language-760.jpg?v2 760w, https://s.w.org/images/core/4.7/language-280.jpg?v2 280w, https://s.w.org/images/core/4.7/language-568.jpg?v2 568w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 781px) calc((100vw - 70px) * .466), (max-width: 959px) calc((100vw - 116px) * .469), (max-width: 1290px) calc((100vw - 240px) * .472), 496px" alt="" />
-				<p><?php _e( 'Just because your site is in one language doesn&#8217;t mean that everybody helping manage it prefers that language for their admin. Add more languages to your site and a user language option will show up in your user&#8217;s profiles.' );?></p>
+				<p><?php _e('Just because your site is in one language doesn&#8217;t mean that everybody helping manage it prefers that language for their admin. Add more languages to your site and a user language option will show up in your user&#8217;s profiles.'); ?></p>
 			</div>
 		</div>
 
 		<hr />
 
 		<div class="rest-api feature-section one-col">
-			<h2><?php _e( 'Introducing REST API Content Endpoints' ); ?></h2>
-			<p class="lead-description"><?php _e( 'WordPress 4.7 comes with REST API endpoints for posts, comments, terms, users, meta, and settings.' ); ?></p>
+			<h2><?php _e('Introducing REST API Content Endpoints'); ?></h2>
+			<p class="lead-description"><?php _e('WordPress 4.7 comes with REST API endpoints for posts, comments, terms, users, meta, and settings.'); ?></p>
 			<img src="https://s.w.org/images/core/4.7/api-1559.jpg?v2" srcset="https://s.w.org/images/core/4.7/api-2100.jpg?v2 2100w, https://s.w.org/images/core/4.7/api-280.jpg?v2 280w, https://s.w.org/images/core/4.7/api-1034.jpg?v2 1034w, https://s.w.org/images/core/4.7/api-1559.jpg?v2 1559w, https://s.w.org/images/core/4.7/api-2032.jpg?v2 2032w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 782px) calc(100vw - 70px), (max-width: 959px) calc(100vw - 116px), (max-width: 1290px) calc(100vw - 240px), 1050px" alt="" />
 			<p><?php
 				printf(
 					/* translators: %s: https://developer.wordpress.org/rest-api/  */
-					__( 'Content endpoints provide machine-readable external access to your WordPress site with a clear, standards-driven interface, paving the way for new and innovative methods of interacting with sites through plugins, themes, apps, and beyond. Ready to get started with development? <a href="%s">Check out the REST API reference.</a>' ),
+					__('Content endpoints provide machine-readable external access to your WordPress site with a clear, standards-driven interface, paving the way for new and innovative methods of interacting with sites through plugins, themes, apps, and beyond. Ready to get started with development? <a href="%s">Check out the REST API reference.</a>'),
 					'https://developer.wordpress.org/rest-api/reference/'
 				);
 			?></p>
@@ -170,29 +170,29 @@ 
 			<h2><?php
 				printf(
 					/* translators: %s: smiling face with smiling eyes emoji */
-					__( 'Even More Developer Happiness %s' ),
+					__('Even More Developer Happiness %s'),
 					'&#x1F60A'
 				);
 			?></h2>
 
 			<div class="under-the-hood three-col">
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2016/11/03/post-type-templates-in-4-7/"><?php _e( 'Post Type Templates' ); ?></a></h3>
-					<p><?php _e( 'By opening up the page template functionality to all post types, theme developers have even more flexibility with the WordPress template hierarchy.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2016/11/03/post-type-templates-in-4-7/"><?php _e('Post Type Templates'); ?></a></h3>
+					<p><?php _e('By opening up the page template functionality to all post types, theme developers have even more flexibility with the WordPress template hierarchy.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><?php _e( 'More Theme API Goodies' ); ?></h3>
+					<h3><?php _e('More Theme API Goodies'); ?></h3>
 					<p><?php
 						printf(
 							/* translators: %s: https://make.wordpress.org/core/2016/09/09/new-functions-hooks-and-behaviour-for-theme-developers-in-wordpress-4-7/  */
-							__( 'WordPress 4.7 includes <a href="%s">new functions, hooks, and behavior</a> for theme developers.' ),
+							__('WordPress 4.7 includes <a href="%s">new functions, hooks, and behavior</a> for theme developers.'),
 							'https://make.wordpress.org/core/2016/09/09/new-functions-hooks-and-behaviour-for-theme-developers-in-wordpress-4-7/'
 						);
 					?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2016/10/04/custom-bulk-actions/"><?php _e( 'Custom Bulk Actions' ); ?></a></h3>
-					<p><?php _e( 'List tables, now with more than bulk edit and delete.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2016/10/04/custom-bulk-actions/"><?php _e('Custom Bulk Actions'); ?></a></h3>
+					<p><?php _e('List tables, now with more than bulk edit and delete.'); ?></p>
 				</div>
 			</div>
 
@@ -202,25 +202,25 @@ 
 					<p><?php
 						printf(
 							/* translators: %s: https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/  */
-							__( 'The code that lies beneath actions and filters has been overhauled and modernized, fixing bugs along the way.' ),
+							__('The code that lies beneath actions and filters has been overhauled and modernized, fixing bugs along the way.'),
 							'https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/'
 						);
 					?></p>
 				</div>
 				<div class="col">
-					<h3><?php _e( 'Settings Registration API' ); ?></h3>
+					<h3><?php _e('Settings Registration API'); ?></h3>
 					<p><?php
 						printf(
 							/* translators: 1: register_setting(), 2: https://make.wordpress.org/core/2016/10/26/registering-your-settings-in-wordpress-4-7/ */
-							__( '%1$s <a href="%2$s">has been enhanced</a> to include type, description, and REST API visibility.' ),
+							__('%1$s <a href="%2$s">has been enhanced</a> to include type, description, and REST API visibility.'),
 							'<code>register_setting()</code>',
 							'https://make.wordpress.org/core/2016/10/26/registering-your-settings-in-wordpress-4-7/'
 						);
 					?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2016/10/12/customize-changesets-technical-design-decisions/"><?php _e( 'Customize Changesets' ); ?></a></h3>
-					<p><?php _e( 'Customize changesets make changes in the customizer persistent, like autosave drafts. They also make exciting new features like starter content possible.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2016/10/12/customize-changesets-technical-design-decisions/"><?php _e('Customize Changesets'); ?></a></h3>
+					<p><?php _e('Customize changesets make changes in the customizer persistent, like autosave drafts. They also make exciting new features like starter content possible.'); ?></p>
 				</div>
 			</div>
 
@@ -229,47 +229,47 @@ 
 		<hr />
 
 		<div class="return-to-dashboard">
-			<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-				<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-					<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
+			<?php if (current_user_can('update_core') && isset($_GET['updated'])) : ?>
+				<a href="<?php echo esc_url(self_admin_url('update-core.php')); ?>">
+					<?php is_multisite() ? _e('Return to Updates') : _e('Return to Dashboard &rarr; Updates'); ?>
 				</a> |
 			<?php endif; ?>
-			<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
+			<a href="<?php echo esc_url(self_admin_url()); ?>"><?php is_blog_admin() ? _e('Go to Dashboard &rarr; Home') : _e('Go to Dashboard'); ?></a>
 		</div>
 
 	</div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
 return;
 
-__( 'Maintenance Release' );
-__( 'Maintenance Releases' );
+__('Maintenance Release');
+__('Maintenance Releases');
 
-__( 'Security Release' );
-__( 'Security Releases' );
+__('Security Release');
+__('Security Releases');
 
-__( 'Maintenance and Security Release' );
-__( 'Maintenance and Security Releases' );
+__('Maintenance and Security Release');
+__('Maintenance and Security Releases');
 
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed one security issue.' );
+__('<strong>Version %s</strong> addressed one security issue.');
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed some security issues.' );
+__('<strong>Version %s</strong> addressed some security issues.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.');
 
 /* translators: %s: Codex URL */
-__( 'For more information, see <a href="%s">the release notes</a>.' );
+__('For more information, see <a href="%s">the release notes</a>.');

src/wp-admin/edit-tags.php

Indentation +1 added lines, -1 removed lines

@@ -348,7 +348,7 @@
 if ( current_user_can($tax->cap->edit_terms) ) {
 	if ( 'category' == $taxonomy ) {
 		/**
- 		 * Fires before the Add Category form.
+		 * Fires before the Add Category form.
 		 *
 		 * @since 2.1.0
 		 * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.

Switch Indentation +86 added lines, -86 removed lines

@@ -68,115 +68,115 @@
 
 switch ( $wp_list_table->current_action() ) {
 
-case 'add-tag':
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
-
-	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
-			403
-		);
-	}
-
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
-
-	break;
+	case 'add-tag':
+		check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
+				403
+			);
+		}
+
+		$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
+		if ( $ret && !is_wp_error( $ret ) )
+			$location = add_query_arg( 'message', 1, $referer );
+		else
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
 
-case 'delete':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+	case 'delete':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
-			403
-		);
-	}
+		$tag_ID = (int) $_REQUEST['tag_ID'];
+		check_admin_referer( 'delete-tag_' . $tag_ID );
 
-	wp_delete_term( $tag_ID, $taxonomy );
+		if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+				403
+			);
+		}
 
-	$location = add_query_arg( 'message', 2, $referer );
+		wp_delete_term( $tag_ID, $taxonomy );
 
-	break;
+		$location = add_query_arg( 'message', 2, $referer );
 
-case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+		break;
 
-	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
-			403
-		);
-	}
+	case 'bulk-delete':
+		check_admin_referer( 'bulk-tags' );
 
-	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
-	}
+		if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+				403
+			);
+		}
 
-	$location = add_query_arg( 'message', 6, $referer );
+		$tags = (array) $_REQUEST['delete_tags'];
+		foreach ( $tags as $tag_ID ) {
+			wp_delete_term( $tag_ID, $taxonomy );
+		}
 
-	break;
+		$location = add_query_arg( 'message', 6, $referer );
 
-case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	case 'edit':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
-	}
+		$term_id = (int) $_REQUEST['tag_ID'];
+		$term    = get_term( $term_id );
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
-	exit;
+		if ( ! $term instanceof WP_Term ) {
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
 
-case 'editedtag':
-	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+		wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+		exit;
 
-	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
-			403
-		);
-	}
+	case 'editedtag':
+		$tag_ID = (int) $_POST['tag_ID'];
+		check_admin_referer( 'update-tag_' . $tag_ID );
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+				403
+			);
+		}
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+		$tag = get_term( $tag_ID, $taxonomy );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
 
-	if ( $ret && ! is_wp_error( $ret ) ) {
-		$location = add_query_arg( 'message', 3, $referer );
-	} else {
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
-	}
-	break;
-default:
-	if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+		$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+
+		if ( $ret && ! is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 3, $referer );
+		} else {
+			$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
+		}
+		break;
+	default:
+		if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+			break;
+		}
+		check_admin_referer( 'bulk-tags' );
+		$tags = (array) $_REQUEST['delete_tags'];
+		/** This action is documented in wp-admin/edit-comments.php */
+		$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
 		break;
-	}
-	check_admin_referer( 'bulk-tags' );
-	$tags = (array) $_REQUEST['delete_tags'];
-	/** This action is documented in wp-admin/edit-comments.php */
-	$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
-	break;
 }
 
 if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {

Spacing +162 added lines, -162 removed lines

@@ -7,24 +7,24 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! $taxnow )
-	wp_die( __( 'Invalid taxonomy.' ) );
+if ( ! $taxnow)
+	wp_die(__('Invalid taxonomy.'));
 
-$tax = get_taxonomy( $taxnow );
+$tax = get_taxonomy($taxnow);
 
-if ( ! $tax )
-	wp_die( __( 'Invalid taxonomy.' ) );
+if ( ! $tax)
+	wp_die(__('Invalid taxonomy.'));
 
-if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
-   wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
+if ( ! in_array($tax->name, get_taxonomies(array('show_ui' => true)))) {
+   wp_die(__('Sorry, you are not allowed to edit terms in this taxonomy.'));
 }
 
-if ( ! current_user_can( $tax->cap->manage_terms ) ) {
+if ( ! current_user_can($tax->cap->manage_terms)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to manage terms in this taxonomy.').'</p>',
 		403
 	);
 }
@@ -41,10 +41,10 @@ 
 
 $title = $tax->labels->name;
 
-if ( 'post' != $post_type ) {
-	$parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
+if ('post' != $post_type) {
+	$parent_file = ('attachment' == $post_type) ? 'upload.php' : "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
-} elseif ( 'link_category' == $tax->name ) {
+} elseif ('link_category' == $tax->name) {
 	$parent_file = 'link-manager.php';
 	$submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
@@ -52,140 +52,140 @@ 
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
+add_screen_option('per_page', array('default' => 20, 'option' => 'edit_'.$tax->name.'_per_page'));
 
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(array(
 	'heading_pagination' => $tax->labels->items_list_navigation,
 	'heading_list'       => $tax->labels->items_list,
-) );
+));
 
 $location = false;
 $referer = wp_get_referer();
-if ( ! $referer ) { // For POST requests.
-	$referer = wp_unslash( $_SERVER['REQUEST_URI'] );
+if ( ! $referer) { // For POST requests.
+	$referer = wp_unslash($_SERVER['REQUEST_URI']);
 }
-$referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
+$referer = remove_query_arg(array('_wp_http_referer', '_wpnonce', 'error', 'message', 'paged'), $referer);
 
-switch ( $wp_list_table->current_action() ) {
+switch ($wp_list_table->current_action()) {
 
 case 'add-tag':
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+	check_admin_referer('add-tag', '_wpnonce_add-tag');
 
-	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+	if ( ! current_user_can($tax->cap->edit_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to create terms in this taxonomy.').'</p>',
 			403
 		);
 	}
 
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
+	$ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
+	if ($ret && ! is_wp_error($ret))
+		$location = add_query_arg('message', 1, $referer);
 	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+		$location = add_query_arg(array('error' => true, 'message' => 4), $referer);
 
 	break;
 
 case 'delete':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+	if ( ! isset($_REQUEST['tag_ID'])) {
 		break;
 	}
 
 	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+	check_admin_referer('delete-tag_'.$tag_ID);
 
-	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
+	if ( ! current_user_can('delete_term', $tag_ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to delete this item.').'</p>',
 			403
 		);
 	}
 
-	wp_delete_term( $tag_ID, $taxonomy );
+	wp_delete_term($tag_ID, $taxonomy);
 
-	$location = add_query_arg( 'message', 2, $referer );
+	$location = add_query_arg('message', 2, $referer);
 
 	break;
 
 case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+	check_admin_referer('bulk-tags');
 
-	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+	if ( ! current_user_can($tax->cap->delete_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to delete these items.').'</p>',
 			403
 		);
 	}
 
 	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
+	foreach ($tags as $tag_ID) {
+		wp_delete_term($tag_ID, $taxonomy);
 	}
 
-	$location = add_query_arg( 'message', 6, $referer );
+	$location = add_query_arg('message', 6, $referer);
 
 	break;
 
 case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+	if ( ! isset($_REQUEST['tag_ID'])) {
 		break;
 	}
 
 	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	$term    = get_term($term_id);
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	if ( ! $term instanceof WP_Term) {
+		wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 	}
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+	wp_redirect(esc_url_raw(get_edit_term_link($term_id, $taxonomy, $post_type)));
 	exit;
 
 case 'editedtag':
 	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+	check_admin_referer('update-tag_'.$tag_ID);
 
-	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
+	if ( ! current_user_can('edit_term', $tag_ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 			403
 		);
 	}
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	$tag = get_term($tag_ID, $taxonomy);
+	if ( ! $tag)
+		wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+	$ret = wp_update_term($tag_ID, $taxonomy, $_POST);
 
-	if ( $ret && ! is_wp_error( $ret ) ) {
-		$location = add_query_arg( 'message', 3, $referer );
+	if ($ret && ! is_wp_error($ret)) {
+		$location = add_query_arg('message', 3, $referer);
 	} else {
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
+		$location = add_query_arg(array('error' => true, 'message' => 5), $referer);
 	}
 	break;
 default:
-	if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+	if ( ! $wp_list_table->current_action() || ! isset($_REQUEST['delete_tags'])) {
 		break;
 	}
-	check_admin_referer( 'bulk-tags' );
+	check_admin_referer('bulk-tags');
 	$tags = (array) $_REQUEST['delete_tags'];
 	/** This action is documented in wp-admin/edit-comments.php */
-	$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
+	$location = apply_filters('handle_bulk_actions-'.get_current_screen()->id, $location, $wp_list_table->current_action(), $tags);
 	break;
 }
 
-if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-	$location = remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) );
+if ( ! $location && ! empty($_REQUEST['_wp_http_referer'])) {
+	$location = remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']));
 }
 
-if ( $location ) {
-	if ( $pagenum > 1 ) {
-		$location = add_query_arg( 'paged', $pagenum, $location ); // $pagenum takes care of $total_pages.
+if ($location) {
+	if ($pagenum > 1) {
+		$location = add_query_arg('paged', $pagenum, $location); // $pagenum takes care of $total_pages.
 	}
 
 	/**
@@ -196,114 +196,114 @@ 
 	 * @param string $location The destination URL.
 	 * @param object $tax      The taxonomy object.
 	 */
-	wp_redirect( apply_filters( 'redirect_term_location', $location, $tax ) );
+	wp_redirect(apply_filters('redirect_term_location', $location, $tax));
 	exit;
 }
 
 $wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+$total_pages = $wp_list_table->get_pagination_arg('total_pages');
 
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
+if ($pagenum > $total_pages && $total_pages > 0) {
+	wp_redirect(add_query_arg('paged', $total_pages));
 	exit;
 }
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
+if (current_user_can($tax->cap->edit_terms))
 	wp_enqueue_script('inline-edit-tax');
 
-if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
-	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+if ('category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy) {
+	$help = '';
+	if ('category' == $taxonomy)
+		$help = '<p>'.sprintf(__('You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.'), 'options-writing.php').'</p>';
+	elseif ('link_category' == $taxonomy)
+		$help = '<p>'.__('You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.').'</p>';
 	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+		$help = '<p>'.__('You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.').'</p>';
 
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+	if ('link_category' == $taxonomy)
+		$help .= '<p>'.__('You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.').'</p>';
 	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+		$help .= '<p>'.__('What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' => $help,
-	) );
+	));
 
-	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
-			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+	if ('category' == $taxonomy || 'post_tag' == $taxonomy) {
+		if ('category' == $taxonomy)
+			$help = '<p>'.__('When adding a new category on this screen, you&#8217;ll fill in the following fields:').'</p>';
 		else
-			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+			$help = '<p>'.__('When adding a new tag on this screen, you&#8217;ll fill in the following fields:').'</p>';
 
-		$help .= '<ul>' .
-		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
+		$help .= '<ul>'.
+		'<li>'.__('<strong>Name</strong> &mdash; The name is how it appears on your site.').'</li>';
 
-		if ( ! global_terms_enabled() )
-			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		if ( ! global_terms_enabled())
+			$help .= '<li>'.__('<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.').'</li>';
 
-		if ( 'category' == $taxonomy )
-			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		if ('category' == $taxonomy)
+			$help .= '<li>'.__('<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.').'</li>';
 
-		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
-		'</ul>' .
-		'<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
+		$help .= '<li>'.__('<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.').'</li>'.
+		'</ul>'.
+		'<p>'.__('You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.').'</p>';
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'adding-terms',
-			'title'   => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
+			'title'   => 'category' == $taxonomy ? __('Adding Categories') : __('Adding Tags'),
 			'content' => $help,
-		) );
+		));
 	}
 
-	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
+	$help = '<p><strong>'.__('For more information:').'</strong></p>';
 
-	if ( 'category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
+	if ('category' == $taxonomy)
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>').'</p>';
+	elseif ('link_category' == $taxonomy)
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>').'</p>';
 	else
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>').'</p>';
 
-	$help .= '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>';
+	$help .= '<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>';
 
-	get_current_screen()->set_help_sidebar( $help );
+	get_current_screen()->set_help_sidebar($help);
 
-	unset( $help );
+	unset($help);
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 /** Also used by the Edit Tag  form */
-require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+require_once(ABSPATH.'wp-admin/includes/edit-tag-messages.php');
 
-$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';
+$class = (isset($_REQUEST['error'])) ? 'error' : 'updated';
 
-if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
-	$import_link = admin_url( 'admin.php?import=wpcat2tag' );
+if (is_plugin_active('wpcat2tag-importer/wpcat2tag-importer.php')) {
+	$import_link = admin_url('admin.php?import=wpcat2tag');
 } else {
-	$import_link = admin_url( 'import.php' );
+	$import_link = admin_url('import.php');
 }
 
 ?>
 
 <div class="wrap nosubsub">
-<h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
+<h1 class="wp-heading-inline"><?php echo esc_html($title); ?></h1>
 
 <?php
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(wp_unslash($_REQUEST['s'])));
 }
 ?>
 
 <hr class="wp-header-end">
 
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message', 'error'), $_SERVER['REQUEST_URI']);
 endif; ?>
 <div id="ajax-response"></div>
 
@@ -311,7 +311,7 @@ 
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 
-<?php $wp_list_table->search_box( $tax->labels->search_items, 'tag' ); ?>
+<?php $wp_list_table->search_box($tax->labels->search_items, 'tag'); ?>
 
 </form>
 
@@ -322,8 +322,8 @@ 
 
 <?php
 
-if ( current_user_can($tax->cap->edit_terms) ) {
-	if ( 'category' == $taxonomy ) {
+if (current_user_can($tax->cap->edit_terms)) {
+	if ('category' == $taxonomy) {
 		/**
  		 * Fires before the Add Category form.
 		 *
@@ -332,8 +332,8 @@ 
 		 *
 		 * @param object $arg Optional arguments cast to an object.
 		 */
-		do_action( 'add_category_form_pre', (object) array( 'parent' => 0 ) );
-	} elseif ( 'link_category' == $taxonomy ) {
+		do_action('add_category_form_pre', (object) array('parent' => 0));
+	} elseif ('link_category' == $taxonomy) {
 		/**
 		 * Fires before the link category form.
 		 *
@@ -342,7 +342,7 @@ 
 		 *
 		 * @param object $arg Optional arguments cast to an object.
 		 */
-		do_action( 'add_link_category_form_pre', (object) array( 'parent' => 0 ) );
+		do_action('add_link_category_form_pre', (object) array('parent' => 0));
 	} else {
 		/**
 		 * Fires before the Add Tag form.
@@ -352,7 +352,7 @@ 
 		 *
 		 * @param string $taxonomy The taxonomy slug.
 		 */
-		do_action( 'add_tag_form_pre', $taxonomy );
+		do_action('add_tag_form_pre', $taxonomy);
 	}
 
 	/**
@@ -364,7 +364,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( "{$taxonomy}_pre_add_form", $taxonomy );
+	do_action("{$taxonomy}_pre_add_form", $taxonomy);
 ?>
 
 <div class="form-wrap">
@@ -377,7 +377,7 @@ 
  *
  * @since 3.7.0
  */
-do_action( "{$taxonomy}_term_new_form_tag" );
+do_action("{$taxonomy}_term_new_form_tag");
 ?>>
 <input type="hidden" name="action" value="add-tag" />
 <input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
@@ -386,20 +386,20 @@ 
 <?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>
 
 <div class="form-field form-required term-name-wrap">
-	<label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>
+	<label for="tag-name"><?php _ex('Name', 'term name'); ?></label>
 	<input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
 	<p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
-<?php if ( ! global_terms_enabled() ) : ?>
+<?php if ( ! global_terms_enabled()) : ?>
 <div class="form-field term-slug-wrap">
-	<label for="tag-slug"><?php _e( 'Slug' ); ?></label>
+	<label for="tag-slug"><?php _e('Slug'); ?></label>
 	<input name="slug" id="tag-slug" type="text" value="" size="40" />
 	<p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
 <?php endif; // global_terms_enabled() ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if (is_taxonomy_hierarchical($taxonomy)) : ?>
 <div class="form-field term-parent-wrap">
-	<label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label>
+	<label for="parent"><?php _ex('Parent', 'term parent'); ?></label>
 	<?php
 	$dropdown_args = array(
 		'hide_empty'       => 0,
@@ -408,7 +408,7 @@ 
 		'name'             => 'parent',
 		'orderby'          => 'name',
 		'hierarchical'     => true,
-		'show_option_none' => __( 'None' ),
+		'show_option_none' => __('None'),
 	);
 
 	/**
@@ -432,23 +432,23 @@ 
 	 * @param string $taxonomy The taxonomy slug.
 	 * @param string $context  Filter context. Accepts 'new' or 'edit'.
 	 */
-	$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
+	$dropdown_args = apply_filters('taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new');
 
-	wp_dropdown_categories( $dropdown_args );
+	wp_dropdown_categories($dropdown_args);
 	?>
-	<?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
+	<?php if ('category' == $taxonomy) : // @todo: Generic text for hierarchical taxonomies ?>
 		<p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
 	<?php endif; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>
 <div class="form-field term-description-wrap">
-	<label for="tag-description"><?php _e( 'Description' ); ?></label>
+	<label for="tag-description"><?php _e('Description'); ?></label>
 	<textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
 	<p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>
 
 <?php
-if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+if ( ! is_taxonomy_hierarchical($taxonomy)) {
 	/**
 	 * Fires after the Add Tag form fields for non-hierarchical taxonomies.
 	 *
@@ -456,7 +456,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form_fields', $taxonomy );
+	do_action('add_tag_form_fields', $taxonomy);
 }
 
 /**
@@ -468,11 +468,11 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form_fields", $taxonomy );
+do_action("{$taxonomy}_add_form_fields", $taxonomy);
 
-submit_button( $tax->labels->add_new_item );
+submit_button($tax->labels->add_new_item);
 
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/**
 	 * Fires at the end of the Edit Category form.
 	 *
@@ -481,8 +481,8 @@ 
 	 *
 	 * @param object $arg Optional arguments cast to an object.
 	 */
-	do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form', (object) array('parent' => 0));
+} elseif ('link_category' == $taxonomy) {
 	/**
 	 * Fires at the end of the Edit Link form.
 	 *
@@ -491,7 +491,7 @@ 
 	 *
 	 * @param object $arg Optional arguments cast to an object.
 	 */
-	do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+	do_action('edit_link_category_form', (object) array('parent' => 0));
 } else {
 	/**
 	 * Fires at the end of the Add Tag form.
@@ -501,7 +501,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form', $taxonomy );
+	do_action('add_tag_form', $taxonomy);
 }
 
 /**
@@ -513,7 +513,7 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form", $taxonomy );
+do_action("{$taxonomy}_add_form", $taxonomy);
 ?>
 </form></div>
 <?php } ?>
@@ -524,33 +524,33 @@ 
 <div id="col-right">
 <div class="col-wrap">
 <form id="posts-filter" method="post">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
+<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 
 <?php $wp_list_table->display(); ?>
 
 </form>
 
-<?php if ( 'category' == $taxonomy ) : ?>
+<?php if ('category' == $taxonomy) : ?>
 <div class="form-wrap edit-term-notes">
 <p>
 	<?php
-	echo '<strong>' . __( 'Note:' ) . '</strong><br />';
+	echo '<strong>'.__('Note:').'</strong><br />';
 	printf(
 		/* translators: %s: default category */
-		__( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
+		__('Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'),
 		/** This filter is documented in wp-includes/category-template.php */
-		'<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
+		'<strong>'.apply_filters('the_category', get_cat_name(get_option('default_category'))).'</strong>'
 	);
 	?>
 </p>
-<?php if ( current_user_can( 'import' ) ) : ?>
-<p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ) ?></p>
+<?php if (current_user_can('import')) : ?>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), esc_url($import_link)) ?></p>
 <?php endif; ?>
 </div>
-<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
+<?php elseif ('post_tag' == $taxonomy && current_user_can('import')) : ?>
 <div class="form-wrap edit-term-notes">
-<p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ) ;?></p>
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.'), esc_url($import_link)); ?></p>
 </div>
 <?php endif;
 
@@ -563,7 +563,7 @@ 
  *
  * @param string $taxonomy The taxonomy name.
  */
-do_action( "after-{$taxonomy}-table", $taxonomy );
+do_action("after-{$taxonomy}-table", $taxonomy);
 ?>
 
 </div>
@@ -572,7 +572,7 @@ 
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.forms.addtag['tag-name'].focus();}catch(e){}
 </script>
@@ -581,4 +581,4 @@ 
 
 $wp_list_table->inline_edit();
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +45 added lines, -34 removed lines

@@ -9,13 +9,15 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $taxnow )
+if ( ! $taxnow ) {
 	wp_die( __( 'Invalid taxonomy.' ) );
+}
 
 $tax = get_taxonomy( $taxnow );
 
-if ( ! $tax )
+if ( ! $tax ) {
 	wp_die( __( 'Invalid taxonomy.' ) );
+}
 
 if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
    wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
@@ -80,10 +82,11 @@ 
 	}
 
 	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+	if ( $ret && !is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 1, $referer );
+	} else {
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+	}
 
 	break;
 
@@ -157,8 +160,9 @@ 
 	}
 
 	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $tag ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 
 	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
@@ -209,22 +213,25 @@ 
 }
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
+if ( current_user_can($tax->cap->edit_terms) ) {
 	wp_enqueue_script('inline-edit-tax');
+}
 
 if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
 	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
-	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
-
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
-	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	if ( 'category' == $taxonomy ) {
+			$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
+			$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+	} else {
+			$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+	}
+
+	if ( 'link_category' == $taxonomy ) {
+			$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+	} else {
+			$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	}
 
 	get_current_screen()->add_help_tab( array(
 		'id'      => 'overview',
@@ -233,19 +240,22 @@ 
 	) );
 
 	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
-			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
-		else
-			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		if ( 'category' == $taxonomy ) {
+					$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		} else {
+					$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		}
 
 		$help .= '<ul>' .
 		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
 
-		if ( ! global_terms_enabled() )
-			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		if ( ! global_terms_enabled() ) {
+					$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		}
 
-		if ( 'category' == $taxonomy )
-			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		if ( 'category' == $taxonomy ) {
+					$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		}
 
 		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
 		'</ul>' .
@@ -260,12 +270,13 @@ 
 
 	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
-	if ( 'category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
-	else
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+	if ( 'category' == $taxonomy ) {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
+	} else {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+	}
 
 	$help .= '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>';
 

src/wp-admin/custom-header.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 	/**
 	 * Used to trigger a success message when settings updated and set to true.
- 	 *
+	 *
 	 * @since 3.0.0
 	 * @access private
 	 * @var bool

Spacing +368 added lines, -368 removed lines

@@ -60,12 +60,12 @@ 
 		$this->admin_header_callback = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
-		add_action( 'admin_menu', array( $this, 'init' ) );
+		add_action('admin_menu', array($this, 'init'));
 
-		add_action( 'customize_save_after',         array( $this, 'customize_set_last_used' ) );
-		add_action( 'wp_ajax_custom-header-crop',   array( $this, 'ajax_header_crop'        ) );
-		add_action( 'wp_ajax_custom-header-add',    array( $this, 'ajax_header_add'         ) );
-		add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove'      ) );
+		add_action('customize_save_after', array($this, 'customize_set_last_used'));
+		add_action('wp_ajax_custom-header-crop', array($this, 'ajax_header_crop'));
+		add_action('wp_ajax_custom-header-add', array($this, 'ajax_header_add'));
+		add_action('wp_ajax_custom-header-remove', array($this, 'ajax_header_remove'));
 	}
 
 	/**
@@ -74,18 +74,18 @@ 
 	 * @since 2.1.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) );
-		if ( ! $page ) {
+		$page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
+		if ( ! $page) {
 			return;
 		}
 
-		add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) );
-		add_action( "admin_print_styles-$page", array( $this, 'css_includes' ) );
-		add_action( "admin_head-$page", array( $this, 'help' ) );
-		add_action( "admin_head-$page", array( $this, 'take_action' ), 50 );
-		add_action( "admin_head-$page", array( $this, 'js' ), 50 );
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+		add_action("admin_print_scripts-$page", array($this, 'js_includes'));
+		add_action("admin_print_styles-$page", array($this, 'css_includes'));
+		add_action("admin_head-$page", array($this, 'help'));
+		add_action("admin_head-$page", array($this, 'take_action'), 50);
+		add_action("admin_head-$page", array($this, 'js'), 50);
+		if ($this->admin_header_callback) {
+			add_action("admin_head-$page", $this->admin_header_callback, 51);
 		}
 	}
 
@@ -95,37 +95,37 @@ 
 	 * @since 3.0.0
 	 */
 	public function help() {
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'overview',
 			'title'   => __('Overview'),
 			'content' =>
-				'<p>' . __( 'This screen is used to customize the header section of your theme.') . '</p>' .
-				'<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>'
-		) );
+				'<p>'.__('This screen is used to customize the header section of your theme.').'</p>'.
+				'<p>'.__('You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.').'<p>'
+		));
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'set-header-image',
 			'title'   => __('Header Image'),
 			'content' =>
-				'<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.' ) . '</p>' .
-				'<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.' ) . '</p>' .
-				'<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.') . '</p>' .
-				'<p>' . __( 'If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>'
-		) );
+				'<p>'.__('You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.').'</p>'.
+				'<p>'.__('Some themes come with additional header images bundled. If you see multiple images displayed, select the one you&#8217;d like and click the &#8220;Save Changes&#8221; button.').'</p>'.
+				'<p>'.__('If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.').'</p>'.
+				'<p>'.__('If you don&#8217;t want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.').'</p>'
+		));
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'set-header-text',
 			'title'   => __('Header Text'),
 			'content' =>
-				'<p>' . sprintf( __( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.' ), admin_url( 'options-general.php' ) ) . '<p>' .
-				'<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-				'<p>' . __( 'Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!') . '</p>'
-		) );
+				'<p>'.sprintf(__('For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%1$s">General Settings</a> section.'), admin_url('options-general.php')).'<p>'.
+				'<p>'.__('In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.').'</p>'.
+				'<p>'.__('Don&#8217;t forget to click &#8220;Save Changes&#8221; when you&#8217;re done!').'</p>'
+		));
 
 		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Header_Screen">Documentation on Custom Header</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+			'<p><strong>'.__('For more information:').'</strong></p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Header_Screen">Documentation on Custom Header</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 		);
 	}
 
@@ -137,13 +137,13 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
+		if ( ! isset($_GET['step']))
 			return 1;
 
 		$step = (int) $_GET['step'];
-		if ( $step < 1 || 3 < $step ||
-			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
-			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
+		if ($step < 1 || 3 < $step ||
+			(2 == $step && ! wp_verify_nonce($_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload')) ||
+			(3 == $step && ! wp_verify_nonce($_REQUEST['_wpnonce'], 'custom-header-crop-image'))
 		)
 			return 1;
 
@@ -158,12 +158,12 @@ 
 	public function js_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) ) {
+		if ((1 == $step || 3 == $step)) {
 			wp_enqueue_media();
-			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
-		} elseif ( 2 == $step ) {
+			wp_enqueue_script('custom-header');
+			if (current_theme_supports('custom-header', 'header-text'))
+				wp_enqueue_script('wp-color-picker');
+		} elseif (2 == $step) {
 			wp_enqueue_script('imgareaselect');
 		}
 	}
@@ -176,9 +176,9 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
+		if ((1 == $step || 3 == $step) && current_theme_supports('custom-header', 'header-text'))
+			wp_enqueue_style('wp-color-picker');
+		elseif (2 == $step)
 			wp_enqueue_style('imgareaselect');
 	}
 
@@ -188,42 +188,42 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
+		if ( ! current_user_can('edit_theme_options'))
 			return;
 
-		if ( empty( $_POST ) )
+		if (empty($_POST))
 			return;
 
 		$this->updated = true;
 
-		if ( isset( $_POST['resetheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['resetheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 			$this->reset_header_image();
 			return;
 		}
 
-		if ( isset( $_POST['removeheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['removeheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 			$this->remove_header_image();
 			return;
 		}
 
-		if ( isset( $_POST['text-color'] ) && ! isset( $_POST['display-header-text'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			set_theme_mod( 'header_textcolor', 'blank' );
-		} elseif ( isset( $_POST['text-color'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
+		if (isset($_POST['text-color']) && ! isset($_POST['display-header-text'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			set_theme_mod('header_textcolor', 'blank');
+		} elseif (isset($_POST['text-color'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			$_POST['text-color'] = str_replace('#', '', $_POST['text-color']);
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
+			if (strlen($color) == 6 || strlen($color) == 3)
 				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			elseif ( ! $color)
+				set_theme_mod('header_textcolor', 'blank');
 		}
 
-		if ( isset( $_POST['default-header'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			$this->set_header_image( $_POST['default-header'] );
+		if (isset($_POST['default-header'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			$this->set_header_image($_POST['default-header']);
 			return;
 		}
 	}
@@ -238,19 +238,19 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
+		if ( ! isset($_wp_default_headers))
 			return;
 
-		if ( ! empty( $this->default_headers ) ) {
+		if ( ! empty($this->default_headers)) {
 			return;
 		}
 
 		$this->default_headers = $_wp_default_headers;
 		$template_directory_uri = get_template_directory_uri();
 		$stylesheet_directory_uri = get_stylesheet_directory_uri();
-		foreach ( array_keys($this->default_headers) as $header ) {
-			$this->default_headers[$header]['url'] =  sprintf( $this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri );
-			$this->default_headers[$header]['thumbnail_url'] =  sprintf( $this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri );
+		foreach (array_keys($this->default_headers) as $header) {
+			$this->default_headers[$header]['url'] = sprintf($this->default_headers[$header]['url'], $template_directory_uri, $stylesheet_directory_uri);
+			$this->default_headers[$header]['thumbnail_url'] = sprintf($this->default_headers[$header]['thumbnail_url'], $template_directory_uri, $stylesheet_directory_uri);
 		}
 	}
 
@@ -265,33 +265,33 @@ 
 	 * @param string $type The header type. One of 'default' (for the Uploaded Images control)
 	 *                     or 'uploaded' (for the Uploaded Images control).
 	 */
-	public function show_header_selector( $type = 'default' ) {
-		if ( 'default' == $type ) {
+	public function show_header_selector($type = 'default') {
+		if ('default' == $type) {
 			$headers = $this->default_headers;
 		} else {
 			$headers = get_uploaded_header_images();
 			$type = 'uploaded';
 		}
 
-		if ( 1 < count( $headers ) ) {
+		if (1 < count($headers)) {
 			echo '<div class="random-header">';
-			echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
-			_e( '<strong>Random:</strong> Show a different image on each page.' );
+			echo '<label><input name="default-header" type="radio" value="random-'.$type.'-image"'.checked(is_random_header_image($type), true, false).' />';
+			_e('<strong>Random:</strong> Show a different image on each page.');
 			echo '</label>';
 			echo '</div>';
 		}
 
 		echo '<div class="available-headers">';
-		foreach ( $headers as $header_key => $header ) {
+		foreach ($headers as $header_key => $header) {
 			$header_thumbnail = $header['thumbnail_url'];
 			$header_url = $header['url'];
-			$header_alt_text = empty( $header['alt_text'] ) ? '' : $header['alt_text'];
+			$header_alt_text = empty($header['alt_text']) ? '' : $header['alt_text'];
 			echo '<div class="default-header">';
-			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
+			echo '<label><input name="default-header" type="radio" value="'.esc_attr($header_key).'" '.checked($header_url, get_theme_mod('header_image'), false).' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
+			if ( ! empty($header['attachment_id']))
 				$width = ' width="230"';
-			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'"' . $width . ' /></label>';
+			echo '<img src="'.set_url_scheme($header_thumbnail).'" alt="'.esc_attr($header_alt_text).'"'.$width.' /></label>';
 			echo '</div>';
 		}
 		echo '<div class="clear"></div></div>';
@@ -304,9 +304,9 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
+		if ((1 == $step || 3 == $step) && current_theme_supports('custom-header', 'header-text'))
 			$this->js_1();
-		elseif ( 2 == $step )
+		elseif (2 == $step)
 			$this->js_2();
 	}
 
@@ -317,10 +317,10 @@ 
 	 */
 	public function js_1() {
 		$default_color = '';
-		if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-			$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $default_color && false === strpos( $default_color, '#' ) ) {
-				$default_color = '#' . $default_color;
+		if (current_theme_supports('custom-header', 'default-text-color')) {
+			$default_color = get_theme_support('custom-header', 'default-text-color');
+			if ($default_color && false === strpos($default_color, '#')) {
+				$default_color = '#'.$default_color;
 			}
 		}
 		?>
@@ -362,7 +362,7 @@ 
 			}
 		});
 		$('#display-header-text').click( toggle_text );
-		<?php if ( ! display_header_text() ) : ?>
+		<?php if ( ! display_header_text()) : ?>
 		toggle_text();
 		<?php endif; ?>
 	});
@@ -386,8 +386,8 @@ 
 	}
 
 	jQuery(document).ready(function() {
-		var xinit = <?php echo absint( get_theme_support( 'custom-header', 'width' ) ); ?>;
-		var yinit = <?php echo absint( get_theme_support( 'custom-header', 'height' ) ); ?>;
+		var xinit = <?php echo absint(get_theme_support('custom-header', 'width')); ?>;
+		var yinit = <?php echo absint(get_theme_support('custom-header', 'height')); ?>;
 		var ratio = xinit / yinit;
 		var ximg = jQuery('img#upload').width();
 		var yimg = jQuery('img#upload').height();
@@ -411,19 +411,19 @@ 
 			x2: xinit,
 			y2: yinit,
 			<?php
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')) {
 			?>
 			aspectRatio: xinit + ':' + yinit,
 			<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-height')) {
 			?>
-			maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
+			maxHeight: <?php echo get_theme_support('custom-header', 'height'); ?>,
 			<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-width')) {
 			?>
-			maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
+			maxWidth: <?php echo get_theme_support('custom-header', 'width'); ?>,
 			<?php
 			}
 			?>
@@ -453,144 +453,144 @@ 
 ?>
 
 <div class="wrap">
-<h1><?php _e( 'Custom Header' ); ?></h1>
+<h1><?php _e('Custom Header'); ?></h1>
 
-<?php if ( current_user_can( 'customize' ) ) { ?>
+<?php if (current_user_can('customize')) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
 		<?php
 		printf(
-			__( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=header_image' )
+			__('You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.'),
+			admin_url('customize.php?autofocus[control]=header_image')
 		);
 		?>
 	</p>
 </div>
 <?php } ?>
 
-<?php if ( ! empty( $this->updated ) ) { ?>
+<?php if ( ! empty($this->updated)) { ?>
 <div id="message" class="updated">
-<p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
+<p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url('/')); ?></p>
 </div>
 <?php } ?>
 
-<h3><?php _e( 'Header Image' ); ?></h3>
+<h3><?php _e('Header Image'); ?></h3>
 
 <table class="form-table">
 <tbody>
 
-<?php if ( get_custom_header() || display_header_text() ) : ?>
+<?php if (get_custom_header() || display_header_text()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
+<th scope="row"><?php _e('Preview'); ?></th>
 <td>
 	<?php
-	if ( $this->admin_image_div_callback ) {
-		call_user_func( $this->admin_image_div_callback );
+	if ($this->admin_image_div_callback) {
+		call_user_func($this->admin_image_div_callback);
 	} else {
 		$custom_header = get_custom_header();
 		$header_image = get_header_image();
 
-		if ( $header_image ) {
-			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		if ($header_image) {
+			$header_image_style = 'background-image:url('.esc_url($header_image).');';
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ($custom_header->width)
+			$header_image_style .= 'max-width:'.$custom_header->width.'px;';
+		if ($custom_header->height)
+			$header_image_style .= 'height:'.$custom_header->height.'px;';
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
+		if (display_header_text())
+			$style = ' style="color:#'.get_header_textcolor().';"';
 		else
 			$style = ' style="display:none;"';
 		?>
-		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
+		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo('name'); ?></a></h1>
+		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo('description'); ?></div>
 	</div>
 	<?php } ?>
 </td>
 </tr>
 <?php endif; ?>
 
-<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+<?php if (current_user_can('upload_files') && current_theme_supports('custom-header', 'uploads')) : ?>
 <tr>
-<th scope="row"><?php _e( 'Select Image' ); ?></th>
+<th scope="row"><?php _e('Select Image'); ?></th>
 <td>
-	<p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
+	<p><?php _e('You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.'); ?><br />
 	<?php
-	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
-	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
+	if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')) {
+		printf(__('Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.').'<br />', get_theme_support('custom-header', 'width'), get_theme_support('custom-header', 'height'));
+	} elseif (current_theme_supports('custom-header', 'flex-height')) {
+		if ( ! current_theme_supports('custom-header', 'flex-width'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Images should be at least %s wide.' ) . ' ',
+				__('Images should be at least %s wide.').' ',
 				sprintf(
 					/* translators: %d: custom header width */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'width' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'width')
 				)
 			);
-	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
+	} elseif (current_theme_supports('custom-header', 'flex-width')) {
+		if ( ! current_theme_supports('custom-header', 'flex-height'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Images should be at least %s tall.' ) . ' ',
+				__('Images should be at least %s tall.').' ',
 				sprintf(
 					/* translators: %d: custom header height */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'height' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'height')
 				)
 			);
 	}
-	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
+	if (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width')) {
+		if (current_theme_supports('custom-header', 'width'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Suggested width is %s.' ) . ' ',
+				__('Suggested width is %s.').' ',
 				sprintf(
 					/* translators: %d: custom header width */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'width' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'width')
 				)
 			);
-		if ( current_theme_supports( 'custom-header', 'height' ) )
+		if (current_theme_supports('custom-header', 'height'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Suggested height is %s.' ) . ' ',
+				__('Suggested height is %s.').' ',
 				sprintf(
 					/* translators: %d: custom header height */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'height' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'height')
 				)
 			);
 	}
 	?></p>
-	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
+	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url(add_query_arg('step', 2)) ?>">
 	<p>
-		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+		<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-		<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+		<?php wp_nonce_field('custom-header-upload', '_wpnonce-custom-header-upload'); ?>
+		<?php submit_button(__('Upload'), '', 'submit', false); ?>
 	</p>
 	<?php
-		$modal_update_href = esc_url( add_query_arg( array(
+		$modal_update_href = esc_url(add_query_arg(array(
 			'page' => 'custom-header',
 			'step' => 2,
 			'_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
-		), admin_url('themes.php') ) );
+		), admin_url('themes.php')));
 	?>
 	<p>
-		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+		<label for="choose-from-library-link"><?php _e('Or choose an image from your media library:'); ?></label><br />
 		<button id="choose-from-library-link" class="button"
-			data-update-link="<?php echo esc_attr( $modal_update_href ); ?>"
-			data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-update-link="<?php echo esc_attr($modal_update_href); ?>"
+			data-choose="<?php esc_attr_e('Choose a Custom Header'); ?>"
+			data-update="<?php esc_attr_e('Set as header'); ?>"><?php _e('Choose Image'); ?></button>
 	</p>
 	</form>
 </td>
@@ -599,97 +599,97 @@ 
 </tbody>
 </table>
 
-<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ) ?>">
-<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
+<form method="post" action="<?php echo esc_url(add_query_arg('step', 1)) ?>">
+<?php submit_button(null, 'screen-reader-text', 'save-header-options', false); ?>
 <table class="form-table">
 <tbody>
-	<?php if ( get_uploaded_header_images() ) : ?>
+	<?php if (get_uploaded_header_images()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
+<th scope="row"><?php _e('Uploaded Images'); ?></th>
 <td>
-	<p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ) ?></p>
+	<p><?php _e('You can choose one of your previously uploaded headers, or show a random one.') ?></p>
 	<?php
-		$this->show_header_selector( 'uploaded' );
+		$this->show_header_selector('uploaded');
 	?>
 </td>
 </tr>
 	<?php endif;
-	if ( ! empty( $this->default_headers ) ) : ?>
+	if ( ! empty($this->default_headers)) : ?>
 <tr>
-<th scope="row"><?php _e( 'Default Images' ); ?></th>
+<th scope="row"><?php _e('Default Images'); ?></th>
 <td>
-<?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
-	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
+<?php if (current_theme_supports('custom-header', 'uploads')) : ?>
+	<p><?php _e('If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.') ?></p>
 <?php else: ?>
-	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
+	<p><?php _e('You can use one of these cool headers or show a random one on each page.') ?></p>
 <?php endif; ?>
 	<?php
-		$this->show_header_selector( 'default' );
+		$this->show_header_selector('default');
 	?>
 </td>
 </tr>
 	<?php endif;
-	if ( get_header_image() ) : ?>
+	if (get_header_image()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<th scope="row"><?php _e('Remove Image'); ?></th>
 <td>
-	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
-	<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
+	<p><?php _e('This will remove the header image. You will not be able to restore any customizations.') ?></p>
+	<?php submit_button(__('Remove Header Image'), '', 'removeheader', false); ?>
 </td>
 </tr>
 	<?php endif;
 
-	$default_image = sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() );
-	if ( $default_image && get_header_image() != $default_image ) : ?>
+	$default_image = sprintf(get_theme_support('custom-header', 'default-image'), get_template_directory_uri(), get_stylesheet_directory_uri());
+	if ($default_image && get_header_image() != $default_image) : ?>
 <tr>
-<th scope="row"><?php _e( 'Reset Image' ); ?></th>
+<th scope="row"><?php _e('Reset Image'); ?></th>
 <td>
-	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
-	<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
+	<p><?php _e('This will restore the original header image. You will not be able to restore any customizations.') ?></p>
+	<?php submit_button(__('Restore Original Header Image'), '', 'resetheader', false); ?>
 </td>
 </tr>
 	<?php endif; ?>
 </tbody>
 </table>
 
-<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+<?php if (current_theme_supports('custom-header', 'header-text')) : ?>
 
-<h3><?php _e( 'Header Text' ); ?></h3>
+<h3><?php _e('Header Text'); ?></h3>
 
 <table class="form-table">
 <tbody>
 <tr>
-<th scope="row"><?php _e( 'Header Text' ); ?></th>
+<th scope="row"><?php _e('Header Text'); ?></th>
 <td>
 	<p>
-	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked( display_header_text() ); ?> /> <?php _e( 'Show header text with your image.' ); ?></label>
+	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked(display_header_text()); ?> /> <?php _e('Show header text with your image.'); ?></label>
 	</p>
 </td>
 </tr>
 
 <tr class="displaying-header-text">
-<th scope="row"><?php _e( 'Text Color' ); ?></th>
+<th scope="row"><?php _e('Text Color'); ?></th>
 <td>
 	<p>
 	<?php
 	$default_color = '';
-	if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-		$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-		if ( $default_color && false === strpos( $default_color, '#' ) ) {
-			$default_color = '#' . $default_color;
+	if (current_theme_supports('custom-header', 'default-text-color')) {
+		$default_color = get_theme_support('custom-header', 'default-text-color');
+		if ($default_color && false === strpos($default_color, '#')) {
+			$default_color = '#'.$default_color;
 		}
 	}
 
-	$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
+	$default_color_attr = $default_color ? ' data-default-color="'.esc_attr($default_color).'"' : '';
 
-	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-	if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
-		$header_textcolor = '#' . $header_textcolor;
+	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support('custom-header', 'default-text-color');
+	if ($header_textcolor && false === strpos($header_textcolor, '#')) {
+		$header_textcolor = '#'.$header_textcolor;
 	}
 
-	echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
-	if ( $default_color ) {
-		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+	echo '<input type="text" name="text-color" id="text-color" value="'.esc_attr($header_textcolor).'"'.$default_color_attr.' />';
+	if ($default_color) {
+		echo ' <span class="description hide-if-js">'.sprintf(_x('Default: %s', 'color'), esc_html($default_color)).'</span>';
 	}
 	?>
 	</p>
@@ -704,11 +704,11 @@ 
  *
  * @since 3.1.0
  */
-do_action( 'custom_header_options' );
+do_action('custom_header_options');
 
-wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
+wp_nonce_field('custom-header-options', '_wpnonce-custom-header-options'); ?>
 
-<?php submit_button( null, 'primary', 'save-header-options' ); ?>
+<?php submit_button(null, 'primary', 'save-header-options'); ?>
 </form>
 </div>
 
@@ -721,53 +721,53 @@ 
 	 */
 	public function step_2() {
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The current theme does not support uploading a custom header image.').'</p>',
 				403
 			);
 		}
 
-		if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
-			$attachment_id = absint( $_GET['file'] );
-			$file = get_attached_file( $attachment_id, true );
-			$url = wp_get_attachment_image_src( $attachment_id, 'full' );
+		if (empty($_POST) && isset($_GET['file'])) {
+			$attachment_id = absint($_GET['file']);
+			$file = get_attached_file($attachment_id, true);
+			$url = wp_get_attachment_image_src($attachment_id, 'full');
 			$url = $url[0];
-		} elseif ( isset( $_POST ) ) {
+		} elseif (isset($_POST)) {
 			$data = $this->step_2_manage_upload();
 			$attachment_id = $data['attachment_id'];
 			$file = $data['file'];
 			$url = $data['url'];
 		}
 
-		if ( file_exists( $file ) ) {
-			list( $width, $height, $type, $attr ) = getimagesize( $file );
+		if (file_exists($file)) {
+			list($width, $height, $type, $attr) = getimagesize($file);
 		} else {
-			$data = wp_get_attachment_metadata( $attachment_id );
-			$height = isset( $data[ 'height' ] ) ? $data[ 'height' ] : 0;
-			$width = isset( $data[ 'width' ] ) ? $data[ 'width' ] : 0;
-			unset( $data );
+			$data = wp_get_attachment_metadata($attachment_id);
+			$height = isset($data['height']) ? $data['height'] : 0;
+			$width = isset($data['width']) ? $data['width'] : 0;
+			unset($data);
 		}
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
+		if (current_theme_supports('custom-header', 'flex-width'))
 			$max_width = 1500;
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
-		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
+		if (current_theme_supports('custom-header', 'max-width'))
+			$max_width = max($max_width, get_theme_support('custom-header', 'max-width'));
+		$max_width = max($max_width, get_theme_support('custom-header', 'width'));
 
 		// If flexible height isn't supported and the image is the exact right size
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' )
-			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
+		if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')
+			&& $width == get_theme_support('custom-header', 'width') && $height == get_theme_support('custom-header', 'height'))
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			if (file_exists($file))
+				wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
 
-			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+			$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 			/**
 			 * Fires after the header image is set or an error is returned.
@@ -777,17 +777,17 @@ 
 			 * @param string $file          Path to the file.
 			 * @param int    $attachment_id Attachment ID.
 			 */
-			do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication
+			do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication
 
 			return $this->finished();
-		} elseif ( $width > $max_width ) {
+		} elseif ($width > $max_width) {
 			$oitar = $width / $max_width;
 			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			if ( ! $image || is_wp_error($image))
+				wp_die(__('Image could not be processed. Please go back and try again.'), __('Image Processing Error'));
 
 			/** This filter is documented in wp-admin/custom-header.php */
-			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
+			$image = apply_filters('wp_create_file_in_uploads', $image, $attachment_id); // For replication
 
 			$url = str_replace(basename($url), basename($image), $url);
 			$width = $width / $oitar;
@@ -798,32 +798,32 @@ 
 		?>
 
 <div class="wrap">
-<h1><?php _e( 'Crop Header Image' ); ?></h1>
+<h1><?php _e('Crop Header Image'); ?></h1>
 
 <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
 	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-	<p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.'); ?></strong></p>
+	<p class="hide-if-js"><strong><?php _e('You need JavaScript to choose a part of the image.'); ?></strong></p>
 
 	<div id="crop_image" style="position: relative">
-		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" />
+		<img src="<?php echo esc_url($url); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" />
 	</div>
 
 	<input type="hidden" name="x1" id="x1" value="0"/>
 	<input type="hidden" name="y1" id="y1" value="0"/>
-	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
-	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
-	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
-	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
-	<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+	<input type="hidden" name="width" id="width" value="<?php echo esc_attr($width); ?>"/>
+	<input type="hidden" name="height" id="height" value="<?php echo esc_attr($height); ?>"/>
+	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($attachment_id); ?>" />
+	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
+	<?php if (empty($_POST) && isset($_GET['file'])) { ?>
 	<input type="hidden" name="create-new-attachment" value="true" />
 	<?php } ?>
-	<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
+	<?php wp_nonce_field('custom-header-crop-image') ?>
 
 	<p class="submit">
-	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+	<?php submit_button(__('Crop and Publish'), 'primary', 'submit', false); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
+	if (isset($oitar) && 1 == $oitar && (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width')))
+		submit_button(__('Skip Cropping, Publish Image as Is'), '', 'skip-cropping', false);
 	?>
 	</p>
 </form>
@@ -841,14 +841,14 @@ 
 		$overrides = array('test_form' => false);
 
 		$uploaded_file = $_FILES['import'];
-		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		$wp_filetype = wp_check_filetype_and_ext($uploaded_file['tmp_name'], $uploaded_file['name']);
+		if ( ! wp_match_mime_types('image', $wp_filetype['type']))
+			wp_die(__('The uploaded file is not a valid image. Please try again.'));
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if (isset($file['error']))
+			wp_die($file['error'], __('Image Upload Error'));
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -865,8 +865,8 @@ 
 		);
 
 		// Save the data
-		$attachment_id = wp_insert_attachment( $object, $file );
-		return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
+		$attachment_id = wp_insert_attachment($object, $file);
+		return compact('attachment_id', 'file', 'filename', 'url', 'type');
 	}
 
 	/**
@@ -877,73 +877,73 @@ 
 	 *              for retrieving the header image URL.
 	 */
 	public function step_3() {
-		check_admin_referer( 'custom-header-crop-image' );
+		check_admin_referer('custom-header-crop-image');
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The current theme does not support uploading a custom header image.').'</p>',
 				403
 			);
 		}
 
-		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+		if ( ! empty($_POST['skip-cropping']) && ! (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width'))) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The current theme does not support a flexible sized header image.').'</p>',
 				403
 			);
 		}
 
-		if ( $_POST['oitar'] > 1 ) {
+		if ($_POST['oitar'] > 1) {
 			$_POST['x1'] = $_POST['x1'] * $_POST['oitar'];
 			$_POST['y1'] = $_POST['y1'] * $_POST['oitar'];
 			$_POST['width'] = $_POST['width'] * $_POST['oitar'];
 			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
+		$attachment_id = absint($_POST['attachment_id']);
 		$original = get_attached_file($attachment_id);
 
-		$dimensions = $this->get_header_dimensions( array(
+		$dimensions = $this->get_header_dimensions(array(
 			'height' => $_POST['height'],
 			'width'  => $_POST['width'],
-		) );
+		));
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
-			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
-			$cropped = _copy_image_file( $attachment_id );
+		if (empty($_POST['skip-cropping']))
+			$cropped = wp_crop_image($attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height);
+		elseif ( ! empty($_POST['create-new-attachment']))
+			$cropped = _copy_image_file($attachment_id);
 		else
-			$cropped = get_attached_file( $attachment_id );
+			$cropped = get_attached_file($attachment_id);
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		if ( ! $cropped || is_wp_error($cropped))
+			wp_die(__('Image could not be processed. Please go back and try again.'), __('Image Processing Error'));
 
 		/** This filter is documented in wp-admin/custom-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
-		$object = $this->create_attachment_object( $cropped, $attachment_id );
+		$object = $this->create_attachment_object($cropped, $attachment_id);
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty($_POST['create-new-attachment']))
+			unset($object['ID']);
 
 		// Update the attachment
-		$attachment_id = $this->insert_attachment( $object, $cropped );
+		$attachment_id = $this->insert_attachment($object, $cropped);
 
-		$url = wp_get_attachment_url( $attachment_id );
-		$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+		$url = wp_get_attachment_url($attachment_id);
+		$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 		// Cleanup.
-		$medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
-		if ( file_exists( $medium ) ) {
-			wp_delete_file( $medium );
+		$medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
+		if (file_exists($medium)) {
+			wp_delete_file($medium);
 		}
 
-		if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
-			wp_delete_file( $original );
+		if (empty($_POST['create-new-attachment']) && empty($_POST['skip-cropping'])) {
+			wp_delete_file($original);
 		}
 
 		return $this->finished();
@@ -965,12 +965,12 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
+		if ( ! current_user_can('edit_theme_options'))
 			wp_die(__('Sorry, you are not allowed to customize headers.'));
 		$step = $this->step();
-		if ( 2 == $step )
+		if (2 == $step)
 			$this->step_2();
-		elseif ( 3 == $step )
+		elseif (3 == $step)
 			$this->step_3();
 		else
 			$this->step_1();
@@ -984,7 +984,7 @@ 
 	 * @param array $form_fields
 	 * @return array $form_fields
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit($form_fields) {
 		return $form_fields;
 	}
 
@@ -996,7 +996,7 @@ 
 	 * @param array $tabs
 	 * @return array $tabs
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs($tabs) {
 		return $tabs;
 	}
 
@@ -1012,13 +1012,13 @@ 
 	 * 	the key of an image uploaded for that theme (the attachment ID of the image).
 	 *  Or an array of arguments: attachment_id, url, width, height. All are required.
 	 */
-	final public function set_header_image( $choice ) {
-		if ( is_array( $choice ) || is_object( $choice ) ) {
+	final public function set_header_image($choice) {
+		if (is_array($choice) || is_object($choice)) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
+			if ( ! isset($choice['attachment_id']) || ! isset($choice['url']))
 				return;
 
-			$choice['url'] = esc_url_raw( $choice['url'] );
+			$choice['url'] = esc_url_raw($choice['url']);
 
 			$header_image_data = (object) array(
 				'attachment_id' => $choice['attachment_id'],
@@ -1028,32 +1028,32 @@ 
 				'width'         => $choice['width'],
 			);
 
-			update_post_meta( $choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet() );
-			set_theme_mod( 'header_image', $choice['url'] );
-			set_theme_mod( 'header_image_data', $header_image_data );
+			update_post_meta($choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet());
+			set_theme_mod('header_image', $choice['url']);
+			set_theme_mod('header_image_data', $header_image_data);
 			return;
 		}
 
-		if ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ) ) ) {
-			set_theme_mod( 'header_image', $choice );
-			remove_theme_mod( 'header_image_data' );
+		if (in_array($choice, array('remove-header', 'random-default-image', 'random-uploaded-image'))) {
+			set_theme_mod('header_image', $choice);
+			remove_theme_mod('header_image_data');
 			return;
 		}
 
 		$uploaded = get_uploaded_header_images();
-		if ( $uploaded && isset( $uploaded[ $choice ] ) ) {
-			$header_image_data = $uploaded[ $choice ];
+		if ($uploaded && isset($uploaded[$choice])) {
+			$header_image_data = $uploaded[$choice];
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
+			if (isset($this->default_headers[$choice]))
+				$header_image_data = $this->default_headers[$choice];
 			else
 				return;
 		}
 
-		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
-		set_theme_mod( 'header_image_data', $header_image_data );
+		set_theme_mod('header_image', esc_url_raw($header_image_data['url']));
+		set_theme_mod('header_image_data', $header_image_data);
 	}
 
 	/**
@@ -1062,7 +1062,7 @@ 
 	 * @since 3.4.0
 	 */
 	final public function remove_header_image() {
-		$this->set_header_image( 'remove-header' );
+		$this->set_header_image('remove-header');
 	}
 
 	/**
@@ -1074,24 +1074,24 @@ 
 	 */
 	final public function reset_header_image() {
 		$this->process_default_headers();
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) {
+		if ( ! $default) {
 			$this->remove_header_image();
 			return;
 		}
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 		$default_data = array();
-		foreach ( $this->default_headers as $header => $details ) {
-			if ( $details['url'] == $default ) {
+		foreach ($this->default_headers as $header => $details) {
+			if ($details['url'] == $default) {
 				$default_data = $details;
 				break;
 			}
 		}
 
-		set_theme_mod( 'header_image', $default );
-		set_theme_mod( 'header_image_data', (object) $default_data );
+		set_theme_mod('header_image', $default);
+		set_theme_mod('header_image_data', (object) $default_data);
 	}
 
 	/**
@@ -1100,41 +1100,41 @@ 
 	 * @param array $dimensions
 	 * @return array dst_height and dst_width of header image.
 	 */
-	final public function get_header_dimensions( $dimensions ) {
+	final public function get_header_dimensions($dimensions) {
 		$max_width = 0;
-		$width = absint( $dimensions['width'] );
-		$height = absint( $dimensions['height'] );
-		$theme_height = get_theme_support( 'custom-header', 'height' );
-		$theme_width = get_theme_support( 'custom-header', 'width' );
-		$has_flex_width = current_theme_supports( 'custom-header', 'flex-width' );
-		$has_flex_height = current_theme_supports( 'custom-header', 'flex-height' );
-		$has_max_width = current_theme_supports( 'custom-header', 'max-width' ) ;
-		$dst = array( 'dst_height' => null, 'dst_width' => null );
+		$width = absint($dimensions['width']);
+		$height = absint($dimensions['height']);
+		$theme_height = get_theme_support('custom-header', 'height');
+		$theme_width = get_theme_support('custom-header', 'width');
+		$has_flex_width = current_theme_supports('custom-header', 'flex-width');
+		$has_flex_height = current_theme_supports('custom-header', 'flex-height');
+		$has_max_width = current_theme_supports('custom-header', 'max-width');
+		$dst = array('dst_height' => null, 'dst_width' => null);
 
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( $has_flex_width ) {
+		if ($has_flex_width) {
 			$max_width = 1500;
 		}
 
-		if ( $has_max_width ) {
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ($has_max_width) {
+			$max_width = max($max_width, get_theme_support('custom-header', 'max-width'));
 		}
-		$max_width = max( $max_width, $theme_width );
+		$max_width = max($max_width, $theme_width);
 
-		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
-			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
+		if ($has_flex_height && ( ! $has_flex_width || $width > $max_width)) {
+			$dst['dst_height'] = absint($height * ($max_width / $width));
 		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		elseif ($has_flex_height && $has_flex_width) {
 			$dst['dst_height'] = $height;
 		}
 		else {
 			$dst['dst_height'] = $theme_height;
 		}
 
-		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
-			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
+		if ($has_flex_width && ( ! $has_flex_height || $width > $max_width)) {
+			$dst['dst_width'] = absint($width * ($max_width / $width));
 		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		elseif ($has_flex_width && $has_flex_height) {
 			$dst['dst_width'] = $width;
 		}
 		else {
@@ -1152,13 +1152,13 @@ 
 	 *
 	 * @return array Attachment object.
 	 */
-	final public function create_attachment_object( $cropped, $parent_attachment_id ) {
-		$parent = get_post( $parent_attachment_id );
-		$parent_url = wp_get_attachment_url( $parent->ID );
-		$url = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+	final public function create_attachment_object($cropped, $parent_attachment_id) {
+		$parent = get_post($parent_attachment_id);
+		$parent_url = wp_get_attachment_url($parent->ID);
+		$url = str_replace(basename($parent_url), basename($cropped), $parent_url);
 
-		$size = @getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+		$size = @getimagesize($cropped);
+		$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 		$object = array(
 			'ID' => $parent_attachment_id,
@@ -1179,9 +1179,9 @@ 
 	 *
 	 * @return int Attachment ID.
 	 */
-	final public function insert_attachment( $object, $cropped ) {
-		$attachment_id = wp_insert_attachment( $object, $cropped );
-		$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
+	final public function insert_attachment($object, $cropped) {
+		$attachment_id = wp_insert_attachment($object, $cropped);
+		$metadata = wp_generate_attachment_metadata($attachment_id, $cropped);
 		/**
 		 * Filters the header image attachment metadata.
 		 *
@@ -1191,8 +1191,8 @@ 
 		 *
 		 * @param array $metadata Attachment metadata.
 		 */
-		$metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
-		wp_update_attachment_metadata( $attachment_id, $metadata );
+		$metadata = apply_filters('wp_header_image_attachment_metadata', $metadata);
+		wp_update_attachment_metadata($attachment_id, $metadata);
 		return $attachment_id;
 	}
 
@@ -1201,24 +1201,24 @@ 
 	 * new object. Returns JSON-encoded object details.
 	 */
 	public function ajax_header_crop() {
-		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
+		check_ajax_referer('image_editor-'.$_POST['id'], 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_send_json_error();
 		}
 
 		$crop_details = $_POST['cropDetails'];
 
-		$dimensions = $this->get_header_dimensions( array(
+		$dimensions = $this->get_header_dimensions(array(
 			'height' => $crop_details['height'],
 			'width'  => $crop_details['width'],
-		) );
+		));
 
-		$attachment_id = absint( $_POST['id'] );
+		$attachment_id = absint($_POST['id']);
 
 		$cropped = wp_crop_image(
 			$attachment_id,
@@ -1230,25 +1230,25 @@ 
 			(int) $dimensions['dst_height']
 		);
 
-		if ( ! $cropped || is_wp_error( $cropped ) ) {
-			wp_send_json_error( array( 'message' => __( 'Image could not be processed. Please go back and try again.' ) ) );
+		if ( ! $cropped || is_wp_error($cropped)) {
+			wp_send_json_error(array('message' => __('Image could not be processed. Please go back and try again.')));
 		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
-		$object = $this->create_attachment_object( $cropped, $attachment_id );
+		$object = $this->create_attachment_object($cropped, $attachment_id);
 
-		unset( $object['ID'] );
+		unset($object['ID']);
 
-		$new_attachment_id = $this->insert_attachment( $object, $cropped );
+		$new_attachment_id = $this->insert_attachment($object, $cropped);
 
 		$object['attachment_id'] = $new_attachment_id;
-		$object['url']           = wp_get_attachment_url( $new_attachment_id );;
+		$object['url']           = wp_get_attachment_url($new_attachment_id); ;
 		$object['width']         = $dimensions['dst_width'];
 		$object['height']        = $dimensions['dst_height'];
 
-		wp_send_json_success( $object );
+		wp_send_json_success($object);
 	}
 
 	/**
@@ -1259,20 +1259,20 @@ 
 	 * Media Manager, even if s/he doesn't save that change.
 	 */
 	public function ajax_header_add() {
-		check_ajax_referer( 'header-add', 'nonce' );
+		check_ajax_referer('header-add', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		update_post_meta($attachment_id, $key, time());
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1285,20 +1285,20 @@ 
 	 * choice in the Customizer's Header tool.
 	 */
 	public function ajax_header_remove() {
-		check_ajax_referer( 'header-remove', 'nonce' );
+		check_ajax_referer('header-remove', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		delete_post_meta( $attachment_id, $key );
-		delete_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		delete_post_meta($attachment_id, $key);
+		delete_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1307,16 +1307,16 @@ 
 	 *
 	 * @param WP_Customize_Manager $wp_customize
 	 */
-	public function customize_set_last_used( $wp_customize ) {
-		$data = $wp_customize->get_setting( 'header_image_data' )->post_value();
+	public function customize_set_last_used($wp_customize) {
+		$data = $wp_customize->get_setting('header_image_data')->post_value();
 
-		if ( ! isset( $data['attachment_id'] ) ) {
+		if ( ! isset($data['attachment_id'])) {
 			return;
 		}
 
 		$attachment_id = $data['attachment_id'];
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		update_post_meta($attachment_id, $key, time());
 	}
 
 	/**
@@ -1327,23 +1327,23 @@ 
 		$this->process_default_headers();
 
 		// Get the default image if there is one.
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) { // If not,
+		if ( ! $default) { // If not,
 			return $this->default_headers; // easy peasy.
 		}
 
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 		$already_has_default = false;
 
-		foreach ( $this->default_headers as $k => $h ) {
-			if ( $h['url'] === $default ) {
+		foreach ($this->default_headers as $k => $h) {
+			if ($h['url'] === $default) {
 				$already_has_default = true;
 				break;
 			}
 		}
 
-		if ( $already_has_default ) {
+		if ($already_has_default) {
 			return $this->default_headers;
 		}
 
@@ -1356,7 +1356,7 @@ 
 		);
 
 		// The rest of the set comes after.
-		return array_merge( $header_images, $this->default_headers );
+		return array_merge($header_images, $this->default_headers);
 	}
 
 	/**
@@ -1365,13 +1365,13 @@ 
 	 */
 	public function get_uploaded_header_images() {
 		$header_images = get_uploaded_header_images();
-		$timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
+		$timestamp_key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
 		$alt_text_key = '_wp_attachment_image_alt';
 
-		foreach ( $header_images as &$header_image ) {
-			$header_meta = get_post_meta( $header_image['attachment_id'] );
-			$header_image['timestamp'] = isset( $header_meta[ $timestamp_key ] ) ? $header_meta[ $timestamp_key ] : '';
-			$header_image['alt_text'] = isset( $header_meta[ $alt_text_key ] ) ? $header_meta[ $alt_text_key ] : '';
+		foreach ($header_images as &$header_image) {
+			$header_meta = get_post_meta($header_image['attachment_id']);
+			$header_image['timestamp'] = isset($header_meta[$timestamp_key]) ? $header_meta[$timestamp_key] : '';
+			$header_image['alt_text'] = isset($header_meta[$alt_text_key]) ? $header_meta[$alt_text_key] : '';
 		}
 
 		return $header_images;

Braces +121 added lines, -91 removed lines

@@ -137,15 +137,17 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
+		if ( ! isset( $_GET['step'] ) ) {
+					return 1;
+		}
 
 		$step = (int) $_GET['step'];
 		if ( $step < 1 || 3 < $step ||
 			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
 			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
-		)
-			return 1;
+		) {
+					return 1;
+		}
 
 		return $step;
 	}
@@ -161,8 +163,9 @@ 
 		if ( ( 1 == $step || 3 == $step ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
+			if ( current_theme_supports( 'custom-header', 'header-text' ) ) {
+							wp_enqueue_script( 'wp-color-picker' );
+			}
 		} elseif ( 2 == $step ) {
 			wp_enqueue_script('imgareaselect');
 		}
@@ -176,10 +179,11 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
-			wp_enqueue_style('imgareaselect');
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					wp_enqueue_style( 'wp-color-picker' );
+		} elseif ( 2 == $step ) {
+					wp_enqueue_style('imgareaselect');
+		}
 	}
 
 	/**
@@ -188,11 +192,13 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
-			return;
+		if ( ! current_user_can('edit_theme_options') ) {
+					return;
+		}
 
-		if ( empty( $_POST ) )
-			return;
+		if ( empty( $_POST ) ) {
+					return;
+		}
 
 		$this->updated = true;
 
@@ -215,10 +221,11 @@ 
 			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
 			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			if ( strlen($color) == 6 || strlen($color) == 3 ) {
+							set_theme_mod('header_textcolor', $color);
+			} elseif ( ! $color ) {
+							set_theme_mod( 'header_textcolor', 'blank' );
+			}
 		}
 
 		if ( isset( $_POST['default-header'] ) ) {
@@ -238,8 +245,9 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
-			return;
+		if ( !isset($_wp_default_headers) ) {
+					return;
+		}
 
 		if ( ! empty( $this->default_headers ) ) {
 			return;
@@ -289,8 +297,9 @@ 
 			echo '<div class="default-header">';
 			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
-				$width = ' width="230"';
+			if ( !empty( $header['attachment_id'] ) ) {
+							$width = ' width="230"';
+			}
 			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'"' . $width . ' /></label>';
 			echo '</div>';
 		}
@@ -304,10 +313,11 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			$this->js_1();
-		elseif ( 2 == $step )
-			$this->js_2();
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					$this->js_1();
+		} elseif ( 2 == $step ) {
+					$this->js_2();
+		}
 	}
 
 	/**
@@ -492,21 +502,24 @@ 
 
 		if ( $header_image ) {
 			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ( $custom_header->width ) {
+					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+		}
+		if ( $custom_header->height ) {
+					$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		}
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		else
-			$style = ' style="display:none;"';
+		if ( display_header_text() ) {
+					$style = ' style="color:#' . get_header_textcolor() . ';"';
+		} else {
+					$style = ' style="display:none;"';
+		}
 		?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
@@ -525,8 +538,8 @@ 
 	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
 		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
 	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s wide.' ) . ' ',
 				sprintf(
@@ -535,9 +548,10 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
+		}
 	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s tall.' ) . ' ',
 				sprintf(
@@ -546,10 +560,11 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
-			printf(
+		if ( current_theme_supports( 'custom-header', 'width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested width is %s.' ) . ' ',
 				sprintf(
@@ -558,8 +573,9 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
-		if ( current_theme_supports( 'custom-header', 'height' ) )
-			printf(
+		}
+		if ( current_theme_supports( 'custom-header', 'height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested height is %s.' ) . ' ',
 				sprintf(
@@ -568,6 +584,7 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	?></p>
 	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
@@ -620,9 +637,12 @@ 
 <td>
 <?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
-<?php else: ?>
+<?php else {
+	: ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 		$this->show_header_selector( 'default' );
 	?>
@@ -752,11 +772,13 @@ 
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
-			$max_width = 1500;
+		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					$max_width = 1500;
+		}
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
+					$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		}
 		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
 
 		// If flexible height isn't supported and the image is the exact right size
@@ -764,8 +786,9 @@ 
 			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			if ( file_exists( $file ) ) {
+							wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			}
 
 			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
@@ -783,8 +806,9 @@ 
 		} elseif ( $width > $max_width ) {
 			$oitar = $width / $max_width;
 			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			if ( ! $image || is_wp_error( $image ) ) {
+							wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			}
 
 			/** This filter is documented in wp-admin/custom-header.php */
 			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
@@ -822,8 +846,9 @@ 
 	<p class="submit">
 	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
+	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+			submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
+	}
 	?>
 	</p>
 </form>
@@ -842,13 +867,15 @@ 
 
 		$uploaded_file = $_FILES['import'];
 		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
+					wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if ( isset($file['error']) ) {
+					wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		}
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -912,23 +939,26 @@ 
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
-			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
-			$cropped = _copy_image_file( $attachment_id );
-		else
-			$cropped = get_attached_file( $attachment_id );
+		if ( empty( $_POST['skip-cropping'] ) ) {
+					$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
+		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
+					$cropped = _copy_image_file( $attachment_id );
+		} else {
+					$cropped = get_attached_file( $attachment_id );
+		}
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		if ( ! $cropped || is_wp_error( $cropped ) ) {
+					wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
 		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
 
 		$object = $this->create_attachment_object( $cropped, $attachment_id );
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty( $_POST['create-new-attachment'] ) ) {
+					unset( $object['ID'] );
+		}
 
 		// Update the attachment
 		$attachment_id = $this->insert_attachment( $object, $cropped );
@@ -965,15 +995,17 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('Sorry, you are not allowed to customize headers.'));
+		if ( ! current_user_can('edit_theme_options') ) {
+					wp_die(__('Sorry, you are not allowed to customize headers.'));
+		}
 		$step = $this->step();
-		if ( 2 == $step )
-			$this->step_2();
-		elseif ( 3 == $step )
-			$this->step_3();
-		else
-			$this->step_1();
+		if ( 2 == $step ) {
+					$this->step_2();
+		} elseif ( 3 == $step ) {
+					$this->step_3();
+		} else {
+					$this->step_1();
+		}
 	}
 
 	/**
@@ -1015,8 +1047,9 @@ 
 	final public function set_header_image( $choice ) {
 		if ( is_array( $choice ) || is_object( $choice ) ) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
-				return;
+			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
+							return;
+			}
 
 			$choice['url'] = esc_url_raw( $choice['url'] );
 
@@ -1046,10 +1079,11 @@ 
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
-			else
-				return;
+			if ( isset( $this->default_headers[ $choice ] ) ) {
+							$header_image_data = $this->default_headers[ $choice ];
+			} else {
+							return;
+			}
 		}
 
 		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
@@ -1123,21 +1157,17 @@ 
 
 		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
 			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		} elseif ( $has_flex_height && $has_flex_width ) {
 			$dst['dst_height'] = $height;
-		}
-		else {
+		} else {
 			$dst['dst_height'] = $theme_height;
 		}
 
 		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
 			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		} elseif ( $has_flex_width && $has_flex_height ) {
 			$dst['dst_width'] = $width;
-		}
-		else {
+		} else {
 			$dst['dst_width'] = $theme_width;
 		}