ntwb / wordpress

src/wp-admin/theme-install.php

Braces +2 added lines, -1 removed lines

@@ -12,8 +12,9 @@
 
 wp_reset_vars( array( 'tab' ) );
 
-if ( ! current_user_can('install_themes') )
+if ( ! current_user_can('install_themes') ) {
 	wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'theme-install.php' ) );

Spacing +102 added lines, -102 removed lines

@@ -7,59 +7,59 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-require( ABSPATH . 'wp-admin/includes/theme-install.php' );
+require_once(dirname(__FILE__).'/admin.php');
+require(ABSPATH.'wp-admin/includes/theme-install.php');
 
-wp_reset_vars( array( 'tab' ) );
+wp_reset_vars(array('tab'));
 
-if ( ! current_user_can('install_themes') )
-	wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+if ( ! current_user_can('install_themes'))
+	wp_die(__('You do not have sufficient permissions to install themes on this site.'));
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'theme-install.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('theme-install.php'));
 	exit();
 }
 
-$title = __( 'Add Themes' );
+$title = __('Add Themes');
 $parent_file = 'themes.php';
 
-if ( ! is_network_admin() ) {
+if ( ! is_network_admin()) {
 	$submenu_file = 'themes.php';
 }
 
 $installed_themes = search_theme_directories();
-foreach ( $installed_themes as $k => $v ) {
-	if ( false !== strpos( $k, '/' ) ) {
-		unset( $installed_themes[ $k ] );
+foreach ($installed_themes as $k => $v) {
+	if (false !== strpos($k, '/')) {
+		unset($installed_themes[$k]);
 	}
 }
 
-wp_localize_script( 'theme', '_wpThemeSettings', array(
+wp_localize_script('theme', '_wpThemeSettings', array(
 	'themes'   => false,
 	'settings' => array(
 		'isInstall'     => true,
-		'canInstall'    => current_user_can( 'install_themes' ),
-		'installURI'    => current_user_can( 'install_themes' ) ? self_admin_url( 'theme-install.php' ) : null,
-		'adminUrl'      => parse_url( self_admin_url(), PHP_URL_PATH )
+		'canInstall'    => current_user_can('install_themes'),
+		'installURI'    => current_user_can('install_themes') ? self_admin_url('theme-install.php') : null,
+		'adminUrl'      => parse_url(self_admin_url(), PHP_URL_PATH)
 	),
 	'l10n' => array(
-		'addNew' => __( 'Add New Theme' ),
-		'search' => __( 'Search Themes' ),
-		'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
-		'upload' => __( 'Upload Theme' ),
-		'back'   => __( 'Back' ),
-		'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>.' ),
-		'themesFound'   => __( 'Number of Themes found: %d' ),
-		'noThemesFound' => __( 'No themes found. Try a different search.' ),
-		'collapseSidebar'    => __( 'Collapse Sidebar' ),
-		'expandSidebar'      => __( 'Expand Sidebar' ),
+		'addNew' => __('Add New Theme'),
+		'search' => __('Search Themes'),
+		'searchPlaceholder' => __('Search themes...'), // placeholder (no ellipsis)
+		'upload' => __('Upload Theme'),
+		'back'   => __('Back'),
+		'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>.'),
+		'themesFound'   => __('Number of Themes found: %d'),
+		'noThemesFound' => __('No themes found. Try a different search.'),
+		'collapseSidebar'    => __('Collapse Sidebar'),
+		'expandSidebar'      => __('Expand Sidebar'),
 	),
-	'installedThemes' => array_keys( $installed_themes ),
-) );
+	'installedThemes' => array_keys($installed_themes),
+));
 
-wp_enqueue_script( 'theme' );
+wp_enqueue_script('theme');
 
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires before each of the tabs are rendered on the Install Themes page.
 	 *
@@ -69,51 +69,51 @@ 
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( "install_themes_pre_{$tab}" );
+	do_action("install_themes_pre_{$tab}");
 }
 
 $help_overview =
-	'<p>' . sprintf(
+	'<p>'.sprintf(
 			/* translators: %s: Theme Directory URL */
-			__( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
-			__( 'https://wordpress.org/themes/' )
-		) . '</p>' .
-	'<p>' . __( 'You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>' .
-	'<p>' . __( 'Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.' ) . '</p>' .
-	'<p>' . sprintf(
+			__('You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.'),
+			__('https://wordpress.org/themes/')
+		).'</p>'.
+	'<p>'.__('You can Search for themes by keyword, author, or tag, or can get more specific and search by criteria listed in the feature filter.').' <span id="live-search-desc">'.__('The search results will be updated as you type.').'</span></p>'.
+	'<p>'.__('Alternately, you can browse the themes that are Featured, Popular, or Latest. When you find a theme you like, you can preview it or install it.').'</p>'.
+	'<p>'.sprintf(
 			/* translators: %s: /wp-content/themes */
-			__( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
+			__('You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.'),
 			'<code>/wp-content/themes</code>'
-		) . '</p>';
+		).'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help_overview
-) );
+));
 
 $help_installing =
-	'<p>' . __('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.') . '</p>' .
-	'<p>' . __('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.') . '</p>';
+	'<p>'.__('Once you have generated a list of themes, you can preview and install any of them. Click on the thumbnail of the theme you&#8217;re interested in previewing. It will open up in a full-screen Preview page to give you a better idea of how that theme will look.').'</p>'.
+	'<p>'.__('To install the theme so you can preview it with your site&#8217;s content and customize its theme options, click the "Install" button at the top of the left-hand pane. The theme files will be downloaded to your website automatically. When this is complete, the theme is now available for activation, which you can do by clicking the "Activate" link, or by navigating to your Manage Themes screen and clicking the "Live Preview" link under any installed theme&#8217;s thumbnail image.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'installing',
 	'title'   => __('Previewing and Installing'),
 	'content' => $help_installing
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</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/Using_Themes#Adding_New_Themes" target="_blank">Documentation on Adding New Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
 	<h1><?php
-	echo esc_html( $title );
+	echo esc_html($title);
 
 	/**
 	 * Filter the tabs shown on the Add Themes screen.
@@ -125,10 +125,10 @@ 
 	 *
 	 * @param array $tabs The tabs shown on the Add Themes screen. Default is 'upload'.
 	 */
-	$tabs = apply_filters( 'install_themes_tabs', array( 'upload' => __( 'Upload Theme' ) ) );
-	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_themes' ) ) {
-		echo ' <a href="#" class="upload page-title-action">' . __( 'Upload Theme' ) . '</a>';
-		echo ' <a href="#" class="browse-themes page-title-action">' . _x( 'Browse', 'themes' ) . '</a>';
+	$tabs = apply_filters('install_themes_tabs', array('upload' => __('Upload Theme')));
+	if ( ! empty($tabs['upload']) && current_user_can('upload_themes')) {
+		echo ' <a href="#" class="upload page-title-action">'.__('Upload Theme').'</a>';
+		echo ' <a href="#" class="browse-themes page-title-action">'._x('Browse', 'themes').'</a>';
 	}
 	?></h1>
 
@@ -136,7 +136,7 @@ 
 	<?php install_themes_upload(); ?>
 	</div>
 
-	<h2 class="screen-reader-text"><?php _e( 'Filter themes list' ); ?></h2>
+	<h2 class="screen-reader-text"><?php _e('Filter themes list'); ?></h2>
 
 	<div class="wp-filter">
 		<div class="filter-count">
@@ -144,67 +144,67 @@ 
 		</div>
 
 		<ul class="filter-links">
-			<li><a href="#" data-sort="featured"><?php _ex( 'Featured', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="popular"><?php _ex( 'Popular', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="new"><?php _ex( 'Latest', 'themes' ); ?></a></li>
-			<li><a href="#" data-sort="favorites"><?php _ex( 'Favorites', 'themes' ); ?></a></li>
+			<li><a href="#" data-sort="featured"><?php _ex('Featured', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="popular"><?php _ex('Popular', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="new"><?php _ex('Latest', 'themes'); ?></a></li>
+			<li><a href="#" data-sort="favorites"><?php _ex('Favorites', 'themes'); ?></a></li>
 		</ul>
 
-		<a class="drawer-toggle" href="#"><?php _e( 'Feature Filter' ); ?></a>
+		<a class="drawer-toggle" href="#"><?php _e('Feature Filter'); ?></a>
 
 		<div class="search-form"></div>
 
 		<div class="favorites-form">
 			<?php
-			$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-			update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+			$user = isset($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
+			update_user_meta(get_current_user_id(), 'wporg_favorites', $user);
 			?>
-			<p class="install-help"><?php _e( 'If you have marked themes as favorites on WordPress.org, you can browse them here.' ); ?></p>
+			<p class="install-help"><?php _e('If you have marked themes as favorites on WordPress.org, you can browse them here.'); ?></p>
 
 			<p>
-				<label for="wporg-username-input"><?php _e( 'Your WordPress.org username:' ); ?></label>
-				<input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
-				<input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+				<label for="wporg-username-input"><?php _e('Your WordPress.org username:'); ?></label>
+				<input type="search" id="wporg-username-input" value="<?php echo esc_attr($user); ?>" />
+				<input type="button" class="button button-secondary favorites-form-submit" value="<?php esc_attr_e('Get Favorites'); ?>" />
 			</p>
 		</div>
 
 		<div class="filter-drawer">
 			<div class="buttons">
-				<a class="apply-filters button button-secondary" href="#"><?php _e( 'Apply Filters' ); ?><span></span></a>
-				<a class="clear-filters button button-secondary" href="#"><?php _e( 'Clear' ); ?></a>
+				<a class="apply-filters button button-secondary" href="#"><?php _e('Apply Filters'); ?><span></span></a>
+				<a class="clear-filters button button-secondary" href="#"><?php _e('Clear'); ?></a>
 			</div>
 		<?php
 		$feature_list = get_theme_feature_list();
-		foreach ( $feature_list as $feature_name => $features ) {
+		foreach ($feature_list as $feature_name => $features) {
 			echo '<fieldset class="filter-group">';
-			$feature_name = esc_html( $feature_name );
-			echo '<legend>' . $feature_name . '</legend>';
+			$feature_name = esc_html($feature_name);
+			echo '<legend>'.$feature_name.'</legend>';
 			echo '<div class="filter-group-feature">';
-			foreach ( $features as $feature => $feature_name ) {
-				$feature = esc_attr( $feature );
-				echo '<input type="checkbox" id="filter-id-' . $feature . '" value="' . $feature . '" /> ';
-				echo '<label for="filter-id-' . $feature . '">' . $feature_name . '</label><br>';
+			foreach ($features as $feature => $feature_name) {
+				$feature = esc_attr($feature);
+				echo '<input type="checkbox" id="filter-id-'.$feature.'" value="'.$feature.'" /> ';
+				echo '<label for="filter-id-'.$feature.'">'.$feature_name.'</label><br>';
 			}
 			echo '</div>';
 			echo '</fieldset>';
 		}
 		?>
 			<div class="filtered-by">
-				<span><?php _e( 'Filtering by:' ); ?></span>
+				<span><?php _e('Filtering by:'); ?></span>
 				<div class="tags"></div>
-				<a href="#"><?php _e( 'Edit' ); ?></a>
+				<a href="#"><?php _e('Edit'); ?></a>
 			</div>
 		</div>
 	</div>
-	<h2 class="screen-reader-text"><?php _e( 'Themes list' ); ?></h2>
+	<h2 class="screen-reader-text"><?php _e('Themes list'); ?></h2>
 	<div class="theme-browser content-filterable"></div>
 	<div class="theme-install-overlay wp-full-overlay expanded"></div>
 
-	<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+	<p class="no-themes"><?php _e('No themes found. Try a different search.'); ?></p>
 	<span class="spinner"></span>
 
 <?php
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires at the top of each of the tabs on the Install Themes page.
 	 *
@@ -216,7 +216,7 @@ 
 	 *
 	 * @param int $paged Number of the current page of results being viewed.
 	 */
-	do_action( "install_themes_{$tab}", $paged );
+	do_action("install_themes_{$tab}", $paged);
 }
 ?>
 </div>
@@ -229,36 +229,36 @@ 
 	<# } else { #>
 		<div class="theme-screenshot blank"></div>
 	<# } #>
-	<span class="more-details"><?php _ex( 'Details &amp; Preview', 'theme' ); ?></span>
-	<div class="theme-author"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></div>
+	<span class="more-details"><?php _ex('Details &amp; Preview', 'theme'); ?></span>
+	<div class="theme-author"><?php printf(__('By %s'), '{{ data.author }}'); ?></div>
 	<h3 class="theme-name">{{ data.name }}</h3>
 
 	<div class="theme-actions">
-		<a class="button button-primary" href="{{ data.install_url }}"><?php esc_html_e( 'Install' ); ?></a>
-		<a class="button button-secondary preview install-theme-preview" href="#"><?php esc_html_e( 'Preview' ); ?></a>
+		<a class="button button-primary" href="{{ data.install_url }}"><?php esc_html_e('Install'); ?></a>
+		<a class="button button-secondary preview install-theme-preview" href="#"><?php esc_html_e('Preview'); ?></a>
 	</div>
 
 	<# if ( data.installed ) { #>
-		<div class="theme-installed"><?php _ex( 'Already Installed', 'theme' ); ?></div>
+		<div class="theme-installed"><?php _ex('Already Installed', 'theme'); ?></div>
 	<# } #>
 </script>
 
 <script id="tmpl-theme-preview" type="text/template">
 	<div class="wp-full-overlay-sidebar">
 		<div class="wp-full-overlay-header">
-			<a href="#" class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></a>
-			<a href="#" class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></a>
-			<a href="#" class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></a>
+			<a href="#" class="close-full-overlay"><span class="screen-reader-text"><?php _e('Close'); ?></span></a>
+			<a href="#" class="previous-theme"><span class="screen-reader-text"><?php _ex('Previous', 'Button label for a theme'); ?></span></a>
+			<a href="#" class="next-theme"><span class="screen-reader-text"><?php _ex('Next', 'Button label for a theme'); ?></span></a>
 		<# if ( data.installed ) { #>
-			<a href="#" class="button button-primary theme-install disabled"><?php _ex( 'Installed', 'theme' ); ?></a>
+			<a href="#" class="button button-primary theme-install disabled"><?php _ex('Installed', 'theme'); ?></a>
 		<# } else { #>
-			<a href="{{ data.install_url }}" class="button button-primary theme-install"><?php _e( 'Install' ); ?></a>
+			<a href="{{ data.install_url }}" class="button button-primary theme-install"><?php _e('Install'); ?></a>
 		<# } #>
 		</div>
 		<div class="wp-full-overlay-sidebar-content">
 			<div class="install-theme-info">
 				<h3 class="theme-name">{{ data.name }}</h3>
-				<span class="theme-by"><?php printf( __( 'By %s' ), '{{ data.author }}' ); ?></span>
+				<span class="theme-by"><?php printf(__('By %s'), '{{ data.author }}'); ?></span>
 
 				<img class="theme-screenshot" src="{{ data.screenshot_url }}" alt="" />
 
@@ -269,29 +269,29 @@ 
 							<span class="num-ratings" aria-hidden="true">({{ data.num_ratings }})</span>
 						</div>
 					<# } else { #>
-						<span class="no-rating"><?php _e( 'This theme has not been rated yet.' ); ?></span>
+						<span class="no-rating"><?php _e('This theme has not been rated yet.'); ?></span>
 					<# } #>
-					<div class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></div>
+					<div class="theme-version"><?php printf(__('Version: %s'), '{{ data.version }}'); ?></div>
 					<div class="theme-description">{{{ data.description }}}</div>
 				</div>
 			</div>
 		</div>
 		<div class="wp-full-overlay-footer">
 			<div class="devices">
-				<button type="button" class="preview-desktop active" aria-pressed="true" data-device="desktop"><span class="screen-reader-text"><?php _e( 'Enter desktop preview mode' ); ?></span></button>
-				<button type="button" class="preview-tablet" aria-pressed="false" data-device="tablet"><span class="screen-reader-text"><?php _e( 'Enter tablet preview mode' ); ?></span></button>
-				<button type="button" class="preview-mobile" aria-pressed="false" data-device="mobile"><span class="screen-reader-text"><?php _e( 'Enter mobile preview mode' ); ?></span></button>
+				<button type="button" class="preview-desktop active" aria-pressed="true" data-device="desktop"><span class="screen-reader-text"><?php _e('Enter desktop preview mode'); ?></span></button>
+				<button type="button" class="preview-tablet" aria-pressed="false" data-device="tablet"><span class="screen-reader-text"><?php _e('Enter tablet preview mode'); ?></span></button>
+				<button type="button" class="preview-mobile" aria-pressed="false" data-device="mobile"><span class="screen-reader-text"><?php _e('Enter mobile preview mode'); ?></span></button>
 			</div>
-			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e('Collapse Sidebar'); ?>">
 				<span class="collapse-sidebar-arrow"></span>
-				<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+				<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 			</button>
 		</div>
 	</div>
 	<div class="wp-full-overlay-main">
-		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e( 'Preview' ); ?>" />
+		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e('Preview'); ?>" />
 	</div>
 </script>
 
 <?php
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/includes/schema.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * WordPress Administration Scheme API
- *
- * Here we keep the DB structure and option values.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Scheme API
+	 *
+	 * Here we keep the DB structure and option values.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Declare these as global in case schema.php is included from a function.

Spacing +157 added lines, -157 removed lines

@@ -33,21 +33,21 @@ 
  * @param int $blog_id Optional. The site ID for which to retrieve SQL. Default is the current site ID.
  * @return string The SQL needed to create the requested tables.
  */
-function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
+function wp_get_db_schema($scope = 'all', $blog_id = null) {
 	global $wpdb;
 
 	$charset_collate = '';
 
-	if ( ! empty($wpdb->charset) )
+	if ( ! empty($wpdb->charset))
 		$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-	if ( ! empty($wpdb->collate) )
+	if ( ! empty($wpdb->collate))
 		$charset_collate .= " COLLATE $wpdb->collate";
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
-		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	if ($blog_id && $blog_id != $wpdb->blogid)
+		$old_blog_id = $wpdb->set_blog_id($blog_id);
 
 	// Engage multisite if in the middle of turning it on from network.php.
-	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
+	$is_multisite = is_multisite() || (defined('WP_INSTALLING_NETWORK') && WP_INSTALLING_NETWORK);
 
 	/*
 	 * Indexes have a maximum size of 767 bytes. Historically, we haven't need to be concerned about that.
@@ -240,10 +240,10 @@ 
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
-		$global_tables = $users_multi_table . $usermeta_table;
+	if ($is_multisite)
+		$global_tables = $users_multi_table.$usermeta_table;
 	else
-		$global_tables = $users_single_table . $usermeta_table;
+		$global_tables = $users_single_table.$usermeta_table;
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -314,13 +314,13 @@ 
   KEY domain_path (domain(140),path(51))
 ) $charset_collate;";
 
-	switch ( $scope ) {
+	switch ($scope) {
 		case 'blog' :
 			$queries = $blog_tables;
 			break;
 		case 'global' :
 			$queries = $global_tables;
-			if ( $is_multisite )
+			if ($is_multisite)
 				$queries .= $ms_global_tables;
 			break;
 		case 'ms_global' :
@@ -328,20 +328,20 @@ 
 			break;
 		case 'all' :
 		default:
-			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
+			$queries = $global_tables.$blog_tables;
+			if ($is_multisite)
 				$queries .= $ms_global_tables;
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
-		$wpdb->set_blog_id( $old_blog_id );
+	if (isset($old_blog_id))
+		$wpdb->set_blog_id($old_blog_id);
 
 	return $queries;
 }
 
 // Populate for back compat.
-$wp_queries = wp_get_db_schema( 'all' );
+$wp_queries = wp_get_db_schema('all');
 
 /**
  * Create WordPress options and set the default values.
@@ -361,9 +361,9 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'populate_options' );
+	do_action('populate_options');
 
-	if ( ini_get('safe_mode') ) {
+	if (ini_get('safe_mode')) {
 		// Safe mode can break mkdir() so use a flat structure by default.
 		$uploads_use_yearmonth_folders = 0;
 	} else {
@@ -372,13 +372,13 @@ 
 
 	// If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
 	$stylesheet = $template = WP_DEFAULT_THEME;
-	$theme = wp_get_theme( WP_DEFAULT_THEME );
-	if ( ! $theme->exists() ) {
+	$theme = wp_get_theme(WP_DEFAULT_THEME);
+	if ( ! $theme->exists()) {
 		$theme = WP_Theme::get_core_default_theme();
 	}
 
 	// If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
-	if ( $theme ) {
+	if ($theme) {
 		$stylesheet = $theme->get_stylesheet();
 		$template   = $theme->get_template();
 	}
@@ -389,10 +389,10 @@ 
 	   or a valid timezone string (America/New_York). See http://us3.php.net/manual/en/timezones.php
 	   for all timezone strings supported by PHP.
 	*/
-	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
+	$offset_or_tz = _x('0', 'default GMT offset or timezone string');
+	if (is_numeric($offset_or_tz))
 		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
+	elseif ($offset_or_tz && in_array($offset_or_tz, timezone_identifiers_list()))
 			$timezone_string = $offset_or_tz;
 
 	$options = array(
@@ -404,7 +404,7 @@ 
 	'users_can_register' => 0,
 	'admin_email' => 'you@example.com',
 	/* translators: default start of the week. 0 = Sunday, 1 = Monday */
-	'start_of_week' => _x( '1', 'start of week' ),
+	'start_of_week' => _x('1', 'start of week'),
 	'use_balanceTags' => 0,
 	'use_smilies' => 1,
 	'require_name_email' => 1,
@@ -524,45 +524,45 @@ 
 	);
 
 	// 3.3
-	if ( ! is_multisite() ) {
-		$options['initial_db_version'] = ! empty( $wp_current_db_version ) && $wp_current_db_version < $wp_db_version
+	if ( ! is_multisite()) {
+		$options['initial_db_version'] = ! empty($wp_current_db_version) && $wp_current_db_version < $wp_db_version
 			? $wp_current_db_version : $wp_db_version;
 	}
 
 	// 3.0 multisite
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		/* translators: site tagline */
-		$options[ 'blogdescription' ] = sprintf(__('Just another %s site'), get_current_site()->site_name );
-		$options[ 'permalink_structure' ] = '/%year%/%monthnum%/%day%/%postname%/';
+		$options['blogdescription'] = sprintf(__('Just another %s site'), get_current_site()->site_name);
+		$options['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
 	}
 
 	// Set autoload to no for these options
-	$fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' );
+	$fat_options = array('moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins');
 
-	$keys = "'" . implode( "', '", array_keys( $options ) ) . "'";
-	$existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" );
+	$keys = "'".implode("', '", array_keys($options))."'";
+	$existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )");
 
 	$insert = '';
-	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
+	foreach ($options as $option => $value) {
+		if (in_array($option, $existing_options))
 			continue;
-		if ( in_array($option, $fat_options) )
+		if (in_array($option, $fat_options))
 			$autoload = 'no';
 		else
 			$autoload = 'yes';
 
-		if ( is_array($value) )
+		if (is_array($value))
 			$value = serialize($value);
-		if ( !empty($insert) )
+		if ( ! empty($insert))
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
+		$insert .= $wpdb->prepare("(%s, %s, %s)", $option, $value, $autoload);
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( ! empty($insert))
+		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES ".$insert);
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( ! __get_option('home')) update_option('home', $guessurl);
 
 	// Delete unused options.
 	$unusedoptions = array(
@@ -583,7 +583,7 @@ 
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
 		'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit'
 	);
-	foreach ( $unusedoptions as $option )
+	foreach ($unusedoptions as $option)
 		delete_option($option);
 
 	// Delete obsolete magpie stuff.
@@ -600,15 +600,15 @@ 
 		AND a.option_name NOT LIKE %s
 		AND b.option_name = CONCAT( '_transient_timeout_', SUBSTRING( a.option_name, 12 ) )
 		AND b.option_value < %d";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_transient_' ) . '%', $wpdb->esc_like( '_transient_timeout_' ) . '%', $time ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_transient_').'%', $wpdb->esc_like('_transient_timeout_').'%', $time));
 
-	if ( is_main_site() && is_main_network() ) {
+	if (is_main_site() && is_main_network()) {
 		$sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
 			WHERE a.option_name LIKE %s
 			AND a.option_name NOT LIKE %s
 			AND b.option_name = CONCAT( '_site_transient_timeout_', SUBSTRING( a.option_name, 17 ) )
 			AND b.option_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 }
 
@@ -742,7 +742,7 @@ 
 	$roles = array('administrator', 'editor');
 	foreach ($roles as $role) {
 		$role = get_role($role);
-		if ( empty($role) )
+		if (empty($role))
 			continue;
 
 		$role->add_cap('edit_others_pages');
@@ -763,19 +763,19 @@ 
 	}
 
 	$role = get_role('administrator');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_users');
 		$role->add_cap('create_users');
 	}
 
 	$role = get_role('author');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_posts');
 		$role->add_cap('delete_published_posts');
 	}
 
 	$role = get_role('contributor');
-	if ( ! empty($role) ) {
+	if ( ! empty($role)) {
 		$role->add_cap('delete_posts');
 	}
 }
@@ -786,10 +786,10 @@ 
  * @since 2.3.0
  */
 function populate_roles_230() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'unfiltered_upload' );
+	if ( ! empty($role)) {
+		$role->add_cap('unfiltered_upload');
 	}
 }
 
@@ -799,10 +799,10 @@ 
  * @since 2.5.0
  */
 function populate_roles_250() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'edit_dashboard' );
+	if ( ! empty($role)) {
+		$role->add_cap('edit_dashboard');
 	}
 }
 
@@ -812,11 +812,11 @@ 
  * @since 2.6.0
  */
 function populate_roles_260() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'update_plugins' );
-		$role->add_cap( 'delete_plugins' );
+	if ( ! empty($role)) {
+		$role->add_cap('update_plugins');
+		$role->add_cap('delete_plugins');
 	}
 }
 
@@ -826,11 +826,11 @@ 
  * @since 2.7.0
  */
 function populate_roles_270() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'install_plugins' );
-		$role->add_cap( 'update_themes' );
+	if ( ! empty($role)) {
+		$role->add_cap('install_plugins');
+		$role->add_cap('update_themes');
 	}
 }
 
@@ -840,10 +840,10 @@ 
  * @since 2.8.0
  */
 function populate_roles_280() {
-	$role = get_role( 'administrator' );
+	$role = get_role('administrator');
 
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'install_themes' );
+	if ( ! empty($role)) {
+		$role->add_cap('install_themes');
 	}
 }
 
@@ -853,16 +853,16 @@ 
  * @since 3.0.0
  */
 function populate_roles_300() {
-	$role = get_role( 'administrator' );
-
-	if ( !empty( $role ) ) {
-		$role->add_cap( 'update_core' );
-		$role->add_cap( 'list_users' );
-		$role->add_cap( 'remove_users' );
-		$role->add_cap( 'promote_users' );
-		$role->add_cap( 'edit_theme_options' );
-		$role->add_cap( 'delete_themes' );
-		$role->add_cap( 'export' );
+	$role = get_role('administrator');
+
+	if ( ! empty($role)) {
+		$role->add_cap('update_core');
+		$role->add_cap('list_users');
+		$role->add_cap('remove_users');
+		$role->add_cap('promote_users');
+		$role->add_cap('edit_theme_options');
+		$role->add_cap('delete_themes');
+		$role->add_cap('export');
 	}
 }
 
@@ -872,12 +872,12 @@ 
  * @since 3.0.0
  *
  */
-if ( !function_exists( 'install_network' ) ) :
+if ( ! function_exists('install_network')) :
 function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+	if ( ! defined('WP_INSTALLING_NETWORK'))
+		define('WP_INSTALLING_NETWORK', true);
 
-	dbDelta( wp_get_db_schema( 'global' ) );
+	dbDelta(wp_get_db_schema('global'));
 }
 endif;
 
@@ -901,75 +901,75 @@ 
  * @return bool|WP_Error True on success, or WP_Error on warning (with the install otherwise successful,
  *                       so the error code must be checked) or failure.
  */
-function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
+function populate_network($network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false) {
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
-		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	if ('' == $domain)
+		$errors->add('empty_domain', __('You must provide a domain name.'));
+	if ('' == $site_name)
+		$errors->add('empty_sitename', __('You must provide a name for your network of sites.'));
 
 	// Check for network collision.
-	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-		$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if ($network_id == $wpdb->get_var($wpdb->prepare("SELECT id FROM $wpdb->site WHERE id = %d", $network_id)))
+		$errors->add('siteid_exists', __('The network already exists.'));
 
-	if ( ! is_email( $email ) )
-		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	if ( ! is_email($email))
+		$errors->add('invalid_email', __('You must provide a valid email address.'));
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
 	// If a user with the provided email does not exist, default to the current user as the new network admin.
-	$site_user = get_user_by( 'email', $email );
-	if ( false === $site_user ) {
+	$site_user = get_user_by('email', $email);
+	if (false === $site_user) {
 		$site_user = wp_get_current_user();
 	}
 
 	// Set up site tables.
-	$template = get_option( 'template' );
-	$stylesheet = get_option( 'stylesheet' );
-	$allowed_themes = array( $stylesheet => true );
+	$template = get_option('template');
+	$stylesheet = get_option('stylesheet');
+	$allowed_themes = array($stylesheet => true);
 
-	if ( $template != $stylesheet ) {
-		$allowed_themes[ $template ] = true;
+	if ($template != $stylesheet) {
+		$allowed_themes[$template] = true;
 	}
 
-	if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
-		$allowed_themes[ WP_DEFAULT_THEME ] = true;
+	if (WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template) {
+		$allowed_themes[WP_DEFAULT_THEME] = true;
 	}
 
 	// If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme.
-	if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
-		if ( $core_default = WP_Theme::get_core_default_theme() ) {
-			$allowed_themes[ $core_default->get_stylesheet() ] = true;
+	if ( ! wp_get_theme(WP_DEFAULT_THEME)->exists()) {
+		if ($core_default = WP_Theme::get_core_default_theme()) {
+			$allowed_themes[$core_default->get_stylesheet()] = true;
 		}
 	}
 
-	if ( 1 == $network_id ) {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );
+	if (1 == $network_id) {
+		$wpdb->insert($wpdb->site, array('domain' => $domain, 'path' => $path));
 		$network_id = $wpdb->insert_id;
 	} else {
-		$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path, 'id' => $network_id ) );
+		$wpdb->insert($wpdb->site, array('domain' => $domain, 'path' => $path, 'id' => $network_id));
 	}
 
-	wp_cache_delete( 'networks_have_paths', 'site-options' );
+	wp_cache_delete('networks_have_paths', 'site-options');
 
-	if ( !is_multisite() ) {
-		$site_admins = array( $site_user->user_login );
-		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
-		if ( $users ) {
-			foreach ( $users as $user ) {
-				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
+	if ( ! is_multisite()) {
+		$site_admins = array($site_user->user_login);
+		$users = get_users(array('fields' => array('ID', 'user_login')));
+		if ($users) {
+			foreach ($users as $user) {
+				if (is_super_admin($user->ID) && ! in_array($user->user_login, $site_admins))
 					$site_admins[] = $user->user_login;
 			}
 		}
 	} else {
-		$site_admins = get_site_option( 'site_admins' );
+		$site_admins = get_site_option('site_admins');
 	}
 
 	/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-	$welcome_email = __( 'Howdy USERNAME,
+	$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -996,35 +996,35 @@ 
 	);
 	$audio_exts = wp_get_audio_extensions();
 	$video_exts = wp_get_video_extensions();
-	$upload_filetypes = array_unique( array_merge( $misc_exts, $audio_exts, $video_exts ) );
+	$upload_filetypes = array_unique(array_merge($misc_exts, $audio_exts, $video_exts));
 
 	$sitemeta = array(
 		'site_name' => $site_name,
 		'admin_email' => $email,
 		'admin_user_id' => $site_user->ID,
 		'registration' => 'none',
-		'upload_filetypes' => implode( ' ', $upload_filetypes ),
+		'upload_filetypes' => implode(' ', $upload_filetypes),
 		'blog_upload_space' => 100,
 		'fileupload_maxk' => 1500,
 		'site_admins' => $site_admins,
 		'allowedthemes' => $allowed_themes,
-		'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
+		'illegal_names' => array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files'),
 		'wpmu_upgrade_site' => $wp_db_version,
 		'welcome_email' => $welcome_email,
 		/* translators: %s: site link */
-		'first_post' => __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' ),
+		'first_post' => __('Welcome to %s. This is your first post. Edit or delete it, then start blogging!'),
 		// @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
-		'siteurl' => get_option( 'siteurl' ) . '/',
+		'siteurl' => get_option('siteurl').'/',
 		'add_new_users' => '0',
-		'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
-		'subdomain_install' => intval( $subdomain_install ),
+		'upload_space_check_disabled' => is_multisite() ? get_site_option('upload_space_check_disabled') : '1',
+		'subdomain_install' => intval($subdomain_install),
 		'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
-		'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-		'initial_db_version' => get_option( 'initial_db_version' ),
+		'ms_files_rewriting' => is_multisite() ? get_site_option('ms_files_rewriting') : '0',
+		'initial_db_version' => get_option('initial_db_version'),
 		'active_sitewide_plugins' => array(),
 		'WPLANG' => get_locale(),
 	);
-	if ( ! $subdomain_install )
+	if ( ! $subdomain_install)
 		$sitemeta['illegal_names'][] = 'blog';
 
 	/**
@@ -1035,17 +1035,17 @@ 
 	 * @param array $sitemeta   Associative array of network meta keys and values to be inserted.
 	 * @param int   $network_id ID of network to populate.
 	 */
-	$sitemeta = apply_filters( 'populate_network_meta', $sitemeta, $network_id );
+	$sitemeta = apply_filters('populate_network_meta', $sitemeta, $network_id);
 
 	$insert = '';
-	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
-			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
+	foreach ($sitemeta as $meta_key => $meta_value) {
+		if (is_array($meta_value))
+			$meta_value = serialize($meta_value);
+		if ( ! empty($insert))
 			$insert .= ', ';
-		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
+		$insert .= $wpdb->prepare("( %d, %s, %s)", $network_id, $meta_key, $meta_value);
 	}
-	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
+	$wpdb->query("INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES ".$insert);
 
 	/*
 	 * When upgrading from single to multisite, assume the current site will
@@ -1054,58 +1054,58 @@ 
 	 * these steps since the main site of the new network has not yet been
 	 * created.
 	 */
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$current_site = new stdClass;
 		$current_site->domain = $domain;
 		$current_site->path = $path;
-		$current_site->site_name = ucfirst( $domain );
-		$wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time( 'mysql' ) ) );
+		$current_site->site_name = ucfirst($domain);
+		$wpdb->insert($wpdb->blogs, array('site_id' => $network_id, 'blog_id' => 1, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
 		$current_site->blog_id = $blog_id = $wpdb->insert_id;
-		update_user_meta( $site_user->ID, 'source_domain', $domain );
-		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
+		update_user_meta($site_user->ID, 'source_domain', $domain);
+		update_user_meta($site_user->ID, 'primary_blog', $blog_id);
 
-		if ( $subdomain_install )
-			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+		if ($subdomain_install)
+			$wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
 		else
-			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+			$wp_rewrite->set_permalink_structure('/blog/%year%/%monthnum%/%day%/%postname%/');
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
+		if ( ! $subdomain_install)
 			return true;
 
 		$vhost_ok = false;
 		$errstr = '';
-		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
-		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
+		$hostname = substr(md5(time()), 0, 6).'.'.$domain; // Very random hostname!
+		$page = wp_remote_get('http://'.$hostname, array('timeout' => 5, 'httpversion' => '1.1'));
+		if (is_wp_error($page))
 			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
+		elseif (200 == wp_remote_retrieve_response_code($page))
 				$vhost_ok = true;
 
-		if ( ! $vhost_ok ) {
-			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';
+		if ( ! $vhost_ok) {
+			$msg = '<p><strong>'.__('Warning! Wildcard DNS may not be configured correctly!').'</strong></p>';
 
-			$msg .= '<p>' . sprintf(
+			$msg .= '<p>'.sprintf(
 				/* translators: %s: host name */
-				__( 'The installer attempted to contact a random hostname (%s) on your domain.' ),
-				'<code>' . $hostname . '</code>'
+				__('The installer attempted to contact a random hostname (%s) on your domain.'),
+				'<code>'.$hostname.'</code>'
 			);
-			if ( ! empty ( $errstr ) ) {
+			if ( ! empty ($errstr)) {
 				/* translators: %s: error message */
-				$msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '<code>' . $errstr . '</code>' );
+				$msg .= ' '.sprintf(__('This resulted in an error message: %s'), '<code>'.$errstr.'</code>');
 			}
 			$msg .= '</p>';
 
-			$msg .= '<p>' . sprintf(
+			$msg .= '<p>'.sprintf(
 				/* translators: %s: asterisk symbol (*) */
-				__( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.' ),
+				__('To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a %s hostname record pointing at your web server in your DNS configuration tool.'),
 				'<code>*</code>'
-			) . '</p>';
+			).'</p>';
 
-			$msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
+			$msg .= '<p>'.__('You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.').'</p>';
 
-			return new WP_Error( 'no_wildcard_dns', $msg );
+			return new WP_Error('no_wildcard_dns', $msg);
 		}
 	}
 

Braces +98 added lines, -68 removed lines

@@ -38,13 +38,16 @@ 
 
 	$charset_collate = '';
 
-	if ( ! empty($wpdb->charset) )
-		$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-	if ( ! empty($wpdb->collate) )
-		$charset_collate .= " COLLATE $wpdb->collate";
+	if ( ! empty($wpdb->charset) ) {
+			$charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+	}
+	if ( ! empty($wpdb->collate) ) {
+			$charset_collate .= " COLLATE $wpdb->collate";
+	}
 
-	if ( $blog_id && $blog_id != $wpdb->blogid )
-		$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	if ( $blog_id && $blog_id != $wpdb->blogid ) {
+			$old_blog_id = $wpdb->set_blog_id( $blog_id );
+	}
 
 	// Engage multisite if in the middle of turning it on from network.php.
 	$is_multisite = is_multisite() || ( defined( 'WP_INSTALLING_NETWORK' ) && WP_INSTALLING_NETWORK );
@@ -240,10 +243,11 @@ 
 ) $charset_collate;\n";
 
 	// Global tables
-	if ( $is_multisite )
-		$global_tables = $users_multi_table . $usermeta_table;
-	else
-		$global_tables = $users_single_table . $usermeta_table;
+	if ( $is_multisite ) {
+			$global_tables = $users_multi_table . $usermeta_table;
+	} else {
+			$global_tables = $users_single_table . $usermeta_table;
+	}
 
 	// Multisite global tables.
 	$ms_global_tables = "CREATE TABLE $wpdb->blogs (
@@ -320,8 +324,9 @@ 
 			break;
 		case 'global' :
 			$queries = $global_tables;
-			if ( $is_multisite )
-				$queries .= $ms_global_tables;
+			if ( $is_multisite ) {
+							$queries .= $ms_global_tables;
+			}
 			break;
 		case 'ms_global' :
 			$queries = $ms_global_tables;
@@ -329,13 +334,15 @@ 
 		case 'all' :
 		default:
 			$queries = $global_tables . $blog_tables;
-			if ( $is_multisite )
-				$queries .= $ms_global_tables;
+			if ( $is_multisite ) {
+							$queries .= $ms_global_tables;
+			}
 			break;
 	}
 
-	if ( isset( $old_blog_id ) )
-		$wpdb->set_blog_id( $old_blog_id );
+	if ( isset( $old_blog_id ) ) {
+			$wpdb->set_blog_id( $old_blog_id );
+	}
 
 	return $queries;
 }
@@ -390,10 +397,11 @@ 
 	   for all timezone strings supported by PHP.
 	*/
 	$offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
-	if ( is_numeric( $offset_or_tz ) )
-		$gmt_offset = $offset_or_tz;
-	elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
-			$timezone_string = $offset_or_tz;
+	if ( is_numeric( $offset_or_tz ) ) {
+			$gmt_offset = $offset_or_tz;
+	} elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) ) {
+				$timezone_string = $offset_or_tz;
+	}
 
 	$options = array(
 	'siteurl' => $guessurl,
@@ -544,25 +552,32 @@ 
 
 	$insert = '';
 	foreach ( $options as $option => $value ) {
-		if ( in_array($option, $existing_options) )
-			continue;
-		if ( in_array($option, $fat_options) )
-			$autoload = 'no';
-		else
-			$autoload = 'yes';
-
-		if ( is_array($value) )
-			$value = serialize($value);
-		if ( !empty($insert) )
-			$insert .= ', ';
+		if ( in_array($option, $existing_options) ) {
+					continue;
+		}
+		if ( in_array($option, $fat_options) ) {
+					$autoload = 'no';
+		} else {
+					$autoload = 'yes';
+		}
+
+		if ( is_array($value) ) {
+					$value = serialize($value);
+		}
+		if ( !empty($insert) ) {
+					$insert .= ', ';
+		}
 		$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
 	}
 
-	if ( !empty($insert) )
-		$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	if ( !empty($insert) ) {
+			$wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
+	}
 
 	// In case it is set, but blank, update "home".
-	if ( !__get_option('home') ) update_option('home', $guessurl);
+	if ( !__get_option('home') ) {
+		update_option('home', $guessurl);
+	}
 
 	// Delete unused options.
 	$unusedoptions = array(
@@ -583,8 +598,9 @@ 
 		'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app',
 		'embed_autourls', 'default_post_edit_rows', 'gzipcompression', 'advanced_edit'
 	);
-	foreach ( $unusedoptions as $option )
-		delete_option($option);
+	foreach ( $unusedoptions as $option ) {
+			delete_option($option);
+	}
 
 	// Delete obsolete magpie stuff.
 	$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
@@ -742,8 +758,9 @@ 
 	$roles = array('administrator', 'editor');
 	foreach ($roles as $role) {
 		$role = get_role($role);
-		if ( empty($role) )
-			continue;
+		if ( empty($role) ) {
+					continue;
+		}
 
 		$role->add_cap('edit_others_pages');
 		$role->add_cap('edit_published_pages');
@@ -874,8 +891,9 @@ 
  */
 if ( !function_exists( 'install_network' ) ) :
 function install_network() {
-	if ( ! defined( 'WP_INSTALLING_NETWORK' ) )
-		define( 'WP_INSTALLING_NETWORK', true );
+	if ( ! defined( 'WP_INSTALLING_NETWORK' ) ) {
+			define( 'WP_INSTALLING_NETWORK', true );
+	}
 
 	dbDelta( wp_get_db_schema( 'global' ) );
 }
@@ -905,20 +923,25 @@ 
 	global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
 	$errors = new WP_Error();
-	if ( '' == $domain )
-		$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
-	if ( '' == $site_name )
-		$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	if ( '' == $domain ) {
+			$errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
+	}
+	if ( '' == $site_name ) {
+			$errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
+	}
 
 	// Check for network collision.
-	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
-		$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) ) {
+			$errors->add( 'siteid_exists', __( 'The network already exists.' ) );
+	}
 
-	if ( ! is_email( $email ) )
-		$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	if ( ! is_email( $email ) ) {
+			$errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
+	}
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	// If a user with the provided email does not exist, default to the current user as the new network admin.
 	$site_user = get_user_by( 'email', $email );
@@ -960,8 +983,9 @@ 
 		$users = get_users( array( 'fields' => array( 'ID', 'user_login' ) ) );
 		if ( $users ) {
 			foreach ( $users as $user ) {
-				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
-					$site_admins[] = $user->user_login;
+				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) ) {
+									$site_admins[] = $user->user_login;
+				}
 			}
 		}
 	} else {
@@ -1024,8 +1048,9 @@ 
 		'active_sitewide_plugins' => array(),
 		'WPLANG' => get_locale(),
 	);
-	if ( ! $subdomain_install )
-		$sitemeta['illegal_names'][] = 'blog';
+	if ( ! $subdomain_install ) {
+			$sitemeta['illegal_names'][] = 'blog';
+	}
 
 	/**
 	 * Filter meta for a network on creation.
@@ -1039,10 +1064,12 @@ 
 
 	$insert = '';
 	foreach ( $sitemeta as $meta_key => $meta_value ) {
-		if ( is_array( $meta_value ) )
-			$meta_value = serialize( $meta_value );
-		if ( !empty( $insert ) )
-			$insert .= ', ';
+		if ( is_array( $meta_value ) ) {
+					$meta_value = serialize( $meta_value );
+		}
+		if ( !empty( $insert ) ) {
+					$insert .= ', ';
+		}
 		$insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value );
 	}
 	$wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
@@ -1064,24 +1091,27 @@ 
 		update_user_meta( $site_user->ID, 'source_domain', $domain );
 		update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
 
-		if ( $subdomain_install )
-			$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
-		else
-			$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		if ( $subdomain_install ) {
+					$wp_rewrite->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+		} else {
+					$wp_rewrite->set_permalink_structure( '/blog/%year%/%monthnum%/%day%/%postname%/' );
+		}
 
 		flush_rewrite_rules();
 
-		if ( ! $subdomain_install )
-			return true;
+		if ( ! $subdomain_install ) {
+					return true;
+		}
 
 		$vhost_ok = false;
 		$errstr = '';
 		$hostname = substr( md5( time() ), 0, 6 ) . '.' . $domain; // Very random hostname!
 		$page = wp_remote_get( 'http://' . $hostname, array( 'timeout' => 5, 'httpversion' => '1.1' ) );
-		if ( is_wp_error( $page ) )
-			$errstr = $page->get_error_message();
-		elseif ( 200 == wp_remote_retrieve_response_code( $page ) )
-				$vhost_ok = true;
+		if ( is_wp_error( $page ) ) {
+					$errstr = $page->get_error_message();
+		} elseif ( 200 == wp_remote_retrieve_response_code( $page ) ) {
+						$vhost_ok = true;
+		}
 
 		if ( ! $vhost_ok ) {
 			$msg = '<p><strong>' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '</strong></p>';

src/wp-admin/includes/meta-boxes.php

Braces +59 added lines, -32 removed lines

@@ -107,8 +107,11 @@ 
 <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
 <?php if ( 'auto-draft' == $post->post_status ) : ?>
 <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
-<?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<?php else {
+	: ?>
+<option<?php selected( $post->post_status, 'draft' );
+}
+?> value='draft'><?php _e('Draft') ?></option>
 <?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -238,10 +241,11 @@ 
 <div id="delete-action">
 <?php
 if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
-		$delete_text = __('Delete Permanently');
-	else
-		$delete_text = __('Move to Trash');
+	if ( !EMPTY_TRASH_DAYS ) {
+			$delete_text = __('Delete Permanently');
+	} else {
+			$delete_text = __('Move to Trash');
+	}
 	?>
 <a class="submitdelete deletion" href="<?php echo get_delete_post_link($post->ID); ?>"><?php echo $delete_text; ?></a><?php
 } ?>
@@ -255,13 +259,19 @@ 
 		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
 		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false ); ?>
-<?php	else : ?>
+<?php	else {
+	: ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false );
+}
+?>
 <?php	endif;
-	else : ?>
+	else {
+		: ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false );
+	}
+	?>
 <?php
 	endif;
 } else { ?>
@@ -323,9 +333,10 @@ 
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
-		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
+	if ( current_user_can( 'delete_post', $post->ID ) ) {
+			if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
 			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . __( 'Trash' ) . "</a>";
+	}
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
 			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
@@ -367,11 +378,13 @@ 
 
 	if ( is_array( $post_formats[0] ) ) :
 		$post_format = get_post_format( $post->ID );
-		if ( !$post_format )
-			$post_format = '0';
+		if ( !$post_format ) {
+					$post_format = '0';
+		}
 		// Add in the current one if it isn't there yet, in case the current theme doesn't support it
-		if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
-			$post_formats[0][] = $post_format;
+		if ( $post_format && !in_array( $post_format, $post_formats[0] ) ) {
+					$post_formats[0][] = $post_format;
+		}
 	?>
 	<div id="post-formats-select">
 		<fieldset>
@@ -557,9 +570,10 @@ 
 <p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty($pings) ) {
 	echo $pings;
 }
+}
 
 /**
  * Display custom fields form fields.
@@ -575,9 +589,10 @@ 
 <?php
 $metadata = has_meta($post->ID);
 foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) )
-		unset( $metadata[ $key ] );
-}
+	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) ) {
+			unset( $metadata[ $key ] );
+	}
+	}
 list_meta( $metadata );
 meta_form( $post ); ?>
 </div>
@@ -868,10 +883,11 @@ 
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
-				wp_link_category_checklist($link->link_id);
-			else
-				wp_link_category_checklist();
+			if ( isset($link->link_id) ) {
+							wp_link_category_checklist($link->link_id);
+			} else {
+							wp_link_category_checklist();
+			}
 			?>
 		</ul>
 	</div>
@@ -933,8 +949,10 @@ 
 function xfn_check( $class, $value = '', $deprecated = '' ) {
 	global $link;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.0' );
+	}
+	// Never implemented
 
 	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
 	$rels = preg_split('/\s+/', $link_rel);
@@ -944,10 +962,18 @@ 
 	}
 
 	if ('' == $value) {
-		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
-		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
-		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) {
+			echo ' checked="checked"';
+		}
+		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) {
+			echo ' checked="checked"';
+		}
+		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) {
+			echo ' checked="checked"';
+		}
+		if ('identity' == $class && in_array('me', $rels) ) {
+			echo ' checked="checked"';
+		}
 	}
 }
 
@@ -1097,8 +1123,9 @@ 
 		<?php
 			for ( $r = 0; $r <= 10; $r++ ) {
 				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
-					echo ' selected="selected"';
+				if ( isset($link->link_rating) && $link->link_rating == $r ) {
+									echo ' selected="selected"';
+				}
 				echo('>' . $r . '</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>

Indentation +14 added lines, -14 removed lines

@@ -61,12 +61,12 @@ 
 <?php endif; // public post type ?>
 <?php
 /**
- * Fires before the post time/date setting in the Publish meta box.
- *
- * @since 4.4.0
- *
- * @param WP_Post $post WP_Post object for the current post.
- */
+	 * Fires before the post time/date setting in the Publish meta box.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param WP_Post $post WP_Post object for the current post.
+	 */
 do_action( 'post_submitbox_minor_actions', $post );
 ?>
 <div class="clear"></div>
@@ -835,14 +835,14 @@ 
 <label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
 <?php
 /**
- * Filter the title of the default page template displayed in the drop-down.
- *
- * @since 4.1.0
- *
- * @param string $label   The display value for the default page template title.
- * @param string $context Where the option label is displayed. Possible values
- *                        include 'meta-box' or 'quick-edit'.
- */
+	 * Filter the title of the default page template displayed in the drop-down.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param string $label   The display value for the default page template title.
+	 * @param string $context Where the option label is displayed. Possible values
+	 *                        include 'meta-box' or 'quick-edit'.
+	 */
 $default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'meta-box' );
 ?>
 <option value="default"><?php echo esc_html( $default_title ); ?></option>

Spacing +207 added lines, -207 removed lines

@@ -19,7 +19,7 @@ 
  *     @type array    $args     Extra meta box arguments.
  * }
  */
-function post_submit_meta_box( $post, $args = array() ) {
+function post_submit_meta_box($post, $args = array()) {
 	global $action;
 
 	$post_type = $post->post_type;
@@ -32,27 +32,27 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
+<?php submit_button(__('Save'), 'button', 'save'); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="save-action">
-<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?>
-<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
+<?php if ('publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status) { ?>
+<input <?php if ('private' == $post->post_status) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save Draft'); ?>" class="button" />
 <span class="spinner"></span>
-<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
+<?php } elseif ('pending' == $post->post_status && $can_publish) { ?>
 <input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" class="button" />
 <span class="spinner"></span>
 <?php } ?>
 </div>
-<?php if ( is_post_type_viewable( $post_type_object ) ) : ?>
+<?php if (is_post_type_viewable($post_type_object)) : ?>
 <div id="preview-action">
 <?php
-$preview_link = esc_url( get_preview_post_link( $post ) );
-if ( 'publish' == $post->post_status ) {
-	$preview_button = __( 'Preview Changes' );
+$preview_link = esc_url(get_preview_post_link($post));
+if ('publish' == $post->post_status) {
+	$preview_button = __('Preview Changes');
 } else {
-	$preview_button = __( 'Preview' );
+	$preview_button = __('Preview');
 }
 ?>
 <a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview-<?php echo (int) $post->ID; ?>" id="post-preview"><?php echo $preview_button; ?></a>
@@ -67,7 +67,7 @@ 
  *
  * @param WP_Post $post WP_Post object for the current post.
  */
-do_action( 'post_submitbox_minor_actions', $post );
+do_action('post_submitbox_minor_actions', $post);
 ?>
 <div class="clear"></div>
 </div><!-- #minor-publishing-actions -->
@@ -77,7 +77,7 @@ 
 <div class="misc-pub-section misc-pub-post-status"><label for="post_status"><?php _e('Status:') ?></label>
 <span id="post-status-display">
 <?php
-switch ( $post->post_status ) {
+switch ($post->post_status) {
 	case 'private':
 		_e('Privately Published');
 		break;
@@ -97,24 +97,24 @@ 
 }
 ?>
 </span>
-<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?>
-<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
+<?php if ('publish' == $post->post_status || 'private' == $post->post_status || $can_publish) { ?>
+<a href="#post_status" <?php if ('private' == $post->post_status) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit status'); ?></span></a>
 
 <div id="post-status-select" class="hide-if-js">
-<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ('auto-draft' == $post->post_status ) ? 'draft' : $post->post_status); ?>" />
+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr(('auto-draft' == $post->post_status) ? 'draft' : $post->post_status); ?>" />
 <select name='post_status' id='post_status'>
-<?php if ( 'publish' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option>
-<?php elseif ( 'private' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option>
-<?php elseif ( 'future' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>
+<?php if ('publish' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'publish'); ?> value='publish'><?php _e('Published') ?></option>
+<?php elseif ('private' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'private'); ?> value='publish'><?php _e('Privately Published') ?></option>
+<?php elseif ('future' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'future'); ?> value='future'><?php _e('Scheduled') ?></option>
 <?php endif; ?>
-<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
-<?php if ( 'auto-draft' == $post->post_status ) : ?>
-<option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<option<?php selected($post->post_status, 'pending'); ?> value='pending'><?php _e('Pending Review') ?></option>
+<?php if ('auto-draft' == $post->post_status) : ?>
+<option<?php selected($post->post_status, 'auto-draft'); ?> value='draft'><?php _e('Draft') ?></option>
 <?php else : ?>
-<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
+<option<?php selected($post->post_status, 'draft'); ?> value='draft'><?php _e('Draft') ?></option>
 <?php endif; ?>
 </select>
  <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -127,14 +127,14 @@ 
 <div class="misc-pub-section misc-pub-visibility" id="visibility">
 <?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
 
-if ( 'private' == $post->post_status ) {
+if ('private' == $post->post_status) {
 	$post->post_password = '';
 	$visibility = 'private';
 	$visibility_trans = __('Private');
-} elseif ( !empty( $post->post_password ) ) {
+} elseif ( ! empty($post->post_password)) {
 	$visibility = 'password';
 	$visibility_trans = __('Password protected');
-} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
+} elseif ($post_type == 'post' && is_sticky($post->ID)) {
 	$visibility = 'public';
 	$visibility_trans = __('Public, Sticky');
 } else {
@@ -142,23 +142,23 @@ 
 	$visibility_trans = __('Public');
 }
 
-echo esc_html( $visibility_trans ); ?></span>
-<?php if ( $can_publish ) { ?>
-<a href="#visibility" class="edit-visibility hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit visibility' ); ?></span></a>
+echo esc_html($visibility_trans); ?></span>
+<?php if ($can_publish) { ?>
+<a href="#visibility" class="edit-visibility hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit visibility'); ?></span></a>
 
 <div id="post-visibility-select" class="hide-if-js">
 <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr($post->post_password); ?>" />
 <?php if ($post_type == 'post'): ?>
 <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
 <?php endif; ?>
-<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
-<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
-<?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
-<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
+<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr($visibility); ?>" />
+<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked($visibility, 'public'); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
+<?php if ($post_type == 'post' && current_user_can('edit_others_posts')) : ?>
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page'); ?></label><br /></span>
 <?php endif; ?>
-<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked($visibility, 'password'); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
 <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($post->post_password); ?>"  maxlength="20" /><br /></span>
-<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
+<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked($visibility, 'private'); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
 
 <p>
  <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
@@ -171,40 +171,40 @@ 
 
 <?php
 /* translators: Publish box date format, see http://php.net/date */
-$datef = __( 'M j, Y @ H:i' );
-if ( 0 != $post->ID ) {
-	if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
+$datef = __('M j, Y @ H:i');
+if (0 != $post->ID) {
+	if ('future' == $post->post_status) { // scheduled for publishing at a future date
 		$stamp = __('Scheduled for: <b>%1$s</b>');
-	} elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
+	} elseif ('publish' == $post->post_status || 'private' == $post->post_status) { // already published
 		$stamp = __('Published on: <b>%1$s</b>');
-	} elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
+	} elseif ('0000-00-00 00:00:00' == $post->post_date_gmt) { // draft, 1 or more saves, no date specified
 		$stamp = __('Publish <b>immediately</b>');
-	} elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
+	} elseif (time() < strtotime($post->post_date_gmt.' +0000')) { // draft, 1 or more saves, future date specified
 		$stamp = __('Schedule for: <b>%1$s</b>');
 	} else { // draft, 1 or more saves, date specified
 		$stamp = __('Publish on: <b>%1$s</b>');
 	}
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	$date = date_i18n($datef, strtotime($post->post_date));
 } else { // draft (no saves, and thus no date specified)
 	$stamp = __('Publish <b>immediately</b>');
-	$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
+	$date = date_i18n($datef, strtotime(current_time('mysql')));
 }
 
-if ( ! empty( $args['args']['revisions_count'] ) ) : ?>
+if ( ! empty($args['args']['revisions_count'])) : ?>
 <div class="misc-pub-section misc-pub-revisions">
-	<?php printf( __( 'Revisions: %s' ), '<b>' . number_format_i18n( $args['args']['revisions_count'] ) . '</b>' ); ?>
-	<a class="hide-if-no-js" href="<?php echo esc_url( get_edit_post_link( $args['args']['revision_id'] ) ); ?>"><span aria-hidden="true"><?php _ex( 'Browse', 'revisions' ); ?></span> <span class="screen-reader-text"><?php _e( 'Browse revisions' ); ?></span></a>
+	<?php printf(__('Revisions: %s'), '<b>'.number_format_i18n($args['args']['revisions_count']).'</b>'); ?>
+	<a class="hide-if-no-js" href="<?php echo esc_url(get_edit_post_link($args['args']['revision_id'])); ?>"><span aria-hidden="true"><?php _ex('Browse', 'revisions'); ?></span> <span class="screen-reader-text"><?php _e('Browse revisions'); ?></span></a>
 </div>
 <?php endif;
 
-if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
+if ($can_publish) : // Contributors don't get to choose the date of publish ?>
 <div class="misc-pub-section curtime misc-pub-curtime">
 	<span id="timestamp">
 	<?php printf($stamp, $date); ?></span>
-	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+	<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit date and time'); ?></span></a>
 	<fieldset id="timestampdiv" class="hide-if-js">
-	<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
-	<?php touch_time( ( $action === 'edit' ), 1 ); ?>
+	<legend class="screen-reader-text"><?php _e('Date and time'); ?></legend>
+	<?php touch_time(($action === 'edit'), 1); ?>
 	</fieldset>
 </div><?php // /misc-pub-section ?>
 <?php endif; ?>
@@ -218,7 +218,7 @@ 
  *
  * @param WP_Post $post WP_Post object for the current post.
  */
-do_action( 'post_submitbox_misc_actions', $post );
+do_action('post_submitbox_misc_actions', $post);
 ?>
 </div>
 <div class="clear"></div>
@@ -231,12 +231,12 @@ 
  *
  * @since 2.7.0
  */
-do_action( 'post_submitbox_start' );
+do_action('post_submitbox_start');
 ?>
 <div id="delete-action">
 <?php
-if ( current_user_can( "delete_post", $post->ID ) ) {
-	if ( !EMPTY_TRASH_DAYS )
+if (current_user_can("delete_post", $post->ID)) {
+	if ( ! EMPTY_TRASH_DAYS)
 		$delete_text = __('Delete Permanently');
 	else
 		$delete_text = __('Move to Trash');
@@ -248,23 +248,23 @@ 
 <div id="publishing-action">
 <span class="spinner"></span>
 <?php
-if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
-	if ( $can_publish ) :
-		if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+if ( ! in_array($post->post_status, array('publish', 'future', 'private')) || 0 == $post->ID) {
+	if ($can_publish) :
+		if ( ! empty($post->post_date_gmt) && time() < strtotime($post->post_date_gmt.' +0000')) : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
-		<?php submit_button( __( 'Schedule' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Schedule'), 'primary button-large', 'publish', false); ?>
 <?php	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
-		<?php submit_button( __( 'Publish' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Publish'), 'primary button-large', 'publish', false); ?>
 <?php	endif;
 	else : ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
-		<?php submit_button( __( 'Submit for Review' ), 'primary button-large', 'publish', false ); ?>
+		<?php submit_button(__('Submit for Review'), 'primary button-large', 'publish', false); ?>
 <?php
 	endif;
 } else { ?>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ) ?>" />
+		<input name="save" type="submit" class="button button-primary button-large" id="publish" value="<?php esc_attr_e('Update') ?>" />
 <?php
 } ?>
 </div>
@@ -282,7 +282,7 @@ 
  *
  * @param object $post
  */
-function attachment_submit_meta_box( $post ) {
+function attachment_submit_meta_box($post) {
 ?>
 <div class="submitbox" id="submitpost">
 
@@ -290,16 +290,16 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
+<?php submit_button(__('Save'), 'button', 'save'); ?>
 </div>
 
 
 <div id="misc-publishing-actions">
 	<?php
 	/* translators: Publish box date format, see http://php.net/date */
-	$datef = __( 'M j, Y @ H:i' );
+	$datef = __('M j, Y @ H:i');
 	$stamp = __('Uploaded on: <b>%1$s</b>');
-	$date = date_i18n( $datef, strtotime( $post->post_date ) );
+	$date = date_i18n($datef, strtotime($post->post_date));
 	?>
 	<div class="misc-pub-section curtime misc-pub-curtime">
 		<span id="timestamp"><?php printf($stamp, $date); ?></span>
@@ -312,7 +312,7 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'attachment_submitbox_misc_actions' );
+	do_action('attachment_submitbox_misc_actions');
 	?>
 </div><!-- #misc-publishing-actions -->
 <div class="clear"></div>
@@ -321,12 +321,12 @@ 
 <div id="major-publishing-actions">
 	<div id="delete-action">
 	<?php
-	if ( current_user_can( 'delete_post', $post->ID ) )
-		if ( EMPTY_TRASH_DAYS && MEDIA_TRASH ) {
-			echo "<a class='submitdelete deletion' href='" . get_delete_post_link( $post->ID ) . "'>" . _x( 'Trash', 'verb' ) . "</a>";
+	if (current_user_can('delete_post', $post->ID))
+		if (EMPTY_TRASH_DAYS && MEDIA_TRASH) {
+			echo "<a class='submitdelete deletion' href='".get_delete_post_link($post->ID)."'>"._x('Trash', 'verb')."</a>";
 		} else {
 			$delete_ays = ! MEDIA_TRASH ? " onclick='return showNotice.warn();'" : '';
-			echo  "<a class='submitdelete deletion'$delete_ays href='" . get_delete_post_link( $post->ID, null, true ) . "'>" . __( 'Delete Permanently' ) . "</a>";
+			echo  "<a class='submitdelete deletion'$delete_ays href='".get_delete_post_link($post->ID, null, true)."'>".__('Delete Permanently')."</a>";
 		}
 	?>
 	</div>
@@ -334,7 +334,7 @@ 
 	<div id="publishing-action">
 		<span class="spinner"></span>
 		<input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update') ?>" />
-		<input name="save" type="submit" class="button-primary button-large" id="publish" value="<?php esc_attr_e( 'Update' ) ?>" />
+		<input name="save" type="submit" class="button-primary button-large" id="publish" value="<?php esc_attr_e('Update') ?>" />
 	</div>
 	<div class="clear"></div>
 </div><!-- #major-publishing-actions -->
@@ -359,24 +359,24 @@ 
  *     @type array    $args     Extra meta box arguments.
  * }
  */
-function post_format_meta_box( $post, $box ) {
-	if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) :
-	$post_formats = get_theme_support( 'post-formats' );
+function post_format_meta_box($post, $box) {
+	if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) :
+	$post_formats = get_theme_support('post-formats');
 
-	if ( is_array( $post_formats[0] ) ) :
-		$post_format = get_post_format( $post->ID );
-		if ( !$post_format )
+	if (is_array($post_formats[0])) :
+		$post_format = get_post_format($post->ID);
+		if ( ! $post_format)
 			$post_format = '0';
 		// Add in the current one if it isn't there yet, in case the current theme doesn't support it
-		if ( $post_format && !in_array( $post_format, $post_formats[0] ) )
+		if ($post_format && ! in_array($post_format, $post_formats[0]))
 			$post_formats[0][] = $post_format;
 	?>
 	<div id="post-formats-select">
 		<fieldset>
-			<legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
-			<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
-			<?php foreach ( $post_formats[0] as $format ) : ?>
-			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>" class="post-format-icon post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+			<legend class="screen-reader-text"><?php _e('Post Formats'); ?></legend>
+			<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked($post_format, '0'); ?> /> <label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string('standard'); ?></label>
+			<?php foreach ($post_formats[0] as $format) : ?>
+			<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr($format); ?>" value="<?php echo esc_attr($format); ?>" <?php checked($post_format, $format); ?> /> <label for="post-format-<?php echo esc_attr($format); ?>" class="post-format-icon post-format-<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></label>
 			<?php endforeach; ?>
 		</fieldset>
 	</div>
@@ -404,20 +404,20 @@ 
  *     }
  * }
  */
-function post_tags_meta_box( $post, $box ) {
-	$defaults = array( 'taxonomy' => 'post_tag' );
-	if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+function post_tags_meta_box($post, $box) {
+	$defaults = array('taxonomy' => 'post_tag');
+	if ( ! isset($box['args']) || ! is_array($box['args'])) {
 		$args = array();
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
-	$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-	$comma = _x( ',', 'tag delimiter' );
-	$terms_to_edit = get_terms_to_edit( $post->ID, $tax_name );
-	if ( ! is_string( $terms_to_edit ) ) {
+	$r = wp_parse_args($args, $defaults);
+	$tax_name = esc_attr($r['taxonomy']);
+	$taxonomy = get_taxonomy($r['taxonomy']);
+	$user_can_assign_terms = current_user_can($taxonomy->cap->assign_terms);
+	$comma = _x(',', 'tag delimiter');
+	$terms_to_edit = get_terms_to_edit($post->ID, $tax_name);
+	if ( ! is_string($terms_to_edit)) {
 		$terms_to_edit = '';
 	}
 ?>
@@ -425,9 +425,9 @@ 
 	<div class="jaxtag">
 	<div class="nojs-tags hide-if-js">
 		<label for="tax-input-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_or_remove_items; ?></label>
-		<p><textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?> aria-describedby="new-tag-<?php echo $tax_name; ?>-desc"><?php echo str_replace( ',', $comma . ' ', $terms_to_edit ); // textarea_escaped by esc_attr() ?></textarea></p>
+		<p><textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms); ?> aria-describedby="new-tag-<?php echo $tax_name; ?>-desc"><?php echo str_replace(',', $comma.' ', $terms_to_edit); // textarea_escaped by esc_attr() ?></textarea></p>
 	</div>
- 	<?php if ( $user_can_assign_terms ) : ?>
+ 	<?php if ($user_can_assign_terms) : ?>
 	<div class="ajaxtag hide-if-no-js">
 		<label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
 		<p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" aria-describedby="new-tag-<?php echo $tax_name; ?>-desc" value="" />
@@ -438,7 +438,7 @@ 
 	</div>
 	<div class="tagchecklist"></div>
 </div>
-<?php if ( $user_can_assign_terms ) : ?>
+<?php if ($user_can_assign_terms) : ?>
 <p class="hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->choose_from_most_used; ?></a></p>
 <?php endif; ?>
 <?php
@@ -465,49 +465,49 @@ 
  *     }
  * }
  */
-function post_categories_meta_box( $post, $box ) {
-	$defaults = array( 'taxonomy' => 'category' );
-	if ( ! isset( $box['args'] ) || ! is_array( $box['args'] ) ) {
+function post_categories_meta_box($post, $box) {
+	$defaults = array('taxonomy' => 'category');
+	if ( ! isset($box['args']) || ! is_array($box['args'])) {
 		$args = array();
 	} else {
 		$args = $box['args'];
 	}
-	$r = wp_parse_args( $args, $defaults );
-	$tax_name = esc_attr( $r['taxonomy'] );
-	$taxonomy = get_taxonomy( $r['taxonomy'] );
+	$r = wp_parse_args($args, $defaults);
+	$tax_name = esc_attr($r['taxonomy']);
+	$taxonomy = get_taxonomy($r['taxonomy']);
 	?>
 	<div id="taxonomy-<?php echo $tax_name; ?>" class="categorydiv">
 		<ul id="<?php echo $tax_name; ?>-tabs" class="category-tabs">
 			<li class="tabs"><a href="#<?php echo $tax_name; ?>-all"><?php echo $taxonomy->labels->all_items; ?></a></li>
-			<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e( 'Most Used' ); ?></a></li>
+			<li class="hide-if-no-js"><a href="#<?php echo $tax_name; ?>-pop"><?php _e('Most Used'); ?></a></li>
 		</ul>
 
 		<div id="<?php echo $tax_name; ?>-pop" class="tabs-panel" style="display: none;">
 			<ul id="<?php echo $tax_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
-				<?php $popular_ids = wp_popular_terms_checklist( $tax_name ); ?>
+				<?php $popular_ids = wp_popular_terms_checklist($tax_name); ?>
 			</ul>
 		</div>
 
 		<div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
 			<?php
-			$name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
+			$name = ($tax_name == 'category') ? 'post_category' : 'tax_input['.$tax_name.']';
 			echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
 			?>
 			<ul id="<?php echo $tax_name; ?>checklist" data-wp-lists="list:<?php echo $tax_name; ?>" class="categorychecklist form-no-clear">
-				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?>
+				<?php wp_terms_checklist($post->ID, array('taxonomy' => $tax_name, 'popular_cats' => $popular_ids)); ?>
 			</ul>
 		</div>
-	<?php if ( current_user_can( $taxonomy->cap->edit_terms ) ) : ?>
+	<?php if (current_user_can($taxonomy->cap->edit_terms)) : ?>
 			<div id="<?php echo $tax_name; ?>-adder" class="wp-hidden-children">
 				<a id="<?php echo $tax_name; ?>-add-toggle" href="#<?php echo $tax_name; ?>-add" class="hide-if-no-js taxonomy-add-new">
 					<?php
 						/* translators: %s: add new taxonomy label */
-						printf( __( '+ %s' ), $taxonomy->labels->add_new_item );
+						printf(__('+ %s'), $taxonomy->labels->add_new_item);
 					?>
 				</a>
 				<p id="<?php echo $tax_name; ?>-add" class="category-add wp-hidden-child">
 					<label class="screen-reader-text" for="new<?php echo $tax_name; ?>"><?php echo $taxonomy->labels->add_new_item; ?></label>
-					<input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/>
+					<input type="text" name="new<?php echo $tax_name; ?>" id="new<?php echo $tax_name; ?>" class="form-required form-input-tip" value="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" aria-required="true"/>
 					<label class="screen-reader-text" for="new<?php echo $tax_name; ?>_parent">
 						<?php echo $taxonomy->labels->parent_item_colon; ?>
 					</label>
@@ -515,10 +515,10 @@ 
 					$parent_dropdown_args = array(
 						'taxonomy'         => $tax_name,
 						'hide_empty'       => 0,
-						'name'             => 'new' . $tax_name . '_parent',
+						'name'             => 'new'.$tax_name.'_parent',
 						'orderby'          => 'name',
 						'hierarchical'     => 1,
-						'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;',
+						'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;',
 					);
 
 					/**
@@ -545,12 +545,12 @@ 
 					 *                                      taxonomy label.
 					 * }
 					 */
-					$parent_dropdown_args = apply_filters( 'post_edit_category_parent_dropdown_args', $parent_dropdown_args );
+					$parent_dropdown_args = apply_filters('post_edit_category_parent_dropdown_args', $parent_dropdown_args);
 
-					wp_dropdown_categories( $parent_dropdown_args );
+					wp_dropdown_categories($parent_dropdown_args);
 					?>
-					<input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr( $taxonomy->labels->add_new_item ); ?>" />
-					<?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?>
+					<input type="button" id="<?php echo $tax_name; ?>-add-submit" data-wp-lists="add:<?php echo $tax_name; ?>checklist:<?php echo $tax_name; ?>-add" class="button category-add-submit" value="<?php echo esc_attr($taxonomy->labels->add_new_item); ?>" />
+					<?php wp_nonce_field('add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false); ?>
 					<span id="<?php echo $tax_name; ?>-ajax-response"></span>
 				</p>
 			</div>
@@ -572,8 +572,8 @@ 
 <p><?php
 	printf(
 		/* translators: %s: Codex URL */
-		__( 'Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.' ),
-		__( 'https://codex.wordpress.org/Excerpt' )
+		__('Excerpts are optional hand-crafted summaries of your content that can be used in your theme. <a href="%s">Learn more about manual excerpts</a>.'),
+		__('https://codex.wordpress.org/Excerpt')
 	);
 ?></p>
 <?php
@@ -587,32 +587,32 @@ 
  * @param object $post
  */
 function post_trackback_meta_box($post) {
-	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="' .
-		esc_attr( str_replace( "\n", ' ', $post->to_ping ) ) . '" aria-describedby="trackback-url-desc" />';
+	$form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="'.
+		esc_attr(str_replace("\n", ' ', $post->to_ping)).'" aria-describedby="trackback-url-desc" />';
 	if ('' != $post->pinged) {
-		$pings = '<p>'. __('Already pinged:') . '</p><ul>';
+		$pings = '<p>'.__('Already pinged:').'</p><ul>';
 		$already_pinged = explode("\n", trim($post->pinged));
 		foreach ($already_pinged as $pinged_url) {
-			$pings .= "\n\t<li>" . esc_html($pinged_url) . "</li>";
+			$pings .= "\n\t<li>".esc_html($pinged_url)."</li>";
 		}
 		$pings .= '</ul>';
 	}
 
 ?>
 <p>
-	<label for="trackback_url"><?php _e( 'Send trackbacks to:' ); ?></label>
+	<label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label>
 	<?php echo $form_trackback; ?>
 </p>
-<p id="trackback-url-desc" class="howto"><?php _e( 'Separate multiple URLs with spaces' ); ?></p>
+<p id="trackback-url-desc" class="howto"><?php _e('Separate multiple URLs with spaces'); ?></p>
 <p><?php
 	printf(
 		/* translators: %s: Codex URL */
-		__( 'Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.' ),
-		__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' )
+		__('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites, they&#8217;ll be notified automatically using <a href="%s">pingbacks</a>, no other action necessary.'),
+		__('https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments')
 	);
 ?></p>
 <?php
-if ( ! empty($pings) )
+if ( ! empty($pings))
 	echo $pings;
 }
 
@@ -629,18 +629,18 @@ 
 <div id="ajax-response"></div>
 <?php
 $metadata = has_meta($post->ID);
-foreach ( $metadata as $key => $value ) {
-	if ( is_protected_meta( $metadata[ $key ][ 'meta_key' ], 'post' ) || ! current_user_can( 'edit_post_meta', $post->ID, $metadata[ $key ][ 'meta_key' ] ) )
-		unset( $metadata[ $key ] );
+foreach ($metadata as $key => $value) {
+	if (is_protected_meta($metadata[$key]['meta_key'], 'post') || ! current_user_can('edit_post_meta', $post->ID, $metadata[$key]['meta_key']))
+		unset($metadata[$key]);
 }
-list_meta( $metadata );
-meta_form( $post ); ?>
+list_meta($metadata);
+meta_form($post); ?>
 </div>
 <p><?php
 	printf(
 		/* translators: %s: Codex URL */
-		__( 'Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.' ),
-		__( 'https://codex.wordpress.org/Using_Custom_Fields' )
+		__('Custom fields can be used to add extra metadata to a post that you can <a href="%s">use in your theme</a>.'),
+		__('https://codex.wordpress.org/Using_Custom_Fields')
 	);
 ?></p>
 <?php
@@ -657,12 +657,12 @@ 
 ?>
 <input name="advanced_view" type="hidden" value="1" />
 <p class="meta-options">
-	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e( 'Allow comments.' ) ?></label><br />
+	<label for="comment_status" class="selectit"><input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e('Allow comments.') ?></label><br />
 	<label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php
 		printf(
 			/* translators: %s: Codex URL */
-			__( 'Allow <a href="%s">trackbacks and pingbacks</a> on this page.' ),
-			__( 'https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments' ) );
+			__('Allow <a href="%s">trackbacks and pingbacks</a> on this page.'),
+			__('https://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments') );
 		?></label>
 	<?php
 	/**
@@ -672,7 +672,7 @@ 
 	 *
 	 * @param WP_Post $post WP_Post object of the current post.
 	 */
-	do_action( 'post_comment_status_meta_box-options', $post );
+	do_action('post_comment_status_meta_box-options', $post);
 	?>
 </p>
 <?php
@@ -698,21 +698,21 @@ 
  *
  * @param object $post
  */
-function post_comment_meta_box( $post ) {
-	wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
+function post_comment_meta_box($post) {
+	wp_nonce_field('get-comments', 'add_comment_nonce', false);
 	?>
 	<p class="hide-if-no-js" id="add-new-comment"><a class="button" href="#commentstatusdiv" onclick="window.commentReply && commentReply.addcomment(<?php echo $post->ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>
 	<?php
 
-	$total = get_comments( array( 'post_id' => $post->ID, 'number' => 1, 'count' => true ) );
+	$total = get_comments(array('post_id' => $post->ID, 'number' => 1, 'count' => true));
 	$wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
-	$wp_list_table->display( true );
+	$wp_list_table->display(true);
 
-	if ( 1 > $total ) {
-		echo '<p id="no-comments">' . __('No comments yet.') . '</p>';
+	if (1 > $total) {
+		echo '<p id="no-comments">'.__('No comments yet.').'</p>';
 	} else {
-		$hidden = get_hidden_meta_boxes( get_current_screen() );
-		if ( ! in_array('commentsdiv', $hidden) ) {
+		$hidden = get_hidden_meta_boxes(get_current_screen());
+		if ( ! in_array('commentsdiv', $hidden)) {
 			?>
 			<script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
 			<?php
@@ -735,9 +735,9 @@ 
  */
 function post_slug_meta_box($post) {
 /** This filter is documented in wp-admin/edit-tag-form.php */
-$editable_slug = apply_filters( 'editable_slug', $post->post_name, $post );
+$editable_slug = apply_filters('editable_slug', $post->post_name, $post);
 ?>
-<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $editable_slug ); ?>" />
+<label class="screen-reader-text" for="post_name"><?php _e('Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr($editable_slug); ?>" />
 <?php
 }
 
@@ -755,13 +755,13 @@ 
 ?>
 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
 <?php
-	wp_dropdown_users( array(
+	wp_dropdown_users(array(
 		'who' => 'authors',
 		'name' => 'post_author_override',
 		'selected' => empty($post->ID) ? $user_ID : $post->post_author,
 		'include_selected' => true,
 		'show' => 'display_name_with_login',
-	) );
+	));
 }
 
 /**
@@ -771,8 +771,8 @@ 
  *
  * @param object $post
  */
-function post_revisions_meta_box( $post ) {
-	wp_list_post_revisions( $post );
+function post_revisions_meta_box($post) {
+	wp_list_post_revisions($post);
 }
 
 // -- Page related Meta Boxes
@@ -786,7 +786,7 @@ 
  */
 function page_attributes_meta_box($post) {
 	$post_type_object = get_post_type_object($post->post_type);
-	if ( $post_type_object->hierarchical ) {
+	if ($post_type_object->hierarchical) {
 		$dropdown_args = array(
 			'post_type'        => $post->post_type,
 			'exclude_tree'     => $post->ID,
@@ -807,9 +807,9 @@ 
 		 * @param array   $dropdown_args Array of arguments used to generate the pages drop-down.
 		 * @param WP_Post $post          The current WP_Post object.
 		 */
-		$dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
-		$pages = wp_dropdown_pages( $dropdown_args );
-		if ( ! empty($pages) ) {
+		$dropdown_args = apply_filters('page_attributes_dropdown_pages_args', $dropdown_args, $post);
+		$pages = wp_dropdown_pages($dropdown_args);
+		if ( ! empty($pages)) {
 ?>
 <p><strong><?php _e('Parent') ?></strong></p>
 <label class="screen-reader-text" for="parent_id"><?php _e('Parent') ?></label>
@@ -817,8 +817,8 @@ 
 <?php
 		} // end empty pages check
 	} // end hierarchical check.
-	if ( 'page' == $post->post_type && 0 != count( get_page_templates( $post ) ) && get_option( 'page_for_posts' ) != $post->ID ) {
-		$template = !empty($post->page_template) ? $post->page_template : false;
+	if ('page' == $post->post_type && 0 != count(get_page_templates($post)) && get_option('page_for_posts') != $post->ID) {
+		$template = ! empty($post->page_template) ? $post->page_template : false;
 		?>
 <p><strong><?php _e('Template') ?></strong><?php
 	/**
@@ -830,7 +830,7 @@ 
 	 * @param string  $template The template used for the current post.
 	 * @param WP_Post $post     The current post.
 	 */
-	do_action( 'page_attributes_meta_box_template', $template, $post );
+	do_action('page_attributes_meta_box_template', $template, $post);
 ?></p>
 <label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
 <?php
@@ -843,17 +843,17 @@ 
  * @param string $context Where the option label is displayed. Possible values
  *                        include 'meta-box' or 'quick-edit'.
  */
-$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'meta-box' );
+$default_title = apply_filters('default_page_template_title', __('Default Template'), 'meta-box');
 ?>
-<option value="default"><?php echo esc_html( $default_title ); ?></option>
+<option value="default"><?php echo esc_html($default_title); ?></option>
 <?php page_template_dropdown($template); ?>
 </select>
 <?php
 	} ?>
 <p><strong><?php _e('Order') ?></strong></p>
 <p><label class="screen-reader-text" for="menu_order"><?php _e('Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr($post->menu_order) ?>" /></p>
-<?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) { ?>
-<p><?php _e( 'Need help? Use the Help tab in the upper right of your screen.' ); ?></p>
+<?php if ('page' == $post->post_type && get_current_screen()->get_help_tabs()) { ?>
+<p><?php _e('Need help? Use the Help tab in the upper right of your screen.'); ?></p>
 <?php
 	}
 }
@@ -875,12 +875,12 @@ 
 
 <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
 <div style="display:none;">
-<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
+<?php submit_button(__('Save'), 'button', 'save', false); ?>
 </div>
 
 <div id="minor-publishing-actions">
 <div id="preview-action">
-<?php if ( !empty($link->link_id) ) { ?>
+<?php if ( ! empty($link->link_id)) { ?>
 	<a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a>
 <?php } ?>
 </div>
@@ -898,20 +898,20 @@ 
 <div id="major-publishing-actions">
 <?php
 /** This action is documented in wp-admin/includes/meta-boxes.php */
-do_action( 'post_submitbox_start' );
+do_action('post_submitbox_start');
 ?>
 <div id="delete-action">
 <?php
-if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?>
-	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
+if ( ! empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links')) { ?>
+	<a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&amp;link_id=$link->link_id", 'delete-bookmark_'.$link->link_id); ?>" onclick="if ( confirm('<?php echo esc_js(sprintf(__("You are about to delete this link '%s'\n  'Cancel' to stop, 'OK' to delete."), $link->link_name)); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>
 <?php } ?>
 </div>
 
 <div id="publishing-action">
-<?php if ( !empty($link->link_id) ) { ?>
-	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e( 'Update Link' ) ?>" />
+<?php if ( ! empty($link->link_id)) { ?>
+	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e('Update Link') ?>" />
 <?php } else { ?>
-	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e( 'Add Link' ) ?>" />
+	<input name="save" type="submit" class="button-large button-primary" id="publish" value="<?php esc_attr_e('Add Link') ?>" />
 <?php } ?>
 </div>
 <div class="clear"></div>
@@ -922,7 +922,7 @@ 
  *
  * @since 2.5.0
  */
-do_action( 'submitlink_box' );
+do_action('submitlink_box');
 ?>
 <div class="clear"></div>
 </div>
@@ -940,14 +940,14 @@ 
 ?>
 <div id="taxonomy-linkcategory" class="categorydiv">
 	<ul id="category-tabs" class="category-tabs">
-		<li class="tabs"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li>
-		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li>
+		<li class="tabs"><a href="#categories-all"><?php _e('All Categories'); ?></a></li>
+		<li class="hide-if-no-js"><a href="#categories-pop"><?php _e('Most Used'); ?></a></li>
 	</ul>
 
 	<div id="categories-all" class="tabs-panel">
 		<ul id="categorychecklist" data-wp-lists="list:category" class="categorychecklist form-no-clear">
 			<?php
-			if ( isset($link->link_id) )
+			if (isset($link->link_id))
 				wp_link_category_checklist($link->link_id);
 			else
 				wp_link_category_checklist();
@@ -962,12 +962,12 @@ 
 	</div>
 
 	<div id="category-adder" class="wp-hidden-children">
-		<a id="category-add-toggle" href="#category-add" class="taxonomy-add-new"><?php _e( '+ Add New Category' ); ?></a>
+		<a id="category-add-toggle" href="#category-add" class="taxonomy-add-new"><?php _e('+ Add New Category'); ?></a>
 		<p id="link-category-add" class="wp-hidden-child">
-			<label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
-			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e( 'Add' ); ?>" />
-			<?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
+			<label class="screen-reader-text" for="newcat"><?php _e('+ Add New Category'); ?></label>
+			<input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e('New category name'); ?>" aria-required="true" />
+			<input type="button" id="link-category-add-submit" data-wp-lists="add:categorychecklist:link-category-add" class="button" value="<?php esc_attr_e('Add'); ?>" />
+			<?php wp_nonce_field('add-link-category', '_ajax_nonce', false); ?>
 			<span id="category-ajax-response"></span>
 		</p>
 	</div>
@@ -985,13 +985,13 @@ 
 function link_target_meta_box($link) { ?>
 <fieldset><legend class="screen-reader-text"><span><?php _e('Target') ?></span></legend>
 <p><label for="link_target_blank" class="selectit">
-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo (isset($link->link_target) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_blank</code> &mdash; new window or tab.'); ?></label></p>
 <p><label for="link_target_top" class="selectit">
-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo (isset($link->link_target) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_top</code> &mdash; current window or tab, with no frames.'); ?></label></p>
 <p><label for="link_target_none" class="selectit">
-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo (isset($link->link_target) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> />
 <?php _e('<code>_none</code> &mdash; same window or tab.'); ?></label></p>
 </fieldset>
 <p><?php _e('Choose the target frame for your link.'); ?></p>
@@ -1009,16 +1009,16 @@ 
  * @param string $value
  * @param mixed $deprecated Never used.
  */
-function xfn_check( $class, $value = '', $deprecated = '' ) {
+function xfn_check($class, $value = '', $deprecated = '') {
 	global $link;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.0' ); // Never implemented
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.0'); // Never implemented
 
-	$link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
+	$link_rel = isset($link->link_rel) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
 	$rels = preg_split('/\s+/', $link_rel);
 
-	if ('' != $value && in_array($value, $rels) ) {
+	if ('' != $value && in_array($value, $rels)) {
 		echo ' checked="checked"';
 	}
 
@@ -1026,7 +1026,7 @@ 
 		if ('family' == $class && strpos($link_rel, 'child') === false && strpos($link_rel, 'parent') === false && strpos($link_rel, 'sibling') === false && strpos($link_rel, 'spouse') === false && strpos($link_rel, 'kin') === false) echo ' checked="checked"';
 		if ('friendship' == $class && strpos($link_rel, 'friend') === false && strpos($link_rel, 'acquaintance') === false && strpos($link_rel, 'contact') === false) echo ' checked="checked"';
 		if ('geographical' == $class && strpos($link_rel, 'co-resident') === false && strpos($link_rel, 'neighbor') === false) echo ' checked="checked"';
-		if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"';
+		if ('identity' == $class && in_array('me', $rels)) echo ' checked="checked"';
 	}
 }
 
@@ -1042,7 +1042,7 @@ 
 <table class="links-table">
 	<tr>
 		<th scope="row"><label for="link_rel"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('rel:') ?></label></th>
-		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo ( isset( $link->link_rel ) ? esc_attr($link->link_rel) : ''); ?>" /></td>
+		<td><input type="text" name="link_rel" id="link_rel" value="<?php echo (isset($link->link_rel) ? esc_attr($link->link_rel) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><?php /* translators: xfn: http://gmpg.org/xfn/ */ _e('identity') ?></th>
@@ -1160,25 +1160,25 @@ 
 <table class="links-table" cellpadding="0">
 	<tr>
 		<th scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th>
-		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo ( isset( $link->link_image ) ? esc_attr($link->link_image) : ''); ?>" /></td>
+		<td><input type="text" name="link_image" class="code" id="link_image" maxlength="255" value="<?php echo (isset($link->link_image) ? esc_attr($link->link_image) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th>
-		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo ( isset( $link->link_rss ) ? esc_attr($link->link_rss) : ''); ?>" /></td>
+		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo (isset($link->link_rss) ? esc_attr($link->link_rss) : ''); ?>" /></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
+		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo (isset($link->link_notes) ? $link->link_notes : ''); // textarea_escaped ?></textarea></td>
 	</tr>
 	<tr>
 		<th scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
 		<td><select name="link_rating" id="link_rating" size="1">
 		<?php
-			for ( $r = 0; $r <= 10; $r++ ) {
-				echo '<option value="' . $r . '"';
-				if ( isset($link->link_rating) && $link->link_rating == $r )
+			for ($r = 0; $r <= 10; $r++) {
+				echo '<option value="'.$r.'"';
+				if (isset($link->link_rating) && $link->link_rating == $r)
 					echo ' selected="selected"';
-				echo('>' . $r . '</option>');
+				echo('>'.$r.'</option>');
 			}
 		?></select>&nbsp;<?php _e('(Leave at 0 for no rating.)') ?>
 		</td>
@@ -1194,9 +1194,9 @@ 
  *
  * @param WP_Post $post A post object.
  */
-function post_thumbnail_meta_box( $post ) {
-	$thumbnail_id = get_post_meta( $post->ID, '_thumbnail_id', true );
-	echo _wp_post_thumbnail_html( $thumbnail_id, $post->ID );
+function post_thumbnail_meta_box($post) {
+	$thumbnail_id = get_post_meta($post->ID, '_thumbnail_id', true);
+	echo _wp_post_thumbnail_html($thumbnail_id, $post->ID);
 }
 
 /**
@@ -1206,18 +1206,18 @@ 
  *
  * @param WP_Post $post A post object.
  */
-function attachment_id3_data_meta_box( $post ) {
+function attachment_id3_data_meta_box($post) {
 	$meta = array();
-	if ( ! empty( $post->ID ) ) {
-		$meta = wp_get_attachment_metadata( $post->ID );
+	if ( ! empty($post->ID)) {
+		$meta = wp_get_attachment_metadata($post->ID);
 	}
 
-	foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) : ?>
+	foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) : ?>
 	<p>
 		<label for="title"><?php echo $label ?></label><br />
-		<input type="text" name="id3_<?php echo esc_attr( $key ) ?>" id="id3_<?php echo esc_attr( $key ) ?>" class="large-text" value="<?php
-			if ( ! empty( $meta[ $key ] ) ) {
-				echo esc_attr( $meta[ $key ] );
+		<input type="text" name="id3_<?php echo esc_attr($key) ?>" id="id3_<?php echo esc_attr($key) ?>" class="large-text" value="<?php
+			if ( ! empty($meta[$key])) {
+				echo esc_attr($meta[$key]);
 			}
 		?>" />
 	</p>

src/wp-admin/includes/image.php

Switch Indentation +6 added lines, -6 removed lines

@@ -156,12 +156,12 @@
 		} else {
 			$ext = '.jpg';
 			switch ( $metadata['image']['mime'] ) {
-			case 'image/gif':
-				$ext = '.gif';
-				break;
-			case 'image/png':
-				$ext = '.png';
-				break;
+				case 'image/gif':
+					$ext = '.gif';
+					break;
+				case 'image/png':
+					$ext = '.png';
+					break;
 			}
 			$basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
 			$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );

Braces +68 added lines, -38 removed lines

@@ -37,15 +37,18 @@ 
 	}
 
 	$editor = wp_get_image_editor( $src );
-	if ( is_wp_error( $editor ) )
-		return $editor;
+	if ( is_wp_error( $editor ) ) {
+			return $editor;
+	}
 
 	$src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
-	if ( is_wp_error( $src ) )
-		return $src;
+	if ( is_wp_error( $src ) ) {
+			return $src;
+	}
 
-	if ( ! $dst_file )
-		$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	if ( ! $dst_file ) {
+			$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	}
 
 	/*
 	 * The directory containing the original file may no longer exist when
@@ -56,8 +59,9 @@ 
 	$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
 
 	$result = $editor->save( $dst_file );
-	if ( is_wp_error( $result ) )
-		return $result;
+	if ( is_wp_error( $result ) ) {
+			return $result;
+	}
 
 	return $dst_file;
 }
@@ -92,18 +96,30 @@ 
 		$sizes = array();
 		foreach ( get_intermediate_image_sizes() as $s ) {
 			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
-			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
-				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
-			else
-				$sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
-				$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
-			else
-				$sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
-				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes
-			else
-				$sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
+			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) {
+							$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] );
+			}
+			// For theme-added sizes
+			else {
+							$sizes[$s]['width'] = get_option( "{$s}_size_w" );
+			}
+			// For default sizes set in options
+			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {
+							$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] );
+			}
+			// For theme-added sizes
+			else {
+							$sizes[$s]['height'] = get_option( "{$s}_size_h" );
+			}
+			// For default sizes set in options
+			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {
+							$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
+			}
+			// For theme-added sizes
+			else {
+							$sizes[$s]['crop'] = get_option( "{$s}_crop" );
+			}
+			// For default sizes set in options
 		}
 
 		/**
@@ -118,16 +134,18 @@ 
 		if ( $sizes ) {
 			$editor = wp_get_image_editor( $file );
 
-			if ( ! is_wp_error( $editor ) )
-				$metadata['sizes'] = $editor->multi_resize( $sizes );
+			if ( ! is_wp_error( $editor ) ) {
+							$metadata['sizes'] = $editor->multi_resize( $sizes );
+			}
 		} else {
 			$metadata['sizes'] = array();
 		}
 
 		// Fetch additional metadata from EXIF/IPTC.
 		$image_meta = wp_read_image_metadata( $file );
-		if ( $image_meta )
-			$metadata['image_meta'] = $image_meta;
+		if ( $image_meta ) {
+					$metadata['image_meta'] = $image_meta;
+		}
 
 	} elseif ( wp_attachment_is( 'video', $attachment ) ) {
 		$metadata = wp_read_video_metadata( $file );
@@ -215,8 +233,9 @@ 
  */
 function wp_exif_frac2dec($str) {
 	@list( $n, $d ) = explode( '/', $str );
-	if ( !empty($d) )
-		return $n / $d;
+	if ( !empty($d) ) {
+			return $n / $d;
+	}
 	return $str;
 }
 
@@ -252,8 +271,9 @@ 
  * @return bool|array False on failure. Image metadata array on success.
  */
 function wp_read_image_metadata( $file ) {
-	if ( ! file_exists( $file ) )
-		return false;
+	if ( ! file_exists( $file ) ) {
+			return false;
+	}
 
 	list( , , $sourceImageType ) = getimagesize( $file );
 
@@ -313,16 +333,23 @@ 
 				$meta['caption'] = $caption;
 			}
 
-			if ( ! empty( $iptc['2#110'][0] ) ) // credit
+			if ( ! empty( $iptc['2#110'][0] ) ) {
+				// credit
 				$meta['credit'] = trim( $iptc['2#110'][0] );
-			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
+			} elseif ( ! empty( $iptc['2#080'][0] ) ) {
+				// creator / legacy byline
 				$meta['credit'] = trim( $iptc['2#080'][0] );
+			}
 
-			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
+			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) {
+				// created date and time
 				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+			}
 
-			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
+			if ( ! empty( $iptc['2#116'][0] ) ) {
+				// copyright
 				$meta['copyright'] = trim( $iptc['2#116'][0] );
+			}
 		 }
 	}
 
@@ -473,8 +500,9 @@ 
  */
 function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
 	$filepath = _load_image_to_edit_path( $attachment_id, $size );
-	if ( empty( $filepath ) )
-		return false;
+	if ( empty( $filepath ) ) {
+			return false;
+	}
 
 	switch ( $mime_type ) {
 		case 'image/jpeg':
@@ -578,8 +606,9 @@ 
  */
 function _copy_image_file( $attachment_id ) {
 	$dst_file = $src_file = get_attached_file( $attachment_id );
-	if ( ! file_exists( $src_file ) )
-		$src_file = _load_image_to_edit_path( $attachment_id );
+	if ( ! file_exists( $src_file ) ) {
+			$src_file = _load_image_to_edit_path( $attachment_id );
+	}
 
 	if ( $src_file ) {
 		$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
@@ -591,8 +620,9 @@ 
 		 */
 		wp_mkdir_p( dirname( $dst_file ) );
 
-		if ( ! @copy( $src_file, $dst_file ) )
-			$dst_file = false;
+		if ( ! @copy( $src_file, $dst_file ) ) {
+					$dst_file = false;
+		}
 	} else {
 		$dst_file = false;
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  * @param int $dst_h The destination height.
  * @param int $src_abs Optional. If the source crop points are absolute.
  * @param string $dst_file Optional. The destination file to write to.
- * @return string|WP_Error New filepath on success, WP_Error on failure.
+ * @return string New filepath on success, WP_Error on failure.
  */
 function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
 	$src_file = $src;

Spacing +163 added lines, -163 removed lines

@@ -22,41 +22,41 @@ 
  * @param string $dst_file Optional. The destination file to write to.
  * @return string|WP_Error New filepath on success, WP_Error on failure.
  */
-function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
+function wp_crop_image($src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false) {
 	$src_file = $src;
-	if ( is_numeric( $src ) ) { // Handle int as attachment ID
-		$src_file = get_attached_file( $src );
+	if (is_numeric($src)) { // Handle int as attachment ID
+		$src_file = get_attached_file($src);
 
-		if ( ! file_exists( $src_file ) ) {
+		if ( ! file_exists($src_file)) {
 			// If the file doesn't exist, attempt a URL fopen on the src link.
 			// This can occur with certain file replication plugins.
-			$src = _load_image_to_edit_path( $src, 'full' );
+			$src = _load_image_to_edit_path($src, 'full');
 		} else {
 			$src = $src_file;
 		}
 	}
 
-	$editor = wp_get_image_editor( $src );
-	if ( is_wp_error( $editor ) )
+	$editor = wp_get_image_editor($src);
+	if (is_wp_error($editor))
 		return $editor;
 
-	$src = $editor->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs );
-	if ( is_wp_error( $src ) )
+	$src = $editor->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs);
+	if (is_wp_error($src))
 		return $src;
 
-	if ( ! $dst_file )
-		$dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
+	if ( ! $dst_file)
+		$dst_file = str_replace(basename($src_file), 'cropped-'.basename($src_file), $src_file);
 
 	/*
 	 * The directory containing the original file may no longer exist when
 	 * using a replication plugin.
 	 */
-	wp_mkdir_p( dirname( $dst_file ) );
+	wp_mkdir_p(dirname($dst_file));
 
-	$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+	$dst_file = dirname($dst_file).'/'.wp_unique_filename(dirname($dst_file), basename($dst_file));
 
-	$result = $editor->save( $dst_file );
-	if ( is_wp_error( $result ) )
+	$result = $editor->save($dst_file);
+	if (is_wp_error($result))
 		return $result;
 
 	return $dst_file;
@@ -73,13 +73,13 @@ 
  * @param string $file Filepath of the Attached image.
  * @return mixed Metadata for attachment.
  */
-function wp_generate_attachment_metadata( $attachment_id, $file ) {
-	$attachment = get_post( $attachment_id );
+function wp_generate_attachment_metadata($attachment_id, $file) {
+	$attachment = get_post($attachment_id);
 
 	$metadata = array();
 	$support = false;
-	if ( preg_match('!^image/!', get_post_mime_type( $attachment )) && file_is_displayable_image($file) ) {
-		$imagesize = getimagesize( $file );
+	if (preg_match('!^image/!', get_post_mime_type($attachment)) && file_is_displayable_image($file)) {
+		$imagesize = getimagesize($file);
 		$metadata['width'] = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
 
@@ -90,20 +90,20 @@ 
 		global $_wp_additional_image_sizes;
 
 		$sizes = array();
-		foreach ( get_intermediate_image_sizes() as $s ) {
-			$sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
-			if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
-				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
+		foreach (get_intermediate_image_sizes() as $s) {
+			$sizes[$s] = array('width' => '', 'height' => '', 'crop' => false);
+			if (isset($_wp_additional_image_sizes[$s]['width']))
+				$sizes[$s]['width'] = intval($_wp_additional_image_sizes[$s]['width']); // For theme-added sizes
 			else
-				$sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
-				$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
+				$sizes[$s]['width'] = get_option("{$s}_size_w"); // For default sizes set in options
+			if (isset($_wp_additional_image_sizes[$s]['height']))
+				$sizes[$s]['height'] = intval($_wp_additional_image_sizes[$s]['height']); // For theme-added sizes
 			else
-				$sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
+				$sizes[$s]['height'] = get_option("{$s}_size_h"); // For default sizes set in options
+			if (isset($_wp_additional_image_sizes[$s]['crop']))
 				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes
 			else
-				$sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
+				$sizes[$s]['crop'] = get_option("{$s}_crop"); // For default sizes set in options
 		}
 
 		/**
@@ -115,34 +115,34 @@ 
 		 * @param array $sizes    An associative array of image sizes.
 		 * @param array $metadata An associative array of image metadata: width, height, file.
 		 */
-		$sizes = apply_filters( 'intermediate_image_sizes_advanced', $sizes, $metadata );
+		$sizes = apply_filters('intermediate_image_sizes_advanced', $sizes, $metadata);
 
-		if ( $sizes ) {
-			$editor = wp_get_image_editor( $file );
+		if ($sizes) {
+			$editor = wp_get_image_editor($file);
 
-			if ( ! is_wp_error( $editor ) )
-				$metadata['sizes'] = $editor->multi_resize( $sizes );
+			if ( ! is_wp_error($editor))
+				$metadata['sizes'] = $editor->multi_resize($sizes);
 		} else {
 			$metadata['sizes'] = array();
 		}
 
 		// Fetch additional metadata from EXIF/IPTC.
-		$image_meta = wp_read_image_metadata( $file );
-		if ( $image_meta )
+		$image_meta = wp_read_image_metadata($file);
+		if ($image_meta)
 			$metadata['image_meta'] = $image_meta;
 
-	} elseif ( wp_attachment_is( 'video', $attachment ) ) {
-		$metadata = wp_read_video_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
-	} elseif ( wp_attachment_is( 'audio', $attachment ) ) {
-		$metadata = wp_read_audio_metadata( $file );
-		$support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
+	} elseif (wp_attachment_is('video', $attachment)) {
+		$metadata = wp_read_video_metadata($file);
+		$support = current_theme_supports('post-thumbnails', 'attachment:video') || post_type_supports('attachment:video', 'thumbnail');
+	} elseif (wp_attachment_is('audio', $attachment)) {
+		$metadata = wp_read_audio_metadata($file);
+		$support = current_theme_supports('post-thumbnails', 'attachment:audio') || post_type_supports('attachment:audio', 'thumbnail');
 	}
 
-	if ( $support && ! empty( $metadata['image']['data'] ) ) {
+	if ($support && ! empty($metadata['image']['data'])) {
 		// Check for existing cover.
-		$hash = md5( $metadata['image']['data'] );
-		$posts = get_posts( array(
+		$hash = md5($metadata['image']['data']);
+		$posts = get_posts(array(
 			'fields' => 'ids',
 			'post_type' => 'attachment',
 			'post_mime_type' => $metadata['image']['mime'],
@@ -150,14 +150,14 @@ 
 			'posts_per_page' => 1,
 			'meta_key' => '_cover_hash',
 			'meta_value' => $hash
-		) );
-		$exists = reset( $posts );
+		));
+		$exists = reset($posts);
 
-		if ( ! empty( $exists ) ) {
-			update_post_meta( $attachment_id, '_thumbnail_id', $exists );
+		if ( ! empty($exists)) {
+			update_post_meta($attachment_id, '_thumbnail_id', $exists);
 		} else {
 			$ext = '.jpg';
-			switch ( $metadata['image']['mime'] ) {
+			switch ($metadata['image']['mime']) {
 			case 'image/gif':
 				$ext = '.gif';
 				break;
@@ -165,9 +165,9 @@ 
 				$ext = '.png';
 				break;
 			}
-			$basename = str_replace( '.', '-', basename( $file ) ) . '-image' . $ext;
-			$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
-			if ( false === $uploaded['error'] ) {
+			$basename = str_replace('.', '-', basename($file)).'-image'.$ext;
+			$uploaded = wp_upload_bits($basename, '', $metadata['image']['data']);
+			if (false === $uploaded['error']) {
 				$image_attachment = array(
 					'post_mime_type' => $metadata['image']['mime'],
 					'post_type' => 'attachment',
@@ -182,20 +182,20 @@ 
 				 * @param array $metadata         Current attachment metadata.
 				 * @param array $uploaded         An array containing the thumbnail path and url.
 				 */
-				$image_attachment = apply_filters( 'attachment_thumbnail_args', $image_attachment, $metadata, $uploaded );
+				$image_attachment = apply_filters('attachment_thumbnail_args', $image_attachment, $metadata, $uploaded);
 
-				$sub_attachment_id = wp_insert_attachment( $image_attachment, $uploaded['file'] );
-				add_post_meta( $sub_attachment_id, '_cover_hash', $hash );
-				$attach_data = wp_generate_attachment_metadata( $sub_attachment_id, $uploaded['file'] );
-				wp_update_attachment_metadata( $sub_attachment_id, $attach_data );
-				update_post_meta( $attachment_id, '_thumbnail_id', $sub_attachment_id );
+				$sub_attachment_id = wp_insert_attachment($image_attachment, $uploaded['file']);
+				add_post_meta($sub_attachment_id, '_cover_hash', $hash);
+				$attach_data = wp_generate_attachment_metadata($sub_attachment_id, $uploaded['file']);
+				wp_update_attachment_metadata($sub_attachment_id, $attach_data);
+				update_post_meta($attachment_id, '_thumbnail_id', $sub_attachment_id);
 			}
 		}
 	}
 
 	// Remove the blob of binary data from the array.
-	if ( $metadata ) {
-		unset( $metadata['image']['data'] );
+	if ($metadata) {
+		unset($metadata['image']['data']);
 	}
 
 	/**
@@ -206,7 +206,7 @@ 
 	 * @param array $metadata      An array of attachment meta data.
 	 * @param int   $attachment_id Current attachment ID.
 	 */
-	return apply_filters( 'wp_generate_attachment_metadata', $metadata, $attachment_id );
+	return apply_filters('wp_generate_attachment_metadata', $metadata, $attachment_id);
 }
 
 /**
@@ -218,8 +218,8 @@ 
  * @return int|float
  */
 function wp_exif_frac2dec($str) {
-	@list( $n, $d ) = explode( '/', $str );
-	if ( !empty($d) )
+	@list($n, $d) = explode('/', $str);
+	if ( ! empty($d))
 		return $n / $d;
 	return $str;
 }
@@ -233,10 +233,10 @@ 
  * @return int
  */
 function wp_exif_date2ts($str) {
-	@list( $date, $time ) = explode( ' ', trim($str) );
-	@list( $y, $m, $d ) = explode( ':', $date );
+	@list($date, $time) = explode(' ', trim($str));
+	@list($y, $m, $d) = explode(':', $date);
 
-	return strtotime( "{$y}-{$m}-{$d} {$time}" );
+	return strtotime("{$y}-{$m}-{$d} {$time}");
 }
 
 /**
@@ -255,11 +255,11 @@ 
  * @param string $file
  * @return bool|array False on failure. Image metadata array on success.
  */
-function wp_read_image_metadata( $file ) {
-	if ( ! file_exists( $file ) )
+function wp_read_image_metadata($file) {
+	if ( ! file_exists($file))
 		return false;
 
-	list( , , $sourceImageType ) = getimagesize( $file );
+	list(,, $sourceImageType) = getimagesize($file);
 
 	/*
 	 * EXIF contains a bunch of data we'll probably never need formatted in ways
@@ -287,31 +287,31 @@ 
 	 * Read IPTC first, since it might contain data not available in exif such
 	 * as caption, description etc.
 	 */
-	if ( is_callable( 'iptcparse' ) ) {
-		getimagesize( $file, $info );
+	if (is_callable('iptcparse')) {
+		getimagesize($file, $info);
 
-		if ( ! empty( $info['APP13'] ) ) {
-			$iptc = iptcparse( $info['APP13'] );
+		if ( ! empty($info['APP13'])) {
+			$iptc = iptcparse($info['APP13']);
 
 			// Headline, "A brief synopsis of the caption."
-			if ( ! empty( $iptc['2#105'][0] ) ) {
-				$meta['title'] = trim( $iptc['2#105'][0] );
+			if ( ! empty($iptc['2#105'][0])) {
+				$meta['title'] = trim($iptc['2#105'][0]);
 			/*
 			 * Title, "Many use the Title field to store the filename of the image,
 			 * though the field may be used in many ways."
 			 */
-			} elseif ( ! empty( $iptc['2#005'][0] ) ) {
-				$meta['title'] = trim( $iptc['2#005'][0] );
+			} elseif ( ! empty($iptc['2#005'][0])) {
+				$meta['title'] = trim($iptc['2#005'][0]);
 			}
 
-			if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
-				$caption = trim( $iptc['2#120'][0] );
+			if ( ! empty($iptc['2#120'][0])) { // description / legacy caption
+				$caption = trim($iptc['2#120'][0]);
 
 				mbstring_binary_safe_encoding();
-				$caption_length = strlen( $caption );
+				$caption_length = strlen($caption);
 				reset_mbstring_encoding();
 
-				if ( empty( $meta['title'] ) && $caption_length < 80 ) {
+				if (empty($meta['title']) && $caption_length < 80) {
 					// Assume the title is stored in 2:120 if it's short.
 					$meta['title'] = $caption;
 				}
@@ -319,19 +319,19 @@ 
 				$meta['caption'] = $caption;
 			}
 
-			if ( ! empty( $iptc['2#110'][0] ) ) // credit
-				$meta['credit'] = trim( $iptc['2#110'][0] );
-			elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
-				$meta['credit'] = trim( $iptc['2#080'][0] );
+			if ( ! empty($iptc['2#110'][0])) // credit
+				$meta['credit'] = trim($iptc['2#110'][0]);
+			elseif ( ! empty($iptc['2#080'][0])) // creator / legacy byline
+				$meta['credit'] = trim($iptc['2#080'][0]);
 
-			if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
-				$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
+			if ( ! empty($iptc['2#055'][0]) && ! empty($iptc['2#060'][0])) // created date and time
+				$meta['created_timestamp'] = strtotime($iptc['2#055'][0].' '.$iptc['2#060'][0]);
 
-			if ( ! empty( $iptc['2#116'][0] ) ) // copyright
-				$meta['copyright'] = trim( $iptc['2#116'][0] );
+			if ( ! empty($iptc['2#116'][0])) // copyright
+				$meta['copyright'] = trim($iptc['2#116'][0]);
 
-			if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
-				$meta['keywords'] = array_values( $iptc['2#025'] );
+			if ( ! empty($iptc['2#025'][0])) { // keywords array
+				$meta['keywords'] = array_values($iptc['2#025']);
 			}
 		 }
 	}
@@ -343,78 +343,78 @@ 
 	 *
 	 * @param array $image_types Image types to check for exif data.
 	 */
-	if ( is_callable( 'exif_read_data' ) && in_array( $sourceImageType, apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) ) ) ) {
-		$exif = @exif_read_data( $file );
+	if (is_callable('exif_read_data') && in_array($sourceImageType, apply_filters('wp_read_image_metadata_types', array(IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM)))) {
+		$exif = @exif_read_data($file);
 
-		if ( ! empty( $exif['ImageDescription'] ) ) {
+		if ( ! empty($exif['ImageDescription'])) {
 			mbstring_binary_safe_encoding();
-			$description_length = strlen( $exif['ImageDescription'] );
+			$description_length = strlen($exif['ImageDescription']);
 			reset_mbstring_encoding();
 
-			if ( empty( $meta['title'] ) && $description_length < 80 ) {
+			if (empty($meta['title']) && $description_length < 80) {
 				// Assume the title is stored in ImageDescription
-				$meta['title'] = trim( $exif['ImageDescription'] );
+				$meta['title'] = trim($exif['ImageDescription']);
 			}
 
-			if ( empty( $meta['caption'] ) && ! empty( $exif['COMPUTED']['UserComment'] ) ) {
-				$meta['caption'] = trim( $exif['COMPUTED']['UserComment'] );
+			if (empty($meta['caption']) && ! empty($exif['COMPUTED']['UserComment'])) {
+				$meta['caption'] = trim($exif['COMPUTED']['UserComment']);
 			}
 
-			if ( empty( $meta['caption'] ) ) {
-				$meta['caption'] = trim( $exif['ImageDescription'] );
+			if (empty($meta['caption'])) {
+				$meta['caption'] = trim($exif['ImageDescription']);
 			}
-		} elseif ( empty( $meta['caption'] ) && ! empty( $exif['Comments'] ) ) {
-			$meta['caption'] = trim( $exif['Comments'] );
+		} elseif (empty($meta['caption']) && ! empty($exif['Comments'])) {
+			$meta['caption'] = trim($exif['Comments']);
 		}
 
-		if ( empty( $meta['credit'] ) ) {
-			if ( ! empty( $exif['Artist'] ) ) {
-				$meta['credit'] = trim( $exif['Artist'] );
-			} elseif ( ! empty($exif['Author'] ) ) {
-				$meta['credit'] = trim( $exif['Author'] );
+		if (empty($meta['credit'])) {
+			if ( ! empty($exif['Artist'])) {
+				$meta['credit'] = trim($exif['Artist']);
+			} elseif ( ! empty($exif['Author'])) {
+				$meta['credit'] = trim($exif['Author']);
 			}
 		}
 
-		if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) {
-			$meta['copyright'] = trim( $exif['Copyright'] );
+		if (empty($meta['copyright']) && ! empty($exif['Copyright'])) {
+			$meta['copyright'] = trim($exif['Copyright']);
 		}
-		if ( ! empty( $exif['FNumber'] ) ) {
-			$meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
+		if ( ! empty($exif['FNumber'])) {
+			$meta['aperture'] = round(wp_exif_frac2dec($exif['FNumber']), 2);
 		}
-		if ( ! empty( $exif['Model'] ) ) {
-			$meta['camera'] = trim( $exif['Model'] );
+		if ( ! empty($exif['Model'])) {
+			$meta['camera'] = trim($exif['Model']);
 		}
-		if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) {
-			$meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] );
+		if (empty($meta['created_timestamp']) && ! empty($exif['DateTimeDigitized'])) {
+			$meta['created_timestamp'] = wp_exif_date2ts($exif['DateTimeDigitized']);
 		}
-		if ( ! empty( $exif['FocalLength'] ) ) {
-			$meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
+		if ( ! empty($exif['FocalLength'])) {
+			$meta['focal_length'] = (string) wp_exif_frac2dec($exif['FocalLength']);
 		}
-		if ( ! empty( $exif['ISOSpeedRatings'] ) ) {
-			$meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
-			$meta['iso'] = trim( $meta['iso'] );
+		if ( ! empty($exif['ISOSpeedRatings'])) {
+			$meta['iso'] = is_array($exif['ISOSpeedRatings']) ? reset($exif['ISOSpeedRatings']) : $exif['ISOSpeedRatings'];
+			$meta['iso'] = trim($meta['iso']);
 		}
-		if ( ! empty( $exif['ExposureTime'] ) ) {
-			$meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
+		if ( ! empty($exif['ExposureTime'])) {
+			$meta['shutter_speed'] = (string) wp_exif_frac2dec($exif['ExposureTime']);
 		}
-		if ( ! empty( $exif['Orientation'] ) ) {
+		if ( ! empty($exif['Orientation'])) {
 			$meta['orientation'] = $exif['Orientation'];
 		}
 	}
 
-	foreach ( array( 'title', 'caption', 'credit', 'copyright', 'camera', 'iso' ) as $key ) {
-		if ( $meta[ $key ] && ! seems_utf8( $meta[ $key ] ) ) {
-			$meta[ $key ] = utf8_encode( $meta[ $key ] );
+	foreach (array('title', 'caption', 'credit', 'copyright', 'camera', 'iso') as $key) {
+		if ($meta[$key] && ! seems_utf8($meta[$key])) {
+			$meta[$key] = utf8_encode($meta[$key]);
 		}
 	}
 
-	foreach ( $meta['keywords'] as $key => $keyword ) {
-		if ( ! seems_utf8( $keyword ) ) {
-			$meta['keywords'][ $key ] = utf8_encode( $keyword );
+	foreach ($meta['keywords'] as $key => $keyword) {
+		if ( ! seems_utf8($keyword)) {
+			$meta['keywords'][$key] = utf8_encode($keyword);
 		}
 	}
 
-	$meta = wp_kses_post_deep( $meta );
+	$meta = wp_kses_post_deep($meta);
 
 	/**
 	 * Filter the array of meta data read from an image's exif data.
@@ -427,7 +427,7 @@ 
 	 * @param int    $sourceImageType Type of image.
 	 * @param array  $iptc            IPTC data.
 	 */
-	return apply_filters( 'wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc );
+	return apply_filters('wp_read_image_metadata', $meta, $file, $sourceImageType, $iptc);
 
 }
 
@@ -441,7 +441,7 @@ 
  */
 function file_is_valid_image($path) {
 	$size = @getimagesize($path);
-	return !empty($size);
+	return ! empty($size);
 }
 
 /**
@@ -453,12 +453,12 @@ 
  * @return bool True if suitable, false if not suitable.
  */
 function file_is_displayable_image($path) {
-	$displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP );
+	$displayable_image_types = array(IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP);
 
-	$info = @getimagesize( $path );
-	if ( empty( $info ) ) {
+	$info = @getimagesize($path);
+	if (empty($info)) {
 		$result = false;
-	} elseif ( ! in_array( $info[2], $displayable_image_types ) ) {
+	} elseif ( ! in_array($info[2], $displayable_image_types)) {
 		$result = false;
 	} else {
 		$result = true;
@@ -472,7 +472,7 @@ 
 	 * @param bool   $result Whether the image can be displayed. Default true.
 	 * @param string $path   Path to the image.
 	 */
-	return apply_filters( 'file_is_displayable_image', $result, $path );
+	return apply_filters('file_is_displayable_image', $result, $path);
 }
 
 /**
@@ -485,12 +485,12 @@ 
  * @param string $size Optional. Image size, defaults to 'full'.
  * @return resource|false The resulting image resource on success, false on failure.
  */
-function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
-	$filepath = _load_image_to_edit_path( $attachment_id, $size );
-	if ( empty( $filepath ) )
+function load_image_to_edit($attachment_id, $mime_type, $size = 'full') {
+	$filepath = _load_image_to_edit_path($attachment_id, $size);
+	if (empty($filepath))
 		return false;
 
-	switch ( $mime_type ) {
+	switch ($mime_type) {
 		case 'image/jpeg':
 			$image = imagecreatefromjpeg($filepath);
 			break;
@@ -504,7 +504,7 @@ 
 			$image = false;
 			break;
 	}
-	if ( is_resource($image) ) {
+	if (is_resource($image)) {
 		/**
 		 * Filter the current image being loaded for editing.
 		 *
@@ -514,8 +514,8 @@ 
 		 * @param string   $attachment_id Attachment ID.
 		 * @param string   $size          Image size.
 		 */
-		$image = apply_filters( 'load_image_to_edit', $image, $attachment_id, $size );
-		if ( function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
+		$image = apply_filters('load_image_to_edit', $image, $attachment_id, $size);
+		if (function_exists('imagealphablending') && function_exists('imagesavealpha')) {
 			imagealphablending($image, false);
 			imagesavealpha($image, true);
 		}
@@ -536,11 +536,11 @@ 
  * @param string $size Optional. Image size, defaults to 'full'.
  * @return string|false File path or url on success, false on failure.
  */
-function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
-	$filepath = get_attached_file( $attachment_id );
+function _load_image_to_edit_path($attachment_id, $size = 'full') {
+	$filepath = get_attached_file($attachment_id);
 
-	if ( $filepath && file_exists( $filepath ) ) {
-		if ( 'full' != $size && ( $data = image_get_intermediate_size( $attachment_id, $size ) ) ) {
+	if ($filepath && file_exists($filepath)) {
+		if ('full' != $size && ($data = image_get_intermediate_size($attachment_id, $size))) {
 			/**
 			 * Filter the path to the current image.
 			 *
@@ -552,9 +552,9 @@ 
 			 * @param string $attachment_id Attachment ID.
 			 * @param string $size          Size of the image.
 			 */
-			$filepath = apply_filters( 'load_image_to_edit_filesystempath', path_join( dirname( $filepath ), $data['file'] ), $attachment_id, $size );
+			$filepath = apply_filters('load_image_to_edit_filesystempath', path_join(dirname($filepath), $data['file']), $attachment_id, $size);
 		}
-	} elseif ( function_exists( 'fopen' ) && function_exists( 'ini_get' ) && true == ini_get( 'allow_url_fopen' ) ) {
+	} elseif (function_exists('fopen') && function_exists('ini_get') && true == ini_get('allow_url_fopen')) {
 		/**
 		 * Filter the image URL if not in the local filesystem.
 		 *
@@ -566,7 +566,7 @@ 
 		 * @param string $attachment_id Attachment ID.
 		 * @param string $size          Size of the image.
 		 */
-		$filepath = apply_filters( 'load_image_to_edit_attachmenturl', wp_get_attachment_url( $attachment_id ), $attachment_id, $size );
+		$filepath = apply_filters('load_image_to_edit_attachmenturl', wp_get_attachment_url($attachment_id), $attachment_id, $size);
 	}
 
 	/**
@@ -578,7 +578,7 @@ 
 	 * @param string      $attachment_id Attachment ID.
 	 * @param string      $size          Size of the image.
 	 */
-	return apply_filters( 'load_image_to_edit_path', $filepath, $attachment_id, $size );
+	return apply_filters('load_image_to_edit_path', $filepath, $attachment_id, $size);
 }
 
 /**
@@ -590,22 +590,22 @@ 
  * @param string $attachment_id Attachment ID.
  * @return string|false New file path on success, false on failure.
  */
-function _copy_image_file( $attachment_id ) {
-	$dst_file = $src_file = get_attached_file( $attachment_id );
-	if ( ! file_exists( $src_file ) )
-		$src_file = _load_image_to_edit_path( $attachment_id );
+function _copy_image_file($attachment_id) {
+	$dst_file = $src_file = get_attached_file($attachment_id);
+	if ( ! file_exists($src_file))
+		$src_file = _load_image_to_edit_path($attachment_id);
 
-	if ( $src_file ) {
-		$dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
-		$dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
+	if ($src_file) {
+		$dst_file = str_replace(basename($dst_file), 'copy-'.basename($dst_file), $dst_file);
+		$dst_file = dirname($dst_file).'/'.wp_unique_filename(dirname($dst_file), basename($dst_file));
 
 		/*
 		 * The directory containing the original file may no longer
 		 * exist when using a replication plugin.
 		 */
-		wp_mkdir_p( dirname( $dst_file ) );
+		wp_mkdir_p(dirname($dst_file));
 
-		if ( ! @copy( $src_file, $dst_file ) )
+		if ( ! @copy($src_file, $dst_file))
 			$dst_file = false;
 	} else {
 		$dst_file = false;

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Helper functions for displaying a list of items in an ajaxified HTML table.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- */
+	 * Helper functions for displaying a list of items in an ajaxified HTML table.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 */
 
 /**
  * Fetch an instance of a WP_List_Table class.

Braces +13 added lines, -10 removed lines

@@ -40,15 +40,17 @@ 
 	);
 
 	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		foreach ( (array) $core_classes[ $class ] as $required ) {
+					require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+		}
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
-			$args['screen'] = get_current_screen();
-		else
-			$args['screen'] = null;
+		if ( isset( $args['screen'] ) ) {
+					$args['screen'] = convert_to_screen( $args['screen'] );
+		} elseif ( isset( $GLOBALS['hook_suffix'] ) ) {
+					$args['screen'] = get_current_screen();
+		} else {
+					$args['screen'] = null;
+		}
 
 		return new $class( $args );
 	}
@@ -90,8 +92,9 @@ 
 	public $_columns;
 
 	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) )
-			$screen = convert_to_screen( $screen );
+		if ( is_string( $screen ) ) {
+					$screen = convert_to_screen( $screen );
+		}
 
 		$this->_screen = $screen;
 

Spacing +20 added lines, -20 removed lines

@@ -19,7 +19,7 @@ 
  * @param array $args Optional. Arguments to pass to the class. Accepts 'screen'.
  * @return object|bool Object on success, false if the class does not exist.
  */
-function _get_list_table( $class, $args = array() ) {
+function _get_list_table($class, $args = array()) {
 	$core_classes = array(
 		//Site Admin
 		'WP_Posts_List_Table' => 'posts',
@@ -27,11 +27,11 @@ 
 		'WP_Terms_List_Table' => 'terms',
 		'WP_Users_List_Table' => 'users',
 		'WP_Comments_List_Table' => 'comments',
-		'WP_Post_Comments_List_Table' => array( 'comments', 'post-comments' ),
+		'WP_Post_Comments_List_Table' => array('comments', 'post-comments'),
 		'WP_Links_List_Table' => 'links',
 		'WP_Plugin_Install_List_Table' => 'plugin-install',
 		'WP_Themes_List_Table' => 'themes',
-		'WP_Theme_Install_List_Table' => array( 'themes', 'theme-install' ),
+		'WP_Theme_Install_List_Table' => array('themes', 'theme-install'),
 		'WP_Plugins_List_Table' => 'plugins',
 		// Network Admin
 		'WP_MS_Sites_List_Table' => 'ms-sites',
@@ -39,18 +39,18 @@ 
 		'WP_MS_Themes_List_Table' => 'ms-themes',
 	);
 
-	if ( isset( $core_classes[ $class ] ) ) {
-		foreach ( (array) $core_classes[ $class ] as $required )
-			require_once( ABSPATH . 'wp-admin/includes/class-wp-' . $required . '-list-table.php' );
+	if (isset($core_classes[$class])) {
+		foreach ((array) $core_classes[$class] as $required)
+			require_once(ABSPATH.'wp-admin/includes/class-wp-'.$required.'-list-table.php');
 
-		if ( isset( $args['screen'] ) )
-			$args['screen'] = convert_to_screen( $args['screen'] );
-		elseif ( isset( $GLOBALS['hook_suffix'] ) )
+		if (isset($args['screen']))
+			$args['screen'] = convert_to_screen($args['screen']);
+		elseif (isset($GLOBALS['hook_suffix']))
 			$args['screen'] = get_current_screen();
 		else
 			$args['screen'] = null;
 
-		return new $class( $args );
+		return new $class($args);
 	}
 
 	return false;
@@ -77,10 +77,10 @@ 
  * @param string|WP_Screen $screen  The screen hook name or screen object.
  * @param bool             $with_id Whether to set the id attribute or not.
  */
-function print_column_headers( $screen, $with_id = true ) {
+function print_column_headers($screen, $with_id = true) {
 	$wp_list_table = new _WP_List_Table_Compat($screen);
 
-	$wp_list_table->print_column_headers( $with_id );
+	$wp_list_table->print_column_headers($with_id);
 }
 
 /**
@@ -92,15 +92,15 @@ 
 	public $_screen;
 	public $_columns;
 
-	public function __construct( $screen, $columns = array() ) {
-		if ( is_string( $screen ) )
-			$screen = convert_to_screen( $screen );
+	public function __construct($screen, $columns = array()) {
+		if (is_string($screen))
+			$screen = convert_to_screen($screen);
 
 		$this->_screen = $screen;
 
-		if ( !empty( $columns ) ) {
+		if ( ! empty($columns)) {
 			$this->_columns = $columns;
-			add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
+			add_filter('manage_'.$screen->id.'_columns', array($this, 'get_columns'), 0);
 		}
 	}
 
@@ -110,12 +110,12 @@ 
 	 * @return array
 	 */
 	protected function get_column_info() {
-		$columns = get_column_headers( $this->_screen );
-		$hidden = get_hidden_columns( $this->_screen );
+		$columns = get_column_headers($this->_screen);
+		$hidden = get_hidden_columns($this->_screen);
 		$sortable = array();
 		$primary = $this->get_default_primary_column_name();
 
-		return array( $columns, $hidden, $sortable, $primary );
+		return array($columns, $hidden, $sortable, $primary);
 	}
 
 	/**

src/wp-admin/includes/revision.php

Braces +24 added lines, -16 removed lines

@@ -19,26 +19,31 @@ 
  *                    Or, false on failure.
  */
 function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
 	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
-			return false;
+		if ( ! $compare_from = get_post( $compare_from ) ) {
+					return false;
+		}
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
-		return false;
+	if ( ! $compare_to = get_post( $compare_to ) ) {
+			return false;
+	}
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
-		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
-		return false;
+	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID ) {
+			return false;
+	}
+	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID ) {
+			return false;
+	}
 
 	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
 		$temp = $compare_from;
@@ -47,10 +52,12 @@ 
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
-		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
-		$compare_to->post_title = __( '(no title)' );
+	if ( $compare_from && empty( $compare_from->post_title ) ) {
+			$compare_from->post_title = __( '(no title)' );
+	}
+	if ( empty( $compare_to->post_title ) ) {
+			$compare_to->post_title = __( '(no title)' );
+	}
 
 	$return = array();
 
@@ -150,8 +157,9 @@ 
 	// If revisions are disabled, we only want autosaves and the current post.
 	if ( ! wp_revisions_enabled( $post ) ) {
 		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
-				unset( $revisions[ $revision_id ] );
+			if ( ! wp_is_post_autosave( $revision ) ) {
+							unset( $revisions[ $revision_id ] );
+			}
 		}
 		$revisions = array( $post->ID => $post ) + $revisions;
 	}

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Administration Revisions API
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.6.0
- */
+	 * WordPress Administration Revisions API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.6.0
+	 */
 
 /**
  * Get the revision UI diff.

Spacing +99 added lines, -99 removed lines

@@ -19,43 +19,43 @@ 
  * @return array|bool Associative array of a post's revisioned fields and their diffs.
  *                    Or, false on failure.
  */
-function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
-	if ( ! $post = get_post( $post ) )
+function wp_get_revision_ui_diff($post, $compare_from, $compare_to) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	if ( $compare_from ) {
-		if ( ! $compare_from = get_post( $compare_from ) )
+	if ($compare_from) {
+		if ( ! $compare_from = get_post($compare_from))
 			return false;
 	} else {
 		// If we're dealing with the first revision...
 		$compare_from = false;
 	}
 
-	if ( ! $compare_to = get_post( $compare_to ) )
+	if ( ! $compare_to = get_post($compare_to))
 		return false;
 
 	// If comparing revisions, make sure we're dealing with the right post parent.
 	// The parent post may be a 'revision' when revisions are disabled and we're looking at autosaves.
-	if ( $compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID )
+	if ($compare_from && $compare_from->post_parent !== $post->ID && $compare_from->ID !== $post->ID)
 		return false;
-	if ( $compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID )
+	if ($compare_to->post_parent !== $post->ID && $compare_to->ID !== $post->ID)
 		return false;
 
-	if ( $compare_from && strtotime( $compare_from->post_date_gmt ) > strtotime( $compare_to->post_date_gmt ) ) {
+	if ($compare_from && strtotime($compare_from->post_date_gmt) > strtotime($compare_to->post_date_gmt)) {
 		$temp = $compare_from;
 		$compare_from = $compare_to;
 		$compare_to = $temp;
 	}
 
 	// Add default title if title field is empty
-	if ( $compare_from && empty( $compare_from->post_title ) )
-		$compare_from->post_title = __( '(no title)' );
-	if ( empty( $compare_to->post_title ) )
-		$compare_to->post_title = __( '(no title)' );
+	if ($compare_from && empty($compare_from->post_title))
+		$compare_from->post_title = __('(no title)');
+	if (empty($compare_to->post_title))
+		$compare_to->post_title = __('(no title)');
 
 	$return = array();
 
-	foreach ( _wp_post_revision_fields( $post ) as $field => $name ) {
+	foreach (_wp_post_revision_fields($post) as $field => $name) {
 		/**
 		 * Contextually filter a post revision field.
 		 *
@@ -70,10 +70,10 @@ 
 		 * @param string  null                  The context of whether the current revision is the old
 		 *                                      or the new one. Values are 'to' or 'from'.
 		 */
-		$content_from = $compare_from ? apply_filters( "_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from' ) : '';
+		$content_from = $compare_from ? apply_filters("_wp_post_revision_field_$field", $compare_from->$field, $field, $compare_from, 'from') : '';
 
 		/** This filter is documented in wp-admin/includes/revision.php */
-		$content_to = apply_filters( "_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to' );
+		$content_to = apply_filters("_wp_post_revision_field_$field", $compare_to->$field, $field, $compare_to, 'to');
 
 		$args = array(
 			'show_split_view' => true
@@ -96,20 +96,20 @@ 
 		 * @param WP_Post $compare_from The revision post to compare from.
 		 * @param WP_Post $compare_to   The revision post to compare to.
 		 */
-		$args = apply_filters( 'revision_text_diff_options', $args, $field, $compare_from, $compare_to );
+		$args = apply_filters('revision_text_diff_options', $args, $field, $compare_from, $compare_to);
 
-		$diff = wp_text_diff( $content_from, $content_to, $args );
+		$diff = wp_text_diff($content_from, $content_to, $args);
 
-		if ( ! $diff && 'post_title' === $field ) {
+		if ( ! $diff && 'post_title' === $field) {
 			// It's a better user experience to still show the Title, even if it didn't change.
 			// No, you didn't see this.
 			$diff = '<table class="diff"><colgroup><col class="content diffsplit left"><col class="content diffsplit middle"><col class="content diffsplit right"></colgroup><tbody><tr>';
-			$diff .= '<td>' . esc_html( $compare_from->post_title ) . '</td><td></td><td>' . esc_html( $compare_to->post_title ) . '</td>';
+			$diff .= '<td>'.esc_html($compare_from->post_title).'</td><td></td><td>'.esc_html($compare_to->post_title).'</td>';
 			$diff .= '</tr></tbody>';
 			$diff .= '</table>';
 		}
 
-		if ( $diff ) {
+		if ($diff) {
 			$return[] = array(
 				'id' => $field,
 				'name' => $name,
@@ -127,7 +127,7 @@ 
 	 * @param WP_Post $compare_from The revision post to compare from.
 	 * @param WP_Post $compare_to   The revision post to compare to.
 	 */
-	return apply_filters( 'wp_get_revision_ui_diff', $return, $compare_from, $compare_to );
+	return apply_filters('wp_get_revision_ui_diff', $return, $compare_from, $compare_to);
 
 }
 
@@ -142,71 +142,71 @@ 
  *
  * @return array An associative array of revision data and related settings.
  */
-function wp_prepare_revisions_for_js( $post, $selected_revision_id, $from = null ) {
-	$post = get_post( $post );
+function wp_prepare_revisions_for_js($post, $selected_revision_id, $from = null) {
+	$post = get_post($post);
 	$authors = array();
 	$now_gmt = time();
 
-	$revisions = wp_get_post_revisions( $post->ID, array( 'order' => 'ASC', 'check_enabled' => false ) );
+	$revisions = wp_get_post_revisions($post->ID, array('order' => 'ASC', 'check_enabled' => false));
 	// If revisions are disabled, we only want autosaves and the current post.
-	if ( ! wp_revisions_enabled( $post ) ) {
-		foreach ( $revisions as $revision_id => $revision ) {
-			if ( ! wp_is_post_autosave( $revision ) )
-				unset( $revisions[ $revision_id ] );
+	if ( ! wp_revisions_enabled($post)) {
+		foreach ($revisions as $revision_id => $revision) {
+			if ( ! wp_is_post_autosave($revision))
+				unset($revisions[$revision_id]);
 		}
-		$revisions = array( $post->ID => $post ) + $revisions;
+		$revisions = array($post->ID => $post) + $revisions;
 	}
 
-	$show_avatars = get_option( 'show_avatars' );
+	$show_avatars = get_option('show_avatars');
 
-	cache_users( wp_list_pluck( $revisions, 'post_author' ) );
+	cache_users(wp_list_pluck($revisions, 'post_author'));
 
-	$can_restore = current_user_can( 'edit_post', $post->ID );
+	$can_restore = current_user_can('edit_post', $post->ID);
 	$current_id = false;
 
-	foreach ( $revisions as $revision ) {
-		$modified = strtotime( $revision->post_modified );
-		$modified_gmt = strtotime( $revision->post_modified_gmt );
-		if ( $can_restore ) {
-			$restore_link = str_replace( '&amp;', '&', wp_nonce_url(
+	foreach ($revisions as $revision) {
+		$modified = strtotime($revision->post_modified);
+		$modified_gmt = strtotime($revision->post_modified_gmt);
+		if ($can_restore) {
+			$restore_link = str_replace('&amp;', '&', wp_nonce_url(
 				add_query_arg(
-					array( 'revision' => $revision->ID,
-						'action' => 'restore' ),
-						admin_url( 'revision.php' )
+					array('revision' => $revision->ID,
+						'action' => 'restore'),
+						admin_url('revision.php')
 				),
 				"restore-post_{$revision->ID}"
-			) );
+			));
 		}
 
-		if ( ! isset( $authors[ $revision->post_author ] ) ) {
-			$authors[ $revision->post_author ] = array(
+		if ( ! isset($authors[$revision->post_author])) {
+			$authors[$revision->post_author] = array(
 				'id' => (int) $revision->post_author,
-				'avatar' => $show_avatars ? get_avatar( $revision->post_author, 32 ) : '',
-				'name' => get_the_author_meta( 'display_name', $revision->post_author ),
+				'avatar' => $show_avatars ? get_avatar($revision->post_author, 32) : '',
+				'name' => get_the_author_meta('display_name', $revision->post_author),
 			);
 		}
 
-		$autosave = (bool) wp_is_post_autosave( $revision );
+		$autosave = (bool) wp_is_post_autosave($revision);
 		$current = ! $autosave && $revision->post_modified_gmt === $post->post_modified_gmt;
-		if ( $current && ! empty( $current_id ) ) {
+		if ($current && ! empty($current_id)) {
 			// If multiple revisions have the same post_modified_gmt, highest ID is current.
-			if ( $current_id < $revision->ID ) {
-				$revisions[ $current_id ]['current'] = false;
+			if ($current_id < $revision->ID) {
+				$revisions[$current_id]['current'] = false;
 				$current_id = $revision->ID;
 			} else {
 				$current = false;
 			}
-		} elseif ( $current ) {
+		} elseif ($current) {
 			$current_id = $revision->ID;
 		}
 
 		$revisions_data = array(
 			'id'         => $revision->ID,
-			'title'      => get_the_title( $post->ID ),
-			'author'     => $authors[ $revision->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ H:i' ), $modified ),
-			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), $modified ),
-			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( $modified_gmt, $now_gmt ) ),
+			'title'      => get_the_title($post->ID),
+			'author'     => $authors[$revision->post_author],
+			'date'       => date_i18n(__('M j, Y @ H:i'), $modified),
+			'dateShort'  => date_i18n(_x('j M @ H:i', 'revision date short format'), $modified),
+			'timeAgo'    => sprintf(__('%s ago'), human_time_diff($modified_gmt, $now_gmt)),
 			'autosave'   => $autosave,
 			'current'    => $current,
 			'restoreUrl' => $can_restore ? $restore_link : false,
@@ -234,21 +234,21 @@ 
 		 * @param WP_Post $revision       The revision's WP_Post object.
 		 * @param WP_Post $post           The revision's parent WP_Post object.
 		 */
-		$revisions[ $revision->ID ] = apply_filters( 'wp_prepare_revision_for_js', $revisions_data, $revision, $post );
+		$revisions[$revision->ID] = apply_filters('wp_prepare_revision_for_js', $revisions_data, $revision, $post);
 	}
 
 	/**
 	 * If we only have one revision, the initial revision is missing; This happens
 	 * when we have an autsosave and the user has clicked 'View the Autosave'
 	 */
-	if ( 1 === sizeof( $revisions ) ) {
-		$revisions[ $post->ID ] = array(
+	if (1 === sizeof($revisions)) {
+		$revisions[$post->ID] = array(
 			'id'         => $post->ID,
-			'title'      => get_the_title( $post->ID ),
-			'author'     => $authors[ $post->post_author ],
-			'date'       => date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_modified ) ),
-			'dateShort'  => date_i18n( _x( 'j M @ H:i', 'revision date short format' ), strtotime( $post->post_modified ) ),
-			'timeAgo'    => sprintf( __( '%s ago' ), human_time_diff( strtotime( $post->post_modified_gmt ), $now_gmt ) ),
+			'title'      => get_the_title($post->ID),
+			'author'     => $authors[$post->post_author],
+			'date'       => date_i18n(__('M j, Y @ H:i'), strtotime($post->post_modified)),
+			'dateShort'  => date_i18n(_x('j M @ H:i', 'revision date short format'), strtotime($post->post_modified)),
+			'timeAgo'    => sprintf(__('%s ago'), human_time_diff(strtotime($post->post_modified_gmt), $now_gmt)),
 			'autosave'   => false,
 			'current'    => true,
 			'restoreUrl' => false,
@@ -261,48 +261,48 @@ 
 	 * were changed), we may not have a "current" revision. Mark the latest
 	 * revision as "current".
 	 */
-	if ( empty( $current_id ) ) {
-		if ( $revisions[ $revision->ID ]['autosave'] ) {
-			$revision = end( $revisions );
-			while ( $revision['autosave'] ) {
-				$revision = prev( $revisions );
+	if (empty($current_id)) {
+		if ($revisions[$revision->ID]['autosave']) {
+			$revision = end($revisions);
+			while ($revision['autosave']) {
+				$revision = prev($revisions);
 			}
 			$current_id = $revision['id'];
 		} else {
 			$current_id = $revision->ID;
 		}
-		$revisions[ $current_id ]['current'] = true;
+		$revisions[$current_id]['current'] = true;
 	}
 
 	// Now, grab the initial diff.
-	$compare_two_mode = is_numeric( $from );
-	if ( ! $compare_two_mode ) {
-		$found = array_search( $selected_revision_id, array_keys( $revisions ) );
-		if ( $found ) {
-			$from = array_keys( array_slice( $revisions, $found - 1, 1, true ) );
-			$from = reset( $from );
+	$compare_two_mode = is_numeric($from);
+	if ( ! $compare_two_mode) {
+		$found = array_search($selected_revision_id, array_keys($revisions));
+		if ($found) {
+			$from = array_keys(array_slice($revisions, $found - 1, 1, true));
+			$from = reset($from);
 		} else {
 			$from = 0;
 		}
 	}
 
-	$from = absint( $from );
+	$from = absint($from);
 
-	$diffs = array( array(
-		'id' => $from . ':' . $selected_revision_id,
-		'fields' => wp_get_revision_ui_diff( $post->ID, $from, $selected_revision_id ),
+	$diffs = array(array(
+		'id' => $from.':'.$selected_revision_id,
+		'fields' => wp_get_revision_ui_diff($post->ID, $from, $selected_revision_id),
 	));
 
 	return array(
 		'postId'           => $post->ID,
-		'nonce'            => wp_create_nonce( 'revisions-ajax-nonce' ),
-		'revisionData'     => array_values( $revisions ),
+		'nonce'            => wp_create_nonce('revisions-ajax-nonce'),
+		'revisionData'     => array_values($revisions),
 		'to'               => $selected_revision_id,
 		'from'             => $from,
 		'diffData'         => $diffs,
-		'baseUrl'          => parse_url( admin_url( 'revision.php' ), PHP_URL_PATH ),
-		'compareTwoMode'   => absint( $compare_two_mode ), // Apparently booleans are not allowed
-		'revisionIds'      => array_keys( $revisions ),
+		'baseUrl'          => parse_url(admin_url('revision.php'), PHP_URL_PATH),
+		'compareTwoMode'   => absint($compare_two_mode), // Apparently booleans are not allowed
+		'revisionIds'      => array_keys($revisions),
 	);
 }
 
@@ -322,11 +322,11 @@ 
 
 	<script id="tmpl-revisions-buttons" type="text/html">
 		<div class="revisions-previous">
-			<input class="button" type="button" value="<?php echo esc_attr_x( 'Previous', 'Button label for a previous revision' ); ?>" />
+			<input class="button" type="button" value="<?php echo esc_attr_x('Previous', 'Button label for a previous revision'); ?>" />
 		</div>
 
 		<div class="revisions-next">
-			<input class="button" type="button" value="<?php echo esc_attr_x( 'Next', 'Button label for a next revision' ); ?>" />
+			<input class="button" type="button" value="<?php echo esc_attr_x('Next', 'Button label for a next revision'); ?>" />
 		</div>
 	</script>
 
@@ -340,7 +340,7 @@ 
 				}
 				#>
 				/>
-				<?php esc_attr_e( 'Compare any two revisions' ); ?>
+				<?php esc_attr_e('Compare any two revisions'); ?>
 			</label>
 		</div>
 	</script>
@@ -349,28 +349,28 @@ 
 		<# if ( ! _.isUndefined( data.attributes ) ) { #>
 			<div class="diff-title">
 				<# if ( 'from' === data.type ) { #>
-					<strong><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong>
+					<strong><?php _ex('From:', 'Followed by post revision info'); ?></strong>
 				<# } else if ( 'to' === data.type ) { #>
-					<strong><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
+					<strong><?php _ex('To:', 'Followed by post revision info'); ?></strong>
 				<# } #>
 				<div class="author-card<# if ( data.attributes.autosave ) { #> autosave<# } #>">
 					{{{ data.attributes.author.avatar }}}
 					<div class="author-info">
 					<# if ( data.attributes.autosave ) { #>
-						<span class="byline"><?php printf( __( 'Autosave by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Autosave by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } else if ( data.attributes.current ) { #>
-						<span class="byline"><?php printf( __( 'Current Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Current Revision by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } else { #>
-						<span class="byline"><?php printf( __( 'Revision by %s' ),
-							'<span class="author-name">{{ data.attributes.author.name }}</span>' ); ?></span>
+						<span class="byline"><?php printf(__('Revision by %s'),
+							'<span class="author-name">{{ data.attributes.author.name }}</span>'); ?></span>
 					<# } #>
 						<span class="time-ago">{{ data.attributes.timeAgo }}</span>
 						<span class="date">({{ data.attributes.dateShort }})</span>
 					</div>
 				<# if ( 'to' === data.type && data.attributes.restoreUrl ) { #>
-					<input  <?php if ( wp_check_post_lock( $post->ID ) ) { ?>
+					<input  <?php if (wp_check_post_lock($post->ID)) { ?>
 						disabled="disabled"
 					<?php } else { ?>
 						<# if ( data.attributes.current ) { #>
@@ -378,9 +378,9 @@ 
 						<# } #>
 					<?php } ?>
 					<# if ( data.attributes.autosave ) { #>
-						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Autosave' ); ?>" />
+						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e('Restore This Autosave'); ?>" />
 					<# } else { #>
-						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e( 'Restore This Revision' ); ?>" />
+						type="button" class="restore-revision button button-primary" value="<?php esc_attr_e('Restore This Revision'); ?>" />
 					<# } #>
 				<# } #>
 			</div>
@@ -392,7 +392,7 @@ 
 
 	<script id="tmpl-revisions-diff" type="text/html">
 		<div class="loading-indicator"><span class="spinner"></span></div>
-		<div class="diff-error"><?php _e( 'Sorry, something went wrong. The requested comparison could not be loaded.' ); ?></div>
+		<div class="diff-error"><?php _e('Sorry, something went wrong. The requested comparison could not be loaded.'); ?></div>
 		<div class="diff">
 		<# _.each( data.fields, function( field ) { #>
 			<h3>{{ field.name }}</h3>

src/wp-admin/includes/admin-filters.php

Spacing +55 added lines, -55 removed lines

@@ -9,77 +9,77 @@ 
  */
 
 // Bookmark hooks.
-add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
+add_action('admin_page_access_denied', 'wp_link_manager_disabled_message');
 
 // Dashboard hooks.
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action('activity_box_end', 'wp_dashboard_quota');
 
 // Media hooks.
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
+add_action('attachment_submitbox_misc_actions', 'attachment_submitbox_metadata');
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file',  'wp_media_upload_handler' );
+add_action('media_upload_image', 'wp_media_upload_handler');
+add_action('media_upload_audio', 'wp_media_upload_handler');
+add_action('media_upload_video', 'wp_media_upload_handler');
+add_action('media_upload_file', 'wp_media_upload_handler');
 
-add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass'  );
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file',  'get_media_item', 10, 2 );
+add_filter('async_upload_image', 'get_media_item', 10, 2);
+add_filter('async_upload_audio', 'get_media_item', 10, 2);
+add_filter('async_upload_video', 'get_media_item', 10, 2);
+add_filter('async_upload_file', 'get_media_item', 10, 2);
 
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
+add_filter('attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2);
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter('media_upload_library', 'media_upload_library');
 
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
+add_filter('media_upload_tabs', 'update_gallery_tab');
 
 // Misc hooks.
-add_action( 'admin_head', 'wp_admin_canonical_url'   );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_head', 'wp_site_icon'             );
-add_action( 'admin_head', '_ipad_meta'               );
+add_action('admin_head', 'wp_admin_canonical_url');
+add_action('admin_head', 'wp_color_scheme_settings');
+add_action('admin_head', 'wp_site_icon');
+add_action('admin_head', '_ipad_meta');
 
-add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );
+add_action('post_edit_form_tag', 'post_form_autocomplete_off');
 
-add_action( 'update_option_home',          'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl',       'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+add_action('update_option_page_on_front', 'update_home_siteurl', 10, 2);
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts',  10,  3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock',   10,  3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10,  3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave',     500, 2 );
+add_filter('heartbeat_received', 'wp_check_locked_posts', 10, 3);
+add_filter('heartbeat_received', 'wp_refresh_post_lock', 10, 3);
+add_filter('wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3);
+add_filter('heartbeat_received', 'heartbeat_autosave', 500, 2);
 
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+add_filter('heartbeat_settings', 'wp_heartbeat_set_suspension');
 
 // Nav Menu hooks.
-add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 // Plugin hooks.
-add_filter( 'whitelist_options', 'option_update_filter' );
+add_filter('whitelist_options', 'option_update_filter');
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured',               'install_dashboard' );
-add_action( 'install_plugins_upload',                 'install_plugins_upload' );
-add_action( 'install_plugins_search',                 'display_plugins_table' );
-add_action( 'install_plugins_popular',                'display_plugins_table' );
-add_action( 'install_plugins_recommended',            'display_plugins_table' );
-add_action( 'install_plugins_new',                    'display_plugins_table' );
-add_action( 'install_plugins_beta',                   'display_plugins_table' );
-add_action( 'install_plugins_favorites',              'display_plugins_table' );
-add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
+add_action('install_plugins_featured', 'install_dashboard');
+add_action('install_plugins_upload', 'install_plugins_upload');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_recommended', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_beta', 'display_plugins_table');
+add_action('install_plugins_favorites', 'display_plugins_table');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts'                ) );
-add_action( 'user_register',         array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action('admin_enqueue_scripts', array('WP_Internal_Pointers', 'enqueue_scripts'));
+add_action('user_register', array('WP_Internal_Pointers', 'dismiss_pointers_for_new_users'));
 
 // Theme hooks.
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
+add_action('customize_controls_print_footer_scripts', 'customize_themes_print_templates');
 
 // Theme Install hooks.
 // add_action('install_themes_dashboard', 'install_themes_dashboard');
@@ -88,26 +88,26 @@ 
 // add_action('install_themes_featured', 'display_themes');
 // add_action('install_themes_new', 'display_themes');
 // add_action('install_themes_updated', 'display_themes');
-add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
+add_action('install_themes_pre_theme-information', 'install_theme_information');
 
 // User hooks.
-add_action( 'admin_init', 'default_password_nag_handler' );
+add_action('admin_init', 'default_password_nag_handler');
 
-add_action( 'admin_notices', 'default_password_nag' );
+add_action('admin_notices', 'default_password_nag');
 
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 
 // Update hooks.
-add_action( 'admin_init', 'wp_plugin_update_rows' );
-add_action( 'admin_init', 'wp_theme_update_rows'  );
+add_action('admin_init', 'wp_plugin_update_rows');
+add_action('admin_init', 'wp_theme_update_rows');
 
-add_action( 'admin_notices', 'update_nag',      3  );
-add_action( 'admin_notices', 'maintenance_nag', 10 );
+add_action('admin_notices', 'update_nag', 3);
+add_action('admin_notices', 'maintenance_nag', 10);
 
-add_filter( 'update_footer', 'core_update_footer' );
+add_filter('update_footer', 'core_update_footer');
 
 // Update Core hooks.
-add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action('_core_updated_successfully', '_redirect_to_about_wordpress');
 
 // Upgrade hooks.
-add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
+add_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Administration API: Default admin hooks
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.3.0
- */
+	 * Administration API: Default admin hooks
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.3.0
+	 */
 
 // Bookmark hooks.
 add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );

src/wp-admin/includes/theme.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Theme Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Theme Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Remove a theme

Braces +44 added lines, -30 removed lines

@@ -20,12 +20,14 @@ 
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
-		return false;
+	if ( empty($stylesheet) ) {
+			return false;
+	}
 
 	ob_start();
-	if ( empty( $redirect ) )
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	if ( empty( $redirect ) ) {
+			$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	}
 	if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
 		$data = ob_get_clean();
 
@@ -51,11 +53,13 @@ 
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
-		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	if ( ! is_object($wp_filesystem) ) {
+			return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+	}
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) {
+			return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+	}
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
@@ -144,11 +148,13 @@ 
 function get_theme_update_available( $theme ) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
-		return false;
+	if ( !current_user_can('update_themes' ) ) {
+			return false;
+	}
 
-	if ( !isset($themes_update) )
-		$themes_update = get_site_transient('update_themes');
+	if ( !isset($themes_update) ) {
+			$themes_update = get_site_transient('update_themes');
+	}
 
 	if ( ! ( $theme instanceof WP_Theme ) ) {
 		return false;
@@ -253,20 +259,24 @@ 
 		)
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
-		return $features;
+	if ( ! $api || ! current_user_can( 'install_themes' ) ) {
+			return $features;
+	}
 
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) ) {
+			set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
 	if ( !$feature_list ) {
 		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
-			return $features;
+		if ( is_wp_error( $feature_list ) ) {
+					return $features;
+		}
 	}
 
-	if ( !$feature_list )
-		return $features;
+	if ( !$feature_list ) {
+			return $features;
+	}
 
 	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -280,15 +290,17 @@ 
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
 	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
-			$feature_category = $category_translations[$feature_category];
+		if ( isset($category_translations[$feature_category]) ) {
+					$feature_category = $category_translations[$feature_category];
+		}
 		$wporg_features[$feature_category] = array();
 
 		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
-				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
-			else
-				$wporg_features[$feature_category][$feature] = $feature;
+			if ( isset($features[$feature_category][$feature]) ) {
+							$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
+			} else {
+							$wporg_features[$feature_category][$feature] = $feature;
+			}
 		}
 	}
 
@@ -360,8 +372,9 @@ 
 
 	if ( ! $res ) {
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+					$url = set_url_scheme( $url, 'https' );
+		}
 
 		$http_args = array(
 			'body' => array(
@@ -382,8 +395,9 @@ 
 			$res = new WP_Error('themes_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 = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('themes_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 ) );
+			if ( ! is_object( $res ) && ! is_array( $res ) ) {
+							$res = new WP_Error('themes_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 ) );
+			}
 		}
 	}
 

Spacing +191 added lines, -191 removed lines

@@ -20,71 +20,71 @@ 
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 
-	if ( empty($stylesheet) )
+	if (empty($stylesheet))
 		return false;
 
 	ob_start();
-	if ( empty( $redirect ) )
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
-	if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
+	if (empty($redirect))
+		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet='.urlencode($stylesheet), 'delete-theme_'.$stylesheet);
+	if (false === ($credentials = request_filesystem_credentials($redirect))) {
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ){
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! WP_Filesystem($credentials) ) {
+	if ( ! WP_Filesystem($credentials)) {
 		request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
 		$data = ob_get_clean();
 
-		if ( ! empty($data) ) {
-			include_once( ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! empty($data)) {
+			include_once(ABSPATH.'wp-admin/admin-header.php');
 			echo $data;
-			include( ABSPATH . 'wp-admin/admin-footer.php');
+			include(ABSPATH.'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
 
-	if ( ! is_object($wp_filesystem) )
+	if ( ! is_object($wp_filesystem))
 		return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
-	if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
+	if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code())
 		return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
 
 	// Get the base plugin folder.
 	$themes_dir = $wp_filesystem->wp_themes_dir();
-	if ( empty( $themes_dir ) ) {
-		return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
+	if (empty($themes_dir)) {
+		return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.'));
 	}
 
-	$themes_dir = trailingslashit( $themes_dir );
-	$theme_dir = trailingslashit( $themes_dir . $stylesheet );
-	$deleted = $wp_filesystem->delete( $theme_dir, true );
+	$themes_dir = trailingslashit($themes_dir);
+	$theme_dir = trailingslashit($themes_dir.$stylesheet);
+	$deleted = $wp_filesystem->delete($theme_dir, true);
 
-	if ( ! $deleted ) {
-		return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) );
+	if ( ! $deleted) {
+		return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $stylesheet));
 	}
 
-	$theme_translations = wp_get_installed_translations( 'themes' );
+	$theme_translations = wp_get_installed_translations('themes');
 
 	// Remove language files, silently.
-	if ( ! empty( $theme_translations[ $stylesheet ] ) ) {
-		$translations = $theme_translations[ $stylesheet ];
+	if ( ! empty($theme_translations[$stylesheet])) {
+		$translations = $theme_translations[$stylesheet];
 
-		foreach ( $translations as $translation => $data ) {
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
-			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
+		foreach ($translations as $translation => $data) {
+			$wp_filesystem->delete(WP_LANG_DIR.'/themes/'.$stylesheet.'-'.$translation.'.po');
+			$wp_filesystem->delete(WP_LANG_DIR.'/themes/'.$stylesheet.'-'.$translation.'.mo');
 		}
 	}
 
 	// Force refresh of theme update information.
-	delete_site_transient( 'update_themes' );
+	delete_site_transient('update_themes');
 
 	return true;
 }
@@ -97,8 +97,8 @@ 
  * @param WP_Post|null $post Optional. The post being edited, provided for context.
  * @return array Key is the template name, value is the filename of the template
  */
-function get_page_templates( $post = null ) {
-	return array_flip( wp_get_theme()->get_page_templates( $post ) );
+function get_page_templates($post = null) {
+	return array_flip(wp_get_theme()->get_page_templates($post));
 }
 
 /**
@@ -112,7 +112,7 @@ 
  * @return string
  */
 function _get_template_edit_filename($fullpath, $containingfolder) {
-	return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
+	return str_replace(dirname(dirname($containingfolder)), '', $fullpath);
 }
 
 /**
@@ -125,8 +125,8 @@ 
  *
  * @param WP_Theme $theme Theme data object.
  */
-function theme_update_available( $theme ) {
-	echo get_theme_update_available( $theme );
+function theme_update_available($theme) {
+	echo get_theme_update_available($theme);
 }
 
 /**
@@ -141,16 +141,16 @@ 
  * @param WP_Theme $theme WP_Theme object.
  * @return false|string HTML for the update link, or false if invalid info was passed.
  */
-function get_theme_update_available( $theme ) {
+function get_theme_update_available($theme) {
 	static $themes_update = null;
 
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return false;
 
-	if ( !isset($themes_update) )
+	if ( ! isset($themes_update))
 		$themes_update = get_site_transient('update_themes');
 
-	if ( ! ( $theme instanceof WP_Theme ) ) {
+	if ( ! ($theme instanceof WP_Theme)) {
 		return false;
 	}
 
@@ -158,42 +158,42 @@ 
 
 	$html = '';
 
-	if ( isset($themes_update->response[ $stylesheet ]) ) {
-		$update = $themes_update->response[ $stylesheet ];
+	if (isset($themes_update->response[$stylesheet])) {
+		$update = $themes_update->response[$stylesheet];
 		$theme_name = $theme->display('Name');
 		$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
-		$update_url = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
+		$update_url = wp_nonce_url(admin_url('update.php?action=upgrade-theme&theme='.urlencode($stylesheet)), 'upgrade-theme_'.$stylesheet);
 
-		if ( !is_multisite() ) {
-			if ( ! current_user_can('update_themes') ) {
+		if ( ! is_multisite()) {
+			if ( ! current_user_can('update_themes')) {
 				/* translators: 1: theme name, 2: theme details URL, 3: accessibility text, 4: version number */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="%3$s">View version %4$s details</a>.' ) . '</strong></p>',
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="%3$s">View version %4$s details</a>.').'</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					/* translators: 1: theme name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) ),
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version'])),
 					$update['new_version']
 				);
-			} elseif ( empty( $update['package'] ) ) {
+			} elseif (empty($update['package'])) {
 				/* translators: 1: theme name, 2: theme details URL, 3: accessibility text, 4: version number */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>').'</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					/* translators: 1: theme name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) ),
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version'])),
 					$update['new_version']
 				);
 			} else {
 				/* translators: 1: theme name, 2: theme details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" aria-label="%6$s">update now</a>.' ) . '</strong></p>',
+				$html = sprintf('<p><strong>'.__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" aria-label="%6$s">update now</a>.').'</strong></p>',
 					$theme_name,
-					esc_url( $details_url ),
+					esc_url($details_url),
 					/* translators: 1: theme name, 2: version number */
-					esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) ),
+					esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $update['new_version'])),
 					$update['new_version'],
 					$update_url,
 					/* translators: %s: theme name */
-					esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) )
+					esc_attr(sprintf(__('Update %s now'), $theme_name))
 				);
 			}
 		}
@@ -210,102 +210,102 @@ 
  * @param bool $api Optional. Whether try to fetch tags from the WordPress.org API. Defaults to true.
  * @return array Array of features keyed by category with translations keyed by slug.
  */
-function get_theme_feature_list( $api = true ) {
+function get_theme_feature_list($api = true) {
 	// Hard-coded list is used if api not accessible.
 	$features = array(
-			__( 'Colors' ) => array(
-				'black'   => __( 'Black' ),
-				'blue'    => __( 'Blue' ),
-				'brown'   => __( 'Brown' ),
-				'gray'    => __( 'Gray' ),
-				'green'   => __( 'Green' ),
-				'orange'  => __( 'Orange' ),
-				'pink'    => __( 'Pink' ),
-				'purple'  => __( 'Purple' ),
-				'red'     => __( 'Red' ),
-				'silver'  => __( 'Silver' ),
-				'tan'     => __( 'Tan' ),
-				'white'   => __( 'White' ),
-				'yellow'  => __( 'Yellow' ),
-				'dark'    => __( 'Dark' ),
-				'light'   => __( 'Light' ),
+			__('Colors') => array(
+				'black'   => __('Black'),
+				'blue'    => __('Blue'),
+				'brown'   => __('Brown'),
+				'gray'    => __('Gray'),
+				'green'   => __('Green'),
+				'orange'  => __('Orange'),
+				'pink'    => __('Pink'),
+				'purple'  => __('Purple'),
+				'red'     => __('Red'),
+				'silver'  => __('Silver'),
+				'tan'     => __('Tan'),
+				'white'   => __('White'),
+				'yellow'  => __('Yellow'),
+				'dark'    => __('Dark'),
+				'light'   => __('Light'),
 			),
 
-		__( 'Layout' ) => array(
-			'fixed-layout'      => __( 'Fixed Layout' ),
-			'fluid-layout'      => __( 'Fluid Layout' ),
-			'responsive-layout' => __( 'Responsive Layout' ),
-			'one-column'    => __( 'One Column' ),
-			'two-columns'   => __( 'Two Columns' ),
-			'three-columns' => __( 'Three Columns' ),
-			'four-columns'  => __( 'Four Columns' ),
-			'left-sidebar'  => __( 'Left Sidebar' ),
-			'right-sidebar' => __( 'Right Sidebar' ),
+		__('Layout') => array(
+			'fixed-layout'      => __('Fixed Layout'),
+			'fluid-layout'      => __('Fluid Layout'),
+			'responsive-layout' => __('Responsive Layout'),
+			'one-column'    => __('One Column'),
+			'two-columns'   => __('Two Columns'),
+			'three-columns' => __('Three Columns'),
+			'four-columns'  => __('Four Columns'),
+			'left-sidebar'  => __('Left Sidebar'),
+			'right-sidebar' => __('Right Sidebar'),
 		),
 
-		__( 'Features' ) => array(
-			'accessibility-ready'   => __( 'Accessibility Ready' ),
-			'blavatar'              => __( 'Blavatar' ),
-			'buddypress'            => __( 'BuddyPress' ),
-			'custom-background'     => __( 'Custom Background' ),
-			'custom-colors'         => __( 'Custom Colors' ),
-			'custom-header'         => __( 'Custom Header' ),
-			'custom-menu'           => __( 'Custom Menu' ),
-			'editor-style'          => __( 'Editor Style' ),
-			'featured-image-header' => __( 'Featured Image Header' ),
-			'featured-images'       => __( 'Featured Images' ),
-			'flexible-header'       => __( 'Flexible Header' ),
-			'front-page-post-form'  => __( 'Front Page Posting' ),
-			'full-width-template'   => __( 'Full Width Template' ),
-			'microformats'          => __( 'Microformats' ),
-			'post-formats'          => __( 'Post Formats' ),
-			'rtl-language-support'  => __( 'RTL Language Support' ),
-			'sticky-post'           => __( 'Sticky Post' ),
-			'theme-options'         => __( 'Theme Options' ),
-			'threaded-comments'     => __( 'Threaded Comments' ),
-			'translation-ready'     => __( 'Translation Ready' ),
+		__('Features') => array(
+			'accessibility-ready'   => __('Accessibility Ready'),
+			'blavatar'              => __('Blavatar'),
+			'buddypress'            => __('BuddyPress'),
+			'custom-background'     => __('Custom Background'),
+			'custom-colors'         => __('Custom Colors'),
+			'custom-header'         => __('Custom Header'),
+			'custom-menu'           => __('Custom Menu'),
+			'editor-style'          => __('Editor Style'),
+			'featured-image-header' => __('Featured Image Header'),
+			'featured-images'       => __('Featured Images'),
+			'flexible-header'       => __('Flexible Header'),
+			'front-page-post-form'  => __('Front Page Posting'),
+			'full-width-template'   => __('Full Width Template'),
+			'microformats'          => __('Microformats'),
+			'post-formats'          => __('Post Formats'),
+			'rtl-language-support'  => __('RTL Language Support'),
+			'sticky-post'           => __('Sticky Post'),
+			'theme-options'         => __('Theme Options'),
+			'threaded-comments'     => __('Threaded Comments'),
+			'translation-ready'     => __('Translation Ready'),
 		),
 
-		__( 'Subject' )  => array(
-			'holiday'       => __( 'Holiday' ),
-			'photoblogging' => __( 'Photoblogging' ),
-			'seasonal'      => __( 'Seasonal' ),
+		__('Subject')  => array(
+			'holiday'       => __('Holiday'),
+			'photoblogging' => __('Photoblogging'),
+			'seasonal'      => __('Seasonal'),
 		)
 	);
 
-	if ( ! $api || ! current_user_can( 'install_themes' ) )
+	if ( ! $api || ! current_user_can('install_themes'))
 		return $features;
 
-	if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) )
-		set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( ! $feature_list = get_site_transient('wporg_theme_feature_list'))
+		set_site_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 
-	if ( !$feature_list ) {
-		$feature_list = themes_api( 'feature_list', array() );
-		if ( is_wp_error( $feature_list ) )
+	if ( ! $feature_list) {
+		$feature_list = themes_api('feature_list', array());
+		if (is_wp_error($feature_list))
 			return $features;
 	}
 
-	if ( !$feature_list )
+	if ( ! $feature_list)
 		return $features;
 
-	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_site_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	$category_translations = array(
-		'Colors'   => __( 'Colors' ),
-		'Layout'   => __( 'Layout' ),
-		'Features' => __( 'Features' ),
-		'Subject'  => __( 'Subject' )
+		'Colors'   => __('Colors'),
+		'Layout'   => __('Layout'),
+		'Features' => __('Features'),
+		'Subject'  => __('Subject')
 	);
 
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
-	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
-		if ( isset($category_translations[$feature_category]) )
+	foreach ((array) $feature_list as $feature_category => $feature_items) {
+		if (isset($category_translations[$feature_category]))
 			$feature_category = $category_translations[$feature_category];
 		$wporg_features[$feature_category] = array();
 
-		foreach ( $feature_items as $feature ) {
-			if ( isset($features[$feature_category][$feature]) )
+		foreach ($feature_items as $feature) {
+			if (isset($features[$feature_category][$feature]))
 				$wporg_features[$feature_category][$feature] = $features[$feature_category][$feature];
 			else
 				$wporg_features[$feature_category][$feature] = $feature;
@@ -396,17 +396,17 @@ 
  *         {@link https://developer.wordpress.org/reference/functions/themes_api/ function reference article}
  *         for more information on the make-up of possible return objects depending on the value of `$action`.
  */
-function themes_api( $action, $args = array() ) {
+function themes_api($action, $args = array()) {
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( ! isset( $args->per_page ) ) {
+	if ( ! isset($args->per_page)) {
 		$args->per_page = 24;
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if ( ! isset($args->locale)) {
 		$args->locale = get_locale();
 	}
 
@@ -421,7 +421,7 @@ 
 	 * @param string $action Requested action. Likely values are 'theme_information',
 	 *                       'feature_list', or 'query_themes'.
 	 */
-	$args = apply_filters( 'themes_api_args', $args, $action );
+	$args = apply_filters('themes_api_args', $args, $action);
 
 	/**
 	 * Filter whether to override the WordPress.org Themes API.
@@ -438,34 +438,34 @@ 
 	 *                                    'feature_list', or 'query_themes'.
 	 * @param object             $args     Arguments used to query for installer pages from the Themes API.
 	 */
-	$res = apply_filters( 'themes_api', false, $action, $args );
+	$res = apply_filters('themes_api', false, $action, $args);
 
-	if ( ! $res ) {
+	if ( ! $res) {
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
-		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-			$url = set_url_scheme( $url, 'https' );
+		if ($ssl = wp_http_supports(array('ssl')))
+			$url = set_url_scheme($url, 'https');
 
 		$http_args = array(
 			'body' => array(
 				'action' => $action,
-				'request' => serialize( $args )
+				'request' => serialize($args)
 			)
 		);
-		$request = wp_remote_post( $url, $http_args );
+		$request = wp_remote_post($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) {
-				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)) {
+			if ( ! defined('DOING_AJAX') || ! DOING_AJAX) {
+				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, $http_args );
+			$request = wp_remote_post($http_url, $http_args);
 		}
 
-		if ( is_wp_error($request) ) {
-			$res = new WP_Error('themes_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('themes_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 = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
-				$res = new WP_Error('themes_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 = maybe_unserialize(wp_remote_retrieve_body($request));
+			if ( ! is_object($res) && ! is_array($res))
+				$res = new WP_Error('themes_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));
 		}
 	}
 
@@ -479,7 +479,7 @@ 
 	 *                             'feature_list', or 'query_themes'.
 	 * @param object       $args   Arguments used to query for installer pages from the WordPress.org Themes API.
 	 */
-	return apply_filters( 'themes_api_result', $res, $action, $args );
+	return apply_filters('themes_api_result', $res, $action, $args);
 }
 
 /**
@@ -492,7 +492,7 @@ 
  *
  * @return array An associative array of theme data, sorted by name.
  */
-function wp_prepare_themes_for_js( $themes = null ) {
+function wp_prepare_themes_for_js($themes = null) {
 	$current_theme = get_stylesheet();
 
 	/**
@@ -507,78 +507,78 @@ 
 	 * @param null|array $themes          An array of WP_Theme objects to prepare, if any.
 	 * @param string     $current_theme   The current theme slug.
 	 */
-	$prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme );
+	$prepared_themes = (array) apply_filters('pre_prepare_themes_for_js', array(), $themes, $current_theme);
 
-	if ( ! empty( $prepared_themes ) ) {
+	if ( ! empty($prepared_themes)) {
 		return $prepared_themes;
 	}
 
 	// Make sure the current theme is listed first.
-	$prepared_themes[ $current_theme ] = array();
+	$prepared_themes[$current_theme] = array();
 
-	if ( null === $themes ) {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
-		if ( ! isset( $themes[ $current_theme ] ) ) {
-			$themes[ $current_theme ] = wp_get_theme();
+	if (null === $themes) {
+		$themes = wp_get_themes(array('allowed' => true));
+		if ( ! isset($themes[$current_theme])) {
+			$themes[$current_theme] = wp_get_theme();
 		}
 	}
 
 	$updates = array();
-	if ( current_user_can( 'update_themes' ) ) {
-		$updates_transient = get_site_transient( 'update_themes' );
-		if ( isset( $updates_transient->response ) ) {
+	if (current_user_can('update_themes')) {
+		$updates_transient = get_site_transient('update_themes');
+		if (isset($updates_transient->response)) {
 			$updates = $updates_transient->response;
 		}
 	}
 
-	WP_Theme::sort_by_name( $themes );
+	WP_Theme::sort_by_name($themes);
 
 	$parents = array();
 
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$slug = $theme->get_stylesheet();
-		$encoded_slug = urlencode( $slug );
+		$encoded_slug = urlencode($slug);
 
 		$parent = false;
-		if ( $theme->parent() ) {
-			$parent = $theme->parent()->display( 'Name' );
-			$parents[ $slug ] = $theme->parent()->get_stylesheet();
+		if ($theme->parent()) {
+			$parent = $theme->parent()->display('Name');
+			$parents[$slug] = $theme->parent()->get_stylesheet();
 		}
 
 		$customize_action = null;
-		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$customize_action = esc_url( add_query_arg(
+		if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+			$customize_action = esc_url(add_query_arg(
 				array(
-					'return' => urlencode( esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ),
+					'return' => urlencode(esc_url_raw(wp_unslash($_SERVER['REQUEST_URI']))),
 				),
-				wp_customize_url( $slug )
-			) );
+				wp_customize_url($slug)
+			));
 		}
 
-		$prepared_themes[ $slug ] = array(
+		$prepared_themes[$slug] = array(
 			'id'           => $slug,
-			'name'         => $theme->display( 'Name' ),
-			'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple
-			'description'  => $theme->display( 'Description' ),
-			'author'       => $theme->display( 'Author', false, true ),
-			'authorAndUri' => $theme->display( 'Author' ),
-			'version'      => $theme->display( 'Version' ),
-			'tags'         => $theme->display( 'Tags' ),
+			'name'         => $theme->display('Name'),
+			'screenshot'   => array($theme->get_screenshot()), // @todo multiple
+			'description'  => $theme->display('Description'),
+			'author'       => $theme->display('Author', false, true),
+			'authorAndUri' => $theme->display('Author'),
+			'version'      => $theme->display('Version'),
+			'tags'         => $theme->display('Tags'),
 			'parent'       => $parent,
 			'active'       => $slug === $current_theme,
-			'hasUpdate'    => isset( $updates[ $slug ] ),
-			'update'       => get_theme_update_available( $theme ),
+			'hasUpdate'    => isset($updates[$slug]),
+			'update'       => get_theme_update_available($theme),
 			'actions'      => array(
-				'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
+				'activate' => current_user_can('switch_themes') ? wp_nonce_url(admin_url('themes.php?action=activate&amp;stylesheet='.$encoded_slug), 'switch-theme_'.$slug) : null,
 				'customize' => $customize_action,
-				'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
+				'delete'   => current_user_can('delete_themes') ? wp_nonce_url(admin_url('themes.php?action=delete&amp;stylesheet='.$encoded_slug), 'delete-theme_'.$slug) : null,
 			),
 		);
 	}
 
 	// Remove 'delete' action if theme has an active child
-	if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
-		unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
+	if ( ! empty($parents) && array_key_exists($current_theme, $parents)) {
+		unset($prepared_themes[$parents[$current_theme]]['actions']['delete']);
 	}
 
 	/**
@@ -590,9 +590,9 @@ 
 	 *
 	 * @param array $prepared_themes Array of themes.
 	 */
-	$prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes );
-	$prepared_themes = array_values( $prepared_themes );
-	return array_filter( $prepared_themes );
+	$prepared_themes = apply_filters('wp_prepare_themes_for_js', $prepared_themes);
+	$prepared_themes = array_values($prepared_themes);
+	return array_filter($prepared_themes);
 }
 
 /**
@@ -601,16 +601,16 @@ 
  * @since 4.2.0
  */
 function customize_themes_print_templates() {
-	$preview_url = esc_url( add_query_arg( 'theme', '__THEME__' ) ); // Token because esc_url() strips curly braces.
-	$preview_url = str_replace( '__THEME__', '{{ data.id }}', $preview_url );
+	$preview_url = esc_url(add_query_arg('theme', '__THEME__')); // Token because esc_url() strips curly braces.
+	$preview_url = str_replace('__THEME__', '{{ data.id }}', $preview_url);
 	?>
 	<script type="text/html" id="tmpl-customize-themes-details-view">
 		<div class="theme-backdrop"></div>
 		<div class="theme-wrap wp-clearfix">
 			<div class="theme-header">
-				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show previous theme'); ?></span></button>
+				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show next theme'); ?></span></button>
+				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close details dialog'); ?></span></button>
 			</div>
 			<div class="theme-about wp-clearfix">
 				<div class="theme-screenshots">
@@ -623,18 +623,18 @@ 
 
 				<div class="theme-info">
 					<# if ( data.active ) { #>
-						<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+						<span class="current-label"><?php _e('Current Theme'); ?></span>
 					<# } #>
-					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
-					<h3 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h3>
+					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf(__('Version: %s'), '{{ data.version }}'); ?></span></h2>
+					<h3 class="theme-author"><?php printf(__('By %s'), '{{{ data.authorAndUri }}}'); ?></h3>
 					<p class="theme-description">{{{ data.description }}}</p>
 
 					<# if ( data.parent ) { #>
-						<p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
+						<p class="parent-theme"><?php printf(__('This is a child theme of %s.'), '<strong>{{{ data.parent }}}</strong>'); ?></p>
 					<# } #>
 
 					<# if ( data.tags ) { #>
-						<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{ data.tags }}</p>
+						<p class="theme-tags"><span><?php _e('Tags:'); ?></span> {{ data.tags }}</p>
 					<# } #>
 				</div>
 			</div>
@@ -642,7 +642,7 @@ 
 			<# if ( ! data.active ) { #>
 				<div class="theme-actions">
 					<div class="inactive-theme">
-						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
+						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary"><?php _e('Live Preview'); ?></a>
 					</div>
 				</div>
 			<# } #>

src/wp-admin/includes/deprecated.php

Indentation +7 added lines, -7 removed lines

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

Doc Comments +2 added lines, -2 removed lines

@@ -127,8 +127,8 @@
  * @param int $currentparent Optional. Current parent category ID. Default 0.
  * @param int $parent        Optional. Parent ID to retrieve categories for. Default 0.
  * @param int $level         Optional. Number of levels deep to display. Default 0.
- * @param array $categories  Optional. Categories to include in the control. Default 0.
- * @return bool|null False if no categories were found.
+ * @param integer $categories  Optional. Categories to include in the control. Default 0.
+ * @return null|false False if no categories were found.
  */
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );

Spacing +174 added lines, -174 removed lines

@@ -18,7 +18,7 @@ 
  * @see wp_editor()
  */
 function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '2.1', 'wp_editor()');
 
 	wp_tiny_mce();
 }
@@ -31,7 +31,7 @@ 
  *
  */
 function documentation_link() {
-	_deprecated_function( __FUNCTION__, '2.5' );
+	_deprecated_function(__FUNCTION__, '2.5');
 }
 
 /**
@@ -47,9 +47,9 @@ 
  * @param int $hmax Maximum wanted height
  * @return array Shrunk dimensions (width, height).
  */
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+function wp_shrink_dimensions($width, $height, $wmax = 128, $hmax = 96) {
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, $wmax, $hmax);
 }
 
 /**
@@ -63,9 +63,9 @@ 
  * @param int $height Current height of the image
  * @return array Shrunk dimensions (width, height).
  */
-function get_udims( $width, $height ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, 128, 96 );
+function get_udims($width, $height) {
+	_deprecated_function(__FUNCTION__, '3.5', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, 128, 96);
 }
 
 /**
@@ -79,10 +79,10 @@ 
  * @param int $parent        Unused.
  * @param array $popular_ids Unused.
  */
-function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) {
-	_deprecated_function( __FUNCTION__, '2.6', 'wp_category_checklist()' );
+function dropdown_categories($default = 0, $parent = 0, $popular_ids = array()) {
+	_deprecated_function(__FUNCTION__, '2.6', 'wp_category_checklist()');
 	global $post_ID;
-	wp_category_checklist( $post_ID );
+	wp_category_checklist($post_ID);
 }
 
 /**
@@ -94,10 +94,10 @@ 
  *
  * @param int $default Unused.
  */
-function dropdown_link_categories( $default = 0 ) {
-	_deprecated_function( __FUNCTION__, '2.6', 'wp_link_category_checklist()' );
+function dropdown_link_categories($default = 0) {
+	_deprecated_function(__FUNCTION__, '2.6', 'wp_link_category_checklist()');
 	global $link_id;
-	wp_link_category_checklist( $link_id );
+	wp_link_category_checklist($link_id);
 }
 
 /**
@@ -110,10 +110,10 @@ 
  * @param string $file Filesystem path relative to the wp-content directory.
  * @return string Full filesystem path to edit.
  */
-function get_real_file_to_edit( $file ) {
-	_deprecated_function( __FUNCTION__, '2.9' );
+function get_real_file_to_edit($file) {
+	_deprecated_function(__FUNCTION__, '2.9');
 
-	return WP_CONTENT_DIR . $file;
+	return WP_CONTENT_DIR.$file;
 }
 
 /**
@@ -130,21 +130,21 @@ 
  * @param array $categories  Optional. Categories to include in the control. Default 0.
  * @return bool|null False if no categories were found.
  */
-function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) {
+	_deprecated_function(__FUNCTION__, '3.0', 'wp_dropdown_categories()');
+	if ( ! $categories)
+		$categories = get_categories(array('hide_empty' => 0));
 
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $currentcat != $category->term_id && $parent == $category->parent) {
-				$pad = str_repeat( '– ', $level );
-				$category->name = esc_html( $category->name );
+	if ($categories) {
+		foreach ($categories as $category) {
+			if ($currentcat != $category->term_id && $parent == $category->parent) {
+				$pad = str_repeat('– ', $level);
+				$category->name = esc_html($category->name);
 				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
+				if ($currentparent == $category->term_id)
 					echo " selected='selected'";
 				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
+				wp_dropdown_cats($currentcat, $currentparent, $category->term_id, $level + 1, $categories);
 			}
 		}
 	} else {
@@ -164,9 +164,9 @@ 
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
-function add_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'register_setting()' );
-	register_setting( $option_group, $option_name, $sanitize_callback );
+function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'register_setting()');
+	register_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -180,9 +180,9 @@ 
  * @param string $option_name
  * @param callable $sanitize_callback
  */
-function remove_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0', 'unregister_setting()' );
-	unregister_setting( $option_group, $option_name, $sanitize_callback );
+function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0', 'unregister_setting()');
+	unregister_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -193,8 +193,8 @@ 
  *
  * @param string $filename
 **/
-function codepress_get_lang( $filename ) {
-	_deprecated_function( __FUNCTION__, '3.0' );
+function codepress_get_lang($filename) {
+	_deprecated_function(__FUNCTION__, '3.0');
 }
 
 /**
@@ -204,7 +204,7 @@ 
  * @deprecated 3.0.0
 **/
 function codepress_footer_js() {
-	_deprecated_function( __FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 }
 
 /**
@@ -214,7 +214,7 @@ 
  * @deprecated 3.0.0
 **/
 function use_codepress() {
-	_deprecated_function( __FUNCTION__, '3.0' );
+	_deprecated_function(__FUNCTION__, '3.0');
 }
 
 /**
@@ -225,15 +225,15 @@ 
  * @return array List of user IDs.
  */
 function get_author_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key));
 }
 
 /**
@@ -244,18 +244,18 @@ 
  * @param int $user_id User ID.
  * @return array|bool List of editable authors. False if no editable users.
  */
-function get_editable_authors( $user_id ) {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+function get_editable_authors($user_id) {
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( !$editable ) {
+	if ( ! $editable) {
 		return false;
 	} else {
 		$editable = join(',', $editable);
-		$authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
+		$authors = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name");
 	}
 
 	return apply_filters('get_editable_authors', $authors);
@@ -270,32 +270,32 @@ 
  * @param bool $exclude_zeros Optional. Whether to exclude zeroes. Default true.
  * @return array Array of editable user IDs, empty array otherwise.
  */
-function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+function get_editable_user_ids($user_id, $exclude_zeros = true, $post_type = 'post') {
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
+	if ( ! $user = get_userdata($user_id))
 		return array();
 	$post_type_obj = get_post_type_object($post_type);
 
-	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
+	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts)) {
+		if ($user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros)
 			return array($user->ID);
 		else
 			return array();
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
+	if ($exclude_zeros)
 		$query .= " AND meta_value != '0'";
 
-	return $wpdb->get_col( $query );
+	return $wpdb->get_col($query);
 }
 
 /**
@@ -304,19 +304,19 @@ 
  * @deprecated 3.1.0 Use get_users()
  */
 function get_nonauthor_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1', 'get_users()');
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key));
 }
 
-if ( ! class_exists( 'WP_User_Search', false ) ) :
+if ( ! class_exists('WP_User_Search', false)) :
 /**
  * WordPress User Search class.
  *
@@ -479,12 +479,12 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	function __construct( $search_term = '', $page = '', $role = '' ) {
-		_deprecated_function( __FUNCTION__, '3.1', 'WP_User_Query' );
+	function __construct($search_term = '', $page = '', $role = '') {
+		_deprecated_function(__FUNCTION__, '3.1', 'WP_User_Query');
 
-		$this->search_term = wp_unslash( $search_term );
-		$this->raw_page = ( '' == $page ) ? false : (int) $page;
-		$this->page = (int) ( '' == $page ) ? 1 : $page;
+		$this->search_term = wp_unslash($search_term);
+		$this->raw_page = ('' == $page) ? false : (int) $page;
+		$this->page = (int) ('' == $page) ? 1 : $page;
 		$this->role = $role;
 
 		$this->prepare_query();
@@ -502,8 +502,8 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
-		self::__construct( $search_term, $page, $role );
+	public function WP_User_Search($search_term = '', $page = '', $role = '') {
+		self::__construct($search_term, $page, $role);
 	}
 
 	/**
@@ -520,11 +520,11 @@ 
 		$this->query_orderby = ' ORDER BY user_login';
 
 		$search_sql = '';
-		if ( $this->search_term ) {
+		if ($this->search_term) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach (array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col)
+				$searches[] = $wpdb->prepare($col.' LIKE %s', '%'.like_escape($this->search_term).'%');
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -532,16 +532,16 @@ 
 		$this->query_from = " FROM $wpdb->users";
 		$this->query_where = " WHERE 1=1 $search_sql";
 
-		if ( $this->role ) {
+		if ($this->role) {
 			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
-			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-		} elseif ( is_multisite() ) {
-			$level_key = $wpdb->prefix . 'capabilities'; // wpmu site admins don't have user_levels
+			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%'.$this->role.'%');
+		} elseif (is_multisite()) {
+			$level_key = $wpdb->prefix.'capabilities'; // wpmu site admins don't have user_levels
 			$this->query_from .= ", $wpdb->usermeta";
 			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
 		}
 
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
+		do_action_ref_array('pre_user_search', array(&$this));
 	}
 
 	/**
@@ -553,10 +553,10 @@ 
 	public function query() {
 		global $wpdb;
 
-		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)".$this->query_from.$this->query_where.$this->query_orderby.$this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
+		if ($this->results)
+			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))".$this->query_from.$this->query_where); // no limit
 		else
 			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
 	}
@@ -576,25 +576,25 @@ 
 	 * @access public
 	 */
 	public function do_paging() {
-		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
+		if ($this->total_users_for_query > $this->users_per_page) { // have to page the results
 			$args = array();
-			if ( ! empty($this->search_term) )
+			if ( ! empty($this->search_term))
 				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
+			if ( ! empty($this->role))
 				$args['role'] = urlencode($this->role);
 
-			$this->paging_text = paginate_links( array(
+			$this->paging_text = paginate_links(array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
 				'current' => $this->page,
 				'base' => 'users.php?%_%',
 				'format' => 'userspage=%#%',
 				'add_args' => $args
-			) );
-			if ( $this->paging_text ) {
-				$this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-					number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
-					number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
-					number_format_i18n( $this->total_users_for_query ),
+			));
+			if ($this->paging_text) {
+				$this->paging_text = sprintf('<span class="displaying-num">'.__('Displaying %s&#8211;%s of %s').'</span>%s',
+					number_format_i18n(($this->page - 1) * $this->users_per_page + 1),
+					number_format_i18n(min($this->page * $this->users_per_page, $this->total_users_for_query)),
+					number_format_i18n($this->total_users_for_query),
 					$this->paging_text
 				);
 			}
@@ -636,7 +636,7 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
+		if ($this->paging_text)
 			return true;
 		return false;
 	}
@@ -650,7 +650,7 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
+		if ($this->search_term)
 			return true;
 		return false;
 	}
@@ -669,25 +669,25 @@ 
  *                        Default 'any'.
  * @return array List of posts from others.
  */
-function get_others_unpublished_posts( $user_id, $type = 'any' ) {
-	_deprecated_function( __FUNCTION__, '3.1' );
+function get_others_unpublished_posts($user_id, $type = 'any') {
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( in_array($type, array('draft', 'pending')) )
+	if (in_array($type, array('draft', 'pending')))
 		$type_sql = " post_status = '$type' ";
 	else
 		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
 
-	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
+	$dir = ('pending' == $type) ? 'ASC' : 'DESC';
 
-	if ( !$editable ) {
+	if ( ! $editable) {
 		$other_unpubs = '';
 	} else {
 		$editable = join(',', $editable);
-		$other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
+		$other_unpubs = $wpdb->get_results($wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id));
 	}
 
 	return apply_filters('get_others_drafts', $other_unpubs);
@@ -703,7 +703,7 @@ 
  * @return array List of drafts from other users.
  */
 function get_others_drafts($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1' );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	return get_others_unpublished_posts($user_id, 'draft');
 }
@@ -718,7 +718,7 @@ 
  * @return array List of posts with pending review post type from other users.
  */
 function get_others_pending($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1' );
+	_deprecated_function(__FUNCTION__, '3.1');
 
 	return get_others_unpublished_posts($user_id, 'pending');
 }
@@ -731,7 +731,7 @@ 
  * @see wp_dashboard_quick_press()
  */
 function wp_dashboard_quick_press_output() {
-	_deprecated_function( __FUNCTION__, '3.2', 'wp_dashboard_quick_press()' );
+	_deprecated_function(__FUNCTION__, '3.2', 'wp_dashboard_quick_press()');
 	wp_dashboard_quick_press();
 }
 
@@ -744,15 +744,15 @@ 
  *
  * @staticvar int $num
  */
-function wp_tiny_mce( $teeny = false, $settings = false ) {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+function wp_tiny_mce($teeny = false, $settings = false) {
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists('_WP_Editors', false))
+		require_once(ABSPATH.WPINC.'/class-wp-editor.php');
 
-	$editor_id = 'content' . $num++;
+	$editor_id = 'content'.$num++;
 
 	$set = array(
 		'teeny' => $teeny,
@@ -771,7 +771,7 @@ 
  * @see wp_editor()
  */
 function wp_preload_dialogs() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 }
 
 /**
@@ -781,7 +781,7 @@ 
  * @see wp_editor()
  */
 function wp_print_editor_js() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 }
 
 /**
@@ -791,7 +791,7 @@ 
  * @see wp_editor()
  */
 function wp_quicktags() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_editor()');
 }
 
 /**
@@ -801,12 +801,12 @@ 
  * @deprecated 3.3.0 WP_Screen::render_screen_layout()
  * @see WP_Screen::render_screen_layout()
  */
-function screen_layout( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_screen_layout()' );
+function screen_layout($screen) {
+	_deprecated_function(__FUNCTION__, '3.3', '$current_screen->render_screen_layout()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return '';
 
 	ob_start();
@@ -821,12 +821,12 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_per_page_options()
  * @see WP_Screen::render_per_page_options()
  */
-function screen_options( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3', '$current_screen->render_per_page_options()' );
+function screen_options($screen) {
+	_deprecated_function(__FUNCTION__, '3.3', '$current_screen->render_per_page_options()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return '';
 
 	ob_start();
@@ -841,7 +841,7 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_screen_meta()
  * @see WP_Screen::render_screen_meta()
  */
-function screen_meta( $screen ) {
+function screen_meta($screen) {
 	$current_screen = get_current_screen();
 	$current_screen->render_screen_meta();
 }
@@ -854,7 +854,7 @@ 
  * @see WP_Admin_Bar
  */
 function favorite_actions() {
-	_deprecated_function( __FUNCTION__, '3.2', 'WP_Admin_Bar' );
+	_deprecated_function(__FUNCTION__, '3.2', 'WP_Admin_Bar');
 }
 
 /**
@@ -866,7 +866,7 @@ 
  * @return null|string
  */
 function media_upload_image() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -879,7 +879,7 @@ 
  * @return null|string
  */
 function media_upload_audio() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -892,7 +892,7 @@ 
  * @return null|string
  */
 function media_upload_video() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -905,7 +905,7 @@ 
  * @return null|string
  */
 function media_upload_file() {
-	_deprecated_function( __FUNCTION__, '3.3', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -918,8 +918,8 @@ 
  * @return string
  */
 function type_url_form_image() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('image')" );
-	return wp_media_insert_url_form( 'image' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('image')");
+	return wp_media_insert_url_form('image');
 }
 
 /**
@@ -931,8 +931,8 @@ 
  * @return string
  */
 function type_url_form_audio() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('audio')" );
-	return wp_media_insert_url_form( 'audio' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('audio')");
+	return wp_media_insert_url_form('audio');
 }
 
 /**
@@ -944,8 +944,8 @@ 
  * @return string
  */
 function type_url_form_video() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('video')" );
-	return wp_media_insert_url_form( 'video' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('video')");
+	return wp_media_insert_url_form('video');
 }
 
 /**
@@ -957,8 +957,8 @@ 
  * @return string
  */
 function type_url_form_file() {
-	_deprecated_function( __FUNCTION__, '3.3', "wp_media_insert_url_form('file')" );
-	return wp_media_insert_url_form( 'file' );
+	_deprecated_function(__FUNCTION__, '3.3', "wp_media_insert_url_form('file')");
+	return wp_media_insert_url_form('file');
 }
 
 /**
@@ -973,13 +973,13 @@ 
  * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
  * @param string    $help   The content of an 'Overview' help tab.
  */
-function add_contextual_help( $screen, $help ) {
-	_deprecated_function( __FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()' );
+function add_contextual_help($screen, $help) {
+	_deprecated_function(__FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()');
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	WP_Screen::add_old_compat_help( $screen, $help );
+	WP_Screen::add_old_compat_help($screen, $help);
 }
 
 /**
@@ -992,13 +992,13 @@ 
  * @return array $themes Array of allowed themes.
  */
 function get_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', "wp_get_themes( array( 'allowed' => true ) )" );
+	_deprecated_function(__FUNCTION__, '3.4', "wp_get_themes( array( 'allowed' => true ) )");
 
-	$themes = wp_get_themes( array( 'allowed' => true ) );
+	$themes = wp_get_themes(array('allowed' => true));
 
 	$wp_themes = array();
-	foreach ( $themes as $theme ) {
-		$wp_themes[ $theme->get('Name') ] = $theme;
+	foreach ($themes as $theme) {
+		$wp_themes[$theme->get('Name')] = $theme;
 	}
 
 	return $wp_themes;
@@ -1014,13 +1014,13 @@ 
  * @return array
  */
 function get_broken_themes() {
-	_deprecated_function( __FUNCTION__, '3.4', "wp_get_themes( array( 'errors' => true )" );
+	_deprecated_function(__FUNCTION__, '3.4', "wp_get_themes( array( 'errors' => true )");
 
-	$themes = wp_get_themes( array( 'errors' => true ) );
+	$themes = wp_get_themes(array('errors' => true));
 	$broken = array();
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		$broken[ $name ] = array(
+		$broken[$name] = array(
 			'Name' => $name,
 			'Title' => $name,
 			'Description' => $theme->errors()->get_error_message(),
@@ -1039,7 +1039,7 @@ 
  * @return WP_Theme
  */
 function current_theme_info() {
-	_deprecated_function( __FUNCTION__, '3.4', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4', 'wp_get_theme()');
 
 	return wp_get_theme();
 }
@@ -1051,8 +1051,8 @@ 
  *
  * @deprecated 3.5.0
  */
-function _insert_into_post_button( $type ) {
-	_deprecated_function( __FUNCTION__, '3.5' );
+function _insert_into_post_button($type) {
+	_deprecated_function(__FUNCTION__, '3.5');
 }
 
 /**
@@ -1063,7 +1063,7 @@ 
  * @deprecated 3.5.0
  */
 function _media_button($title, $icon, $type, $id) {
-	_deprecated_function( __FUNCTION__, '3.5' );
+	_deprecated_function(__FUNCTION__, '3.5');
 }
 
 /**
@@ -1076,10 +1076,10 @@ 
  * @param int $id
  * @return object
  */
-function get_post_to_edit( $id ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'get_post()' );
+function get_post_to_edit($id) {
+	_deprecated_function(__FUNCTION__, '3.5', 'get_post()');
 
-	return get_post( $id, OBJECT, 'edit' );
+	return get_post($id, OBJECT, 'edit');
 }
 
 /**
@@ -1092,7 +1092,7 @@ 
  * @return WP_Post Post object containing all the default post data as attributes
  */
 function get_default_page_to_edit() {
-	_deprecated_function( __FUNCTION__, '3.5', "get_default_post_to_edit( 'page' )" );
+	_deprecated_function(__FUNCTION__, '3.5', "get_default_post_to_edit( 'page' )");
 
 	$page = get_default_post_to_edit();
 	$page->post_type = 'page';
@@ -1111,9 +1111,9 @@ 
  * @param mixed $deprecated Never used.
  * @return string Thumbnail path on success, Error string on failure.
  */
-function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '3.5', 'image_resize()' );
-	return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
+function wp_create_thumbnail($file, $max_side, $deprecated = '') {
+	_deprecated_function(__FUNCTION__, '3.5', 'image_resize()');
+	return apply_filters('wp_create_thumbnail', image_resize($file, $max_side, $max_side));
 }
 
 /**
@@ -1125,7 +1125,7 @@ 
  * @deprecated 3.6.0
  */
 function wp_nav_menu_locations_meta_box() {
-	_deprecated_function( __FUNCTION__, '3.6' );
+	_deprecated_function(__FUNCTION__, '3.6');
 }
 
 /**
@@ -1139,12 +1139,12 @@ 
  * @see Core_Upgrader
  */
 function wp_update_core($current, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7', 'new Core_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7', 'new Core_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Core_Upgrader();
 	return $upgrader->upgrade($current);
 
@@ -1162,12 +1162,12 @@ 
  * @see Plugin_Upgrader
  */
 function wp_update_plugin($plugin, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7', 'new Plugin_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7', 'new Plugin_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Plugin_Upgrader();
 	return $upgrader->upgrade($plugin);
 }
@@ -1184,12 +1184,12 @@ 
  * @see Theme_Upgrader
  */
 function wp_update_theme($theme, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7', 'new Theme_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7', 'new Theme_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Theme_Upgrader();
 	return $upgrader->upgrade($theme);
 }
@@ -1202,8 +1202,8 @@ 
  *
  * @param int|bool $id
  */
-function the_attachment_links( $id = false ) {
-	_deprecated_function( __FUNCTION__, '3.7' );
+function the_attachment_links($id = false) {
+	_deprecated_function(__FUNCTION__, '3.7');
 }
 
 /**
@@ -1304,8 +1304,8 @@ 
  * @param int $old_ID
  * @param int $new_ID
  */
-function _relocate_children( $old_ID, $new_ID ) {
-	_deprecated_function( __FUNCTION__, '3.9' );
+function _relocate_children($old_ID, $new_ID) {
+	_deprecated_function(__FUNCTION__, '3.9');
 }
 
 /**
@@ -1331,8 +1331,8 @@ 
  * @param string   $icon_url   The url to the icon to be used for this menu.
  * @return string The resulting page's hook_suffix.
  */
-function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5', 'add_menu_page()' );
+function add_object_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
+	_deprecated_function(__FUNCTION__, '4.5', 'add_menu_page()');
 
 	global $_wp_last_object_menu;
 
@@ -1364,8 +1364,8 @@ 
  * @param string   $icon_url   The url to the icon to be used for this menu.
  * @return string The resulting page's hook_suffix.
  */
-function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5', 'add_menu_page()' );
+function add_utility_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
+	_deprecated_function(__FUNCTION__, '4.5', 'add_menu_page()');
 
 	global $_wp_last_utility_menu;
 

Braces +83 added lines, -56 removed lines

@@ -132,8 +132,9 @@ 
  */
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+	if (!$categories ) {
+			$categories = get_categories( array('hide_empty' => 0) );
+	}
 
 	if ( $categories ) {
 		foreach ( $categories as $category ) {
@@ -141,8 +142,9 @@ 
 				$pad = str_repeat( '– ', $level );
 				$category->name = esc_html( $category->name );
 				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
-					echo " selected='selected'";
+				if ( $currentparent == $category->term_id ) {
+									echo " selected='selected'";
+				}
 				echo ">$pad$category->name</option>";
 				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
 			}
@@ -228,10 +230,12 @@ 
 	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -275,25 +279,30 @@ 
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
-		return array();
+	if ( ! $user = get_userdata( $user_id ) ) {
+			return array();
+	}
 	$post_type_obj = get_post_type_object($post_type);
 
 	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-			return array($user->ID);
-		else
-			return array();
+		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros ) {
+					return array($user->ID);
+		} else {
+					return array();
+		}
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
+	if ( $exclude_zeros ) {
+			$query .= " AND meta_value != '0'";
+	}
 
 	return $wpdb->get_col( $query );
 }
@@ -308,10 +317,12 @@ 
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }
@@ -523,8 +534,9 @@ 
 		if ( $this->search_term ) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col ) {
+							$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			}
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -555,10 +567,13 @@ 
 
 		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		if ( $this->results ) {
+					$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+		}
+		// no limit
+		else {
+					$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		}
 	}
 
 	/**
@@ -578,10 +593,12 @@ 
 	public function do_paging() {
 		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
 			$args = array();
-			if ( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
+			if ( ! empty($this->search_term) ) {
+							$args['usersearch'] = urlencode($this->search_term);
+			}
+			if ( ! empty($this->role) ) {
+							$args['role'] = urlencode($this->role);
+			}
 
 			$this->paging_text = paginate_links( array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -636,8 +653,9 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
+		if ( $this->paging_text ) {
+					return true;
+		}
 		return false;
 	}
 
@@ -650,8 +668,9 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
-			return true;
+		if ( $this->search_term ) {
+					return true;
+		}
 		return false;
 	}
 }
@@ -676,10 +695,11 @@ 
 
 	$editable = get_editable_user_ids( $user_id );
 
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	if ( in_array($type, array('draft', 'pending')) ) {
+			$type_sql = " post_status = '$type' ";
+	} else {
+			$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	}
 
 	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
@@ -749,8 +769,9 @@ 
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists( '_WP_Editors', false ) ) {
+			require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	}
 
 	$editor_id = 'content' . $num++;
 
@@ -806,8 +827,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_screen_layout();
@@ -826,8 +848,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_per_page_options();
@@ -976,8 +999,9 @@ 
 function add_contextual_help( $screen, $help ) {
 	_deprecated_function( __FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()' );
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	WP_Screen::add_old_compat_help( $screen, $help );
 }
@@ -1141,8 +1165,9 @@ 
 function wp_update_core($current, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Core_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Core_Upgrader();
@@ -1164,8 +1189,9 @@ 
 function wp_update_plugin($plugin, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Plugin_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Plugin_Upgrader();
@@ -1186,8 +1212,9 @@ 
 function wp_update_theme($theme, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Theme_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Theme_Upgrader();