ntwb / wordpress

src/wp-admin/includes/translation-install.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Translation Install Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Translation Install Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 
 /**

Spacing +63 added lines, -63 removed lines

@@ -16,11 +16,11 @@ 
  * @param array|object $args Translation API arguments. Optional.
  * @return object|WP_Error On success an object of translations, WP_Error on failure.
  */
-function translations_api( $type, $args = null ) {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+function translations_api($type, $args = null) {
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
-	if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ) ) ) {
-		return	new WP_Error( 'invalid_type', __( 'Invalid translation type.' ) );
+	if ( ! in_array($type, array('plugins', 'themes', 'core'))) {
+		return	new WP_Error('invalid_type', __('Invalid translation type.'));
 	}
 
 	/**
@@ -32,12 +32,12 @@ 
 	 * @param string      $type   The type of translations being requested.
 	 * @param object      $args   Translation API arguments.
 	 */
-	$res = apply_filters( 'translations_api', false, $type, $args );
+	$res = apply_filters('translations_api', false, $type, $args);
 
-	if ( false === $res ) {
-		$url = $http_url = 'http://api.wordpress.org/translations/' . $type . '/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
-			$url = set_url_scheme( $url, 'https' );
+	if (false === $res) {
+		$url = $http_url = 'http://api.wordpress.org/translations/'.$type.'/1.0/';
+		if ($ssl = wp_http_supports(array('ssl'))) {
+			$url = set_url_scheme($url, 'https');
 		}
 
 		$options = array(
@@ -49,24 +49,24 @@ 
 			),
 		);
 
-		if ( 'core' !== $type ) {
+		if ('core' !== $type) {
 			$options['body']['slug'] = $args['slug']; // Plugin or theme slug
 		}
 
-		$request = wp_remote_post( $url, $options );
+		$request = wp_remote_post($url, $options);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
+		if ($ssl && is_wp_error($request)) {
+			trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
 
-			$request = wp_remote_post( $http_url, $options );
+			$request = wp_remote_post($http_url, $options);
 		}
 
-		if ( is_wp_error( $request ) ) {
-			$res = new WP_Error( 'translations_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
+		if (is_wp_error($request)) {
+			$res = new WP_Error('translations_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), $request->get_error_message());
 		} else {
-			$res = json_decode( wp_remote_retrieve_body( $request ), true );
-			if ( ! is_object( $res ) && ! is_array( $res ) ) {
-				$res = new WP_Error( 'translations_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+			$res = json_decode(wp_remote_retrieve_body($request), true);
+			if ( ! is_object($res) && ! is_array($res)) {
+				$res = new WP_Error('translations_api_failed', __('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.'), wp_remote_retrieve_body($request));
 			}
 		}
 	}
@@ -80,7 +80,7 @@ 
 	 * @param string          $type The type of translations being requested.
 	 * @param object          $args Translation API arguments.
 	 */
-	return apply_filters( 'translations_api_result', $res, $type, $args );
+	return apply_filters('translations_api_result', $res, $type, $args);
 }
 
 /**
@@ -94,26 +94,26 @@ 
  *               in an error, an empty array will be returned.
  */
 function wp_get_available_translations() {
-	if ( ! defined( 'WP_INSTALLING' ) && false !== ( $translations = get_site_transient( 'available_translations' ) ) ) {
+	if ( ! defined('WP_INSTALLING') && false !== ($translations = get_site_transient('available_translations'))) {
 		return $translations;
 	}
 
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
-	$api = translations_api( 'core', array( 'version' => $wp_version ) );
+	$api = translations_api('core', array('version' => $wp_version));
 
-	if ( is_wp_error( $api ) || empty( $api['translations'] ) ) {
+	if (is_wp_error($api) || empty($api['translations'])) {
 		return array();
 	}
 
 	$translations = array();
 	// Key the array with the language code for now.
-	foreach ( $api['translations'] as $translation ) {
-		$translations[ $translation['language'] ] = $translation;
+	foreach ($api['translations'] as $translation) {
+		$translations[$translation['language']] = $translation;
 	}
 
-	if ( ! defined( 'WP_INSTALLING' ) ) {
-		set_site_transient( 'available_translations', $translations, 3 * HOUR_IN_SECONDS );
+	if ( ! defined('WP_INSTALLING')) {
+		set_site_transient('available_translations', $translations, 3 * HOUR_IN_SECONDS);
 	}
 
 	return $translations;
@@ -128,7 +128,7 @@ 
  *
  * @param array $languages Array of available languages (populated via the Translation API).
  */
-function wp_install_language_form( $languages ) {
+function wp_install_language_form($languages) {
 	global $wp_local_package;
 
 	$installed_languages = get_available_languages();
@@ -138,27 +138,27 @@ 
 	echo '<option value="" lang="en" selected="selected" data-continue="Continue" data-installed="1">English (United States)</option>';
 	echo "\n";
 
-	if ( ! empty( $wp_local_package ) && isset( $languages[ $wp_local_package ] ) ) {
-		if ( isset( $languages[ $wp_local_package ] ) ) {
-			$language = $languages[ $wp_local_package ];
-			printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-				esc_attr( $language['language'] ),
-				esc_attr( current( $language['iso'] ) ),
-				esc_attr( $language['strings']['continue'] ),
-				in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
-				esc_html( $language['native_name'] ) );
-
-			unset( $languages[ $wp_local_package ] );
+	if ( ! empty($wp_local_package) && isset($languages[$wp_local_package])) {
+		if (isset($languages[$wp_local_package])) {
+			$language = $languages[$wp_local_package];
+			printf('<option value="%s" lang="%s" data-continue="%s"%s>%s</option>'."\n",
+				esc_attr($language['language']),
+				esc_attr(current($language['iso'])),
+				esc_attr($language['strings']['continue']),
+				in_array($language['language'], $installed_languages) ? ' data-installed="1"' : '',
+				esc_html($language['native_name']));
+
+			unset($languages[$wp_local_package]);
 		}
 	}
 
-	foreach ( $languages as $language ) {
-		printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
-			esc_attr( $language['language'] ),
-			esc_attr( current( $language['iso'] ) ),
-			esc_attr( $language['strings']['continue'] ),
-			in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
-			esc_html( $language['native_name'] ) );
+	foreach ($languages as $language) {
+		printf('<option value="%s" lang="%s" data-continue="%s"%s>%s</option>'."\n",
+			esc_attr($language['language']),
+			esc_attr(current($language['iso'])),
+			esc_attr($language['strings']['continue']),
+			in_array($language['language'], $installed_languages) ? ' data-installed="1"' : '',
+			esc_html($language['native_name']));
 	}
 	echo "</select>\n";
 	echo '<p class="step"><span class="spinner"></span><input id="language-continue" type="submit" class="button button-primary button-large" value="Continue" /></p>';
@@ -175,40 +175,40 @@ 
  * @return string|bool Returns the language code if successfully downloaded
  *                     (or already installed), or false on failure.
  */
-function wp_download_language_pack( $download ) {
+function wp_download_language_pack($download) {
 	// Check if the translation is already installed.
-	if ( in_array( $download, get_available_languages() ) ) {
+	if (in_array($download, get_available_languages())) {
 		return $download;
 	}
 
-	if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+	if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS) {
 		return false;
 	}
 
 	// Confirm the translation is one we can download.
 	$translations = wp_get_available_translations();
-	if ( ! $translations ) {
+	if ( ! $translations) {
 		return false;
 	}
-	foreach ( $translations as $translation ) {
-		if ( $translation['language'] === $download ) {
+	foreach ($translations as $translation) {
+		if ($translation['language'] === $download) {
 			$translation_to_load = true;
 			break;
 		}
 	}
 
-	if ( empty( $translation_to_load ) ) {
+	if (empty($translation_to_load)) {
 		return false;
 	}
 	$translation = (object) $translation;
 
-	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	require_once ABSPATH.'wp-admin/includes/class-wp-upgrader.php';
 	$skin = new Automatic_Upgrader_Skin;
-	$upgrader = new Language_Pack_Upgrader( $skin );
+	$upgrader = new Language_Pack_Upgrader($skin);
 	$translation->type = 'core';
-	$result = $upgrader->upgrade( $translation, array( 'clear_update_cache' => false ) );
+	$result = $upgrader->upgrade($translation, array('clear_update_cache' => false));
 
-	if ( ! $result || is_wp_error( $result ) ) {
+	if ( ! $result || is_wp_error($result)) {
 		return false;
 	}
 
@@ -224,18 +224,18 @@ 
  * @return bool Returns true on success, false on failure.
  */
 function wp_can_install_language_pack() {
-	if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+	if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS) {
 		return false;
 	}
 
-	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	require_once ABSPATH.'wp-admin/includes/class-wp-upgrader.php';
 	$skin = new Automatic_Upgrader_Skin;
-	$upgrader = new Language_Pack_Upgrader( $skin );
+	$upgrader = new Language_Pack_Upgrader($skin);
 	$upgrader->init();
 
-	$check = $upgrader->fs_connect( array( WP_CONTENT_DIR, WP_LANG_DIR ) );
+	$check = $upgrader->fs_connect(array(WP_CONTENT_DIR, WP_LANG_DIR));
 
-	if ( ! $check || is_wp_error( $check ) ) {
+	if ( ! $check || is_wp_error($check)) {
 		return false;
 	}
 

src/wp-admin/includes/class-wp-importer.php

Indentation +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * WP_Importer base class
- */
+	 * WP_Importer base class
+	 */
 class WP_Importer {
 	/**
 	 * Class Constructor

Spacing +71 added lines, -71 removed lines

@@ -18,7 +18,7 @@ 
 	 * @param string $bid
 	 * @return array
 	 */
-	public function get_imported_posts( $importer_name, $bid ) {
+	public function get_imported_posts($importer_name, $bid) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -28,23 +28,23 @@ 
 
 		// Grab all posts in chunks
 		do {
-			$meta_key = $importer_name . '_' . $bid . '_permalink';
-			$sql = $wpdb->prepare( "SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '%s' LIMIT %d,%d", $meta_key, $offset, $limit );
-			$results = $wpdb->get_results( $sql );
+			$meta_key = $importer_name.'_'.$bid.'_permalink';
+			$sql = $wpdb->prepare("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = '%s' LIMIT %d,%d", $meta_key, $offset, $limit);
+			$results = $wpdb->get_results($sql);
 
 			// Increment offset
-			$offset = ( $limit + $offset );
+			$offset = ($limit + $offset);
 
-			if ( !empty( $results ) ) {
-				foreach ( $results as $r ) {
+			if ( ! empty($results)) {
+				foreach ($results as $r) {
 					// Set permalinks into array
-					$hashtable[$r->meta_value] = intval( $r->post_id );
+					$hashtable[$r->meta_value] = intval($r->post_id);
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while (count($results) == $limit);
 
 		// Unset to save memory.
-		unset( $results, $r );
+		unset($results, $r);
 
 		return $hashtable;
 	}
@@ -58,22 +58,22 @@ 
 	 * @param string $bid
 	 * @return int
 	 */
-	public function count_imported_posts( $importer_name, $bid ) {
+	public function count_imported_posts($importer_name, $bid) {
 		global $wpdb;
 
 		$count = 0;
 
 		// Get count of permalinks
-		$meta_key = $importer_name . '_' . $bid . '_permalink';
-		$sql = $wpdb->prepare( "SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key );
+		$meta_key = $importer_name.'_'.$bid.'_permalink';
+		$sql = $wpdb->prepare("SELECT COUNT( post_id ) AS cnt FROM $wpdb->postmeta WHERE meta_key = '%s'", $meta_key);
 
-		$result = $wpdb->get_results( $sql );
+		$result = $wpdb->get_results($sql);
 
-		if ( !empty( $result ) )
-			$count = intval( $result[0]->cnt );
+		if ( ! empty($result))
+			$count = intval($result[0]->cnt);
 
 		// Unset to save memory.
-		unset( $results );
+		unset($results);
 
 		return $count;
 	}
@@ -86,7 +86,7 @@ 
 	 * @param string $bid
 	 * @return array
 	 */
-	public function get_imported_comments( $bid ) {
+	public function get_imported_comments($bid) {
 		global $wpdb;
 
 		$hashtable = array();
@@ -96,28 +96,28 @@ 
 
 		// Grab all comments in chunks
 		do {
-			$sql = $wpdb->prepare( "SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit );
-			$results = $wpdb->get_results( $sql );
+			$sql = $wpdb->prepare("SELECT comment_ID, comment_agent FROM $wpdb->comments LIMIT %d,%d", $offset, $limit);
+			$results = $wpdb->get_results($sql);
 
 			// Increment offset
-			$offset = ( $limit + $offset );
+			$offset = ($limit + $offset);
 
-			if ( !empty( $results ) ) {
-				foreach ( $results as $r ) {
+			if ( ! empty($results)) {
+				foreach ($results as $r) {
 					// Explode comment_agent key
-					list ( $ca_bid, $source_comment_id ) = explode( '-', $r->comment_agent );
-					$source_comment_id = intval( $source_comment_id );
+					list ($ca_bid, $source_comment_id) = explode('-', $r->comment_agent);
+					$source_comment_id = intval($source_comment_id);
 
 					// Check if this comment came from this blog
-					if ( $bid == $ca_bid ) {
-						$hashtable[$source_comment_id] = intval( $r->comment_ID );
+					if ($bid == $ca_bid) {
+						$hashtable[$source_comment_id] = intval($r->comment_ID);
 					}
 				}
 			}
-		} while ( count( $results ) == $limit );
+		} while (count($results) == $limit);
 
 		// Unset to save memory.
-		unset( $results, $r );
+		unset($results, $r);
 
 		return $hashtable;
 	}
@@ -127,28 +127,28 @@ 
 	 * @param int $blog_id
 	 * @return int|void
 	 */
-	public function set_blog( $blog_id ) {
-		if ( is_numeric( $blog_id ) ) {
+	public function set_blog($blog_id) {
+		if (is_numeric($blog_id)) {
 			$blog_id = (int) $blog_id;
 		} else {
-			$blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
-			if ( ( !$parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
-				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
+			$blog = 'http://'.preg_replace('#^https?://#', '', $blog_id);
+			if (( ! $parsed = parse_url($blog)) || empty($parsed['host'])) {
+				fwrite(STDERR, "Error: can not determine blog_id from $blog_id\n");
 				exit();
 			}
-			if ( empty( $parsed['path'] ) )
+			if (empty($parsed['path']))
 				$parsed['path'] = '/';
-			$blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
-			if ( !$blog ) {
-				fwrite( STDERR, "Error: Could not find blog\n" );
+			$blog = get_blog_details(array('domain' => $parsed['host'], 'path' => $parsed['path']));
+			if ( ! $blog) {
+				fwrite(STDERR, "Error: Could not find blog\n");
 				exit();
 			}
 			$blog_id = (int) $blog->blog_id;
 		}
 
-		if ( function_exists( 'is_multisite' ) ) {
-			if ( is_multisite() )
-				switch_to_blog( $blog_id );
+		if (function_exists('is_multisite')) {
+			if (is_multisite())
+				switch_to_blog($blog_id);
 		}
 
 		return $blog_id;
@@ -159,15 +159,15 @@ 
 	 * @param int $user_id
 	 * @return int|void
 	 */
-	public function set_user( $user_id ) {
-		if ( is_numeric( $user_id ) ) {
+	public function set_user($user_id) {
+		if (is_numeric($user_id)) {
 			$user_id = (int) $user_id;
 		} else {
-			$user_id = (int) username_exists( $user_id );
+			$user_id = (int) username_exists($user_id);
 		}
 
-		if ( !$user_id || !wp_set_current_user( $user_id ) ) {
-			fwrite( STDERR, "Error: can not find user\n" );
+		if ( ! $user_id || ! wp_set_current_user($user_id)) {
+			fwrite(STDERR, "Error: can not find user\n");
 			exit();
 		}
 
@@ -181,8 +181,8 @@ 
 	 * @param string $b
 	 * @return int
 	 */
-	public function cmpr_strlen( $a, $b ) {
-		return strlen( $b ) - strlen( $a );
+	public function cmpr_strlen($a, $b) {
+		return strlen($b) - strlen($a);
 	}
 
 	/**
@@ -194,20 +194,20 @@ 
 	 * @param bool   $head
 	 * @return array
 	 */
-	public function get_page( $url, $username = '', $password = '', $head = false ) {
+	public function get_page($url, $username = '', $password = '', $head = false) {
 		// Increase the timeout
-		add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
+		add_filter('http_request_timeout', array($this, 'bump_request_timeout'));
 
 		$headers = array();
 		$args = array();
-		if ( true === $head )
+		if (true === $head)
 			$args['method'] = 'HEAD';
-		if ( !empty( $username ) && !empty( $password ) )
-			$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		if ( ! empty($username) && ! empty($password))
+			$headers['Authorization'] = 'Basic '.base64_encode("$username:$password");
 
 		$args['headers'] = $headers;
 
-		return wp_safe_remote_request( $url, $args );
+		return wp_safe_remote_request($url, $args);
 	}
 
 	/**
@@ -216,7 +216,7 @@ 
 	 * @param int $val
 	 * @return int
 	 */
-	public function bump_request_timeout( $val ) {
+	public function bump_request_timeout($val) {
 		return 60;
 	}
 
@@ -226,8 +226,8 @@ 
 	 * @return bool
 	 */
 	public function is_user_over_quota() {
-		if ( function_exists( 'upload_is_user_over_quota' ) ) {
-			if ( upload_is_user_over_quota() ) {
+		if (function_exists('upload_is_user_over_quota')) {
+			if (upload_is_user_over_quota()) {
 				return true;
 			}
 		}
@@ -241,8 +241,8 @@ 
 	 * @param string $string
 	 * @return string
 	 */
-	public function min_whitespace( $string ) {
-		return preg_replace( '|[\r\n\t ]+|', ' ', $string );
+	public function min_whitespace($string) {
+		return preg_replace('|[\r\n\t ]+|', ' ', $string);
 	}
 
 	/**
@@ -268,7 +268,7 @@ 
  * @param bool   $required
  * @return mixed
  */
-function get_cli_args( $param, $required = false ) {
+function get_cli_args($param, $required = false) {
 	$args = $_SERVER['argv'];
 
 	$out = array();
@@ -276,40 +276,40 @@ 
 	$last_arg = null;
 	$return = null;
 
-	$il = sizeof( $args );
+	$il = sizeof($args);
 
-	for ( $i = 1, $il; $i < $il; $i++ ) {
-		if ( (bool) preg_match( "/^--(.+)/", $args[$i], $match ) ) {
-			$parts = explode( "=", $match[1] );
-			$key = preg_replace( "/[^a-z0-9]+/", "", $parts[0] );
+	for ($i = 1, $il; $i < $il; $i++) {
+		if ((bool) preg_match("/^--(.+)/", $args[$i], $match)) {
+			$parts = explode("=", $match[1]);
+			$key = preg_replace("/[^a-z0-9]+/", "", $parts[0]);
 
-			if ( isset( $parts[1] ) ) {
+			if (isset($parts[1])) {
 				$out[$key] = $parts[1];
 			} else {
 				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
-			for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
+		} elseif ((bool) preg_match("/^-([a-zA-Z0-9]+)/", $args[$i], $match)) {
+			for ($j = 0, $jl = strlen($match[1]); $j < $jl; $j++) {
 				$key = $match[1]{$j};
 				$out[$key] = true;
 			}
 
 			$last_arg = $key;
-		} elseif ( $last_arg !== null ) {
+		} elseif ($last_arg !== null) {
 			$out[$last_arg] = $args[$i];
 		}
 	}
 
 	// Check array for specified param
-	if ( isset( $out[$param] ) ) {
+	if (isset($out[$param])) {
 		// Set return value
 		$return = $out[$param];
 	}
 
 	// Check for missing required param
-	if ( !isset( $out[$param] ) && $required ) {
+	if ( ! isset($out[$param]) && $required) {
 		// Display message and exit
 		echo "\"$param\" parameter is required but was not specified\n";
 		exit();

Braces +15 added lines, -10 removed lines

@@ -69,8 +69,9 @@ 
 
 		$result = $wpdb->get_results( $sql );
 
-		if ( !empty( $result ) )
-			$count = intval( $result[0]->cnt );
+		if ( !empty( $result ) ) {
+					$count = intval( $result[0]->cnt );
+		}
 
 		// Unset to save memory.
 		unset( $results );
@@ -136,8 +137,9 @@ 
 				fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
 				exit();
 			}
-			if ( empty( $parsed['path'] ) )
-				$parsed['path'] = '/';
+			if ( empty( $parsed['path'] ) ) {
+							$parsed['path'] = '/';
+			}
 			$blog = get_blog_details( array( 'domain' => $parsed['host'], 'path' => $parsed['path'] ) );
 			if ( !$blog ) {
 				fwrite( STDERR, "Error: Could not find blog\n" );
@@ -147,8 +149,9 @@ 
 		}
 
 		if ( function_exists( 'is_multisite' ) ) {
-			if ( is_multisite() )
-				switch_to_blog( $blog_id );
+			if ( is_multisite() ) {
+							switch_to_blog( $blog_id );
+			}
 		}
 
 		return $blog_id;
@@ -200,10 +203,12 @@ 
 
 		$headers = array();
 		$args = array();
-		if ( true === $head )
-			$args['method'] = 'HEAD';
-		if ( !empty( $username ) && !empty( $password ) )
-			$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		if ( true === $head ) {
+					$args['method'] = 'HEAD';
+		}
+		if ( !empty( $username ) && !empty( $password ) ) {
+					$headers['Authorization'] = 'Basic ' . base64_encode( "$username:$password" );
+		}
 
 		$args['headers'] = $headers;
 

src/wp-admin/includes/export.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Export Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Export Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Version number for the export format.

Spacing +139 added lines, -139 removed lines

@@ -13,7 +13,7 @@ 
  *
  * @since 2.5.0
  */
-define( 'WXR_VERSION', '1.2' );
+define('WXR_VERSION', '1.2');
 
 /**
  * Generates the WXR export file for download.
@@ -25,13 +25,13 @@ 
  *
  * @param array $args Filters defining what should be included in the export.
  */
-function export_wp( $args = array() ) {
+function export_wp($args = array()) {
 	global $wpdb, $post;
 
-	$defaults = array( 'content' => 'all', 'author' => false, 'category' => false,
+	$defaults = array('content' => 'all', 'author' => false, 'category' => false,
 		'start_date' => false, 'end_date' => false, 'status' => false,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Fires at the beginning of an export, before any headers are sent.
@@ -40,88 +40,88 @@ 
 	 *
 	 * @param array $args An array of export arguments.
 	 */
-	do_action( 'export_wp', $args );
+	do_action('export_wp', $args);
 
-	$sitename = sanitize_key( get_bloginfo( 'name' ) );
-	if ( ! empty($sitename) ) $sitename .= '.';
-	$filename = $sitename . 'wordpress.' . date( 'Y-m-d' ) . '.xml';
+	$sitename = sanitize_key(get_bloginfo('name'));
+	if ( ! empty($sitename)) $sitename .= '.';
+	$filename = $sitename.'wordpress.'.date('Y-m-d').'.xml';
 
-	header( 'Content-Description: File Transfer' );
-	header( 'Content-Disposition: attachment; filename=' . $filename );
-	header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), true );
+	header('Content-Description: File Transfer');
+	header('Content-Disposition: attachment; filename='.$filename);
+	header('Content-Type: text/xml; charset='.get_option('blog_charset'), true);
 
-	if ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
-		$ptype = get_post_type_object( $args['content'] );
-		if ( ! $ptype->can_export )
+	if ('all' != $args['content'] && post_type_exists($args['content'])) {
+		$ptype = get_post_type_object($args['content']);
+		if ( ! $ptype->can_export)
 			$args['content'] = 'post';
 
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type = %s", $args['content'] );
+		$where = $wpdb->prepare("{$wpdb->posts}.post_type = %s", $args['content']);
 	} else {
-		$post_types = get_post_types( array( 'can_export' => true ) );
-		$esses = array_fill( 0, count($post_types), '%s' );
-		$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
+		$post_types = get_post_types(array('can_export' => true));
+		$esses = array_fill(0, count($post_types), '%s');
+		$where = $wpdb->prepare("{$wpdb->posts}.post_type IN (".implode(',', $esses).')', $post_types);
 	}
 
-	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) )
-		$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
+	if ($args['status'] && ('post' == $args['content'] || 'page' == $args['content']))
+		$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_status = %s", $args['status']);
 	else
 		$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
 
 	$join = '';
-	if ( $args['category'] && 'post' == $args['content'] ) {
-		if ( $term = term_exists( $args['category'], 'category' ) ) {
+	if ($args['category'] && 'post' == $args['content']) {
+		if ($term = term_exists($args['category'], 'category')) {
 			$join = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
-			$where .= $wpdb->prepare( " AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id'] );
+			$where .= $wpdb->prepare(" AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id']);
 		}
 	}
 
-	if ( 'post' == $args['content'] || 'page' == $args['content'] ) {
-		if ( $args['author'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+	if ('post' == $args['content'] || 'page' == $args['content']) {
+		if ($args['author'])
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_author = %d", $args['author']);
 
-		if ( $args['start_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		if ($args['start_date'])
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_date >= %s", date('Y-m-d', strtotime($args['start_date'])));
 
-		if ( $args['end_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		if ($args['end_date'])
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_date < %s", date('Y-m-d', strtotime('+1 month', strtotime($args['end_date']))));
 	}
 
 	// Grab a snapshot of post IDs, just in case it changes during the export.
-	$post_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} $join WHERE $where" );
+	$post_ids = $wpdb->get_col("SELECT ID FROM {$wpdb->posts} $join WHERE $where");
 
 	/*
 	 * Get the requested terms ready, empty unless posts filtered by category
 	 * or all content.
 	 */
 	$cats = $tags = $terms = array();
-	if ( isset( $term ) && $term ) {
-		$cat = get_term( $term['term_id'], 'category' );
-		$cats = array( $cat->term_id => $cat );
-		unset( $term, $cat );
-	} elseif ( 'all' == $args['content'] ) {
-		$categories = (array) get_categories( array( 'get' => 'all' ) );
-		$tags = (array) get_tags( array( 'get' => 'all' ) );
+	if (isset($term) && $term) {
+		$cat = get_term($term['term_id'], 'category');
+		$cats = array($cat->term_id => $cat);
+		unset($term, $cat);
+	} elseif ('all' == $args['content']) {
+		$categories = (array) get_categories(array('get' => 'all'));
+		$tags = (array) get_tags(array('get' => 'all'));
 
-		$custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
-		$custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
+		$custom_taxonomies = get_taxonomies(array('_builtin' => false));
+		$custom_terms = (array) get_terms($custom_taxonomies, array('get' => 'all'));
 
 		// Put categories in order with no child going before its parent.
-		while ( $cat = array_shift( $categories ) ) {
-			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
+		while ($cat = array_shift($categories)) {
+			if ($cat->parent == 0 || isset($cats[$cat->parent]))
 				$cats[$cat->term_id] = $cat;
 			else
 				$categories[] = $cat;
 		}
 
 		// Put terms in order with no child going before its parent.
-		while ( $t = array_shift( $custom_terms ) ) {
-			if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
+		while ($t = array_shift($custom_terms)) {
+			if ($t->parent == 0 || isset($terms[$t->parent]))
 				$terms[$t->term_id] = $t;
 			else
 				$custom_terms[] = $t;
 		}
 
-		unset( $categories, $custom_taxonomies, $custom_terms );
+		unset($categories, $custom_taxonomies, $custom_terms);
 	}
 
 	/**
@@ -132,12 +132,12 @@ 
 	 * @param string $str String to wrap in XML CDATA tag.
 	 * @return string
 	 */
-	function wxr_cdata( $str ) {
-		if ( ! seems_utf8( $str ) ) {
-			$str = utf8_encode( $str );
+	function wxr_cdata($str) {
+		if ( ! seems_utf8($str)) {
+			$str = utf8_encode($str);
 		}
 		// $str = ent2ncr(esc_html($str));
-		$str = '<![CDATA[' . str_replace( ']]>', ']]]]><![CDATA[>', $str ) . ']]>';
+		$str = '<![CDATA['.str_replace(']]>', ']]]]><![CDATA[>', $str).']]>';
 
 		return $str;
 	}
@@ -151,11 +151,11 @@ 
 	 */
 	function wxr_site_url() {
 		// Multisite: the base URL.
-		if ( is_multisite() )
+		if (is_multisite())
 			return network_home_url();
 		// WordPress (single site): the blog URL.
 		else
-			return get_bloginfo_rss( 'url' );
+			return get_bloginfo_rss('url');
 	}
 
 	/**
@@ -165,11 +165,11 @@ 
 	 *
 	 * @param object $category Category Object
 	 */
-	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
+	function wxr_cat_name($category) {
+		if (empty($category->name))
 			return;
 
-		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . '</wp:cat_name>';
+		echo '<wp:cat_name>'.wxr_cdata($category->name).'</wp:cat_name>';
 	}
 
 	/**
@@ -179,11 +179,11 @@ 
 	 *
 	 * @param object $category Category Object
 	 */
-	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
+	function wxr_category_description($category) {
+		if (empty($category->description))
 			return;
 
-		echo '<wp:category_description>' . wxr_cdata( $category->description ) . '</wp:category_description>';
+		echo '<wp:category_description>'.wxr_cdata($category->description).'</wp:category_description>';
 	}
 
 	/**
@@ -193,11 +193,11 @@ 
 	 *
 	 * @param object $tag Tag Object
 	 */
-	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
+	function wxr_tag_name($tag) {
+		if (empty($tag->name))
 			return;
 
-		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . '</wp:tag_name>';
+		echo '<wp:tag_name>'.wxr_cdata($tag->name).'</wp:tag_name>';
 	}
 
 	/**
@@ -207,11 +207,11 @@ 
 	 *
 	 * @param object $tag Tag Object
 	 */
-	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
+	function wxr_tag_description($tag) {
+		if (empty($tag->description))
 			return;
 
-		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . '</wp:tag_description>';
+		echo '<wp:tag_description>'.wxr_cdata($tag->description).'</wp:tag_description>';
 	}
 
 	/**
@@ -221,11 +221,11 @@ 
 	 *
 	 * @param object $term Term Object
 	 */
-	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
+	function wxr_term_name($term) {
+		if (empty($term->name))
 			return;
 
-		echo '<wp:term_name>' . wxr_cdata( $term->name ) . '</wp:term_name>';
+		echo '<wp:term_name>'.wxr_cdata($term->name).'</wp:term_name>';
 	}
 
 	/**
@@ -235,11 +235,11 @@ 
 	 *
 	 * @param object $term Term Object
 	 */
-	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
+	function wxr_term_description($term) {
+		if (empty($term->description))
 			return;
 
-		echo '<wp:term_description>' . wxr_cdata( $term->description ) . '</wp:term_description>';
+		echo '<wp:term_description>'.wxr_cdata($term->description).'</wp:term_description>';
 	}
 
 	/**
@@ -251,31 +251,31 @@ 
 	 *
 	 * @param array $post_ids Array of post IDs to filter the query by. Optional.
 	 */
-	function wxr_authors_list( array $post_ids = null ) {
+	function wxr_authors_list(array $post_ids = null) {
 		global $wpdb;
 
-		if ( !empty( $post_ids ) ) {
-			$post_ids = array_map( 'absint', $post_ids );
-			$and = 'AND ID IN ( ' . implode( ', ', $post_ids ) . ')';
+		if ( ! empty($post_ids)) {
+			$post_ids = array_map('absint', $post_ids);
+			$and = 'AND ID IN ( '.implode(', ', $post_ids).')';
 		} else {
 			$and = '';
 		}
 
 		$authors = array();
-		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
-			$authors[] = get_userdata( $result->post_author );
+		$results = $wpdb->get_results("SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and");
+		foreach ((array) $results as $result)
+			$authors[] = get_userdata($result->post_author);
 
-		$authors = array_filter( $authors );
+		$authors = array_filter($authors);
 
-		foreach ( $authors as $author ) {
+		foreach ($authors as $author) {
 			echo "\t<wp:author>";
-			echo '<wp:author_id>' . $author->ID . '</wp:author_id>';
-			echo '<wp:author_login>' . $author->user_login . '</wp:author_login>';
-			echo '<wp:author_email>' . $author->user_email . '</wp:author_email>';
-			echo '<wp:author_display_name>' . wxr_cdata( $author->display_name ) . '</wp:author_display_name>';
-			echo '<wp:author_first_name>' . wxr_cdata( $author->user_firstname ) . '</wp:author_first_name>';
-			echo '<wp:author_last_name>' . wxr_cdata( $author->user_lastname ) . '</wp:author_last_name>';
+			echo '<wp:author_id>'.$author->ID.'</wp:author_id>';
+			echo '<wp:author_login>'.$author->user_login.'</wp:author_login>';
+			echo '<wp:author_email>'.$author->user_email.'</wp:author_email>';
+			echo '<wp:author_display_name>'.wxr_cdata($author->display_name).'</wp:author_display_name>';
+			echo '<wp:author_first_name>'.wxr_cdata($author->user_firstname).'</wp:author_first_name>';
+			echo '<wp:author_last_name>'.wxr_cdata($author->user_lastname).'</wp:author_last_name>';
 			echo "</wp:author>\n";
 		}
 	}
@@ -287,12 +287,12 @@ 
 	 */
 	function wxr_nav_menu_terms() {
 		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
+		if (empty($nav_menus) || ! is_array($nav_menus))
 			return;
 
-		foreach ( $nav_menus as $menu ) {
+		foreach ($nav_menus as $menu) {
 			echo "\t<wp:term><wp:term_id>{$menu->term_id}</wp:term_id><wp:term_taxonomy>nav_menu</wp:term_taxonomy><wp:term_slug>{$menu->slug}</wp:term_slug>";
-			wxr_term_name( $menu );
+			wxr_term_name($menu);
 			echo "</wp:term>\n";
 		}
 	}
@@ -305,13 +305,13 @@ 
 	function wxr_post_taxonomy() {
 		$post = get_post();
 
-		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
+		$taxonomies = get_object_taxonomies($post->post_type);
+		if (empty($taxonomies))
 			return;
-		$terms = wp_get_object_terms( $post->ID, $taxonomies );
+		$terms = wp_get_object_terms($post->ID, $taxonomies);
 
-		foreach ( (array) $terms as $term ) {
-			echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">" . wxr_cdata( $term->name ) . "</category>\n";
+		foreach ((array) $terms as $term) {
+			echo "\t\t<category domain=\"{$term->taxonomy}\" nicename=\"{$term->slug}\">".wxr_cdata($term->name)."</category>\n";
 		}
 	}
 
@@ -321,14 +321,14 @@ 
 	 * @param string $meta_key
 	 * @return bool
 	 */
-	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
+	function wxr_filter_postmeta($return_me, $meta_key) {
+		if ('_edit_lock' == $meta_key)
 			$return_me = true;
 		return $return_me;
 	}
-	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
+	add_filter('wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2);
 
-	echo '<?xml version="1.0" encoding="' . get_bloginfo('charset') . "\" ?>\n";
+	echo '<?xml version="1.0" encoding="'.get_bloginfo('charset')."\" ?>\n";
 
 	?>
 <!-- This is a WordPress eXtended RSS file generated by WordPress as an export of your site. -->
@@ -348,7 +348,7 @@ 
 <!-- 7. WordPress will then import each of the posts, pages, comments, categories, etc. -->
 <!--    contained in this file into your site. -->
 
-<?php the_generator( 'export' ); ?>
+<?php the_generator('export'); ?>
 <rss version="2.0"
 	xmlns:excerpt="http://wordpress.org/export/<?php echo WXR_VERSION; ?>/excerpt/"
 	xmlns:content="http://purl.org/rss/1.0/modules/content/"
@@ -358,34 +358,34 @@ 
 >
 
 <channel>
-	<title><?php bloginfo_rss( 'name' ); ?></title>
-	<link><?php bloginfo_rss( 'url' ); ?></link>
-	<description><?php bloginfo_rss( 'description' ); ?></description>
-	<pubDate><?php echo date( 'D, d M Y H:i:s +0000' ); ?></pubDate>
-	<language><?php bloginfo_rss( 'language' ); ?></language>
+	<title><?php bloginfo_rss('name'); ?></title>
+	<link><?php bloginfo_rss('url'); ?></link>
+	<description><?php bloginfo_rss('description'); ?></description>
+	<pubDate><?php echo date('D, d M Y H:i:s +0000'); ?></pubDate>
+	<language><?php bloginfo_rss('language'); ?></language>
 	<wp:wxr_version><?php echo WXR_VERSION; ?></wp:wxr_version>
 	<wp:base_site_url><?php echo wxr_site_url(); ?></wp:base_site_url>
-	<wp:base_blog_url><?php bloginfo_rss( 'url' ); ?></wp:base_blog_url>
+	<wp:base_blog_url><?php bloginfo_rss('url'); ?></wp:base_blog_url>
 
-<?php wxr_authors_list( $post_ids ); ?>
+<?php wxr_authors_list($post_ids); ?>
 
-<?php foreach ( $cats as $c ) : ?>
-	<wp:category><wp:term_id><?php echo $c->term_id ?></wp:term_id><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->slug : ''; ?></wp:category_parent><?php wxr_cat_name( $c ); ?><?php wxr_category_description( $c ); ?></wp:category>
+<?php foreach ($cats as $c) : ?>
+	<wp:category><wp:term_id><?php echo $c->term_id ?></wp:term_id><wp:category_nicename><?php echo $c->slug; ?></wp:category_nicename><wp:category_parent><?php echo $c->parent ? $cats[$c->parent]->slug : ''; ?></wp:category_parent><?php wxr_cat_name($c); ?><?php wxr_category_description($c); ?></wp:category>
 <?php endforeach; ?>
-<?php foreach ( $tags as $t ) : ?>
-	<wp:tag><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:tag_slug><?php echo $t->slug; ?></wp:tag_slug><?php wxr_tag_name( $t ); ?><?php wxr_tag_description( $t ); ?></wp:tag>
+<?php foreach ($tags as $t) : ?>
+	<wp:tag><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:tag_slug><?php echo $t->slug; ?></wp:tag_slug><?php wxr_tag_name($t); ?><?php wxr_tag_description($t); ?></wp:tag>
 <?php endforeach; ?>
-<?php foreach ( $terms as $t ) : ?>
-	<wp:term><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:term_taxonomy><?php echo $t->taxonomy; ?></wp:term_taxonomy><wp:term_slug><?php echo $t->slug; ?></wp:term_slug><wp:term_parent><?php echo $t->parent ? $terms[$t->parent]->slug : ''; ?></wp:term_parent><?php wxr_term_name( $t ); ?><?php wxr_term_description( $t ); ?></wp:term>
+<?php foreach ($terms as $t) : ?>
+	<wp:term><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:term_taxonomy><?php echo $t->taxonomy; ?></wp:term_taxonomy><wp:term_slug><?php echo $t->slug; ?></wp:term_slug><wp:term_parent><?php echo $t->parent ? $terms[$t->parent]->slug : ''; ?></wp:term_parent><?php wxr_term_name($t); ?><?php wxr_term_description($t); ?></wp:term>
 <?php endforeach; ?>
-<?php if ( 'all' == $args['content'] ) wxr_nav_menu_terms(); ?>
+<?php if ('all' == $args['content']) wxr_nav_menu_terms(); ?>
 
 	<?php
 	/** This action is documented in wp-includes/feed-rss2.php */
-	do_action( 'rss2_head' );
+	do_action('rss2_head');
 	?>
 
-<?php if ( $post_ids ) {
+<?php if ($post_ids) {
 	/**
 	 * @global WP_Query $wp_query
 	 */
@@ -395,23 +395,23 @@ 
 	$wp_query->in_the_loop = true;
 
 	// Fetch 20 posts at a time rather than loading the entire table into memory.
-	while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
-	$where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
-	$posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
+	while ($next_posts = array_splice($post_ids, 0, 20)) {
+	$where = 'WHERE ID IN ('.join(',', $next_posts).')';
+	$posts = $wpdb->get_results("SELECT * FROM {$wpdb->posts} $where");
 
 	// Begin Loop.
-	foreach ( $posts as $post ) {
-		setup_postdata( $post );
-		$is_sticky = is_sticky( $post->ID ) ? 1 : 0;
+	foreach ($posts as $post) {
+		setup_postdata($post);
+		$is_sticky = is_sticky($post->ID) ? 1 : 0;
 ?>
 	<item>
 		<title><?php
 			/** This filter is documented in wp-includes/feed.php */
-			echo apply_filters( 'the_title_rss', $post->post_title );
+			echo apply_filters('the_title_rss', $post->post_title);
 		?></title>
 		<link><?php the_permalink_rss() ?></link>
-		<pubDate><?php echo mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false ); ?></pubDate>
-		<dc:creator><?php echo wxr_cdata( get_the_author_meta( 'login' ) ); ?></dc:creator>
+		<pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
+		<dc:creator><?php echo wxr_cdata(get_the_author_meta('login')); ?></dc:creator>
 		<guid isPermaLink="false"><?php the_guid(); ?></guid>
 		<description></description>
 		<content:encoded><?php
@@ -422,7 +422,7 @@ 
 			 *
 			 * @param string $post_content Content of the current post.
 			 */
-			echo wxr_cdata( apply_filters( 'the_content_export', $post->post_content ) );
+			echo wxr_cdata(apply_filters('the_content_export', $post->post_content));
 		?></content:encoded>
 		<excerpt:encoded><?php
 			/**
@@ -432,7 +432,7 @@ 
 			 *
 			 * @param string $post_excerpt Excerpt for the current post.
 			 */
-			echo wxr_cdata( apply_filters( 'the_excerpt_export', $post->post_excerpt ) );
+			echo wxr_cdata(apply_filters('the_excerpt_export', $post->post_excerpt));
 		?></excerpt:encoded>
 		<wp:post_id><?php echo $post->ID; ?></wp:post_id>
 		<wp:post_date><?php echo $post->post_date; ?></wp:post_date>
@@ -446,12 +446,12 @@ 
 		<wp:post_type><?php echo $post->post_type; ?></wp:post_type>
 		<wp:post_password><?php echo $post->post_password; ?></wp:post_password>
 		<wp:is_sticky><?php echo $is_sticky; ?></wp:is_sticky>
-<?php	if ( $post->post_type == 'attachment' ) : ?>
-		<wp:attachment_url><?php echo wp_get_attachment_url( $post->ID ); ?></wp:attachment_url>
+<?php	if ($post->post_type == 'attachment') : ?>
+		<wp:attachment_url><?php echo wp_get_attachment_url($post->ID); ?></wp:attachment_url>
 <?php 	endif; ?>
 <?php 	wxr_post_taxonomy(); ?>
-<?php	$postmeta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID ) );
-		foreach ( $postmeta as $meta ) :
+<?php	$postmeta = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d", $post->ID));
+		foreach ($postmeta as $meta) :
 			/**
 			 * Filter whether to selectively skip post meta used for WXR exports.
 			 *
@@ -464,32 +464,32 @@ 
 			 * @param string $meta_key Current meta key.
 			 * @param object $meta     Current meta object.
 			 */
-			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) )
+			if (apply_filters('wxr_export_skip_postmeta', false, $meta->meta_key, $meta))
 				continue;
 		?>
 		<wp:postmeta>
 			<wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
-			<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
+			<wp:meta_value><?php echo wxr_cdata($meta->meta_value); ?></wp:meta_value>
 		</wp:postmeta>
 <?php	endforeach;
 
-		$comments = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID ) );
-		foreach ( $comments as $c ) : ?>
+		$comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved <> 'spam'", $post->ID));
+		foreach ($comments as $c) : ?>
 		<wp:comment>
 			<wp:comment_id><?php echo $c->comment_ID; ?></wp:comment_id>
-			<wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
+			<wp:comment_author><?php echo wxr_cdata($c->comment_author); ?></wp:comment_author>
 			<wp:comment_author_email><?php echo $c->comment_author_email; ?></wp:comment_author_email>
-			<wp:comment_author_url><?php echo esc_url_raw( $c->comment_author_url ); ?></wp:comment_author_url>
+			<wp:comment_author_url><?php echo esc_url_raw($c->comment_author_url); ?></wp:comment_author_url>
 			<wp:comment_author_IP><?php echo $c->comment_author_IP; ?></wp:comment_author_IP>
 			<wp:comment_date><?php echo $c->comment_date; ?></wp:comment_date>
 			<wp:comment_date_gmt><?php echo $c->comment_date_gmt; ?></wp:comment_date_gmt>
-			<wp:comment_content><?php echo wxr_cdata( $c->comment_content ) ?></wp:comment_content>
+			<wp:comment_content><?php echo wxr_cdata($c->comment_content) ?></wp:comment_content>
 			<wp:comment_approved><?php echo $c->comment_approved; ?></wp:comment_approved>
 			<wp:comment_type><?php echo $c->comment_type; ?></wp:comment_type>
 			<wp:comment_parent><?php echo $c->comment_parent; ?></wp:comment_parent>
 			<wp:comment_user_id><?php echo $c->user_id; ?></wp:comment_user_id>
-<?php		$c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
-			foreach ( $c_meta as $meta ) :
+<?php		$c_meta = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID));
+			foreach ($c_meta as $meta) :
 				/**
 				 * Filter whether to selectively skip comment meta used for WXR exports.
 				 *
@@ -502,13 +502,13 @@ 
 				 * @param string $meta_key Current meta key.
 				 * @param object $meta     Current meta object.
 				 */
-				if ( apply_filters( 'wxr_export_skip_commentmeta', false, $meta->meta_key, $meta ) ) {
+				if (apply_filters('wxr_export_skip_commentmeta', false, $meta->meta_key, $meta)) {
 					continue;
 				}
 			?>
 			<wp:commentmeta>
 				<wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>
-				<wp:meta_value><?php echo wxr_cdata( $meta->meta_value ); ?></wp:meta_value>
+				<wp:meta_value><?php echo wxr_cdata($meta->meta_value); ?></wp:meta_value>
 			</wp:commentmeta>
 <?php		endforeach; ?>
 		</wp:comment>

Braces +73 added lines, -48 removed lines

@@ -43,7 +43,9 @@ 
 	do_action( 'export_wp', $args );
 
 	$sitename = sanitize_key( get_bloginfo( 'name' ) );
-	if ( ! empty($sitename) ) $sitename .= '.';
+	if ( ! empty($sitename) ) {
+		$sitename .= '.';
+	}
 	$filename = $sitename . 'wordpress.' . date( 'Y-m-d' ) . '.xml';
 
 	header( 'Content-Description: File Transfer' );
@@ -52,8 +54,9 @@ 
 
 	if ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
 		$ptype = get_post_type_object( $args['content'] );
-		if ( ! $ptype->can_export )
-			$args['content'] = 'post';
+		if ( ! $ptype->can_export ) {
+					$args['content'] = 'post';
+		}
 
 		$where = $wpdb->prepare( "{$wpdb->posts}.post_type = %s", $args['content'] );
 	} else {
@@ -62,10 +65,11 @@ 
 		$where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
 	}
 
-	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) )
-		$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
-	else
-		$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
+	if ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) ) {
+			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
+	} else {
+			$where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
+	}
 
 	$join = '';
 	if ( $args['category'] && 'post' == $args['content'] ) {
@@ -76,14 +80,17 @@ 
 	}
 
 	if ( 'post' == $args['content'] || 'page' == $args['content'] ) {
-		if ( $args['author'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+		if ( $args['author'] ) {
+					$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
+		}
 
-		if ( $args['start_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		if ( $args['start_date'] ) {
+					$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date >= %s", date( 'Y-m-d', strtotime($args['start_date']) ) );
+		}
 
-		if ( $args['end_date'] )
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		if ( $args['end_date'] ) {
+					$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
+		}
 	}
 
 	// Grab a snapshot of post IDs, just in case it changes during the export.
@@ -107,18 +114,20 @@ 
 
 		// Put categories in order with no child going before its parent.
 		while ( $cat = array_shift( $categories ) ) {
-			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
-				$cats[$cat->term_id] = $cat;
-			else
-				$categories[] = $cat;
+			if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) ) {
+							$cats[$cat->term_id] = $cat;
+			} else {
+							$categories[] = $cat;
+			}
 		}
 
 		// Put terms in order with no child going before its parent.
 		while ( $t = array_shift( $custom_terms ) ) {
-			if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
-				$terms[$t->term_id] = $t;
-			else
-				$custom_terms[] = $t;
+			if ( $t->parent == 0 || isset( $terms[$t->parent] ) ) {
+							$terms[$t->term_id] = $t;
+			} else {
+							$custom_terms[] = $t;
+			}
 		}
 
 		unset( $categories, $custom_taxonomies, $custom_terms );
@@ -151,11 +160,13 @@ 
 	 */
 	function wxr_site_url() {
 		// Multisite: the base URL.
-		if ( is_multisite() )
-			return network_home_url();
+		if ( is_multisite() ) {
+					return network_home_url();
+		}
 		// WordPress (single site): the blog URL.
-		else
-			return get_bloginfo_rss( 'url' );
+		else {
+					return get_bloginfo_rss( 'url' );
+		}
 	}
 
 	/**
@@ -166,8 +177,9 @@ 
 	 * @param object $category Category Object
 	 */
 	function wxr_cat_name( $category ) {
-		if ( empty( $category->name ) )
-			return;
+		if ( empty( $category->name ) ) {
+					return;
+		}
 
 		echo '<wp:cat_name>' . wxr_cdata( $category->name ) . '</wp:cat_name>';
 	}
@@ -180,8 +192,9 @@ 
 	 * @param object $category Category Object
 	 */
 	function wxr_category_description( $category ) {
-		if ( empty( $category->description ) )
-			return;
+		if ( empty( $category->description ) ) {
+					return;
+		}
 
 		echo '<wp:category_description>' . wxr_cdata( $category->description ) . '</wp:category_description>';
 	}
@@ -194,8 +207,9 @@ 
 	 * @param object $tag Tag Object
 	 */
 	function wxr_tag_name( $tag ) {
-		if ( empty( $tag->name ) )
-			return;
+		if ( empty( $tag->name ) ) {
+					return;
+		}
 
 		echo '<wp:tag_name>' . wxr_cdata( $tag->name ) . '</wp:tag_name>';
 	}
@@ -208,8 +222,9 @@ 
 	 * @param object $tag Tag Object
 	 */
 	function wxr_tag_description( $tag ) {
-		if ( empty( $tag->description ) )
-			return;
+		if ( empty( $tag->description ) ) {
+					return;
+		}
 
 		echo '<wp:tag_description>' . wxr_cdata( $tag->description ) . '</wp:tag_description>';
 	}
@@ -222,8 +237,9 @@ 
 	 * @param object $term Term Object
 	 */
 	function wxr_term_name( $term ) {
-		if ( empty( $term->name ) )
-			return;
+		if ( empty( $term->name ) ) {
+					return;
+		}
 
 		echo '<wp:term_name>' . wxr_cdata( $term->name ) . '</wp:term_name>';
 	}
@@ -236,8 +252,9 @@ 
 	 * @param object $term Term Object
 	 */
 	function wxr_term_description( $term ) {
-		if ( empty( $term->description ) )
-			return;
+		if ( empty( $term->description ) ) {
+					return;
+		}
 
 		echo '<wp:term_description>' . wxr_cdata( $term->description ) . '</wp:term_description>';
 	}
@@ -263,8 +280,9 @@ 
 
 		$authors = array();
 		$results = $wpdb->get_results( "SELECT DISTINCT post_author FROM $wpdb->posts WHERE post_status != 'auto-draft' $and" );
-		foreach ( (array) $results as $result )
-			$authors[] = get_userdata( $result->post_author );
+		foreach ( (array) $results as $result ) {
+					$authors[] = get_userdata( $result->post_author );
+		}
 
 		$authors = array_filter( $authors );
 
@@ -287,8 +305,9 @@ 
 	 */
 	function wxr_nav_menu_terms() {
 		$nav_menus = wp_get_nav_menus();
-		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) )
-			return;
+		if ( empty( $nav_menus ) || ! is_array( $nav_menus ) ) {
+					return;
+		}
 
 		foreach ( $nav_menus as $menu ) {
 			echo "\t<wp:term><wp:term_id>{$menu->term_id}</wp:term_id><wp:term_taxonomy>nav_menu</wp:term_taxonomy><wp:term_slug>{$menu->slug}</wp:term_slug>";
@@ -306,8 +325,9 @@ 
 		$post = get_post();
 
 		$taxonomies = get_object_taxonomies( $post->post_type );
-		if ( empty( $taxonomies ) )
-			return;
+		if ( empty( $taxonomies ) ) {
+					return;
+		}
 		$terms = wp_get_object_terms( $post->ID, $taxonomies );
 
 		foreach ( (array) $terms as $term ) {
@@ -322,8 +342,9 @@ 
 	 * @return bool
 	 */
 	function wxr_filter_postmeta( $return_me, $meta_key ) {
-		if ( '_edit_lock' == $meta_key )
-			$return_me = true;
+		if ( '_edit_lock' == $meta_key ) {
+					$return_me = true;
+		}
 		return $return_me;
 	}
 	add_filter( 'wxr_export_skip_postmeta', 'wxr_filter_postmeta', 10, 2 );
@@ -378,7 +399,10 @@ 
 <?php foreach ( $terms as $t ) : ?>
 	<wp:term><wp:term_id><?php echo $t->term_id ?></wp:term_id><wp:term_taxonomy><?php echo $t->taxonomy; ?></wp:term_taxonomy><wp:term_slug><?php echo $t->slug; ?></wp:term_slug><wp:term_parent><?php echo $t->parent ? $terms[$t->parent]->slug : ''; ?></wp:term_parent><?php wxr_term_name( $t ); ?><?php wxr_term_description( $t ); ?></wp:term>
 <?php endforeach; ?>
-<?php if ( 'all' == $args['content'] ) wxr_nav_menu_terms(); ?>
+<?php if ( 'all' == $args['content'] ) {
+	wxr_nav_menu_terms();
+}
+?>
 
 	<?php
 	/** This action is documented in wp-includes/feed-rss2.php */
@@ -464,8 +488,9 @@ 
 			 * @param string $meta_key Current meta key.
 			 * @param object $meta     Current meta object.
 			 */
-			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) )
-				continue;
+			if ( apply_filters( 'wxr_export_skip_postmeta', false, $meta->meta_key, $meta ) ) {
+							continue;
+			}
 		?>
 		<wp:postmeta>
 			<wp:meta_key><?php echo $meta->meta_key; ?></wp:meta_key>

src/wp-admin/includes/class-wp-media-list-table.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Media Library List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+	 * Media Library List Table class.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 * @access private
+	 */
 class WP_Media_List_Table extends WP_List_Table {
 
 	private $detached;

Spacing +173 added lines, -173 removed lines

@@ -23,18 +23,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		$this->detached = ( isset( $_REQUEST['attachment-filter'] ) && 'detached' === $_REQUEST['attachment-filter'] );
+	public function __construct($args = array()) {
+		$this->detached = (isset($_REQUEST['attachment-filter']) && 'detached' === $_REQUEST['attachment-filter']);
 
 		$this->modes = array(
-			'list' => __( 'List View' ),
-			'grid' => __( 'Grid View' )
+			'list' => __('List View'),
+			'grid' => __('Grid View')
 		);
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'media',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -55,17 +55,17 @@ 
 	public function prepare_items() {
 		global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
 
-		list( $post_mime_types, $avail_post_mime_types ) = wp_edit_attachments_query( $_REQUEST );
+		list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query($_REQUEST);
 
- 		$this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' == $_REQUEST['attachment-filter'];
+ 		$this->is_trash = isset($_REQUEST['attachment-filter']) && 'trash' == $_REQUEST['attachment-filter'];
 
- 		$mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+ 		$mode = empty($_REQUEST['mode']) ? 'list' : $_REQUEST['mode'];
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $wp_query->found_posts,
 			'total_pages' => $wp_query->max_num_pages,
 			'per_page' => $wp_query->query_vars['posts_per_page'],
-		) );
+		));
 	}
 
 	/**
@@ -81,30 +81,30 @@ 
 		$type_links = array();
 		$_num_posts = (array) wp_count_attachments();
 		$_total_posts = array_sum($_num_posts) - $_num_posts['trash'];
-		$total_orphans = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1" );
+		$total_orphans = $wpdb->get_var("SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent < 1");
 		$matches = wp_match_mime_types(array_keys($post_mime_types), array_keys($_num_posts));
 		$num_posts = array();
-		foreach ( $matches as $type => $reals ) {
-			foreach ( $reals as $real ) {
-				$num_posts[$type] = ( isset( $num_posts[$type] ) ) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
+		foreach ($matches as $type => $reals) {
+			foreach ($reals as $real) {
+				$num_posts[$type] = (isset($num_posts[$type])) ? $num_posts[$type] + $_num_posts[$real] : $_num_posts[$real];
 			}
 		}
-		$selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : '';
-		$type_links['all'] = "<option value=''$selected>" . sprintf( _nx( 'All (%s)', 'All (%s)', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</option>';
-		foreach ( $post_mime_types as $mime_type => $label ) {
-			if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
+		$selected = empty($_GET['attachment-filter']) ? ' selected="selected"' : '';
+		$type_links['all'] = "<option value=''$selected>".sprintf(_nx('All (%s)', 'All (%s)', $_total_posts, 'uploaded files'), number_format_i18n($_total_posts)).'</option>';
+		foreach ($post_mime_types as $mime_type => $label) {
+			if ( ! wp_match_mime_types($mime_type, $avail_post_mime_types))
 				continue;
 
 			$selected = '';
-			if ( !empty( $_GET['attachment-filter'] ) && strpos( $_GET['attachment-filter'], 'post_mime_type:' ) === 0 && wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $_GET['attachment-filter'] ) ) )
+			if ( ! empty($_GET['attachment-filter']) && strpos($_GET['attachment-filter'], 'post_mime_type:') === 0 && wp_match_mime_types($mime_type, str_replace('post_mime_type:', '', $_GET['attachment-filter'])))
 				$selected = ' selected="selected"';
-			if ( !empty( $num_posts[$mime_type] ) )
-				$type_links[$mime_type] = '<option value="post_mime_type:' . esc_attr( $mime_type ) . '"' . $selected . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</option>';
+			if ( ! empty($num_posts[$mime_type]))
+				$type_links[$mime_type] = '<option value="post_mime_type:'.esc_attr($mime_type).'"'.$selected.'>'.sprintf(translate_nooped_plural($label[2], $num_posts[$mime_type]), number_format_i18n($num_posts[$mime_type])).'</option>';
 		}
-		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . sprintf( _nx( 'Unattached (%s)', 'Unattached (%s)', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</option>';
+		$type_links['detached'] = '<option value="detached"'.($this->detached ? ' selected="selected"' : '').'>'.sprintf(_nx('Unattached (%s)', 'Unattached (%s)', $total_orphans, 'detached files'), number_format_i18n($total_orphans)).'</option>';
 
-		if ( !empty($_num_posts['trash']) )
-			$type_links['trash'] = '<option value="trash"' . ( (isset($_GET['attachment-filter']) && $_GET['attachment-filter'] == 'trash' ) ? ' selected="selected"' : '') . '>' . sprintf( _nx( 'Trash (%s)', 'Trash (%s)', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</option>';
+		if ( ! empty($_num_posts['trash']))
+			$type_links['trash'] = '<option value="trash"'.((isset($_GET['attachment-filter']) && $_GET['attachment-filter'] == 'trash') ? ' selected="selected"' : '').'>'.sprintf(_nx('Trash (%s)', 'Trash (%s)', $_num_posts['trash'], 'uploaded files'), number_format_i18n($_num_posts['trash'])).'</option>';
 
 		return $type_links;
 	}
@@ -115,19 +115,19 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( MEDIA_TRASH ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (MEDIA_TRASH) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = __( 'Trash' );
+				$actions['trash'] = __('Trash');
 			}
 		} else {
-			$actions['delete'] = __( 'Delete Permanently' );
+			$actions['delete'] = __('Delete Permanently');
 		}
 
-		if ( $this->detached )
-			$actions['attach'] = __( 'Attach to a post' );
+		if ($this->detached)
+			$actions['attach'] = __('Attach to a post');
 
 		return $actions;
 	}
@@ -135,26 +135,26 @@ 
 	/**
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
-		if ( 'bar' !== $which ) {
+	protected function extra_tablenav($which) {
+		if ('bar' !== $which) {
 			return;
 		}
 ?>
 		<div class="actions">
 <?php
-		if ( ! is_singular() ) {
-			if ( ! $this->is_trash ) {
-				$this->months_dropdown( 'attachment' );
+		if ( ! is_singular()) {
+			if ( ! $this->is_trash) {
+				$this->months_dropdown('attachment');
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			do_action( 'restrict_manage_posts', $this->screen->post_type );
+			do_action('restrict_manage_posts', $this->screen->post_type);
 			
-			submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+			submit_button(__('Filter'), 'button', 'filter_action', false, array('id' => 'post-query-submit'));
 		}
 
-		if ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can('edit_others_posts')) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		} ?>
 		</div>
 <?php
@@ -165,13 +165,13 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if (isset($_REQUEST['found_post_id']) && isset($_REQUEST['media']))
 			return 'attach';
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+		if (isset($_REQUEST['parent_post_id']) && isset($_REQUEST['media']))
 			return 'detach';
 
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']))
 			return 'delete_all';
 
 		return parent::current_action();
@@ -189,7 +189,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No media attachments found.' );
+		_e('No media attachments found.');
 	}
 
 	/**
@@ -204,13 +204,13 @@ 
 ?>
 <div class="wp-filter">
 	<div class="filter-items">
-		<?php $this->view_switcher( $mode ); ?>
+		<?php $this->view_switcher($mode); ?>
 
-		<label for="attachment-filter" class="screen-reader-text"><?php _e( 'Filter by type' ); ?></label>
+		<label for="attachment-filter" class="screen-reader-text"><?php _e('Filter by type'); ?></label>
 		<select class="attachment-filters" name="attachment-filter" id="attachment-filter">
 			<?php
-			if ( ! empty( $views ) ) {
-				foreach ( $views as $class => $view ) {
+			if ( ! empty($views)) {
+				foreach ($views as $class => $view) {
 					echo "\t$view\n";
 				}
 			}
@@ -218,15 +218,15 @@ 
 		</select>
 
 <?php
-		$this->extra_tablenav( 'bar' );
+		$this->extra_tablenav('bar');
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-		$views = apply_filters( "views_{$this->screen->id}", array() );
+		$views = apply_filters("views_{$this->screen->id}", array());
 
 		// Back compat for pre-4.0 view links.
-		if ( ! empty( $views ) ) {
+		if ( ! empty($views)) {
 			echo '<ul class="filter-links">';
-			foreach ( $views as $class => $view ) {
+			foreach ($views as $class => $view) {
 				echo "<li class='$class'>$view</li>";
 			}
 			echo '</ul>';
@@ -235,8 +235,8 @@ 
 	</div>
 
 	<div class="search-form">
-		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e( 'Search Media' ); ?></label>
-		<input type="search" placeholder="<?php esc_attr_e( 'Search' ) ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
+		<label for="media-search-input" class="screen-reader-text"><?php esc_html_e('Search Media'); ?></label>
+		<input type="search" placeholder="<?php esc_attr_e('Search') ?>" id="media-search-input" class="search" name="s" value="<?php _admin_search_query(); ?>"></div>
 	</div>
 	<?php
 	}
@@ -249,11 +249,11 @@ 
 		$posts_columns = array();
 		$posts_columns['cb'] = '<input type="checkbox" />';
 		/* translators: column name */
-		$posts_columns['title'] = _x( 'File', 'column name' );
-		$posts_columns['author'] = __( 'Author' );
+		$posts_columns['title'] = _x('File', 'column name');
+		$posts_columns['author'] = __('Author');
 
-		$taxonomies = get_taxonomies_for_attachments( 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_taxonomies_for_attachments('objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filter the taxonomy columns for attachments in the Media list table.
@@ -263,28 +263,28 @@ 
 		 * @param array  $taxonomies An array of registered taxonomies to show for attachments.
 		 * @param string $post_type  The post type. Default 'attachment'.
 		 */
-		$taxonomies = apply_filters( 'manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment' );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters('manage_taxonomies_for_attachment_columns', $taxonomies, 'attachment');
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' == $taxonomy )
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' == $taxonomy)
 				$column_key = 'categories';
-			elseif ( 'post_tag' == $taxonomy )
+			elseif ('post_tag' == $taxonomy)
 				$column_key = 'tags';
 			else
-				$column_key = 'taxonomy-' . $taxonomy;
+				$column_key = 'taxonomy-'.$taxonomy;
 
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
 		/* translators: column name */
-		if ( !$this->detached ) {
-			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
-				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( ! $this->detached) {
+			$posts_columns['parent'] = _x('Uploaded to', 'column name');
+			if (post_type_supports('attachment', 'comments'))
+				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 		}
 		/* translators: column name */
-		$posts_columns['date'] = _x( 'Date', 'column name' );
+		$posts_columns['date'] = _x('Date', 'column name');
 		/**
 		 * Filter the Media list table columns.
 		 *
@@ -294,7 +294,7 @@ 
 		 * @param bool  $detached      Whether the list table contains media not attached
 		 *                             to any posts. Default true.
 		 */
-		return apply_filters( 'manage_media_columns', $posts_columns, $this->detached );
+		return apply_filters('manage_media_columns', $posts_columns, $this->detached);
 	}
 
 	/**
@@ -307,7 +307,7 @@ 
 			'author'   => 'author',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true ),
+			'date'     => array('date', true),
 		);
 	}
 
@@ -319,10 +319,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
-		if ( current_user_can( 'edit_post', $post->ID ) ) { ?>
+	public function column_cb($post) {
+		if (current_user_can('edit_post', $post->ID)) { ?>
 			<label class="screen-reader-text" for="cb-select-<?php echo $post->ID; ?>"><?php
-				echo sprintf( __( 'Select %s' ), _draft_or_post_title() );
+				echo sprintf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input type="checkbox" name="media[]" id="cb-select-<?php echo $post->ID; ?>" value="<?php echo $post->ID; ?>" />
 		<?php }
@@ -336,15 +336,15 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
-		list( $mime ) = explode( '/', $post->post_mime_type );
+	public function column_title($post) {
+		list($mime) = explode('/', $post->post_mime_type);
 
 		$title = _draft_or_post_title();
-		$thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
+		$thumb = wp_get_attachment_image($post->ID, array(60, 60), true, array('alt' => ''));
 		$link_start = $link_end = '';
 
-		if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
-			$link_start = '<a href="' . get_edit_post_link( $post->ID ) . '">';
+		if (current_user_can('edit_post', $post->ID) && ! $this->is_trash) {
+			$link_start = '<a href="'.get_edit_post_link($post->ID).'">';
 			$link_end = '</a>';
 		}
 
@@ -353,16 +353,16 @@ 
 		?>
 		<strong<?php echo $class; ?>>
 			<?php echo $link_start; ?>
-				<?php if ( $thumb ) : ?>
-				<span class="media-icon <?php echo sanitize_html_class( $mime . '-icon' ); ?>"><?php echo $thumb; ?></span>
+				<?php if ($thumb) : ?>
+				<span class="media-icon <?php echo sanitize_html_class($mime.'-icon'); ?>"><?php echo $thumb; ?></span>
 				<?php endif; ?>
 
 				<span aria-hidden="true"><?php echo $title; ?></span>
-				<span class="screen-reader-text"><?php printf( __( 'Edit &#8220;%s&#8221;' ), $title ); ?></span>
+				<span class="screen-reader-text"><?php printf(__('Edit &#8220;%s&#8221;'), $title); ?></span>
 			<?php echo $link_end; ?>
-			<?php _media_states( $post ); ?>
+			<?php _media_states($post); ?>
 		</strong>
-		<p class="filename"><span class="screen-reader-text"><?php _e( 'File name:' ); ?> </span><?php echo wp_basename( $post->guid ); ?></p>
+		<p class="filename"><span class="screen-reader-text"><?php _e('File name:'); ?> </span><?php echo wp_basename($post->guid); ?></p>
 		<?php
 	}
 
@@ -374,9 +374,9 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
-		printf( '<a href="%s">%s</a>',
-			esc_url( add_query_arg( array( 'author' => get_the_author_meta('ID') ), 'upload.php' ) ),
+	public function column_author($post) {
+		printf('<a href="%s">%s</a>',
+			esc_url(add_query_arg(array('author' => get_the_author_meta('ID')), 'upload.php')),
 			get_the_author()
 		);
 	}
@@ -389,7 +389,7 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_desc( $post ) {
+	public function column_desc($post) {
 		echo has_excerpt() ? $post->post_excerpt : '';
 	}
 
@@ -401,20 +401,20 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
-		if ( '0000-00-00 00:00:00' == $post->post_date ) {
-			$h_time = __( 'Unpublished' );
+	public function column_date($post) {
+		if ('0000-00-00 00:00:00' == $post->post_date) {
+			$h_time = __('Unpublished');
 		} else {
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post, false );
-			if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
-				if ( $t_diff < 0 ) {
-					$h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
+			$time = get_post_time('G', true, $post, false);
+			if ((abs($t_diff = time() - $time)) < DAY_IN_SECONDS) {
+				if ($t_diff < 0) {
+					$h_time = sprintf(__('%s from now'), human_time_diff($time));
 				} else {
-					$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+					$h_time = sprintf(__('%s ago'), human_time_diff($time));
 				}
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
@@ -429,43 +429,43 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_parent( $post ) {
-		$user_can_edit = current_user_can( 'edit_post', $post->ID );
+	public function column_parent($post) {
+		$user_can_edit = current_user_can('edit_post', $post->ID);
 
-		if ( $post->post_parent > 0 ) {
-			$parent = get_post( $post->post_parent );
+		if ($post->post_parent > 0) {
+			$parent = get_post($post->post_parent);
 		} else {
 			$parent = false;
 		}
 
-		if ( $parent ) {
-			$title = _draft_or_post_title( $post->post_parent );
-			$parent_type = get_post_type_object( $parent->post_type );
+		if ($parent) {
+			$title = _draft_or_post_title($post->post_parent);
+			$parent_type = get_post_type_object($parent->post_type);
 ?>
 			<strong>
-			<?php if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $post->post_parent ) ) { ?>
-				<a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
+			<?php if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $post->post_parent)) { ?>
+				<a href="<?php echo get_edit_post_link($post->post_parent); ?>">
 					<?php echo $title ?></a><?php
 			} else {
 				echo $title;
 			} ?></strong>,
-			<?php echo get_the_time( __( 'Y/m/d' ) ); ?><br />
+			<?php echo get_the_time(__('Y/m/d')); ?><br />
 			<?php
-			if ( $user_can_edit ):
-				$detach_url = add_query_arg( array(
+			if ($user_can_edit):
+				$detach_url = add_query_arg(array(
 					'parent_post_id' => $post->post_parent,
 					'media[]' => $post->ID,
-					'_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
-				), 'upload.php' ); ?>
-			<a class="hide-if-no-js detach-from-parent" href="<?php echo $detach_url ?>"><?php _e( 'Detach' ); ?></a>
+					'_wpnonce' => wp_create_nonce('bulk-'.$this->_args['plural'])
+				), 'upload.php'); ?>
+			<a class="hide-if-no-js detach-from-parent" href="<?php echo $detach_url ?>"><?php _e('Detach'); ?></a>
 			<?php endif;
 		} else {
-			_e( '(Unattached)' ); ?><br />
-			<?php if ( $user_can_edit ) { ?>
+			_e('(Unattached)'); ?><br />
+			<?php if ($user_can_edit) { ?>
 				<a class="hide-if-no-js"
 					onclick="findPosts.open( 'media[]','<?php echo $post->ID ?>' ); return false;"
 					href="#the-list">
-					<?php _e( 'Attach' ); ?></a>
+					<?php _e('Attach'); ?></a>
 			<?php }
 		}
 	}
@@ -478,11 +478,11 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		echo '<div class="post-com-count-wrapper">';
 
-		$pending_comments = get_pending_comments_num( $post->ID );
-		$this->comments_bubble( $post->ID, $pending_comments );
+		$pending_comments = get_pending_comments_num($post->ID);
+		$this->comments_bubble($post->ID, $pending_comments);
 
 		echo '</div>';
 	}
@@ -496,35 +496,35 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name Current column name.
 	 */
-	public function column_default( $post, $column_name ) {
-		if ( 'categories' == $column_name ) {
+	public function column_default($post, $column_name) {
+		if ('categories' == $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' == $column_name ) {
+		} elseif ('tags' == $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
 
-		if ( $taxonomy ) {
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($taxonomy) {
+			$terms = get_the_terms($post->ID, $taxonomy);
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv = array();
 					$posts_in_term_qv['taxonomy'] = $taxonomy;
 					$posts_in_term_qv['term'] = $t->slug;
 
-					$out[] = sprintf( '<a href="%s">%s</a>',
-						esc_url( add_query_arg( $posts_in_term_qv, 'upload.php' ) ),
-						esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) )
+					$out[] = sprintf('<a href="%s">%s</a>',
+						esc_url(add_query_arg($posts_in_term_qv, 'upload.php')),
+						esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'))
 					);
 				}
 				/* translators: used between list items, there is a space after the comma */
-				echo join( __( ', ' ), $out );
+				echo join(__(', '), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.get_taxonomy($taxonomy)->labels->no_terms.'</span>';
 			}
 
 			return;
@@ -540,7 +540,7 @@ 
 		 * @param string $column_name Name of the custom column.
 		 * @param int    $post_id     Attachment ID.
 		 */
-		do_action( 'manage_media_custom_column', $column_name, $post->ID );
+		do_action('manage_media_custom_column', $column_name, $post->ID);
 	}
 
 	/**
@@ -550,19 +550,19 @@ 
 	public function display_rows() {
 		global $post;
 
-		add_filter( 'the_title','esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		while ( have_posts() ) : the_post();
+		while (have_posts()) : the_post();
 			if (
-				( $this->is_trash && $post->post_status != 'trash' )
-				|| ( ! $this->is_trash && $post->post_status == 'trash' )
+				($this->is_trash && $post->post_status != 'trash')
+				|| ( ! $this->is_trash && $post->post_status == 'trash')
 			) {
 				continue;
 			}
-			$post_owner = ( get_current_user_id() == $post->post_author ) ? 'self' : 'other';
+			$post_owner = (get_current_user_id() == $post->post_author) ? 'self' : 'other';
 		?>
-			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim( ' author-' . $post_owner . ' status-' . $post->post_status ); ?>">
-				<?php $this->single_row_columns( $post ); ?>
+			<tr id="post-<?php echo $post->ID; ?>" class="<?php echo trim(' author-'.$post_owner.' status-'.$post->post_status); ?>">
+				<?php $this->single_row_columns($post); ?>
 			</tr>
 		<?php
 		endwhile;
@@ -586,39 +586,39 @@ 
 	 *
 	 * @return array
 	 */
-	private function _get_row_actions( $post, $att_title ) {
+	private function _get_row_actions($post, $att_title) {
 		$actions = array();
 
-		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) )
-				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID ) . '">' . __( 'Edit' ) . '</a>';
-			if ( current_user_can( 'delete_post', $post->ID ) )
-				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+		if ($this->detached) {
+			if (current_user_can('edit_post', $post->ID))
+				$actions['edit'] = '<a href="'.get_edit_post_link($post->ID).'">'.__('Edit').'</a>';
+			if (current_user_can('delete_post', $post->ID))
+				if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
+					$actions['trash'] = "<a class='submitdelete' href='".wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_'.$post->ID)."'>".__('Trash')."</a>";
 				} else {
-					$delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+					$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
+					$actions['delete'] = "<a class='submitdelete'$delete_ays href='".wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_'.$post->ID)."'>".__('Delete Permanently')."</a>";
 				}
-			$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
-			if ( current_user_can( 'edit_post', $post->ID ) )
-				$actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__( 'Attach' ).'</a>';
+			$actions['view'] = '<a href="'.get_permalink($post->ID).'" title="'.esc_attr(sprintf(__('View &#8220;%s&#8221;'), $att_title)).'" rel="permalink">'.__('View').'</a>';
+			if (current_user_can('edit_post', $post->ID))
+				$actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__('Attach').'</a>';
 		}
 		else {
-			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash )
-				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID ) . '">' . __( 'Edit' ) . '</a>';
-			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash )
-					$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
-				elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
-					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
-				if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
-					$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
-					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			if (current_user_can('edit_post', $post->ID) && ! $this->is_trash)
+				$actions['edit'] = '<a href="'.get_edit_post_link($post->ID).'">'.__('Edit').'</a>';
+			if (current_user_can('delete_post', $post->ID)) {
+				if ($this->is_trash)
+					$actions['untrash'] = "<a class='submitdelete' href='".wp_nonce_url("post.php?action=untrash&amp;post=$post->ID", 'untrash-post_'.$post->ID)."'>".__('Restore')."</a>";
+				elseif (EMPTY_TRASH_DAYS && MEDIA_TRASH)
+					$actions['trash'] = "<a class='submitdelete' href='".wp_nonce_url("post.php?action=trash&amp;post=$post->ID", 'trash-post_'.$post->ID)."'>".__('Trash')."</a>";
+				if ($this->is_trash || ! EMPTY_TRASH_DAYS || ! MEDIA_TRASH) {
+					$delete_ays = ( ! $this->is_trash && ! MEDIA_TRASH) ? " onclick='return showNotice.warn();'" : '';
+					$actions['delete'] = "<a class='submitdelete'$delete_ays href='".wp_nonce_url("post.php?action=delete&amp;post=$post->ID", 'delete-post_'.$post->ID)."'>".__('Delete Permanently')."</a>";
 				}
 			}
-			if ( !$this->is_trash ) {
-				$title =_draft_or_post_title( $post->post_parent );
-				$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
+			if ( ! $this->is_trash) {
+				$title = _draft_or_post_title($post->post_parent);
+				$actions['view'] = '<a href="'.get_permalink($post->ID).'" title="'.esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)).'" rel="permalink">'.__('View').'</a>';
 			}
 		}
 
@@ -633,7 +633,7 @@ 
 		 * @param bool    $detached Whether the list table contains media not attached
 		 *                          to any posts. Default true.
 		 */
-		return apply_filters( 'media_row_actions', $actions, $post, $this->detached );
+		return apply_filters('media_row_actions', $actions, $post, $this->detached);
 	}
 
 	/**
@@ -647,12 +647,12 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for media attachments.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($post, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		$att_title = _draft_or_post_title();
-		return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
+		return $this->row_actions($this->_get_row_actions($post, $att_title));
 	}
 }

Braces +52 added lines, -38 removed lines

@@ -92,19 +92,23 @@ 
 		$selected = empty( $_GET['attachment-filter'] ) ? ' selected="selected"' : '';
 		$type_links['all'] = "<option value=''$selected>" . sprintf( _nx( 'All (%s)', 'All (%s)', $_total_posts, 'uploaded files' ), number_format_i18n( $_total_posts ) ) . '</option>';
 		foreach ( $post_mime_types as $mime_type => $label ) {
-			if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) )
-				continue;
+			if ( !wp_match_mime_types($mime_type, $avail_post_mime_types) ) {
+							continue;
+			}
 
 			$selected = '';
-			if ( !empty( $_GET['attachment-filter'] ) && strpos( $_GET['attachment-filter'], 'post_mime_type:' ) === 0 && wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $_GET['attachment-filter'] ) ) )
-				$selected = ' selected="selected"';
-			if ( !empty( $num_posts[$mime_type] ) )
-				$type_links[$mime_type] = '<option value="post_mime_type:' . esc_attr( $mime_type ) . '"' . $selected . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</option>';
+			if ( !empty( $_GET['attachment-filter'] ) && strpos( $_GET['attachment-filter'], 'post_mime_type:' ) === 0 && wp_match_mime_types( $mime_type, str_replace( 'post_mime_type:', '', $_GET['attachment-filter'] ) ) ) {
+							$selected = ' selected="selected"';
+			}
+			if ( !empty( $num_posts[$mime_type] ) ) {
+							$type_links[$mime_type] = '<option value="post_mime_type:' . esc_attr( $mime_type ) . '"' . $selected . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), number_format_i18n( $num_posts[$mime_type] )) . '</option>';
+			}
 		}
 		$type_links['detached'] = '<option value="detached"' . ( $this->detached ? ' selected="selected"' : '' ) . '>' . sprintf( _nx( 'Unattached (%s)', 'Unattached (%s)', $total_orphans, 'detached files' ), number_format_i18n( $total_orphans ) ) . '</option>';
 
-		if ( !empty($_num_posts['trash']) )
-			$type_links['trash'] = '<option value="trash"' . ( (isset($_GET['attachment-filter']) && $_GET['attachment-filter'] == 'trash' ) ? ' selected="selected"' : '') . '>' . sprintf( _nx( 'Trash (%s)', 'Trash (%s)', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</option>';
+		if ( !empty($_num_posts['trash']) ) {
+					$type_links['trash'] = '<option value="trash"' . ( (isset($_GET['attachment-filter']) && $_GET['attachment-filter'] == 'trash' ) ? ' selected="selected"' : '') . '>' . sprintf( _nx( 'Trash (%s)', 'Trash (%s)', $_num_posts['trash'], 'uploaded files' ), number_format_i18n( $_num_posts['trash'] ) ) . '</option>';
+		}
 
 		return $type_links;
 	}
@@ -126,8 +130,9 @@ 
 			$actions['delete'] = __( 'Delete Permanently' );
 		}
 
-		if ( $this->detached )
-			$actions['attach'] = __( 'Attach to a post' );
+		if ( $this->detached ) {
+					$actions['attach'] = __( 'Attach to a post' );
+		}
 
 		return $actions;
 	}
@@ -165,14 +170,17 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
-			return 'attach';
+		if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+					return 'attach';
+		}
 
-		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
-			return 'detach';
+		if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) ) {
+					return 'detach';
+		}
 
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -267,12 +275,13 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' == $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' == $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' == $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' == $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
@@ -280,8 +289,9 @@ 
 		/* translators: column name */
 		if ( !$this->detached ) {
 			$posts_columns['parent'] = _x( 'Uploaded to', 'column name' );
-			if ( post_type_supports( 'attachment', 'comments' ) )
-				$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+			if ( post_type_supports( 'attachment', 'comments' ) ) {
+							$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+			}
 		}
 		/* translators: column name */
 		$posts_columns['date'] = _x( 'Date', 'column name' );
@@ -590,27 +600,31 @@ 
 		$actions = array();
 
 		if ( $this->detached ) {
-			if ( current_user_can( 'edit_post', $post->ID ) )
-				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID ) . '">' . __( 'Edit' ) . '</a>';
-			if ( current_user_can( 'delete_post', $post->ID ) )
-				if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+			if ( current_user_can( 'edit_post', $post->ID ) ) {
+							$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID ) . '">' . __( 'Edit' ) . '</a>';
+			}
+			if ( current_user_can( 'delete_post', $post->ID ) ) {
+							if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
 					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+			}
 				} else {
 					$delete_ays = !MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";
 				}
 			$actions['view'] = '<a href="' . get_permalink( $post->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ) . '" rel="permalink">' . __( 'View' ) . '</a>';
-			if ( current_user_can( 'edit_post', $post->ID ) )
-				$actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__( 'Attach' ).'</a>';
-		}
-		else {
-			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash )
-				$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID ) . '">' . __( 'Edit' ) . '</a>';
+			if ( current_user_can( 'edit_post', $post->ID ) ) {
+							$actions['attach'] = '<a href="#the-list" onclick="findPosts.open( \'media[]\',\''.$post->ID.'\' );return false;" class="hide-if-no-js">'.__( 'Attach' ).'</a>';
+			}
+		} else {
+			if ( current_user_can( 'edit_post', $post->ID ) && !$this->is_trash ) {
+							$actions['edit'] = '<a href="' . get_edit_post_link( $post->ID ) . '">' . __( 'Edit' ) . '</a>';
+			}
 			if ( current_user_can( 'delete_post', $post->ID ) ) {
-				if ( $this->is_trash )
-					$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
-				elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH )
-					$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+				if ( $this->is_trash ) {
+									$actions['untrash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$post->ID", 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore' ) . "</a>";
+				} elseif ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+									$actions['trash'] = "<a class='submitdelete' href='" . wp_nonce_url( "post.php?action=trash&amp;post=$post->ID", 'trash-post_' . $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+				}
 				if ( $this->is_trash || !EMPTY_TRASH_DAYS || !MEDIA_TRASH ) {
 					$delete_ays = ( !$this->is_trash && !MEDIA_TRASH ) ? " onclick='return showNotice.warn();'" : '';
 					$actions['delete'] = "<a class='submitdelete'$delete_ays href='" . wp_nonce_url( "post.php?action=delete&amp;post=$post->ID", 'delete-post_' . $post->ID ) . "'>" . __( 'Delete Permanently' ) . "</a>";

src/wp-admin/edit.php

Indentation +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Edit Posts Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Edit Posts Administration Screen.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -252,7 +252,7 @@ 
 $bulk_messages['post'] = array(
 	'updated'   => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
 	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
-	                   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
+					   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
 	'deleted'   => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
 	'trashed'   => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
 	'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
@@ -260,7 +260,7 @@ 
 $bulk_messages['page'] = array(
 	'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
 	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
-	                   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
+					   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
 	'deleted'   => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
 	'trashed'   => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
 	'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),

Spacing +140 added lines, -142 removed lines

@@ -7,13 +7,13 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! $typenow )
-	wp_die( __( 'Invalid post type' ) );
+if ( ! $typenow)
+	wp_die(__('Invalid post type'));
 
-if ( 'attachment' === $typenow ) {
-	if ( wp_redirect( admin_url( 'upload.php' ) ) ) {
+if ('attachment' === $typenow) {
+	if (wp_redirect(admin_url('upload.php'))) {
 		exit;
 	}
 }
@@ -25,27 +25,27 @@ 
 global $post_type, $post_type_object;
 
 $post_type = $typenow;
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( ! $post_type_object )
-	wp_die( __( 'Invalid post type' ) );
+if ( ! $post_type_object)
+	wp_die(__('Invalid post type'));
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can($post_type_object->cap->edit_posts))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 $wp_list_table = _get_list_table('WP_Posts_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 
 // Back-compat for viewing comments of an entry
-foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
-	if ( ! empty( $_REQUEST[ $_redirect ] ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
+foreach (array('p', 'attachment_id', 'page_id') as $_redirect) {
+	if ( ! empty($_REQUEST[$_redirect])) {
+		wp_redirect(admin_url('edit-comments.php?p='.absint($_REQUEST[$_redirect])));
 		exit;
 	}
 }
-unset( $_redirect );
+unset($_redirect);
 
-if ( 'post' != $post_type ) {
+if ('post' != $post_type) {
 	$parent_file = "edit.php?post_type=$post_type";
 	$submenu_file = "edit.php?post_type=$post_type";
 	$post_new_file = "post-new.php?post_type=$post_type";
@@ -57,66 +57,66 @@ 
 
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-posts');
 
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
-	if ( ! $sendback )
-		$sendback = admin_url( $parent_file );
-	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos($sendback, 'post.php') !== false )
+	$sendback = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer());
+	if ( ! $sendback)
+		$sendback = admin_url($parent_file);
+	$sendback = add_query_arg('paged', $pagenum, $sendback);
+	if (strpos($sendback, 'post.php') !== false)
 		$sendback = admin_url($post_new_file);
 
-	if ( 'delete_all' == $doaction ) {
+	if ('delete_all' == $doaction) {
 		// Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
 		$post_status = preg_replace('/[^a-z0-9_-]+/i', '', $_REQUEST['post_status']);
 		// Validate the post status exists.
-		if ( get_post_status_object( $post_status ) ) {
-			$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
+		if (get_post_status_object($post_status)) {
+			$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status));
 		}
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
-	} elseif ( !empty( $_REQUEST['post'] ) ) {
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
+	} elseif ( ! empty($_REQUEST['post'])) {
 		$post_ids = array_map('intval', $_REQUEST['post']);
 	}
 
-	if ( !isset( $post_ids ) ) {
-		wp_redirect( $sendback );
+	if ( ! isset($post_ids)) {
+		wp_redirect($sendback);
 		exit;
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'trash':
 			$trashed = $locked = 0;
 
-			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this item to the Trash.') );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this item to the Trash.'));
 
-				if ( wp_check_post_lock( $post_id ) ) {
+				if (wp_check_post_lock($post_id)) {
 					$locked++;
 					continue;
 				}
 
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to Trash.') );
+				if ( ! wp_trash_post($post_id))
+					wp_die(__('Error in moving to Trash.'));
 
 				$trashed++;
 			}
 
-			$sendback = add_query_arg( array('trashed' => $trashed, 'ids' => join(',', $post_ids), 'locked' => $locked ), $sendback );
+			$sendback = add_query_arg(array('trashed' => $trashed, 'ids' => join(',', $post_ids), 'locked' => $locked), $sendback);
 			break;
 		case 'untrash':
 			$untrashed = 0;
-			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to restore this item from the Trash.') );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to restore this item from the Trash.'));
 
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from Trash.') );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 
 				$untrashed++;
 			}
@@ -124,43 +124,43 @@ 
 			break;
 		case 'delete':
 			$deleted = 0;
-			foreach( (array) $post_ids as $post_id ) {
+			foreach ((array) $post_ids as $post_id) {
 				$post_del = get_post($post_id);
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('You are not allowed to delete this item.') );
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to delete this item.'));
 
-				if ( $post_del->post_type == 'attachment' ) {
-					if ( ! wp_delete_attachment($post_id) )
-						wp_die( __('Error in deleting.') );
+				if ($post_del->post_type == 'attachment') {
+					if ( ! wp_delete_attachment($post_id))
+						wp_die(__('Error in deleting.'));
 				} else {
-					if ( !wp_delete_post($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( ! wp_delete_post($post_id))
+						wp_die(__('Error in deleting.'));
 				}
 				$deleted++;
 			}
 			$sendback = add_query_arg('deleted', $deleted, $sendback);
 			break;
 		case 'edit':
-			if ( isset($_REQUEST['bulk_edit']) ) {
+			if (isset($_REQUEST['bulk_edit'])) {
 				$done = bulk_edit_posts($_REQUEST);
 
-				if ( is_array($done) ) {
-					$done['updated'] = count( $done['updated'] );
-					$done['skipped'] = count( $done['skipped'] );
-					$done['locked'] = count( $done['locked'] );
-					$sendback = add_query_arg( $done, $sendback );
+				if (is_array($done)) {
+					$done['updated'] = count($done['updated']);
+					$done['skipped'] = count($done['skipped']);
+					$done['locked'] = count($done['locked']);
+					$sendback = add_query_arg($done, $sendback);
 				}
 			}
 			break;
 	}
 
-	$sendback = remove_query_arg( array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback );
+	$sendback = remove_query_arg(array('action', 'action2', 'tags_input', 'post_author', 'comment_status', 'ping_status', '_status', 'post', 'bulk_edit', 'post_view'), $sendback);
 
 	wp_redirect($sendback);
 	exit();
-} elseif ( ! empty($_REQUEST['_wp_http_referer']) ) {
-	 wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ) );
+} elseif ( ! empty($_REQUEST['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -171,99 +171,97 @@ 
 
 $title = $post_type_object->labels->name;
 
-if ( 'post' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+if ('post' == $post_type) {
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'overview',
 	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
+		'<p>'.__('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.').'</p>'
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'screen-content',
 	'title'		=> __('Screen Content'),
 	'content'	=>
-		'<p>' . __('You can customize the display of this screen&#8217;s contents in a number of ways:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
-			'<li>' . __('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.') . '</li>' .
-			'<li>' . __('You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right.') . '</li>' .
-			'<li>' . __('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.') . '</li>' .
+		'<p>'.__('You can customize the display of this screen&#8217;s contents in a number of ways:').'</p>'.
+		'<ul>'.
+			'<li>'.__('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.').'</li>'.
+			'<li>'.__('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.').'</li>'.
+			'<li>'.__('You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right.').'</li>'.
+			'<li>'.__('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.').'</li>'.
 		'</ul>'
-	) );
-	get_current_screen()->add_help_tab( array(
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'action-links',
 	'title'		=> __('Available Actions'),
 	'content'	=>
-		'<p>' . __('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:') . '</p>' .
-		'<ul>' .
-			'<li>' . __('<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.') . '</li>' .
-			'<li>' . __('<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.') . '</li>' .
-			'<li>' . __('<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.') . '</li>' .
-			'<li>' . __('<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.') . '</li>' .
+		'<p>'.__('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:').'</p>'.
+		'<ul>'.
+			'<li>'.__('<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.').'</li>'.
+			'<li>'.__('<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.').'</li>'.
+			'<li>'.__('<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.').'</li>'.
+			'<li>'.__('<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.').'</li>'.
 		'</ul>'
-	) );
-	get_current_screen()->add_help_tab( array(
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'bulk-actions',
 	'title'		=> __('Bulk Actions'),
 	'content'	=>
-		'<p>' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '</p>' .
-				'<p>' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
-	) );
+		'<p>'.__('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.').'</p>'.
+				'<p>'.__('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Posts_Screen" target="_blank">Documentation on Managing Posts</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Posts_Screen" target="_blank">Documentation on Managing Posts</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
-} elseif ( 'page' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+} elseif ('page' == $post_type) {
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'overview',
 	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>'
-	) );
-	get_current_screen()->add_help_tab( array(
+		'<p>'.__('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.').'</p>'
+	));
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'managing-pages',
 	'title'		=> __('Managing Pages'),
 	'content'	=>
-		'<p>' . __('Managing pages is very similar to managing posts, and the screens can be customized in the same way.') . '</p>' .
-		'<p>' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.') . '</p>'
-	) );
+		'<p>'.__('Managing pages is very similar to managing posts, and the screens can be customized in the same way.').'</p>'.
+		'<p>'.__('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen" target="_blank">Documentation on Managing Pages</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Pages_Screen" target="_blank">Documentation on Managing Pages</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 }
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $post_type . '_per_page' ) );
+add_screen_option('per_page', array('default' => 20, 'option' => 'edit_'.$post_type.'_per_page'));
 
 $bulk_counts = array(
-	'updated'   => isset( $_REQUEST['updated'] )   ? absint( $_REQUEST['updated'] )   : 0,
-	'locked'    => isset( $_REQUEST['locked'] )    ? absint( $_REQUEST['locked'] )    : 0,
-	'deleted'   => isset( $_REQUEST['deleted'] )   ? absint( $_REQUEST['deleted'] )   : 0,
-	'trashed'   => isset( $_REQUEST['trashed'] )   ? absint( $_REQUEST['trashed'] )   : 0,
-	'untrashed' => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 0,
+	'updated'   => isset($_REQUEST['updated']) ? absint($_REQUEST['updated']) : 0,
+	'locked'    => isset($_REQUEST['locked']) ? absint($_REQUEST['locked']) : 0,
+	'deleted'   => isset($_REQUEST['deleted']) ? absint($_REQUEST['deleted']) : 0,
+	'trashed'   => isset($_REQUEST['trashed']) ? absint($_REQUEST['trashed']) : 0,
+	'untrashed' => isset($_REQUEST['untrashed']) ? absint($_REQUEST['untrashed']) : 0,
 );
 
 $bulk_messages = array();
 $bulk_messages['post'] = array(
-	'updated'   => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
-	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
-	                   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
-	'deleted'   => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
-	'trashed'   => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
-	'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
+	'updated'   => _n('%s post updated.', '%s posts updated.', $bulk_counts['updated']),
+	'locked'    => (1 == $bulk_counts['locked']) ? __('1 post not updated, somebody is editing it.') : _n('%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked']),
+	'deleted'   => _n('%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted']),
+	'trashed'   => _n('%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed']),
+	'untrashed' => _n('%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed']),
 );
 $bulk_messages['page'] = array(
-	'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
-	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
-	                   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
-	'deleted'   => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
-	'trashed'   => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
-	'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),
+	'updated'   => _n('%s page updated.', '%s pages updated.', $bulk_counts['updated']),
+	'locked'    => (1 == $bulk_counts['locked']) ? __('1 page not updated, somebody is editing it.') : _n('%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked']),
+	'deleted'   => _n('%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted']),
+	'trashed'   => _n('%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed']),
+	'untrashed' => _n('%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed']),
 );
 
 /**
@@ -277,51 +275,51 @@ 
  *                             keyed with 'updated', 'locked', 'deleted', 'trashed', and 'untrashed'.
  * @param array $bulk_counts   Array of item counts for each message, used to build internationalized strings.
  */
-$bulk_messages = apply_filters( 'bulk_post_updated_messages', $bulk_messages, $bulk_counts );
-$bulk_counts = array_filter( $bulk_counts );
+$bulk_messages = apply_filters('bulk_post_updated_messages', $bulk_messages, $bulk_counts);
+$bulk_counts = array_filter($bulk_counts);
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
 <h1><?php
-echo esc_html( $post_type_object->labels->name );
-if ( current_user_can( $post_type_object->cap->create_posts ) )
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
-if ( ! empty( $_REQUEST['s'] ) )
-	printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+echo esc_html($post_type_object->labels->name);
+if (current_user_can($post_type_object->cap->create_posts))
+	echo ' <a href="'.esc_url(admin_url($post_new_file)).'" class="page-title-action">'.esc_html($post_type_object->labels->add_new).'</a>';
+if ( ! empty($_REQUEST['s']))
+	printf(' <span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query());
 ?></h1>
 
 <?php
 // If we have a bulk message to issue:
 $messages = array();
-foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	elseif ( isset( $bulk_messages['post'][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
-
-	if ( $message == 'trashed' && isset( $_REQUEST['ids'] ) ) {
-		$ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
-		$messages[] = '<a href="' . esc_url( wp_nonce_url( "edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts" ) ) . '">' . __('Undo') . '</a>';
+foreach ($bulk_counts as $message => $count) {
+	if (isset($bulk_messages[$post_type][$message]))
+		$messages[] = sprintf($bulk_messages[$post_type][$message], number_format_i18n($count));
+	elseif (isset($bulk_messages['post'][$message]))
+		$messages[] = sprintf($bulk_messages['post'][$message], number_format_i18n($count));
+
+	if ($message == 'trashed' && isset($_REQUEST['ids'])) {
+		$ids = preg_replace('/[^0-9,]/', '', $_REQUEST['ids']);
+		$messages[] = '<a href="'.esc_url(wp_nonce_url("edit.php?post_type=$post_type&doaction=undo&action=untrash&ids=$ids", "bulk-posts")).'">'.__('Undo').'</a>';
 	}
 }
 
-if ( $messages )
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
-unset( $messages );
+if ($messages)
+	echo '<div id="message" class="updated notice is-dismissible"><p>'.join(' ', $messages).'</p></div>';
+unset($messages);
 
-$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] );
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI']);
 ?>
 
 <?php $wp_list_table->views(); ?>
 
 <form id="posts-filter" method="get">
 
-<?php $wp_list_table->search_box( $post_type_object->labels->search_items, 'post' ); ?>
+<?php $wp_list_table->search_box($post_type_object->labels->search_items, 'post'); ?>
 
-<input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
+<input type="hidden" name="post_status" class="post_status_page" value="<?php echo ! empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
 <input type="hidden" name="post_type" class="post_type_page" value="<?php echo $post_type; ?>" />
-<?php if ( ! empty( $_REQUEST['show_sticky'] ) ) { ?>
+<?php if ( ! empty($_REQUEST['show_sticky'])) { ?>
 <input type="hidden" name="show_sticky" value="1" />
 <?php } ?>
 
@@ -330,7 +328,7 @@ 
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ($wp_list_table->has_items())
 	$wp_list_table->inline_edit();
 ?>
 
@@ -339,4 +337,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +46 added lines, -29 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $typenow )
+if ( ! $typenow ) {
 	wp_die( __( 'Invalid post type' ) );
+}
 
 if ( 'attachment' === $typenow ) {
 	if ( wp_redirect( admin_url( 'upload.php' ) ) ) {
@@ -27,11 +28,13 @@ 
 $post_type = $typenow;
 $post_type_object = get_post_type_object( $post_type );
 
-if ( ! $post_type_object )
+if ( ! $post_type_object ) {
 	wp_die( __( 'Invalid post type' ) );
+}
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 $wp_list_table = _get_list_table('WP_Posts_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
@@ -61,11 +64,13 @@ 
 	check_admin_referer('bulk-posts');
 
 	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
-	if ( ! $sendback )
-		$sendback = admin_url( $parent_file );
+	if ( ! $sendback ) {
+			$sendback = admin_url( $parent_file );
+	}
 	$sendback = add_query_arg( 'paged', $pagenum, $sendback );
-	if ( strpos($sendback, 'post.php') !== false )
-		$sendback = admin_url($post_new_file);
+	if ( strpos($sendback, 'post.php') !== false ) {
+			$sendback = admin_url($post_new_file);
+	}
 
 	if ( 'delete_all' == $doaction ) {
 		// Prepare for deletion of all posts with a specified post status (i.e. Empty trash).
@@ -93,16 +98,18 @@ 
 			$trashed = $locked = 0;
 
 			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this item to the Trash.') );
+				if ( !current_user_can( 'delete_post', $post_id) ) {
+									wp_die( __('You are not allowed to move this item to the Trash.') );
+				}
 
 				if ( wp_check_post_lock( $post_id ) ) {
 					$locked++;
 					continue;
 				}
 
-				if ( !wp_trash_post($post_id) )
-					wp_die( __('Error in moving to Trash.') );
+				if ( !wp_trash_post($post_id) ) {
+									wp_die( __('Error in moving to Trash.') );
+				}
 
 				$trashed++;
 			}
@@ -112,11 +119,13 @@ 
 		case 'untrash':
 			$untrashed = 0;
 			foreach( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to restore this item from the Trash.') );
+				if ( !current_user_can( 'delete_post', $post_id) ) {
+									wp_die( __('You are not allowed to restore this item from the Trash.') );
+				}
 
-				if ( !wp_untrash_post($post_id) )
-					wp_die( __('Error in restoring from Trash.') );
+				if ( !wp_untrash_post($post_id) ) {
+									wp_die( __('Error in restoring from Trash.') );
+				}
 
 				$untrashed++;
 			}
@@ -127,15 +136,18 @@ 
 			foreach( (array) $post_ids as $post_id ) {
 				$post_del = get_post($post_id);
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('You are not allowed to delete this item.') );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __('You are not allowed to delete this item.') );
+				}
 
 				if ( $post_del->post_type == 'attachment' ) {
-					if ( ! wp_delete_attachment($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( ! wp_delete_attachment($post_id) ) {
+											wp_die( __('Error in deleting.') );
+					}
 				} else {
-					if ( !wp_delete_post($post_id) )
-						wp_die( __('Error in deleting.') );
+					if ( !wp_delete_post($post_id) ) {
+											wp_die( __('Error in deleting.') );
+					}
 				}
 				$deleted++;
 			}
@@ -285,20 +297,23 @@ 
 <div class="wrap">
 <h1><?php
 echo esc_html( $post_type_object->labels->name );
-if ( current_user_can( $post_type_object->cap->create_posts ) )
+if ( current_user_can( $post_type_object->cap->create_posts ) ) {
 	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
-if ( ! empty( $_REQUEST['s'] ) )
+}
+if ( ! empty( $_REQUEST['s'] ) ) {
 	printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+}
 ?></h1>
 
 <?php
 // If we have a bulk message to issue:
 $messages = array();
 foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	elseif ( isset( $bulk_messages['post'][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
+	if ( isset( $bulk_messages[ $post_type ][ $message ] ) ) {
+			$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
+	} elseif ( isset( $bulk_messages['post'][ $message ] ) ) {
+			$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
+	}
 
 	if ( $message == 'trashed' && isset( $_REQUEST['ids'] ) ) {
 		$ids = preg_replace( '/[^0-9,]/', '', $_REQUEST['ids'] );
@@ -306,8 +321,9 @@ 
 	}
 }
 
-if ( $messages )
+if ( $messages ) {
 	echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
+}
 unset( $messages );
 
 $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed' ), $_SERVER['REQUEST_URI'] );
@@ -330,8 +346,9 @@ 
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ( $wp_list_table->has_items() ) {
 	$wp_list_table->inline_edit();
+}
 ?>
 
 <div id="ajax-response"></div>

src/wp-admin/nav-menus.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * WordPress Administration for Navigation Menus
- * Interface functions
- *
- * @version 2.0.0
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration for Navigation Menus
+	 * Interface functions
+	 *
+	 * @version 2.0.0
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +309 added lines, -309 removed lines

@@ -10,22 +10,22 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 // Load all the nav menu interface functions
-require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
+require_once(ABSPATH.'wp-admin/includes/nav-menu.php');
 
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
-	wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+if ( ! current_theme_supports('menus') && ! current_theme_supports('widgets'))
+	wp_die(__('Your theme does not support navigation menus or widgets.'));
 
 // Permissions Check
-if ( ! current_user_can('edit_theme_options') )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can('edit_theme_options'))
+	wp_die(__('Cheatin’ uh?'), 403);
 
-wp_enqueue_script( 'nav-menu' );
+wp_enqueue_script('nav-menu');
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 // Container for any messages displayed to the user
 $messages = array();
@@ -34,42 +34,42 @@ 
 $nav_menu_selected_title = '';
 
 // The menu id of the current menu being edited
-$nav_menu_selected_id = isset( $_REQUEST['menu'] ) ? (int) $_REQUEST['menu'] : 0;
+$nav_menu_selected_id = isset($_REQUEST['menu']) ? (int) $_REQUEST['menu'] : 0;
 
 // Get existing menu locations assignments
 $locations = get_registered_nav_menus();
 $menu_locations = get_nav_menu_locations();
-$num_locations = count( array_keys( $locations ) );
+$num_locations = count(array_keys($locations));
 
 // Allowed actions: add, update, delete
-$action = isset( $_REQUEST['action'] ) ? $_REQUEST['action'] : 'edit';
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'edit';
 
-switch ( $action ) {
+switch ($action) {
 	case 'add-menu-item':
-		check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-		if ( isset( $_REQUEST['nav-menu-locations'] ) )
-			set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
-		elseif ( isset( $_REQUEST['menu-item'] ) )
-			wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		check_admin_referer('add-menu_item', 'menu-settings-column-nonce');
+		if (isset($_REQUEST['nav-menu-locations']))
+			set_theme_mod('nav_menu_locations', array_map('absint', $_REQUEST['menu-locations']));
+		elseif (isset($_REQUEST['menu-item']))
+			wp_save_nav_menu_items($nav_menu_selected_id, $_REQUEST['menu-item']);
 		break;
 	case 'move-down-menu-item' :
 
 		// Moving down a menu item is the same as moving up the next in order.
-		check_admin_referer( 'move-menu_item' );
-		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
-		if ( is_nav_menu_item( $menu_item_id ) ) {
-			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
-			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
+		check_admin_referer('move-menu_item');
+		$menu_item_id = isset($_REQUEST['menu-item']) ? (int) $_REQUEST['menu-item'] : 0;
+		if (is_nav_menu_item($menu_item_id)) {
+			$menus = isset($_REQUEST['menu']) ? array((int) $_REQUEST['menu']) : wp_get_object_terms($menu_item_id, 'nav_menu', array('fields' => 'ids'));
+			if ( ! is_wp_error($menus) && ! empty($menus[0])) {
 				$menu_id = (int) $menus[0];
-				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$ordered_menu_items = wp_get_nav_menu_items($menu_id);
+				$menu_item_data = (array) wp_setup_nav_menu_item(get_post($menu_item_id));
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
 				$orders_to_dbids = array();
-				foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
-					if ( isset( $ordered_menu_item_object->ID ) ) {
-						if ( isset( $ordered_menu_item_object->menu_order ) ) {
+				foreach ((array) $ordered_menu_items as $ordered_menu_item_object) {
+					if (isset($ordered_menu_item_object->ID)) {
+						if (isset($ordered_menu_item_object->menu_order)) {
 							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
 							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
 						}
@@ -78,28 +78,28 @@ 
 
 				// Get next in order.
 				if (
-					isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
+					isset($orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1])
 				) {
 					$next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
-					$next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
+					$next_item_data = (array) wp_setup_nav_menu_item(get_post($next_item_id));
 
 					// If not siblings of same parent, bubble menu item up but keep order.
 					if (
-						! empty( $menu_item_data['menu_item_parent'] ) &&
+						! empty($menu_item_data['menu_item_parent']) &&
 						(
-							empty( $next_item_data['menu_item_parent'] ) ||
+							empty($next_item_data['menu_item_parent']) ||
 							$next_item_data['menu_item_parent'] != $menu_item_data['menu_item_parent']
 						)
 					) {
 
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_db_id = in_array($menu_item_data['menu_item_parent'], $orders_to_dbids) ? (int) $menu_item_data['menu_item_parent'] : 0;
 
-						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
+						$parent_object = wp_setup_nav_menu_item(get_post($parent_db_id));
 
-						if ( ! is_wp_error( $parent_object ) ) {
+						if ( ! is_wp_error($parent_object)) {
 							$parent_data = (array) $parent_object;
 							$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
-							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+							update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 
 						}
 
@@ -109,7 +109,7 @@ 
 						$menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
 
 						$menu_item_data['menu_item_parent'] = $next_item_data['ID'];
-						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+						update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 
 						wp_update_post($menu_item_data);
 						wp_update_post($next_item_data);
@@ -117,32 +117,32 @@ 
 
 				// The item is last but still has a parent, so bubble up.
 				} elseif (
-					! empty( $menu_item_data['menu_item_parent'] ) &&
-					in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
+					! empty($menu_item_data['menu_item_parent']) &&
+					in_array($menu_item_data['menu_item_parent'], $orders_to_dbids)
 				) {
-					$menu_item_data['menu_item_parent'] = (int) get_post_meta( $menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
-					update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+					$menu_item_data['menu_item_parent'] = (int) get_post_meta($menu_item_data['menu_item_parent'], '_menu_item_menu_item_parent', true);
+					update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 				}
 			}
 		}
 
 		break;
 	case 'move-up-menu-item' :
-		check_admin_referer( 'move-menu_item' );
-		$menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
-		if ( is_nav_menu_item( $menu_item_id ) ) {
-			$menus = isset( $_REQUEST['menu'] ) ? array( (int) $_REQUEST['menu'] ) : wp_get_object_terms( $menu_item_id, 'nav_menu', array( 'fields' => 'ids' ) );
-			if ( ! is_wp_error( $menus ) && ! empty( $menus[0] ) ) {
+		check_admin_referer('move-menu_item');
+		$menu_item_id = isset($_REQUEST['menu-item']) ? (int) $_REQUEST['menu-item'] : 0;
+		if (is_nav_menu_item($menu_item_id)) {
+			$menus = isset($_REQUEST['menu']) ? array((int) $_REQUEST['menu']) : wp_get_object_terms($menu_item_id, 'nav_menu', array('fields' => 'ids'));
+			if ( ! is_wp_error($menus) && ! empty($menus[0])) {
 				$menu_id = (int) $menus[0];
-				$ordered_menu_items = wp_get_nav_menu_items( $menu_id );
-				$menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
+				$ordered_menu_items = wp_get_nav_menu_items($menu_id);
+				$menu_item_data = (array) wp_setup_nav_menu_item(get_post($menu_item_id));
 
 				// Set up the data we need in one pass through the array of menu items.
 				$dbids_to_orders = array();
 				$orders_to_dbids = array();
-				foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
-					if ( isset( $ordered_menu_item_object->ID ) ) {
-						if ( isset( $ordered_menu_item_object->menu_order ) ) {
+				foreach ((array) $ordered_menu_items as $ordered_menu_item_object) {
+					if (isset($ordered_menu_item_object->ID)) {
+						if (isset($ordered_menu_item_object->menu_order)) {
 							$dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
 							$orders_to_dbids[$ordered_menu_item_object->menu_order] = $ordered_menu_item_object->ID;
 						}
@@ -150,19 +150,19 @@ 
 				}
 
 				// If this menu item is not first.
-				if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
+				if ( ! empty($dbids_to_orders[$menu_item_id]) && ! empty($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1])) {
 
 					// If this menu item is a child of the previous.
 					if (
-						! empty( $menu_item_data['menu_item_parent'] ) &&
-						in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
-						isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &&
-						( $menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] )
+						! empty($menu_item_data['menu_item_parent']) &&
+						in_array($menu_item_data['menu_item_parent'], array_keys($dbids_to_orders)) &&
+						isset($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1]) &&
+						($menu_item_data['menu_item_parent'] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1])
 					) {
-						$parent_db_id = in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids ) ? (int) $menu_item_data['menu_item_parent'] : 0;
-						$parent_object = wp_setup_nav_menu_item( get_post( $parent_db_id ) );
+						$parent_db_id = in_array($menu_item_data['menu_item_parent'], $orders_to_dbids) ? (int) $menu_item_data['menu_item_parent'] : 0;
+						$parent_object = wp_setup_nav_menu_item(get_post($parent_db_id));
 
-						if ( ! is_wp_error( $parent_object ) ) {
+						if ( ! is_wp_error($parent_object)) {
 							$parent_data = (array) $parent_object;
 
 							/*
@@ -170,9 +170,9 @@ 
 							 * make menu item a child also of it.
 							 */
 							if (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
-								! empty( $parent_data['menu_item_parent'] )
+								! empty($dbids_to_orders[$parent_db_id]) &&
+								! empty($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1]) &&
+								! empty($parent_data['menu_item_parent'])
 							) {
 								$menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
 
@@ -181,11 +181,11 @@ 
 							 * make menu item a child of that something's parent
 							 */
 							} elseif (
-								! empty( $dbids_to_orders[$parent_db_id] ) &&
-								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
+								! empty($dbids_to_orders[$parent_db_id]) &&
+								! empty($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1])
 							) {
-								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
-								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
+								$_possible_parent_id = (int) get_post_meta($orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
+								if (in_array($_possible_parent_id, array_keys($dbids_to_orders)))
 									$menu_item_data['menu_item_parent'] = $_possible_parent_id;
 								else
 									$menu_item_data['menu_item_parent'] = 0;
@@ -202,22 +202,22 @@ 
 							$menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
 
 							// Save changes.
-							update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+							update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 							wp_update_post($menu_item_data);
 							wp_update_post($parent_data);
 						}
 
 					// Else this menu item is not a child of the previous.
 					} elseif (
-						empty( $menu_item_data['menu_order'] ) ||
-						empty( $menu_item_data['menu_item_parent'] ) ||
-						! in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) ||
-						empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
+						empty($menu_item_data['menu_order']) ||
+						empty($menu_item_data['menu_item_parent']) ||
+						! in_array($menu_item_data['menu_item_parent'], array_keys($dbids_to_orders)) ||
+						empty($orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1]) ||
 						$orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
 					) {
 						// Just make it a child of the previous; keep the order.
 						$menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
-						update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
+						update_post_meta($menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent']);
 						wp_update_post($menu_item_data);
 					}
 				}
@@ -228,244 +228,244 @@ 
 	case 'delete-menu-item':
 		$menu_item_id = (int) $_REQUEST['menu-item'];
 
-		check_admin_referer( 'delete-menu_item_' . $menu_item_id );
+		check_admin_referer('delete-menu_item_'.$menu_item_id);
 
-		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		if (is_nav_menu_item($menu_item_id) && wp_delete_post($menu_item_id, true))
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('The menu item has been successfully deleted.').'</p></div>';
 		break;
 
 	case 'delete':
-		check_admin_referer( 'delete-nav_menu-' . $nav_menu_selected_id );
-		if ( is_nav_menu( $nav_menu_selected_id ) ) {
-			$deletion = wp_delete_nav_menu( $nav_menu_selected_id );
+		check_admin_referer('delete-nav_menu-'.$nav_menu_selected_id);
+		if (is_nav_menu($nav_menu_selected_id)) {
+			$deletion = wp_delete_nav_menu($nav_menu_selected_id);
 		} else {
 			// Reset the selected menu.
 			$nav_menu_selected_id = 0;
-			unset( $_REQUEST['menu'] );
+			unset($_REQUEST['menu']);
 		}
 
-		if ( ! isset( $deletion ) )
+		if ( ! isset($deletion))
 			break;
 
-		if ( is_wp_error( $deletion ) )
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+		if (is_wp_error($deletion))
+			$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$deletion->get_error_message().'</p></div>';
 		else
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('The menu has been successfully deleted.').'</p></div>';
 		break;
 
 	case 'delete_menus':
-		check_admin_referer( 'nav_menus_bulk_actions' );
-		foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
-			if ( ! is_nav_menu( $menu_id_to_delete ) )
+		check_admin_referer('nav_menus_bulk_actions');
+		foreach ($_REQUEST['delete_menus'] as $menu_id_to_delete) {
+			if ( ! is_nav_menu($menu_id_to_delete))
 				continue;
 
-			$deletion = wp_delete_nav_menu( $menu_id_to_delete );
-			if ( is_wp_error( $deletion ) ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+			$deletion = wp_delete_nav_menu($menu_id_to_delete);
+			if (is_wp_error($deletion)) {
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$deletion->get_error_message().'</p></div>';
 				$deletion_error = true;
 			}
 		}
 
-		if ( empty( $deletion_error ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		if (empty($deletion_error))
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Selected menus have been successfully deleted.').'</p></div>';
 		break;
 
 	case 'update':
-		check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
+		check_admin_referer('update-nav_menu', 'update-nav-menu-nonce');
 
 		// Remove menu locations that have been unchecked.
-		foreach ( $locations as $location => $description ) {
-			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
-				unset( $menu_locations[ $location ] );
+		foreach ($locations as $location => $description) {
+			if ((empty($_POST['menu-locations']) || empty($_POST['menu-locations'][$location])) && isset($menu_locations[$location]) && $menu_locations[$location] == $nav_menu_selected_id)
+				unset($menu_locations[$location]);
 		}
 
 		// Merge new and existing menu locations if any new ones are set.
-		if ( isset( $_POST['menu-locations'] ) ) {
-			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+		if (isset($_POST['menu-locations'])) {
+			$new_menu_locations = array_map('absint', $_POST['menu-locations']);
+			$menu_locations = array_merge($menu_locations, $new_menu_locations);
 		}
 
 		// Set menu locations.
-		set_theme_mod( 'nav_menu_locations', $menu_locations );
+		set_theme_mod('nav_menu_locations', $menu_locations);
 
 		// Add Menu.
-		if ( 0 == $nav_menu_selected_id ) {
-			$new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
+		if (0 == $nav_menu_selected_id) {
+			$new_menu_title = trim(esc_html($_POST['menu-name']));
 
-			if ( $new_menu_title ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( 0, array('menu-name' => $new_menu_title) );
+			if ($new_menu_title) {
+				$_nav_menu_selected_id = wp_update_nav_menu_object(0, array('menu-name' => $new_menu_title));
 
-				if ( is_wp_error( $_nav_menu_selected_id ) ) {
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+				if (is_wp_error($_nav_menu_selected_id)) {
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$_nav_menu_selected_id->get_error_message().'</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object = wp_get_nav_menu_object($_nav_menu_selected_id);
 					$nav_menu_selected_id = $_nav_menu_selected_id;
 					$nav_menu_selected_title = $_menu_object->name;
-					if ( isset( $_REQUEST['menu-item'] ) )
-						wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
-					if ( isset( $_REQUEST['zero-menu-state'] ) ) {
+					if (isset($_REQUEST['menu-item']))
+						wp_save_nav_menu_items($nav_menu_selected_id, absint($_REQUEST['menu-item']));
+					if (isset($_REQUEST['zero-menu-state'])) {
 						// If there are menu items, add them
-						wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
+						wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title);
 						// Auto-save nav_menu_locations
 						$locations = get_nav_menu_locations();
-						foreach ( $locations as $location => $menu_id ) {
-								$locations[ $location ] = $nav_menu_selected_id;
+						foreach ($locations as $location => $menu_id) {
+								$locations[$location] = $nav_menu_selected_id;
 								break; // There should only be 1
 						}
-						set_theme_mod( 'nav_menu_locations', $locations );
+						set_theme_mod('nav_menu_locations', $locations);
 					}
-					if ( isset( $_REQUEST['use-location'] ) ) {
+					if (isset($_REQUEST['use-location'])) {
 						$locations = get_registered_nav_menus();
 						$menu_locations = get_nav_menu_locations();
-						if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
-							$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
-						set_theme_mod( 'nav_menu_locations', $menu_locations );
+						if (isset($locations[$_REQUEST['use-location']]))
+							$menu_locations[$_REQUEST['use-location']] = $nav_menu_selected_id;
+						set_theme_mod('nav_menu_locations', $menu_locations);
 					}
 
 					// $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%s</strong> has been created.' ), $nav_menu_selected_title ) . '</p></div>';
-					wp_redirect( admin_url( 'nav-menus.php?menu=' . $_nav_menu_selected_id ) );
+					wp_redirect(admin_url('nav-menus.php?menu='.$_nav_menu_selected_id));
 					exit();
 				}
 			} else {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('Please enter a valid menu name.').'</p></div>';
 			}
 
 		// Update existing menu.
 		} else {
 
-			$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
+			$_menu_object = wp_get_nav_menu_object($nav_menu_selected_id);
 
-			$menu_title = trim( esc_html( $_POST['menu-name'] ) );
-			if ( ! $menu_title ) {
-				$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
+			$menu_title = trim(esc_html($_POST['menu-name']));
+			if ( ! $menu_title) {
+				$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.__('Please enter a valid menu name.').'</p></div>';
 				$menu_title = $_menu_object->name;
 			}
 
-			if ( ! is_wp_error( $_menu_object ) ) {
-				$_nav_menu_selected_id = wp_update_nav_menu_object( $nav_menu_selected_id, array( 'menu-name' => $menu_title ) );
-				if ( is_wp_error( $_nav_menu_selected_id ) ) {
+			if ( ! is_wp_error($_menu_object)) {
+				$_nav_menu_selected_id = wp_update_nav_menu_object($nav_menu_selected_id, array('menu-name' => $menu_title));
+				if (is_wp_error($_nav_menu_selected_id)) {
 					$_menu_object = $_nav_menu_selected_id;
-					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $_nav_menu_selected_id->get_error_message() . '</p></div>';
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>'.$_nav_menu_selected_id->get_error_message().'</p></div>';
 				} else {
-					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
+					$_menu_object = wp_get_nav_menu_object($_nav_menu_selected_id);
 					$nav_menu_selected_title = $_menu_object->name;
 				}
 			}
 
 			// Update menu items.
-			if ( ! is_wp_error( $_menu_object ) ) {
-				$messages = array_merge( $messages, wp_nav_menu_update_menu_items( $_nav_menu_selected_id, $nav_menu_selected_title ) );
+			if ( ! is_wp_error($_menu_object)) {
+				$messages = array_merge($messages, wp_nav_menu_update_menu_items($_nav_menu_selected_id, $nav_menu_selected_title));
 
 				// If the menu ID changed, redirect to the new URL.
-				if ( $nav_menu_selected_id != $_nav_menu_selected_id ) {
-					wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
+				if ($nav_menu_selected_id != $_nav_menu_selected_id) {
+					wp_redirect(admin_url('nav-menus.php?menu='.intval($_nav_menu_selected_id)));
 					exit();
 				}
 			}
 		}
 		break;
 	case 'locations':
-		if ( ! $num_locations ) {
-			wp_redirect( admin_url( 'nav-menus.php' ) );
+		if ( ! $num_locations) {
+			wp_redirect(admin_url('nav-menus.php'));
 			exit();
 		}
 
-		add_filter( 'screen_options_show_screen', '__return_false' );
+		add_filter('screen_options_show_screen', '__return_false');
 
-		if ( isset( $_POST['menu-locations'] ) ) {
-			check_admin_referer( 'save-menu-locations' );
+		if (isset($_POST['menu-locations'])) {
+			check_admin_referer('save-menu-locations');
 
-			$new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
-			$menu_locations = array_merge( $menu_locations, $new_menu_locations );
+			$new_menu_locations = array_map('absint', $_POST['menu-locations']);
+			$menu_locations = array_merge($menu_locations, $new_menu_locations);
 			// Set menu locations
-			set_theme_mod( 'nav_menu_locations', $menu_locations );
+			set_theme_mod('nav_menu_locations', $menu_locations);
 
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Menu locations updated.' ) . '</p></div>';
+			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.__('Menu locations updated.').'</p></div>';
 		}
 		break;
 }
 
 // Get all nav menus.
 $nav_menus = wp_get_nav_menus();
-$menu_count = count( $nav_menus );
+$menu_count = count($nav_menus);
 
 // Are we on the add new screen?
-$add_new_screen = ( isset( $_GET['menu'] ) && 0 == $_GET['menu'] ) ? true : false;
+$add_new_screen = (isset($_GET['menu']) && 0 == $_GET['menu']) ? true : false;
 
-$locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
+$locations_screen = (isset($_GET['action']) && 'locations' == $_GET['action']) ? true : false;
 
 /*
  * If we have one theme location, and zero menus, we take them right
  * into editing their first menu.
  */
-$page_count = wp_count_posts( 'page' );
-$one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
+$page_count = wp_count_posts('page');
+$one_theme_location_no_menus = (1 == count(get_registered_nav_menus()) && ! $add_new_screen && empty($nav_menus) && ! empty($page_count->publish)) ? true : false;
 
 $nav_menus_l10n = array(
 	'oneThemeLocationNoMenus' => $one_theme_location_no_menus,
-	'moveUp'       => __( 'Move up one' ),
-	'moveDown'     => __( 'Move down one' ),
-	'moveToTop'    => __( 'Move to the top' ),
+	'moveUp'       => __('Move up one'),
+	'moveDown'     => __('Move down one'),
+	'moveToTop'    => __('Move to the top'),
 	/* translators: %s: previous item name */
-	'moveUnder'    => __( 'Move under %s' ),
+	'moveUnder'    => __('Move under %s'),
 	/* translators: %s: previous item name */
-	'moveOutFrom'  => __( 'Move out from under %s' ),
+	'moveOutFrom'  => __('Move out from under %s'),
 	/* translators: %s: previous item name */
-	'under'        => __( 'Under %s' ),
+	'under'        => __('Under %s'),
 	/* translators: %s: previous item name */
-	'outFrom'      => __( 'Out from under %s' ),
+	'outFrom'      => __('Out from under %s'),
 	/* translators: 1: item name, 2: item position, 3: total number of items */
-	'menuFocus'    => __( '%1$s. Menu item %2$d of %3$d.' ),
+	'menuFocus'    => __('%1$s. Menu item %2$d of %3$d.'),
 	/* translators: 1: item name, 2: item position, 3: parent item name */
-	'subMenuFocus' => __( '%1$s. Sub item number %2$d under %3$s.' ),
+	'subMenuFocus' => __('%1$s. Sub item number %2$d under %3$s.'),
 );
-wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
+wp_localize_script('nav-menu', 'menus', $nav_menus_l10n);
 
 /*
  * Redirect to add screen if there are no menus and this users has either zero,
  * or more than 1 theme locations.
  */
-if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
-	wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
+if (0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus)
+	wp_redirect(admin_url('nav-menus.php?action=edit&menu=0'));
 
 // Get recently edited nav menu.
-$recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+$recently_edited = absint(get_user_option('nav_menu_recently_edited'));
+if (empty($recently_edited) && is_nav_menu($nav_menu_selected_id))
 	$recently_edited = $nav_menu_selected_id;
 
 // Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+if (empty($nav_menu_selected_id) && ! isset($_GET['menu']) && is_nav_menu($recently_edited))
 	$nav_menu_selected_id = $recently_edited;
 
 // On deletion of menu, if another menu exists, show it.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+if ( ! $add_new_screen && 0 < $menu_count && isset($_GET['action']) && 'delete' == $_GET['action'])
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
 
 // Set $nav_menu_selected_id to 0 if no menus.
-if ( $one_theme_location_no_menus ) {
+if ($one_theme_location_no_menus) {
 	$nav_menu_selected_id = 0;
-} elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
+} elseif (empty($nav_menu_selected_id) && ! empty($nav_menus) && ! $add_new_screen) {
 	// if we have no selection yet, and we have menus, set to the first one in the list.
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
 }
 
 // Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
-	update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
+if ($nav_menu_selected_id != $recently_edited && is_nav_menu($nav_menu_selected_id))
+	update_user_meta($current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id);
 
 // If there's a menu, get its name.
-if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
-	$_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
-	$nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
+if ( ! $nav_menu_selected_title && is_nav_menu($nav_menu_selected_id)) {
+	$_menu_object = wp_get_nav_menu_object($nav_menu_selected_id);
+	$nav_menu_selected_title = ! is_wp_error($_menu_object) ? $_menu_object->name : '';
 }
 
 // Generate truncated menu names.
-foreach( (array) $nav_menus as $key => $_nav_menu ) {
-	$nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '&hellip;' );
+foreach ((array) $nav_menus as $key => $_nav_menu) {
+	$nav_menus[$key]->truncated_name = wp_html_excerpt($_nav_menu->name, 40, '&hellip;');
 }
 
 // Retrieve menu locations.
-if ( current_theme_supports( 'menus' ) ) {
+if (current_theme_supports('menus')) {
 	$locations = get_registered_nav_menus();
 	$menu_locations = get_nav_menu_locations();
 }
@@ -480,9 +480,9 @@ 
 $_wp_nav_menu_max_depth = 0;
 
 // Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
-if ( is_nav_menu( $nav_menu_selected_id ) ) {
-	$menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
-	$edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
+if (is_nav_menu($nav_menu_selected_id)) {
+	$menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('post_status' => 'any'));
+	$edit_markup = wp_get_nav_menu_to_edit($nav_menu_selected_id);
 }
 
 /**
@@ -492,7 +492,7 @@ 
  * @param string $classes
  * @return string
  */
-function wp_nav_menu_max_depth( $classes ) {
+function wp_nav_menu_max_depth($classes) {
 	global $_wp_nav_menu_max_depth;
 	return "$classes menu-max-depth-$_wp_nav_menu_max_depth";
 }
@@ -502,138 +502,138 @@ 
 wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
-	$messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+if ( ! current_theme_supports('menus') && ! $num_locations)
+	$messages[] = '<div id="message" class="updated"><p>'.sprintf(__('Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.'), admin_url('widgets.php')).'</p></div>';
 
-if ( ! $locations_screen ) : // Main tab
-	$overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
-	$overview .= '<p>' . sprintf( __( 'Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.' ), admin_url( 'widgets.php' ), 'Twenty Fifteen', 'Twenty Fourteen' ) . '</p>';
-	$overview .= '<p>' . __( 'From this screen you can:' ) . '</p>';
-	$overview .= '<ul><li>' . __( 'Create, edit, and delete menus' ) . '</li>';
-	$overview .= '<li>' . __( 'Add, organize, and modify individual menu items' ) . '</li></ul>';
+if ( ! $locations_screen) : // Main tab
+	$overview  = '<p>'.__('This screen is used for managing your custom navigation menus.').'</p>';
+	$overview .= '<p>'.sprintf(__('Menus can be displayed in locations defined by your theme, even used in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%1$s">Widgets</a> screen. If your theme does not support the custom menus feature (the default themes, %2$s and %3$s, do), you can learn about adding this support by following the Documentation link to the side.'), admin_url('widgets.php'), 'Twenty Fifteen', 'Twenty Fourteen').'</p>';
+	$overview .= '<p>'.__('From this screen you can:').'</p>';
+	$overview .= '<ul><li>'.__('Create, edit, and delete menus').'</li>';
+	$overview .= '<li>'.__('Add, organize, and modify individual menu items').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $overview
-	) );
+	));
 
-	$menu_management  = '<p>' . __( 'The menu management box at the top of the screen is used to control which menu is opened in the editor below.' ) . '</p>';
-	$menu_management .= '<ul><li>' . __( 'To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>' ) . '</li>';
-	$menu_management .= '<li>' . __( 'If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started' ) . '</li></ul>';
-	$menu_management .= '<p>' . __( 'You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.' ) . '</p>';
+	$menu_management  = '<p>'.__('The menu management box at the top of the screen is used to control which menu is opened in the editor below.').'</p>';
+	$menu_management .= '<ul><li>'.__('To edit an existing menu, <strong>choose a menu from the drop down and click Select</strong>').'</li>';
+	$menu_management .= '<li>'.__('If you haven&#8217;t yet created any menus, <strong>click the &#8217;create a new menu&#8217; link</strong> to get started').'</li></ul>';
+	$menu_management .= '<p>'.__('You can assign theme locations to individual menus by <strong>selecting the desired settings</strong> at the bottom of the menu editor. To assign menus to all theme locations at once, <strong>visit the Manage Locations tab</strong> at the top of the screen.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'menu-management',
-		'title'   => __( 'Menu Management' ),
+		'title'   => __('Menu Management'),
 		'content' => $menu_management
-	) );
+	));
 
-	$editing_menus  = '<p>' . __( 'Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.' ) . '</p>';
-	$editing_menus .= '<p>' . __( '<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.' ) . '</p>';
-	$editing_menus .= '<ul><li>' . __( 'Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>' ) .'</li>';
-	$editing_menus .= '<li>' . __( 'To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu' ) . '</li>';
-	$editing_menus .= '<li>' . __( 'Delete a menu item by <strong>expanding it and clicking the Remove link</strong>' ) . '</li></ul>';
+	$editing_menus  = '<p>'.__('Each custom menu may contain a mix of links to pages, categories, custom URLs or other content types. Menu links are added by selecting items from the expanding boxes in the left-hand column below.').'</p>';
+	$editing_menus .= '<p>'.__('<strong>Clicking the arrow to the right of any menu item</strong> in the editor will reveal a standard group of settings. Additional settings such as link target, CSS classes, link relationships, and link descriptions can be enabled and disabled via the Screen Options tab.').'</p>';
+	$editing_menus .= '<ul><li>'.__('Add one or several items at once by <strong>selecting the checkbox next to each item and clicking Add to Menu</strong>').'</li>';
+	$editing_menus .= '<li>'.__('To add a custom link, <strong>expand the Custom Links section, enter a URL and link text, and click Add to Menu</strong>').'</li>';
+	$editing_menus .= '<li>'.__('To reorganize menu items, <strong>drag and drop items with your mouse or use your keyboard</strong>. Drag or move a menu item a little to the right to make it a submenu').'</li>';
+	$editing_menus .= '<li>'.__('Delete a menu item by <strong>expanding it and clicking the Remove link</strong>').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'editing-menus',
-		'title'   => __( 'Editing Menus' ),
+		'title'   => __('Editing Menus'),
 		'content' => $editing_menus
-	) );
+	));
 else : // Locations Tab.
-	$locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
-	$locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
-	$locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
-	$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
+	$locations_overview  = '<p>'.__('This screen is used for globally assigning menus to locations defined by your theme.').'</p>';
+	$locations_overview .= '<ul><li>'.__('To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>').'</li>';
+	$locations_overview .= '<li>'.__('To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>').'</li>';
+	$locations_overview .= '<li>'.__('To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location').'</li></ul>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'locations-overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $locations_overview
-	) );
+	));
 endif;
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Menus_Screen" target="_blank">Documentation on Menus</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 // Get the admin header.
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-	<h1><?php echo esc_html( __( 'Menus' ) ); ?>
+	<h1><?php echo esc_html(__('Menus')); ?>
 		<?php
-		if ( current_user_can( 'customize' ) ) :
-			$focus = $locations_screen ? array( 'section' => 'menu_locations' ) : array( 'panel' => 'nav_menus' );
+		if (current_user_can('customize')) :
+			$focus = $locations_screen ? array('section' => 'menu_locations') : array('panel' => 'nav_menus');
 			printf(
 				' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-				esc_url( add_query_arg( array(
-					array( 'autofocus' => $focus ),
-					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ),
-				), admin_url( 'customize.php' ) ) ),
-				__( 'Manage in Customizer' )
+				esc_url(add_query_arg(array(
+					array('autofocus' => $focus),
+					'return' => urlencode(wp_unslash($_SERVER['REQUEST_URI'])),
+				), admin_url('customize.php'))),
+				__('Manage in Customizer')
 			);
 		endif;
 		?>
 	</h1>
 	<h2 class="nav-tab-wrapper">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
-		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+		<a href="<?php echo admin_url('nav-menus.php'); ?>" class="nav-tab<?php if ( ! isset($_GET['action']) || isset($_GET['action']) && 'locations' != $_GET['action']) echo ' nav-tab-active'; ?>"><?php esc_html_e('Edit Menus'); ?></a>
+		<?php if ($num_locations && $menu_count) : ?>
+			<a href="<?php echo esc_url(add_query_arg(array('action' => 'locations'), admin_url('nav-menus.php'))); ?>" class="nav-tab<?php if ($locations_screen) echo ' nav-tab-active'; ?>"><?php esc_html_e('Manage Locations'); ?></a>
 		<?php
 			endif;
 		?>
 	</h2>
 	<?php
-	foreach( $messages as $message ) :
-		echo $message . "\n";
+	foreach ($messages as $message) :
+		echo $message."\n";
 	endforeach;
 	?>
 	<?php
-	if ( $locations_screen ) :
-		if ( 1 == $num_locations ) {
-			echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
+	if ($locations_screen) :
+		if (1 == $num_locations) {
+			echo '<p>'.__('Your theme supports one menu. Select which menu you would like to use.').'</p>';
 		} else {
-			echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+			echo '<p>'.sprintf(_n('Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations), number_format_i18n($num_locations)).'</p>';
 		}
 	?>
 	<div id="menu-locations-wrap">
-		<form method="post" action="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>">
+		<form method="post" action="<?php echo esc_url(add_query_arg(array('action' => 'locations'), admin_url('nav-menus.php'))); ?>">
 			<table class="widefat fixed" id="menu-locations-table">
 				<thead>
 				<tr>
-					<th scope="col" class="manage-column column-locations"><?php _e( 'Theme Location' ); ?></th>
-					<th scope="col" class="manage-column column-menus"><?php _e( 'Assigned Menu' ); ?></th>
+					<th scope="col" class="manage-column column-locations"><?php _e('Theme Location'); ?></th>
+					<th scope="col" class="manage-column column-menus"><?php _e('Assigned Menu'); ?></th>
 				</tr>
 				</thead>
 				<tbody class="menu-locations">
-				<?php foreach ( $locations as $_location => $_name ) { ?>
+				<?php foreach ($locations as $_location => $_name) { ?>
 					<tr class="menu-locations-row">
 						<td class="menu-location-title"><label for="locations-<?php echo $_location; ?>"><?php echo $_name; ?></label></td>
 						<td class="menu-location-menus">
 							<select name="menu-locations[<?php echo $_location; ?>]" id="locations-<?php echo $_location; ?>">
-								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
-								<?php foreach ( $nav_menus as $menu ) : ?>
-									<?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-									<option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
-										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
+								<option value="0"><?php printf('&mdash; %s &mdash;', esc_html__('Select a Menu')); ?></option>
+								<?php foreach ($nav_menus as $menu) : ?>
+									<?php $selected = isset($menu_locations[$_location]) && $menu_locations[$_location] == $menu->term_id; ?>
+									<option <?php if ($selected) echo 'data-orig="true"'; ?> <?php selected($selected); ?> value="<?php echo $menu->term_id; ?>">
+										<?php echo wp_html_excerpt($menu->name, 40, '&hellip;'); ?>
 									</option>
 								<?php endforeach; ?>
 							</select>
 							<div class="locations-row-links">
-								<?php if ( isset( $menu_locations[ $_location ] ) && 0 != $menu_locations[ $_location ] ) : ?>
+								<?php if (isset($menu_locations[$_location]) && 0 != $menu_locations[$_location]) : ?>
 								<span class="locations-edit-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => $menu_locations[$_location] ), admin_url( 'nav-menus.php' ) ) ); ?>">
-										<span aria-hidden="true"><?php _ex( 'Edit', 'menu' ); ?></span><span class="screen-reader-text"><?php _e( 'Edit selected menu' ); ?></span>
+									<a href="<?php echo esc_url(add_query_arg(array('action' => 'edit', 'menu' => $menu_locations[$_location]), admin_url('nav-menus.php'))); ?>">
+										<span aria-hidden="true"><?php _ex('Edit', 'menu'); ?></span><span class="screen-reader-text"><?php _e('Edit selected menu'); ?></span>
 									</a>
 								</span>
 								<?php endif; ?>
 								<span class="locations-add-menu-link">
-									<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0, 'use-location' => $_location ), admin_url( 'nav-menus.php' ) ) ); ?>">
-										<?php _ex( 'Use new menu', 'menu' ); ?>
+									<a href="<?php echo esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0, 'use-location' => $_location), admin_url('nav-menus.php'))); ?>">
+										<?php _ex('Use new menu', 'menu'); ?>
 									</a>
 								</span>
 							</div><!-- .locations-row-links -->
@@ -642,9 +642,9 @@ 
 				<?php } // foreach ?>
 				</tbody>
 			</table>
-			<p class="button-controls"><?php submit_button( __( 'Save Changes' ), 'primary left', 'nav-menu-locations', false ); ?></p>
-			<?php wp_nonce_field( 'save-menu-locations' ); ?>
-			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+			<p class="button-controls"><?php submit_button(__('Save Changes'), 'primary left', 'nav-menu-locations', false); ?></p>
+			<?php wp_nonce_field('save-menu-locations'); ?>
+			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 		</form>
 	</div><!-- #menu-locations-wrap -->
 	<?php
@@ -653,31 +653,31 @@ 
 	 *
 	 * @since 3.6.0
 	 */
-	do_action( 'after_menu_locations_table' ); ?>
+	do_action('after_menu_locations_table'); ?>
 	<?php else : ?>
 	<div class="manage-menus">
- 		<?php if ( $menu_count < 2 ) : ?>
+ 		<?php if ($menu_count < 2) : ?>
 		<span class="add-edit-menu-action">
-			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			<?php printf(__('Edit your menu below, or <a href="%s">create a new menu</a>.'), esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0), admin_url('nav-menus.php')))); ?>
 		</span><!-- /add-edit-menu-action -->
 		<?php else : ?>
-			<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
+			<form method="get" action="<?php echo admin_url('nav-menus.php'); ?>">
 			<input type="hidden" name="action" value="edit" />
-			<label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
+			<label for="select-menu-to-edit" class="selected-menu"><?php _e('Select a menu to edit:'); ?></label>
 			<select name="menu" id="select-menu-to-edit">
-				<?php if ( $add_new_screen ) : ?>
-					<option value="0" selected="selected"><?php _e( '&mdash; Select &mdash;' ); ?></option>
+				<?php if ($add_new_screen) : ?>
+					<option value="0" selected="selected"><?php _e('&mdash; Select &mdash;'); ?></option>
 				<?php endif; ?>
-				<?php foreach( (array) $nav_menus as $_nav_menu ) : ?>
-					<option value="<?php echo esc_attr( $_nav_menu->term_id ); ?>" <?php selected( $_nav_menu->term_id, $nav_menu_selected_id ); ?>>
+				<?php foreach ((array) $nav_menus as $_nav_menu) : ?>
+					<option value="<?php echo esc_attr($_nav_menu->term_id); ?>" <?php selected($_nav_menu->term_id, $nav_menu_selected_id); ?>>
 						<?php
-						echo esc_html( $_nav_menu->truncated_name ) ;
+						echo esc_html($_nav_menu->truncated_name);
 
-						if ( ! empty( $menu_locations ) && in_array( $_nav_menu->term_id, $menu_locations ) ) {
+						if ( ! empty($menu_locations) && in_array($_nav_menu->term_id, $menu_locations)) {
 							$locations_assigned_to_this_menu = array();
-							foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
-								if ( isset( $locations[ $menu_location_key ] ) ) {
-									$locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+							foreach (array_keys($menu_locations, $_nav_menu->term_id) as $menu_location_key) {
+								if (isset($locations[$menu_location_key])) {
+									$locations_assigned_to_this_menu[] = $locations[$menu_location_key];
 								}
 							}
 
@@ -688,13 +688,13 @@ 
 							 *
 							 * @param int $locations Number of menu locations to list. Default 3.
 							 */
-							$assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
+							$assigned_locations = array_slice($locations_assigned_to_this_menu, 0, absint(apply_filters('wp_nav_locations_listed_per_menu', 3)));
 
 							// Adds ellipses following the number of locations defined in $assigned_locations.
-							if ( ! empty( $assigned_locations ) ) {
-								printf( ' (%1$s%2$s)',
-									implode( ', ', $assigned_locations ),
-									count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' &hellip;' : ''
+							if ( ! empty($assigned_locations)) {
+								printf(' (%1$s%2$s)',
+									implode(', ', $assigned_locations),
+									count($locations_assigned_to_this_menu) > count($assigned_locations) ? ' &hellip;' : ''
 								);
 							}
 						}
@@ -702,100 +702,100 @@ 
 					</option>
 				<?php endforeach; ?>
 			</select>
-			<span class="submit-btn"><input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Select' ); ?>"></span>
+			<span class="submit-btn"><input type="submit" class="button-secondary" value="<?php esc_attr_e('Select'); ?>"></span>
 			<span class="add-new-menu-action">
-				<?php printf( __( 'or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+				<?php printf(__('or <a href="%s">create a new menu</a>.'), esc_url(add_query_arg(array('action' => 'edit', 'menu' => 0), admin_url('nav-menus.php')))); ?>
 			</span><!-- /add-new-menu-action -->
 		</form>
 	<?php endif; ?>
 	</div><!-- /manage-menus -->
 	<div id="nav-menus-frame">
-	<div id="menu-settings-column" class="metabox-holder<?php if ( isset( $_GET['menu'] ) && '0' == $_GET['menu'] ) { echo ' metabox-holder-disabled'; } ?>">
+	<div id="menu-settings-column" class="metabox-holder<?php if (isset($_GET['menu']) && '0' == $_GET['menu']) { echo ' metabox-holder-disabled'; } ?>">
 
 		<div class="clear"></div>
 
 		<form id="nav-menu-meta" class="nav-menu-meta" method="post" enctype="multipart/form-data">
-			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+			<input type="hidden" name="menu" id="nav-menu-meta-object-id" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 			<input type="hidden" name="action" value="add-menu-item" />
-			<?php wp_nonce_field( 'add-menu_item', 'menu-settings-column-nonce' ); ?>
-			<?php do_accordion_sections( 'nav-menus', 'side', null ); ?>
+			<?php wp_nonce_field('add-menu_item', 'menu-settings-column-nonce'); ?>
+			<?php do_accordion_sections('nav-menus', 'side', null); ?>
 		</form>
 
 	</div><!-- /#menu-settings-column -->
 	<div id="menu-management-liquid">
 		<div id="menu-management">
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
-				<div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+				<div class="menu-edit <?php if ($add_new_screen) echo 'blank-slate'; ?>">
 					<?php
-					wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-					wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-					wp_nonce_field( 'update-nav_menu', 'update-nav-menu-nonce' );
+					wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+					wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+					wp_nonce_field('update-nav_menu', 'update-nav-menu-nonce');
 
-					if ( $one_theme_location_no_menus ) { ?>
+					if ($one_theme_location_no_menus) { ?>
 						<input type="hidden" name="zero-menu-state" value="true" />
 					<?php } ?>
  					<input type="hidden" name="action" value="update" />
-					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
+					<input type="hidden" name="menu" id="menu" value="<?php echo esc_attr($nav_menu_selected_id); ?>" />
 					<div id="nav-menu-header">
 						<div class="major-publishing-actions">
 							<label class="menu-name-label howto open-label" for="menu-name">
-								<span><?php _e( 'Menu Name' ); ?></span>
-								<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e( 'Enter menu name here' ); ?>" value="<?php if ( $one_theme_location_no_menus ) _e( 'Menu 1' ); else echo esc_attr( $nav_menu_selected_title ); ?>" />
+								<span><?php _e('Menu Name'); ?></span>
+								<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e('Enter menu name here'); ?>" value="<?php if ($one_theme_location_no_menus) _e('Menu 1'); else echo esc_attr($nav_menu_selected_title); ?>" />
 							</label>
 							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
+								<?php submit_button(empty($nav_menu_selected_id) ? __('Create Menu') : __('Save Menu'), 'button-primary menu-save', 'save_menu', false, array('id' => 'save_menu_header')); ?>
 							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- END .nav-menu-header -->
 					<div id="post-body">
 						<div id="post-body-content">
-							<?php if ( ! $add_new_screen ) : ?>
-							<h3><?php _e( 'Menu Structure' ); ?></h3>
-							<?php $starter_copy = ( $one_theme_location_no_menus ) ? __( 'Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.' ) : __( 'Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.' ); ?>
-							<div class="drag-instructions post-body-plain" <?php if ( isset( $menu_items ) && 0 == count( $menu_items ) ) { ?>style="display: none;"<?php } ?>>
+							<?php if ( ! $add_new_screen) : ?>
+							<h3><?php _e('Menu Structure'); ?></h3>
+							<?php $starter_copy = ($one_theme_location_no_menus) ? __('Edit your default menu by adding or removing items. Drag each item into the order you prefer. Click Create Menu to save your changes.') : __('Drag each item into the order you prefer. Click the arrow on the right of the item to reveal additional configuration options.'); ?>
+							<div class="drag-instructions post-body-plain" <?php if (isset($menu_items) && 0 == count($menu_items)) { ?>style="display: none;"<?php } ?>>
 								<p><?php echo $starter_copy; ?></p>
 							</div>
 							<?php
-							if ( isset( $edit_markup ) && ! is_wp_error( $edit_markup ) ) {
+							if (isset($edit_markup) && ! is_wp_error($edit_markup)) {
 								echo $edit_markup;
 							} else {
 							?>
 							<ul class="menu" id="menu-to-edit"></ul>
 							<?php } ?>
 							<?php endif; ?>
-							<?php if ( $add_new_screen ) : ?>
-								<p class="post-body-plain"><?php _e( 'Give your menu a name above, then click Create Menu.' ); ?></p>
-								<?php if ( isset( $_GET['use-location'] ) ) : ?>
-									<input type="hidden" name="use-location" value="<?php echo esc_attr( $_GET['use-location'] ); ?>" />
+							<?php if ($add_new_screen) : ?>
+								<p class="post-body-plain"><?php _e('Give your menu a name above, then click Create Menu.'); ?></p>
+								<?php if (isset($_GET['use-location'])) : ?>
+									<input type="hidden" name="use-location" value="<?php echo esc_attr($_GET['use-location']); ?>" />
 								<?php endif; ?>
 							<?php endif; ?>
-							<div class="menu-settings" <?php if ( $one_theme_location_no_menus ) { ?>style="display: none;"<?php } ?>>
-								<h3><?php _e( 'Menu Settings' ); ?></h3>
+							<div class="menu-settings" <?php if ($one_theme_location_no_menus) { ?>style="display: none;"<?php } ?>>
+								<h3><?php _e('Menu Settings'); ?></h3>
 								<?php
-								if ( ! isset( $auto_add ) ) {
-									$auto_add = get_option( 'nav_menu_options' );
-									if ( ! isset( $auto_add['auto_add'] ) )
+								if ( ! isset($auto_add)) {
+									$auto_add = get_option('nav_menu_options');
+									if ( ! isset($auto_add['auto_add']))
 										$auto_add = false;
-									elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
+									elseif (false !== array_search($nav_menu_selected_id, $auto_add['auto_add']))
 										$auto_add = true;
 									else
 										$auto_add = false;
 								} ?>
 
 								<dl class="auto-add-pages">
-									<dt class="howto"><?php _e( 'Auto add pages' ); ?></dt>
-									<dd class="checkbox-input"><input type="checkbox"<?php checked( $auto_add ); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf( __('Automatically add new top-level pages to this menu' ), esc_url( admin_url( 'edit.php?post_type=page' ) ) ); ?></label></dd>
+									<dt class="howto"><?php _e('Auto add pages'); ?></dt>
+									<dd class="checkbox-input"><input type="checkbox"<?php checked($auto_add); ?> name="auto-add-pages" id="auto-add-pages" value="1" /> <label for="auto-add-pages"><?php printf(__('Automatically add new top-level pages to this menu'), esc_url(admin_url('edit.php?post_type=page'))); ?></label></dd>
 								</dl>
 
-								<?php if ( current_theme_supports( 'menus' ) ) : ?>
+								<?php if (current_theme_supports('menus')) : ?>
 
 									<dl class="menu-theme-locations">
-										<dt class="howto"><?php _e( 'Theme locations' ); ?></dt>
-										<?php foreach ( $locations as $location => $description ) : ?>
+										<dt class="howto"><?php _e('Theme locations'); ?></dt>
+										<?php foreach ($locations as $location => $description) : ?>
 										<dd class="checkbox-input">
-											<input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" /> <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
-											<?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
-											<span class="theme-location-set"> <?php printf( __( "(Currently set to: %s)" ), wp_get_nav_menu_object( $menu_locations[ $location ] )->name ); ?> </span>
+											<input type="checkbox"<?php checked(isset($menu_locations[$location]) && $menu_locations[$location] == $nav_menu_selected_id); ?> name="menu-locations[<?php echo esc_attr($location); ?>]" id="locations-<?php echo esc_attr($location); ?>" value="<?php echo esc_attr($nav_menu_selected_id); ?>" /> <label for="locations-<?php echo esc_attr($location); ?>"><?php echo $description; ?></label>
+											<?php if ( ! empty($menu_locations[$location]) && $menu_locations[$location] != $nav_menu_selected_id) : ?>
+											<span class="theme-location-set"> <?php printf(__("(Currently set to: %s)"), wp_get_nav_menu_object($menu_locations[$location])->name); ?> </span>
 											<?php endif; ?>
 										</dd>
 										<?php endforeach; ?>
@@ -808,13 +808,13 @@ 
 					</div><!-- /#post-body -->
 					<div id="nav-menu-footer">
 						<div class="major-publishing-actions">
-							<?php if ( 0 != $menu_count && ! $add_new_screen ) : ?>
+							<?php if (0 != $menu_count && ! $add_new_screen) : ?>
 							<span class="delete-action">
-								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'menu' => $nav_menu_selected_id, admin_url() ) ), 'delete-nav_menu-' . $nav_menu_selected_id) ); ?>"><?php _e('Delete Menu'); ?></a>
+								<a class="submitdelete deletion menu-delete" href="<?php echo esc_url(wp_nonce_url(add_query_arg(array('action' => 'delete', 'menu' => $nav_menu_selected_id, admin_url())), 'delete-nav_menu-'.$nav_menu_selected_id)); ?>"><?php _e('Delete Menu'); ?></a>
 							</span><!-- END .delete-action -->
 							<?php endif; ?>
 							<div class="publishing-action">
-								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) ); ?>
+								<?php submit_button(empty($nav_menu_selected_id) ? __('Create Menu') : __('Save Menu'), 'button-primary menu-save', 'save_menu', false, array('id' => 'save_menu_footer')); ?>
 							</div><!-- END .publishing-action -->
 						</div><!-- END .major-publishing-actions -->
 					</div><!-- /#nav-menu-footer -->
@@ -825,4 +825,4 @@ 
 	</div><!-- /#nav-menus-frame -->
 	<?php endif; ?>
 </div><!-- /.wrap-->
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +96 added lines, -51 removed lines

@@ -15,17 +15,20 @@ 
 // Load all the nav menu interface functions
 require_once( ABSPATH . 'wp-admin/includes/nav-menu.php' );
 
-if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) )
+if ( ! current_theme_supports( 'menus' ) && ! current_theme_supports( 'widgets' ) ) {
 	wp_die( __( 'Your theme does not support navigation menus or widgets.' ) );
+}
 
 // Permissions Check
-if ( ! current_user_can('edit_theme_options') )
+if ( ! current_user_can('edit_theme_options') ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 wp_enqueue_script( 'nav-menu' );
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 // Container for any messages displayed to the user
 $messages = array();
@@ -47,10 +50,11 @@ 
 switch ( $action ) {
 	case 'add-menu-item':
 		check_admin_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-		if ( isset( $_REQUEST['nav-menu-locations'] ) )
-			set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
-		elseif ( isset( $_REQUEST['menu-item'] ) )
-			wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		if ( isset( $_REQUEST['nav-menu-locations'] ) ) {
+					set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_REQUEST['menu-locations'] ) );
+		} elseif ( isset( $_REQUEST['menu-item'] ) ) {
+					wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
+		}
 		break;
 	case 'move-down-menu-item' :
 
@@ -185,10 +189,11 @@ 
 								! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
 							) {
 								$_possible_parent_id = (int) get_post_meta( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1], '_menu_item_menu_item_parent', true);
-								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) )
-									$menu_item_data['menu_item_parent'] = $_possible_parent_id;
-								else
-									$menu_item_data['menu_item_parent'] = 0;
+								if ( in_array( $_possible_parent_id, array_keys( $dbids_to_orders ) ) ) {
+																	$menu_item_data['menu_item_parent'] = $_possible_parent_id;
+								} else {
+																	$menu_item_data['menu_item_parent'] = 0;
+								}
 
 							// Else there isn't something before the parent.
 							} else {
@@ -230,8 +235,9 @@ 
 
 		check_admin_referer( 'delete-menu_item_' . $menu_item_id );
 
-		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		if ( is_nav_menu_item( $menu_item_id ) && wp_delete_post( $menu_item_id, true ) ) {
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __('The menu item has been successfully deleted.') . '</p></div>';
+		}
 		break;
 
 	case 'delete':
@@ -244,20 +250,23 @@ 
 			unset( $_REQUEST['menu'] );
 		}
 
-		if ( ! isset( $deletion ) )
-			break;
+		if ( ! isset( $deletion ) ) {
+					break;
+		}
 
-		if ( is_wp_error( $deletion ) )
-			$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
-		else
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+		if ( is_wp_error( $deletion ) ) {
+					$messages[] = '<div id="message" class="error notice is-dismissible"><p>' . $deletion->get_error_message() . '</p></div>';
+		} else {
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'The menu has been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'delete_menus':
 		check_admin_referer( 'nav_menus_bulk_actions' );
 		foreach ( $_REQUEST['delete_menus'] as $menu_id_to_delete ) {
-			if ( ! is_nav_menu( $menu_id_to_delete ) )
-				continue;
+			if ( ! is_nav_menu( $menu_id_to_delete ) ) {
+							continue;
+			}
 
 			$deletion = wp_delete_nav_menu( $menu_id_to_delete );
 			if ( is_wp_error( $deletion ) ) {
@@ -266,8 +275,9 @@ 
 			}
 		}
 
-		if ( empty( $deletion_error ) )
-			$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		if ( empty( $deletion_error ) ) {
+					$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' . __( 'Selected menus have been successfully deleted.' ) . '</p></div>';
+		}
 		break;
 
 	case 'update':
@@ -275,8 +285,9 @@ 
 
 		// Remove menu locations that have been unchecked.
 		foreach ( $locations as $location => $description ) {
-			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
-				unset( $menu_locations[ $location ] );
+			if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ) {
+							unset( $menu_locations[ $location ] );
+			}
 		}
 
 		// Merge new and existing menu locations if any new ones are set.
@@ -301,8 +312,9 @@ 
 					$_menu_object = wp_get_nav_menu_object( $_nav_menu_selected_id );
 					$nav_menu_selected_id = $_nav_menu_selected_id;
 					$nav_menu_selected_title = $_menu_object->name;
-					if ( isset( $_REQUEST['menu-item'] ) )
-						wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
+					if ( isset( $_REQUEST['menu-item'] ) ) {
+											wp_save_nav_menu_items( $nav_menu_selected_id, absint( $_REQUEST['menu-item'] ) );
+					}
 					if ( isset( $_REQUEST['zero-menu-state'] ) ) {
 						// If there are menu items, add them
 						wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title );
@@ -317,8 +329,9 @@ 
 					if ( isset( $_REQUEST['use-location'] ) ) {
 						$locations = get_registered_nav_menus();
 						$menu_locations = get_nav_menu_locations();
-						if ( isset( $locations[ $_REQUEST['use-location'] ] ) )
-							$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
+						if ( isset( $locations[ $_REQUEST['use-location'] ] ) ) {
+													$menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
+						}
 						set_theme_mod( 'nav_menu_locations', $menu_locations );
 					}
 
@@ -425,21 +438,25 @@ 
  * Redirect to add screen if there are no menus and this users has either zero,
  * or more than 1 theme locations.
  */
-if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
+if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus ) {
 	wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
+}
 
 // Get recently edited nav menu.
 $recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
-if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
+if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) ) {
 	$recently_edited = $nav_menu_selected_id;
+}
 
 // Use $recently_edited if none are selected.
-if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
+if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) ) {
 	$nav_menu_selected_id = $recently_edited;
+}
 
 // On deletion of menu, if another menu exists, show it.
-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
+if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] ) {
 	$nav_menu_selected_id = $nav_menus[0]->term_id;
+}
 
 // Set $nav_menu_selected_id to 0 if no menus.
 if ( $one_theme_location_no_menus ) {
@@ -450,8 +467,9 @@ 
 }
 
 // Update the user's setting.
-if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
+if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) ) {
 	update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
+}
 
 // If there's a menu, get its name.
 if ( ! $nav_menu_selected_title && is_nav_menu( $nav_menu_selected_id ) ) {
@@ -502,8 +520,9 @@ 
 wp_nav_menu_setup();
 wp_initial_nav_menu_meta_boxes();
 
-if ( ! current_theme_supports( 'menus' ) && ! $num_locations )
+if ( ! current_theme_supports( 'menus' ) && ! $num_locations ) {
 	$messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'Your theme does not natively support menus, but you can use them in sidebars by adding a &#8220;Custom Menu&#8221; widget on the <a href="%s">Widgets</a> screen.' ), admin_url( 'widgets.php' ) ) . '</p></div>';
+}
 
 if ( ! $locations_screen ) : // Main tab
 	$overview  = '<p>' . __( 'This screen is used for managing your custom navigation menus.' ) . '</p>';
@@ -541,8 +560,10 @@ 
 		'title'   => __( 'Editing Menus' ),
 		'content' => $editing_menus
 	) );
-else : // Locations Tab.
+else {
+	: // Locations Tab.
 	$locations_overview  = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
+}
 	$locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location&#8217;s drop down.</strong> When you&#8217;re finished, <strong>click Save Changes</strong>' ) . '</li>';
 	$locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent &#8217;Edit&#8217; link</strong>' ) . '</li>';
 	$locations_overview .= '<li>' . __( 'To add a new menu instead of assigning an existing one, <strong>click the &#8217;Use new menu&#8217; link</strong>. Your new menu will be automatically assigned to that theme location' ) . '</li></ul>';
@@ -580,9 +601,15 @@ 
 		?>
 	</h1>
 	<h2 class="nav-tab-wrapper">
-		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
+		<a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) {
+	echo ' nav-tab-active';
+}
+?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
 		<?php if ( $num_locations && $menu_count ) : ?>
-			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
+			<a href="<?php echo esc_url( add_query_arg( array( 'action' => 'locations' ), admin_url( 'nav-menus.php' ) ) ); ?>" class="nav-tab<?php if ( $locations_screen ) {
+	echo ' nav-tab-active';
+}
+?>"><?php esc_html_e( 'Manage Locations' ); ?></a>
 		<?php
 			endif;
 		?>
@@ -618,7 +645,10 @@ 
 								<option value="0"><?php printf( '&mdash; %s &mdash;', esc_html__( 'Select a Menu' ) ); ?></option>
 								<?php foreach ( $nav_menus as $menu ) : ?>
 									<?php $selected = isset( $menu_locations[$_location] ) && $menu_locations[$_location] == $menu->term_id; ?>
-									<option <?php if ( $selected ) echo 'data-orig="true"'; ?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
+									<option <?php if ( $selected ) {
+	echo 'data-orig="true"';
+}
+?> <?php selected( $selected ); ?> value="<?php echo $menu->term_id; ?>">
 										<?php echo wp_html_excerpt( $menu->name, 40, '&hellip;' ); ?>
 									</option>
 								<?php endforeach; ?>
@@ -654,14 +684,20 @@ 
 	 * @since 3.6.0
 	 */
 	do_action( 'after_menu_locations_table' ); ?>
-	<?php else : ?>
+	<?php else {
+	: ?>
 	<div class="manage-menus">
  		<?php if ( $menu_count < 2 ) : ?>
 		<span class="add-edit-menu-action">
-			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) ); ?>
+			<?php printf( __( 'Edit your menu below, or <a href="%s">create a new menu</a>.' ), esc_url( add_query_arg( array( 'action' => 'edit', 'menu' => 0 ), admin_url( 'nav-menus.php' ) ) ) );
+}
+?>
 		</span><!-- /add-edit-menu-action -->
-		<?php else : ?>
-			<form method="get" action="<?php echo admin_url( 'nav-menus.php' ); ?>">
+		<?php else {
+	: ?>
+			<form method="get" action="<?php echo admin_url( 'nav-menus.php' );
+}
+?>">
 			<input type="hidden" name="action" value="edit" />
 			<label for="select-menu-to-edit" class="selected-menu"><?php _e( 'Select a menu to edit:' ); ?></label>
 			<select name="menu" id="select-menu-to-edit">
@@ -725,7 +761,10 @@ 
 	<div id="menu-management-liquid">
 		<div id="menu-management">
 			<form id="update-nav-menu" method="post" enctype="multipart/form-data">
-				<div class="menu-edit <?php if ( $add_new_screen ) echo 'blank-slate'; ?>">
+				<div class="menu-edit <?php if ( $add_new_screen ) {
+	echo 'blank-slate';
+}
+?>">
 					<?php
 					wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
 					wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
@@ -740,7 +779,12 @@ 
 						<div class="major-publishing-actions">
 							<label class="menu-name-label howto open-label" for="menu-name">
 								<span><?php _e( 'Menu Name' ); ?></span>
-								<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e( 'Enter menu name here' ); ?>" value="<?php if ( $one_theme_location_no_menus ) _e( 'Menu 1' ); else echo esc_attr( $nav_menu_selected_title ); ?>" />
+								<input name="menu-name" id="menu-name" type="text" class="menu-name regular-text menu-item-textbox input-with-default-title" title="<?php esc_attr_e( 'Enter menu name here' ); ?>" value="<?php if ( $one_theme_location_no_menus ) {
+	_e( 'Menu 1' );
+} else {
+	echo esc_attr( $nav_menu_selected_title );
+}
+?>" />
 							</label>
 							<div class="publishing-action">
 								<?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
@@ -774,12 +818,13 @@ 
 								<?php
 								if ( ! isset( $auto_add ) ) {
 									$auto_add = get_option( 'nav_menu_options' );
-									if ( ! isset( $auto_add['auto_add'] ) )
-										$auto_add = false;
-									elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) )
-										$auto_add = true;
-									else
-										$auto_add = false;
+									if ( ! isset( $auto_add['auto_add'] ) ) {
+																			$auto_add = false;
+									} elseif ( false !== array_search( $nav_menu_selected_id, $auto_add['auto_add'] ) ) {
+																			$auto_add = true;
+									} else {
+																			$auto_add = false;
+									}
 								} ?>
 
 								<dl class="auto-add-pages">

src/wp-admin/post.php

Indentation +9 added lines, -9 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * Edit post administration panel.
- *
- * Manage Post actions: post, edit, delete, etc.
- *
- * @package WordPress
- * @subpackage Administration
- */
+								 * Edit post administration panel.
+								 *
+								 * Manage Post actions: post, edit, delete, etc.
+								 *
+								 * @package WordPress
+								 * @subpackage Administration
+								 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -94,8 +94,8 @@ 
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-     strpos( $sendback, 'post.php' ) !== false ||
-     strpos( $sendback, 'post-new.php' ) !== false ) {
+	 strpos( $sendback, 'post.php' ) !== false ||
+	 strpos( $sendback, 'post-new.php' ) !== false ) {
 	if ( 'attachment' == $post_type ) {
 		$sendback = admin_url( 'upload.php' );
 	} else {

Spacing +118 added lines, -118 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit.php';
 $submenu_file = 'edit.php';
 
-wp_reset_vars( array( 'action' ) );
+wp_reset_vars(array('action'));
 
-if ( isset( $_GET['post'] ) )
+if (isset($_GET['post']))
  	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
+elseif (isset($_POST['post_ID']))
  	$post_id = $post_ID = (int) $_POST['post_ID'];
 else
  	$post_id = $post_ID = 0;
@@ -30,12 +30,12 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
-	$post = get_post( $post_id );
+if ($post_id)
+	$post = get_post($post_id);
 
-if ( $post ) {
+if ($post) {
 	$post_type = $post->post_type;
-	$post_type_object = get_post_type_object( $post_type );
+	$post_type_object = get_post_type_object($post_type);
 }
 
 /**
@@ -44,11 +44,11 @@ 
  * @param int $post_id Optional. Post ID.
  */
 function redirect_post($post_id = '') {
-	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
-		$status = get_post_status( $post_id );
+	if (isset($_POST['save']) || isset($_POST['publish'])) {
+		$status = get_post_status($post_id);
 
-		if ( isset( $_POST['publish'] ) ) {
-			switch ( $status ) {
+		if (isset($_POST['publish'])) {
+			switch ($status) {
 				case 'pending':
 					$message = 8;
 					break;
@@ -62,17 +62,17 @@ 
 			$message = 'draft' == $status ? 10 : 1;
 		}
 
-		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
-	} elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
-		$location = add_query_arg( 'message', 2, wp_get_referer() );
+		$location = add_query_arg('message', $message, get_edit_post_link($post_id, 'url'));
+	} elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
+		$location = add_query_arg('message', 2, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
-	} elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
-		$location = add_query_arg( 'message', 3, wp_get_referer() );
+		$location = $location[0].'#postcustom';
+	} elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) {
+		$location = add_query_arg('message', 3, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
+		$location = $location[0].'#postcustom';
 	} else {
-		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+		$location = add_query_arg('message', 4, get_edit_post_link($post_id, 'url'));
 	}
 
 	/**
@@ -83,55 +83,55 @@ 
 	 * @param string $location The destination URL.
 	 * @param int    $post_id  The post ID.
 	 */
-	wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+	wp_redirect(apply_filters('redirect_post_location', $location, $post_id));
 	exit;
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if (isset($_POST['deletepost']))
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+elseif (isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'])
 	$action = 'preview';
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
-     strpos( $sendback, 'post.php' ) !== false ||
-     strpos( $sendback, 'post-new.php' ) !== false ) {
-	if ( 'attachment' == $post_type ) {
-		$sendback = admin_url( 'upload.php' );
+     strpos($sendback, 'post.php') !== false ||
+     strpos($sendback, 'post-new.php') !== false) {
+	if ('attachment' == $post_type) {
+		$sendback = admin_url('upload.php');
 	} else {
-		$sendback = admin_url( 'edit.php' );
-		if ( ! empty( $post_type ) ) {
-			$sendback = add_query_arg( 'post_type', $post_type, $sendback );
+		$sendback = admin_url('edit.php');
+		if ( ! empty($post_type)) {
+			$sendback = add_query_arg('post_type', $post_type, $sendback);
 		}
 	}
 } else {
-	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'ids'), $sendback );
+	$sendback = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'ids'), $sendback);
 }
 
-switch($action) {
+switch ($action) {
 case 'post-quickdraft-save':
 	// Check nonce and capabilities
 	$nonce = $_REQUEST['_wpnonce'];
 	$error_msg = false;
 
 	// For output of the quickdraft dashboard widget
-	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+	require_once ABSPATH.'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	if ( ! wp_verify_nonce($nonce, 'add-post'))
+		$error_msg = __('Unable to submit this form, please refresh and try again.');
 
-	if ( ! current_user_can( 'edit_posts' ) ) {
+	if ( ! current_user_can('edit_posts')) {
 		exit;
 	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
+	if ($error_msg)
+		return wp_dashboard_quick_press($error_msg);
 
-	$post = get_post( $_REQUEST['post_ID'] );
-	check_admin_referer( 'add-' . $post->post_type );
+	$post = get_post($_REQUEST['post_ID']);
+	check_admin_referer('add-'.$post->post_type);
 
-	$_POST['comment_status'] = get_default_comment_status( $post->post_type );
-	$_POST['ping_status']    = get_default_comment_status( $post->post_type, 'pingback' );
+	$_POST['comment_status'] = get_default_comment_status($post->post_type);
+	$_POST['ping_status']    = get_default_comment_status($post->post_type, 'pingback');
 
 	edit_post();
 	wp_dashboard_quick_press();
@@ -139,49 +139,49 @@ 
 
 case 'postajaxpost':
 case 'post':
-	check_admin_referer( 'add-' . $post_type );
+	check_admin_referer('add-'.$post_type);
 	$post_id = 'postajaxpost' == $action ? edit_post() : write_post();
-	redirect_post( $post_id );
+	redirect_post($post_id);
 	exit();
 
 case 'edit':
 	$editing = true;
 
-	if ( empty( $post_id ) ) {
-		wp_redirect( admin_url('post.php') );
+	if (empty($post_id)) {
+		wp_redirect(admin_url('post.php'));
 		exit();
 	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $post)
+		wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post_id))
+		wp_die(__('You are not allowed to edit this item.'));
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	if ('trash' == $post->post_status)
+		wp_die(__('You can’t edit this item because it is in the Trash. Please restore it and try again.'));
 
-	if ( ! empty( $_GET['get-post-lock'] ) ) {
-		check_admin_referer( 'lock-post_' . $post_id );
-		wp_set_post_lock( $post_id );
-		wp_redirect( get_edit_post_link( $post_id, 'url' ) );
+	if ( ! empty($_GET['get-post-lock'])) {
+		check_admin_referer('lock-post_'.$post_id);
+		wp_set_post_lock($post_id);
+		wp_redirect(get_edit_post_link($post_id, 'url'));
 		exit();
 	}
 
 	$post_type = $post->post_type;
-	if ( 'post' == $post_type ) {
+	if ('post' == $post_type) {
 		$parent_file = "edit.php";
 		$submenu_file = "edit.php";
 		$post_new_file = "post-new.php";
-	} elseif ( 'attachment' == $post_type ) {
+	} elseif ('attachment' == $post_type) {
 		$parent_file = 'upload.php';
 		$submenu_file = 'upload.php';
 		$post_new_file = 'media-new.php';
 	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+		if (isset($post_type_object) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true)
 			$parent_file = $post_type_object->show_in_menu;
 		else
 			$parent_file = "edit.php?post_type=$post_type";
@@ -189,57 +189,57 @@ 
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
 
-	if ( ! wp_check_post_lock( $post->ID ) ) {
-		$active_post_lock = wp_set_post_lock( $post->ID );
+	if ( ! wp_check_post_lock($post->ID)) {
+		$active_post_lock = wp_set_post_lock($post->ID);
 
-		if ( 'attachment' !== $post_type )
+		if ('attachment' !== $post_type)
 			wp_enqueue_script('autosave');
 	}
 
-	if ( is_multisite() ) {
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (is_multisite()) {
+		add_action('admin_footer', '_admin_notice_post_locked');
 	} else {
-		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+		$check_users = get_users(array('fields' => 'ID', 'number' => 2));
 
-		if ( count( $check_users ) > 1 )
-			add_action( 'admin_footer', '_admin_notice_post_locked' );
+		if (count($check_users) > 1)
+			add_action('admin_footer', '_admin_notice_post_locked');
 
-		unset( $check_users );
+		unset($check_users);
 	}
 
 	$title = $post_type_object->labels->edit_item;
 	$post = get_post($post_id, OBJECT, 'edit');
 
-	if ( post_type_supports($post_type, 'comments') ) {
+	if (post_type_supports($post_type, 'comments')) {
 		wp_enqueue_script('admin-comments');
 		enqueue_comment_hotkeys_js();
 	}
 
-	include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
+	include(ABSPATH.'wp-admin/edit-form-advanced.php');
 
 	break;
 
 case 'editattachment':
-	check_admin_referer('update-post_' . $post_id);
+	check_admin_referer('update-post_'.$post_id);
 
 	// Don't let these be changed
 	unset($_POST['guid']);
 	$_POST['post_type'] = 'attachment';
 
 	// Update the thumbnail filename
-	$newmeta = wp_get_attachment_metadata( $post_id, true );
+	$newmeta = wp_get_attachment_metadata($post_id, true);
 	$newmeta['thumb'] = $_POST['thumb'];
 
-	wp_update_attachment_metadata( $post_id, $newmeta );
+	wp_update_attachment_metadata($post_id, $newmeta);
 
 case 'editpost':
-	check_admin_referer('update-post_' . $post_id);
+	check_admin_referer('update-post_'.$post_id);
 
 	$post_id = edit_post();
 
 	// Session cookie flag that the post was saved
-	if ( isset( $_COOKIE['wp-saving-post'] ) && $_COOKIE['wp-saving-post'] === $post_id . '-check' ) {
-		setcookie( 'wp-saving-post', $post_id . '-saved', time() + DAY_IN_SECONDS );
+	if (isset($_COOKIE['wp-saving-post']) && $_COOKIE['wp-saving-post'] === $post_id.'-check') {
+		setcookie('wp-saving-post', $post_id.'-saved', time() + DAY_IN_SECONDS);
 	}
 
 	redirect_post($post_id); // Send user on their way while we keep working
@@ -247,73 +247,73 @@ 
 	exit();
 
 case 'trash':
-	check_admin_referer('trash-post_' . $post_id);
+	check_admin_referer('trash-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	if ( ! $post)
+		wp_die(__('The item you are trying to move to the Trash no longer exists.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('You are not allowed to move this item to the Trash.'));
 
-	if ( $user_id = wp_check_post_lock( $post_id ) ) {
-		$user = get_userdata( $user_id );
-		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
+	if ($user_id = wp_check_post_lock($post_id)) {
+		$user = get_userdata($user_id);
+		wp_die(sprintf(__('You cannot move this item to the Trash. %s is currently editing.'), $user->display_name));
 	}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+	if ( ! wp_trash_post($post_id))
+		wp_die(__('Error in moving to Trash.'));
 
-	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
+	wp_redirect(add_query_arg(array('trashed' => 1, 'ids' => $post_id), $sendback));
 	exit();
 
 case 'untrash':
-	check_admin_referer('untrash-post_' . $post_id);
+	check_admin_referer('untrash-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	if ( ! $post)
+		wp_die(__('The item you are trying to restore from the Trash no longer exists.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('You are not allowed to restore this item from the Trash.'));
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+	if ( ! wp_untrash_post($post_id))
+		wp_die(__('Error in restoring from Trash.'));
 
-	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
+	wp_redirect(add_query_arg('untrashed', 1, $sendback));
 	exit();
 
 case 'delete':
-	check_admin_referer('delete-post_' . $post_id);
+	check_admin_referer('delete-post_'.$post_id);
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+	if ( ! $post)
+		wp_die(__('This item has already been deleted.'));
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object)
+		wp_die(__('Unknown post type.'));
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to delete this item.' ) );
+	if ( ! current_user_can('delete_post', $post_id))
+		wp_die(__('You are not allowed to delete this item.'));
 
 	$force = ! EMPTY_TRASH_DAYS;
-	if ( $post->post_type == 'attachment' ) {
-		$force = ( $force || ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+	if ($post->post_type == 'attachment') {
+		$force = ($force || ! MEDIA_TRASH);
+		if ( ! wp_delete_attachment($post_id, $force))
+			wp_die(__('Error in deleting.'));
 	} else {
-		if ( ! wp_delete_post( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_post($post_id, $force))
+			wp_die(__('Error in deleting.'));
 	}
 
-	wp_redirect( add_query_arg('deleted', 1, $sendback) );
+	wp_redirect(add_query_arg('deleted', 1, $sendback));
 	exit();
 
 case 'preview':
-	check_admin_referer( 'update-post_' . $post_id );
+	check_admin_referer('update-post_'.$post_id);
 
 	$url = post_preview();
 
@@ -321,7 +321,7 @@ 
 	exit();
 
 default:
-	wp_redirect( admin_url('edit.php') );
+	wp_redirect(admin_url('edit.php'));
 	exit();
 } // end switch
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +77 added lines, -52 removed lines

@@ -16,12 +16,13 @@ 
 
 wp_reset_vars( array( 'action' ) );
 
-if ( isset( $_GET['post'] ) )
+if ( isset( $_GET['post'] ) ) {
  	$post_id = $post_ID = (int) $_GET['post'];
-elseif ( isset( $_POST['post_ID'] ) )
+} elseif ( isset( $_POST['post_ID'] ) ) {
  	$post_id = $post_ID = (int) $_POST['post_ID'];
-else
+} else {
  	$post_id = $post_ID = 0;
+}
 
 /**
  * @global string  $post_type
@@ -30,8 +31,9 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( $post_id )
+if ( $post_id ) {
 	$post = get_post( $post_id );
+}
 
 if ( $post ) {
 	$post_type = $post->post_type;
@@ -87,10 +89,11 @@ 
 	exit;
 }
 
-if ( isset( $_POST['deletepost'] ) )
+if ( isset( $_POST['deletepost'] ) ) {
 	$action = 'delete';
-elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] )
+} elseif ( isset($_POST['wp-preview']) && 'dopreview' == $_POST['wp-preview'] ) {
 	$action = 'preview';
+}
 
 $sendback = wp_get_referer();
 if ( ! $sendback ||
@@ -117,15 +120,17 @@ 
 	// For output of the quickdraft dashboard widget
 	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
 
-	if ( ! wp_verify_nonce( $nonce, 'add-post' ) )
-		$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	if ( ! wp_verify_nonce( $nonce, 'add-post' ) ) {
+			$error_msg = __( 'Unable to submit this form, please refresh and try again.' );
+	}
 
 	if ( ! current_user_can( 'edit_posts' ) ) {
 		exit;
 	}
 
-	if ( $error_msg )
-		return wp_dashboard_quick_press( $error_msg );
+	if ( $error_msg ) {
+			return wp_dashboard_quick_press( $error_msg );
+	}
 
 	$post = get_post( $_REQUEST['post_ID'] );
 	check_admin_referer( 'add-' . $post->post_type );
@@ -152,17 +157,21 @@ 
 		exit();
 	}
 
-	if ( ! $post )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $post ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( __( 'You are not allowed to edit this item.' ) );
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to edit this item.' ) );
+	}
 
-	if ( 'trash' == $post->post_status )
-		wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	if ( 'trash' == $post->post_status ) {
+			wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
+	}
 
 	if ( ! empty( $_GET['get-post-lock'] ) ) {
 		check_admin_referer( 'lock-post_' . $post_id );
@@ -181,10 +190,11 @@ 
 		$submenu_file = 'upload.php';
 		$post_new_file = 'media-new.php';
 	} else {
-		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
-			$parent_file = $post_type_object->show_in_menu;
-		else
-			$parent_file = "edit.php?post_type=$post_type";
+		if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+					$parent_file = $post_type_object->show_in_menu;
+		} else {
+					$parent_file = "edit.php?post_type=$post_type";
+		}
 		$submenu_file = "edit.php?post_type=$post_type";
 		$post_new_file = "post-new.php?post_type=$post_type";
 	}
@@ -192,8 +202,9 @@ 
 	if ( ! wp_check_post_lock( $post->ID ) ) {
 		$active_post_lock = wp_set_post_lock( $post->ID );
 
-		if ( 'attachment' !== $post_type )
-			wp_enqueue_script('autosave');
+		if ( 'attachment' !== $post_type ) {
+					wp_enqueue_script('autosave');
+		}
 	}
 
 	if ( is_multisite() ) {
@@ -201,8 +212,9 @@ 
 	} else {
 		$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-		if ( count( $check_users ) > 1 )
-			add_action( 'admin_footer', '_admin_notice_post_locked' );
+		if ( count( $check_users ) > 1 ) {
+					add_action( 'admin_footer', '_admin_notice_post_locked' );
+		}
 
 		unset( $check_users );
 	}
@@ -249,22 +261,26 @@ 
 case 'trash':
 	check_admin_referer('trash-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'The item you are trying to move to the Trash no longer exists.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+	}
 
 	if ( $user_id = wp_check_post_lock( $post_id ) ) {
 		$user = get_userdata( $user_id );
 		wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
 	}
 
-	if ( ! wp_trash_post( $post_id ) )
-		wp_die( __( 'Error in moving to Trash.' ) );
+	if ( ! wp_trash_post( $post_id ) ) {
+			wp_die( __( 'Error in moving to Trash.' ) );
+	}
 
 	wp_redirect( add_query_arg( array('trashed' => 1, 'ids' => $post_id), $sendback ) );
 	exit();
@@ -272,17 +288,21 @@ 
 case 'untrash':
 	check_admin_referer('untrash-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'The item you are trying to restore from the Trash no longer exists.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to restore this item from the Trash.' ) );
+	}
 
-	if ( ! wp_untrash_post( $post_id ) )
-		wp_die( __( 'Error in restoring from Trash.' ) );
+	if ( ! wp_untrash_post( $post_id ) ) {
+			wp_die( __( 'Error in restoring from Trash.' ) );
+	}
 
 	wp_redirect( add_query_arg('untrashed', 1, $sendback) );
 	exit();
@@ -290,23 +310,28 @@ 
 case 'delete':
 	check_admin_referer('delete-post_' . $post_id);
 
-	if ( ! $post )
-		wp_die( __( 'This item has already been deleted.' ) );
+	if ( ! $post ) {
+			wp_die( __( 'This item has already been deleted.' ) );
+	}
 
-	if ( ! $post_type_object )
-		wp_die( __( 'Unknown post type.' ) );
+	if ( ! $post_type_object ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
 
-	if ( ! current_user_can( 'delete_post', $post_id ) )
-		wp_die( __( 'You are not allowed to delete this item.' ) );
+	if ( ! current_user_can( 'delete_post', $post_id ) ) {
+			wp_die( __( 'You are not allowed to delete this item.' ) );
+	}
 
 	$force = ! EMPTY_TRASH_DAYS;
 	if ( $post->post_type == 'attachment' ) {
 		$force = ( $force || ! MEDIA_TRASH );
-		if ( ! wp_delete_attachment( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_attachment( $post_id, $force ) ) {
+					wp_die( __( 'Error in deleting.' ) );
+		}
 	} else {
-		if ( ! wp_delete_post( $post_id, $force ) )
-			wp_die( __( 'Error in deleting.' ) );
+		if ( ! wp_delete_post( $post_id, $force ) ) {
+					wp_die( __( 'Error in deleting.' ) );
+		}
 	}
 
 	wp_redirect( add_query_arg('deleted', 1, $sendback) );

src/wp-admin/ms-options.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite network settings administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+	 * Multisite network settings administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.0.0
+	 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Spacing +2 added lines, -2 removed lines

@@ -7,6 +7,6 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('settings.php') );
+wp_redirect(network_admin_url('settings.php'));

src/wp-admin/ms-edit.php

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url() );
+wp_redirect(network_admin_url());
 exit;