ntwb / wordpress

src/wp-admin/user/freedoms.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/freedoms.php' );
+require(ABSPATH.'wp-admin/freedoms.php');

src/wp-admin/user/about.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require( ABSPATH . 'wp-admin/about.php' );
+require(ABSPATH.'wp-admin/about.php');

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 +113 added lines, -113 removed lines

@@ -7,66 +7,66 @@ 
  */
 
 /** 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( __( 'Sorry, you are not allowed to install themes on this site.' ) );
+if ( ! current_user_can('install_themes'))
+	wp_die(__('Sorry, you are not allowed 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' ),
+		'addNew'              => __('Add New Theme'),
+		'search'              => __('Search Themes'),
+		'searchPlaceholder'   => __('Search themes...'), // placeholder (no ellipsis)
+		'upload'              => __('Upload Theme'),
+		'back'                => __('Back'),
 		'error'               => sprintf(
 			/* translators: %s: support forums URL */
-			__( '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="%s">support forums</a>.' ),
-			__( 'https://wordpress.org/support/' )
+			__('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="%s">support forums</a>.'),
+			__('https://wordpress.org/support/')
 		),
-		'themesFound'         => __( 'Number of Themes found: %d' ),
-		'noThemesFound'       => __( 'No themes found. Try a different search.' ),
-		'collapseSidebar'     => __( 'Collapse Sidebar' ),
-		'expandSidebar'       => __( 'Expand Sidebar' ),
+		'themesFound'         => __('Number of Themes found: %d'),
+		'noThemesFound'       => __('No themes found. Try a different search.'),
+		'collapseSidebar'     => __('Collapse Sidebar'),
+		'expandSidebar'       => __('Expand Sidebar'),
 		/* translators: hidden accessibility text */
-		'selectFeatureFilter' => __( 'Select one or more Theme features to filter by' ),
+		'selectFeatureFilter' => __('Select one or more Theme features to filter by'),
 	),
-	'installedThemes' => array_keys( $installed_themes ),
-) );
+	'installedThemes' => array_keys($installed_themes),
+));
 
-wp_enqueue_script( 'theme' );
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('theme');
+wp_enqueue_script('updates');
 
-if ( $tab ) {
+if ($tab) {
 	/**
 	 * Fires before each of the tabs are rendered on the Install Themes page.
 	 *
@@ -76,50 +76,50 @@ 
 	 *
 	 * @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">WordPress 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">WordPress 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">Documentation on Adding New Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Themes#Adding_New_Themes">Documentation on Adding New Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 <div class="wrap">
-	<h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
+	<h1 class="wp-heading-inline"><?php echo esc_html($title); ?></h1>
 
 	<?php
 
@@ -132,23 +132,23 @@ 
 	 *
 	 * @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 ' <button type="button" class="upload-view-toggle page-title-action hide-if-no-js" aria-expanded="false">' . __( 'Upload Theme' ) . '</button>';
+	$tabs = apply_filters('install_themes_tabs', array('upload' => __('Upload Theme')));
+	if ( ! empty($tabs['upload']) && current_user_can('upload_themes')) {
+		echo ' <button type="button" class="upload-view-toggle page-title-action hide-if-no-js" aria-expanded="false">'.__('Upload Theme').'</button>';
 	}
 	?>
 
 	<hr class="wp-header-end">
 
 	<div class="error hide-if-js">
-		<p><?php _e( 'The Theme Installer screen requires JavaScript.' ); ?></p>
+		<p><?php _e('The Theme Installer screen requires JavaScript.'); ?></p>
 	</div>
 
 	<div class="upload-theme">
 	<?php install_themes_upload(); ?>
 	</div>
 
-	<h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Filter themes list' ); ?></h2>
+	<h2 class="screen-reader-text hide-if-no-js"><?php _e('Filter themes list'); ?></h2>
 
 	<div class="wp-filter hide-if-no-js">
 		<div class="filter-count">
@@ -156,77 +156,77 @@ 
 		</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>
 
-		<button type="button" class="button drawer-toggle" aria-expanded="false"><?php _e( 'Feature Filter' ); ?></button>
+		<button type="button" class="button drawer-toggle" aria-expanded="false"><?php _e('Feature Filter'); ?></button>
 
 		<div class="search-form"></div>
 
 		<div class="favorites-form">
 			<?php
-			$action = 'save_wporg_username_' . get_current_user_id();
-			if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) {
-				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
+			$action = 'save_wporg_username_'.get_current_user_id();
+			if (isset($_GET['_wpnonce']) && wp_verify_nonce(wp_unslash($_GET['_wpnonce']), $action)) {
+				$user = isset($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
+				update_user_meta(get_current_user_id(), 'wporg_favorites', $user);
 			} else {
-				$user = get_user_option( 'wporg_favorites' );
+				$user = get_user_option('wporg_favorites');
 			}
 			?>
-			<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="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
-				<input type="search" id="wporg-username-input" value="<?php echo esc_attr( $user ); ?>" />
-				<input type="button" class="button favorites-form-submit" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
+				<label for="wporg-username-input"><?php _e('Your WordPress.org username:'); ?></label>
+				<input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr(wp_create_nonce($action)); ?>" />
+				<input type="search" id="wporg-username-input" value="<?php echo esc_attr($user); ?>" />
+				<input type="button" class="button favorites-form-submit" value="<?php esc_attr_e('Get Favorites'); ?>" />
 			</p>
 		</div>
 
 		<div class="filter-drawer">
 			<div class="buttons">
-				<button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
-				<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
+				<button type="button" class="apply-filters button"><?php _e('Apply Filters'); ?><span></span></button>
+				<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e('Clear current filters'); ?>"><?php _e('Clear'); ?></button>
 			</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="buttons">
-				<button type="button" class="apply-filters button"><?php _e( 'Apply Filters' ); ?><span></span></button>
-				<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e( 'Clear current filters' ); ?>"><?php _e( 'Clear' ); ?></button>
+				<button type="button" class="apply-filters button"><?php _e('Apply Filters'); ?><span></span></button>
+				<button type="button" class="clear-filters button" aria-label="<?php esc_attr_e('Clear current filters'); ?>"><?php _e('Clear'); ?></button>
 			</div>
 			<div class="filtered-by">
-				<span><?php _e( 'Filtering by:' ); ?></span>
+				<span><?php _e('Filtering by:'); ?></span>
 				<div class="tags"></div>
-				<button type="button" class="button-link edit-filters"><?php _e( 'Edit Filters' ); ?></button>
+				<button type="button" class="button-link edit-filters"><?php _e('Edit Filters'); ?></button>
 			</div>
 		</div>
 	</div>
-	<h2 class="screen-reader-text hide-if-no-js"><?php _e( 'Themes list' ); ?></h2>
+	<h2 class="screen-reader-text hide-if-no-js"><?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.
 	 *
@@ -238,7 +238,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>
@@ -251,11 +251,11 @@ 
 	<# } else { #>
 		<div class="theme-screenshot blank"></div>
 	<# } #>
-	<span class="more-details"><?php _ex( 'Details &amp; Preview', 'theme' ); ?></span>
+	<span class="more-details"><?php _ex('Details &amp; Preview', 'theme'); ?></span>
 	<div class="theme-author">
 		<?php
 		/* translators: %s: Theme author name */
-		printf( __( 'By %s' ), '{{ data.author }}' );
+		printf(__('By %s'), '{{ data.author }}');
 		?>
 	</div>
 	<h3 class="theme-name">{{ data.name }}</h3>
@@ -264,41 +264,41 @@ 
 		<# if ( data.installed ) { #>
 			<?php
 			/* translators: %s: Theme name */
-			$aria_label = sprintf( _x( 'Activate %s', 'theme' ), '{{ data.name }}' );
+			$aria_label = sprintf(_x('Activate %s', 'theme'), '{{ data.name }}');
 			?>
 			<# if ( data.activate_url ) { #>
-				<a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Activate' ); ?></a>
+				<a class="button button-primary activate" href="{{ data.activate_url }}" aria-label="<?php echo esc_attr($aria_label); ?>"><?php _e('Activate'); ?></a>
 			<# } #>
 			<# if ( data.customize_url ) { #>
-				<a class="button load-customize" href="{{ data.customize_url }}"><?php _e( 'Live Preview' ); ?></a>
+				<a class="button load-customize" href="{{ data.customize_url }}"><?php _e('Live Preview'); ?></a>
 			<# } else { #>
-				<button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
+				<button class="button preview install-theme-preview"><?php _e('Preview'); ?></button>
 			<# } #>
 		<# } else { #>
 			<?php
 			/* translators: %s: Theme name */
-			$aria_label = sprintf( __( 'Install %s' ), '{{ data.name }}' );
+			$aria_label = sprintf(__('Install %s'), '{{ data.name }}');
 			?>
-			<a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr( $aria_label ); ?>"><?php _e( 'Install' ); ?></a>
-			<button class="button preview install-theme-preview"><?php _e( 'Preview' ); ?></button>
+			<a class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}" href="{{ data.install_url }}" aria-label="<?php echo esc_attr($aria_label); ?>"><?php _e('Install'); ?></a>
+			<button class="button preview install-theme-preview"><?php _e('Preview'); ?></button>
 		<# } #>
 	</div>
 
 	<# if ( data.installed ) { #>
-		<div class="notice notice-success notice-alt"><p><?php _ex( 'Installed', 'theme' ); ?></p></div>
+		<div class="notice notice-success notice-alt"><p><?php _ex('Installed', 'theme'); ?></p></div>
 	<# } #>
 </script>
 
 <script id="tmpl-theme-preview" type="text/template">
 	<div class="wp-full-overlay-sidebar">
 		<div class="wp-full-overlay-header">
-			<button class="close-full-overlay"><span class="screen-reader-text"><?php _e( 'Close' ); ?></span></button>
-			<button class="previous-theme"><span class="screen-reader-text"><?php _ex( 'Previous', 'Button label for a theme' ); ?></span></button>
-			<button class="next-theme"><span class="screen-reader-text"><?php _ex( 'Next', 'Button label for a theme' ); ?></span></button>
+			<button class="close-full-overlay"><span class="screen-reader-text"><?php _e('Close'); ?></span></button>
+			<button class="previous-theme"><span class="screen-reader-text"><?php _ex('Previous', 'Button label for a theme'); ?></span></button>
+			<button class="next-theme"><span class="screen-reader-text"><?php _ex('Next', 'Button label for a theme'); ?></span></button>
 			<# if ( data.installed ) { #>
-				<a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e( 'Activate' ); ?></a>
+				<a class="button button-primary activate" href="{{ data.activate_url }}"><?php _e('Activate'); ?></a>
 			<# } else { #>
-				<a href="{{ data.install_url }}" class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></a>
+				<a href="{{ data.install_url }}" class="button button-primary theme-install" data-name="{{ data.name }}" data-slug="{{ data.id }}"><?php _e('Install'); ?></a>
 			<# } #>
 		</div>
 		<div class="wp-full-overlay-sidebar-content">
@@ -307,7 +307,7 @@ 
 					<span class="theme-by">
 						<?php
 						/* translators: %s: Theme author name */
-						printf( __( 'By %s' ), '{{ data.author }}' );
+						printf(__('By %s'), '{{ data.author }}');
 						?>
 					</span>
 
@@ -320,12 +320,12 @@ 
 								<span class="num-ratings">({{ 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
 							/* translators: %s: Theme version */
-							printf( __( 'Version: %s' ), '{{ data.version }}' );
+							printf(__('Version: %s'), '{{ data.version }}');
 							?>
 						</div>
 						<div class="theme-description">{{{ data.description }}}</div>
@@ -333,14 +333,14 @@ 
 				</div>
 			</div>
 			<div class="wp-full-overlay-footer">
-				<button type="button" class="collapse-sidebar button" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+				<button type="button" class="collapse-sidebar button" 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>
+		<iframe src="{{ data.preview_url }}" title="<?php esc_attr_e('Preview'); ?>"></iframe>
 	</div>
 </script>
 
@@ -348,4 +348,4 @@ 
 wp_print_request_filesystem_credentials_modal();
 wp_print_admin_notice_templates();
 
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

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

Spacing +187 added lines, -187 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;
@@ -71,15 +71,15 @@ 
  * @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;
-	$mime_type = get_post_mime_type( $attachment );
+	$mime_type = get_post_mime_type($attachment);
 
-	if ( preg_match( '!^image/!', $mime_type ) && file_is_displayable_image( $file ) ) {
-		$imagesize = getimagesize( $file );
+	if (preg_match('!^image/!', $mime_type) && file_is_displayable_image($file)) {
+		$imagesize = getimagesize($file);
 		$metadata['width'] = $imagesize[0];
 		$metadata['height'] = $imagesize[1];
 
@@ -90,30 +90,30 @@ 
 		$_wp_additional_image_sizes = wp_get_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'] ) ) {
+		foreach (get_intermediate_image_sizes() as $s) {
+			$sizes[$s] = array('width' => '', 'height' => '', 'crop' => false);
+			if (isset($_wp_additional_image_sizes[$s]['width'])) {
 				// For theme-added sizes
-				$sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] );
+				$sizes[$s]['width'] = intval($_wp_additional_image_sizes[$s]['width']);
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['width'] = get_option( "{$s}_size_w" );
+				$sizes[$s]['width'] = get_option("{$s}_size_w");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {
+			if (isset($_wp_additional_image_sizes[$s]['height'])) {
 				// For theme-added sizes
-				$sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] );
+				$sizes[$s]['height'] = intval($_wp_additional_image_sizes[$s]['height']);
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['height'] = get_option( "{$s}_size_h" );
+				$sizes[$s]['height'] = get_option("{$s}_size_h");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {
+			if (isset($_wp_additional_image_sizes[$s]['crop'])) {
 				// For theme-added sizes
 				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
 			} else {
 				// For default sizes set in options
-				$sizes[$s]['crop'] = get_option( "{$s}_crop" );
+				$sizes[$s]['crop'] = get_option("{$s}_crop");
 			}
 		}
 
@@ -126,34 +126,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'],
@@ -161,14 +161,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;
@@ -176,9 +176,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',
@@ -193,18 +193,18 @@ 
 				 * @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);
 			}
 		}
 	}
 	// Try to create image thumbnails for PDFs
-	else if ( 'application/pdf' === $mime_type ) {
+	else if ('application/pdf' === $mime_type) {
 		$fallback_sizes = array(
 			'thumbnail',
 			'medium',
@@ -218,49 +218,49 @@ 
 		 *
 		 * @param array $fallback_sizes An array of image size names.
 		 */
-		$fallback_sizes = apply_filters( 'fallback_intermediate_image_sizes', $fallback_sizes, $metadata );
+		$fallback_sizes = apply_filters('fallback_intermediate_image_sizes', $fallback_sizes, $metadata);
 
 		$sizes = array();
 		$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-		foreach ( $fallback_sizes as $s ) {
-			if ( isset( $_wp_additional_image_sizes[ $s ]['width'] ) ) {
-				$sizes[ $s ]['width'] = intval( $_wp_additional_image_sizes[ $s ]['width'] );
+		foreach ($fallback_sizes as $s) {
+			if (isset($_wp_additional_image_sizes[$s]['width'])) {
+				$sizes[$s]['width'] = intval($_wp_additional_image_sizes[$s]['width']);
 			} else {
-				$sizes[ $s ]['width'] = get_option( "{$s}_size_w" );
+				$sizes[$s]['width'] = get_option("{$s}_size_w");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $s ]['height'] ) ) {
-				$sizes[ $s ]['height'] = intval( $_wp_additional_image_sizes[ $s ]['height'] );
+			if (isset($_wp_additional_image_sizes[$s]['height'])) {
+				$sizes[$s]['height'] = intval($_wp_additional_image_sizes[$s]['height']);
 			} else {
-				$sizes[ $s ]['height'] = get_option( "{$s}_size_h" );
+				$sizes[$s]['height'] = get_option("{$s}_size_h");
 			}
 
-			if ( isset( $_wp_additional_image_sizes[ $s ]['crop'] ) ) {
-				$sizes[ $s ]['crop'] = $_wp_additional_image_sizes[ $s ]['crop'];
+			if (isset($_wp_additional_image_sizes[$s]['crop'])) {
+				$sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
 			} else {
 				// Force thumbnails to be soft crops.
-				if ( ! 'thumbnail' === $s ) {
-					$sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
+				if ( ! 'thumbnail' === $s) {
+					$sizes[$s]['crop'] = get_option("{$s}_crop");
 				}
 			}
 		}
 
 		// Only load PDFs in an image editor if we're processing sizes.
-		if ( ! empty( $sizes ) ) {
-			$editor = wp_get_image_editor( $file );
+		if ( ! empty($sizes)) {
+			$editor = wp_get_image_editor($file);
 
-			if ( ! is_wp_error( $editor ) ) { // No support for this type of file
-				$uploaded = $editor->save( $file, 'image/jpeg' );
-				unset( $editor );
+			if ( ! is_wp_error($editor)) { // No support for this type of file
+				$uploaded = $editor->save($file, 'image/jpeg');
+				unset($editor);
 
 				// Resize based on the full size image, rather than the source.
-				if ( ! is_wp_error( $uploaded ) ) {
-					$editor = wp_get_image_editor( $uploaded['path'] );
-					unset( $uploaded['path'] );
+				if ( ! is_wp_error($uploaded)) {
+					$editor = wp_get_image_editor($uploaded['path']);
+					unset($uploaded['path']);
 
-					if ( ! is_wp_error( $editor ) ) {
-						$metadata['sizes'] = $editor->multi_resize( $sizes );
+					if ( ! is_wp_error($editor)) {
+						$metadata['sizes'] = $editor->multi_resize($sizes);
 						$metadata['sizes']['full'] = $uploaded;
 					}
 				}
@@ -269,8 +269,8 @@ 
 	}
 
 	// Remove the blob of binary data from the array.
-	if ( $metadata ) {
-		unset( $metadata['image']['data'] );
+	if ($metadata) {
+		unset($metadata['image']['data']);
 	}
 
 	/**
@@ -281,7 +281,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);
 }
 
 /**
@@ -293,8 +293,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;
 }
@@ -308,10 +308,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}");
 }
 
 /**
@@ -330,11 +330,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
@@ -362,31 +362,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;
 				}
@@ -394,19 +394,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']);
 			}
 		 }
 	}
@@ -418,78 +418,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);
 
 	/**
 	 * Filters the array of meta data read from an image's exif data.
@@ -502,7 +502,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);
 
 }
 
@@ -516,7 +516,7 @@ 
  */
 function file_is_valid_image($path) {
 	$size = @getimagesize($path);
-	return !empty($size);
+	return ! empty($size);
 }
 
 /**
@@ -528,12 +528,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;
@@ -547,7 +547,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);
 }
 
 /**
@@ -560,12 +560,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;
@@ -579,7 +579,7 @@ 
 			$image = false;
 			break;
 	}
-	if ( is_resource($image) ) {
+	if (is_resource($image)) {
 		/**
 		 * Filters the current image being loaded for editing.
 		 *
@@ -589,8 +589,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);
 		}
@@ -611,11 +611,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))) {
 			/**
 			 * Filters the path to the current image.
 			 *
@@ -627,9 +627,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' ) && true == ini_get( 'allow_url_fopen' ) ) {
+	} elseif (function_exists('fopen') && true == ini_get('allow_url_fopen')) {
 		/**
 		 * Filters the image URL if not in the local filesystem.
 		 *
@@ -641,7 +641,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);
 	}
 
 	/**
@@ -653,7 +653,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);
 }
 
 /**
@@ -665,22 +665,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;

Braces +44 added lines, -26 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;
 }
@@ -131,16 +135,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 );
@@ -294,8 +300,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;
 }
 
@@ -331,8 +338,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 );
 
@@ -394,16 +402,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] );
+			}
 
 			if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
 				$meta['keywords'] = array_values( $iptc['2#025'] );
@@ -562,8 +577,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':
@@ -667,8 +683,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 );
@@ -680,8 +697,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;
 	}

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;
 	}

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_html_e( 'Compare any two revisions' ); ?>
+				<?php esc_html_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/class-wp-users-list-table.php

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 	/**
 	 * Check the current user's permissions.
 	 *
- 	 * @since 3.1.0
+	 * @since 3.1.0
 	 * @access public
 	 *
 	 * @return bool

Braces +49 added lines, -34 removed lines

@@ -54,8 +54,9 @@ 
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ( $this->is_site_users ) {
+					$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		}
 	}
 
 	/**
@@ -67,10 +68,11 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
-			return current_user_can( 'manage_sites' );
-		else
-			return current_user_can( 'list_users' );
+		if ( $this->is_site_users ) {
+					return current_user_can( 'manage_sites' );
+		} else {
+					return current_user_can( 'list_users' );
+		}
 	}
 
 	/**
@@ -112,17 +114,21 @@ 
 			);
 		}
 
-		if ( '' !== $args['search'] )
-			$args['search'] = '*' . $args['search'] . '*';
+		if ( '' !== $args['search'] ) {
+					$args['search'] = '*' . $args['search'] . '*';
+		}
 
-		if ( $this->is_site_users )
-			$args['blog_id'] = $this->site_id;
+		if ( $this->is_site_users ) {
+					$args['blog_id'] = $this->site_id;
+		}
 
-		if ( isset( $_REQUEST['orderby'] ) )
-			$args['orderby'] = $_REQUEST['orderby'];
+		if ( isset( $_REQUEST['orderby'] ) ) {
+					$args['orderby'] = $_REQUEST['orderby'];
+		}
 
-		if ( isset( $_REQUEST['order'] ) )
-			$args['order'] = $_REQUEST['order'];
+		if ( isset( $_REQUEST['order'] ) ) {
+					$args['order'] = $_REQUEST['order'];
+		}
 
 		/**
 		 * Filter the query arguments used to retrieve users for the current users list table.
@@ -192,8 +198,9 @@ 
 		$role_links = array();
 		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
 		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
-				continue;
+			if ( !isset($avail_roles[$this_role]) ) {
+							continue;
+			}
 
 			$class = '';
 
@@ -237,11 +244,13 @@ 
 		$actions = array();
 
 		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
-				$actions['remove'] = __( 'Remove' );
+			if ( current_user_can( 'remove_users' ) ) {
+							$actions['remove'] = __( 'Remove' );
+			}
 		} else {
-			if ( current_user_can( 'delete_users' ) )
-				$actions['delete'] = __( 'Delete' );
+			if ( current_user_can( 'delete_users' ) ) {
+							$actions['delete'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -319,8 +328,9 @@ 
 			'posts'    => __( 'Posts' )
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ( $this->is_site_users ) {
+					unset( $c['posts'] );
+		}
 
 		return $c;
 	}
@@ -351,12 +361,14 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if ( ! $this->is_site_users ) {
+					$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		}
 
 		foreach ( $this->items as $userid => $user_object ) {
-			if ( is_multisite() && empty( $user_object->allcaps ) )
-				continue;
+			if ( is_multisite() && empty( $user_object->allcaps ) ) {
+							continue;
+			}
 
 			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
 		}
@@ -384,10 +396,11 @@ 
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
-		if ( $this->is_site_users )
-			$url = "site-users.php?id={$this->site_id}&amp;";
-		else
-			$url = 'users.php?';
+		if ( $this->is_site_users ) {
+					$url = "site-users.php?id={$this->site_id}&amp;";
+		} else {
+					$url = 'users.php?';
+		}
 
 		$user_roles = $this->get_role_list( $user_object );
 
@@ -406,10 +419,12 @@ 
 				$edit = "<strong>$user_object->user_login</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) ) {
+							$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
+			}
+			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) ) {
+							$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			}
 
 			/**
 			 * Filter the action links displayed under each user in the Users list table.

Spacing +109 added lines, -109 removed lines

@@ -45,17 +45,17 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'singular' => 'user',
 			'plural'   => 'users',
-			'screen'   => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen'   => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$this->is_site_users = 'site-users-network' === $this->screen->id;
 
-		if ( $this->is_site_users )
-			$this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
+		if ($this->is_site_users)
+			$this->site_id = isset($_REQUEST['id']) ? intval($_REQUEST['id']) : 0;
 	}
 
 	/**
@@ -67,10 +67,10 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		if ( $this->is_site_users )
-			return current_user_can( 'manage_sites' );
+		if ($this->is_site_users)
+			return current_user_can('manage_sites');
 		else
-			return current_user_can( 'list_users' );
+			return current_user_can('list_users');
 	}
 
 	/**
@@ -85,19 +85,19 @@ 
 	public function prepare_items() {
 		global $role, $usersearch;
 
-		$usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
+		$usersearch = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 
-		$role = isset( $_REQUEST['role'] ) ? $_REQUEST['role'] : '';
+		$role = isset($_REQUEST['role']) ? $_REQUEST['role'] : '';
 
-		$per_page = ( $this->is_site_users ) ? 'site_users_network_per_page' : 'users_per_page';
-		$users_per_page = $this->get_items_per_page( $per_page );
+		$per_page = ($this->is_site_users) ? 'site_users_network_per_page' : 'users_per_page';
+		$users_per_page = $this->get_items_per_page($per_page);
 
 		$paged = $this->get_pagenum();
 
-		if ( 'none' === $role ) {
+		if ('none' === $role) {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'include' => wp_get_users_with_no_role(),
 				'search' => $usersearch,
 				'fields' => 'all_with_meta'
@@ -105,23 +105,23 @@ 
 		} else {
 			$args = array(
 				'number' => $users_per_page,
-				'offset' => ( $paged-1 ) * $users_per_page,
+				'offset' => ($paged - 1) * $users_per_page,
 				'role' => $role,
 				'search' => $usersearch,
 				'fields' => 'all_with_meta'
 			);
 		}
 
-		if ( '' !== $args['search'] )
-			$args['search'] = '*' . $args['search'] . '*';
+		if ('' !== $args['search'])
+			$args['search'] = '*'.$args['search'].'*';
 
-		if ( $this->is_site_users )
+		if ($this->is_site_users)
 			$args['blog_id'] = $this->site_id;
 
-		if ( isset( $_REQUEST['orderby'] ) )
+		if (isset($_REQUEST['orderby']))
 			$args['orderby'] = $_REQUEST['orderby'];
 
-		if ( isset( $_REQUEST['order'] ) )
+		if (isset($_REQUEST['order']))
 			$args['order'] = $_REQUEST['order'];
 
 		/**
@@ -132,17 +132,17 @@ 
 		 * @param array $args Arguments passed to WP_User_Query to retrieve items for the current
 		 *                    users list table.
 		 */
-		$args = apply_filters( 'users_list_table_query_args', $args );
+		$args = apply_filters('users_list_table_query_args', $args);
 
 		// Query the user IDs for this page
-		$wp_user_search = new WP_User_Query( $args );
+		$wp_user_search = new WP_User_Query($args);
 
 		$this->items = $wp_user_search->get_results();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $wp_user_search->get_total(),
 			'per_page' => $users_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -152,7 +152,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No users found.' );
+		_e('No users found.');
 	}
 
 	/**
@@ -174,9 +174,9 @@ 
 
 		$wp_roles = wp_roles();
 
-		if ( $this->is_site_users ) {
-			$url = 'site-users.php?id=' . $this->site_id;
-			switch_to_blog( $this->site_id );
+		if ($this->is_site_users) {
+			$url = 'site-users.php?id='.$this->site_id;
+			switch_to_blog($this->site_id);
 			$users_of_blog = count_users();
 			restore_current_blog();
 		} else {
@@ -185,40 +185,40 @@ 
 		}
 
 		$total_users = $users_of_blog['total_users'];
-		$avail_roles =& $users_of_blog['avail_roles'];
+		$avail_roles = & $users_of_blog['avail_roles'];
 		unset($users_of_blog);
 
 		$class = empty($role) ? ' class="current"' : '';
 		$role_links = array();
-		$role_links['all'] = "<a href='$url'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users' ), number_format_i18n( $total_users ) ) . '</a>';
-		foreach ( $wp_roles->get_names() as $this_role => $name ) {
-			if ( !isset($avail_roles[$this_role]) )
+		$role_links['all'] = "<a href='$url'$class>".sprintf(_nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_users, 'users'), number_format_i18n($total_users)).'</a>';
+		foreach ($wp_roles->get_names() as $this_role => $name) {
+			if ( ! isset($avail_roles[$this_role]))
 				continue;
 
 			$class = '';
 
-			if ( $this_role === $role ) {
+			if ($this_role === $role) {
 				$class = ' class="current"';
 			}
 
-			$name = translate_user_role( $name );
+			$name = translate_user_role($name);
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles[$this_role] ) );
-			$role_links[$this_role] = "<a href='" . esc_url( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
+			$name = sprintf(__('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n($avail_roles[$this_role]));
+			$role_links[$this_role] = "<a href='".esc_url(add_query_arg('role', $this_role, $url))."'$class>$name</a>";
 		}
 
-		if ( ! empty( $avail_roles['none' ] ) ) {
+		if ( ! empty($avail_roles['none'])) {
 
 			$class = '';
 
-			if ( 'none' === $role ) {
+			if ('none' === $role) {
 				$class = ' class="current"';
 			}
 
-			$name = __( 'No role' );
+			$name = __('No role');
 			/* translators: User role name with count */
-			$name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n( $avail_roles['none' ] ) );
-			$role_links['none'] = "<a href='" . esc_url( add_query_arg( 'role', 'none', $url ) ) . "'$class>$name</a>";
+			$name = sprintf(__('%1$s <span class="count">(%2$s)</span>'), $name, number_format_i18n($avail_roles['none']));
+			$role_links['none'] = "<a href='".esc_url(add_query_arg('role', 'none', $url))."'$class>$name</a>";
 
 		}
 
@@ -236,12 +236,12 @@ 
 	protected function get_bulk_actions() {
 		$actions = array();
 
-		if ( is_multisite() ) {
-			if ( current_user_can( 'remove_users' ) )
-				$actions['remove'] = __( 'Remove' );
+		if (is_multisite()) {
+			if (current_user_can('remove_users'))
+				$actions['remove'] = __('Remove');
 		} else {
-			if ( current_user_can( 'delete_users' ) )
-				$actions['delete'] = __( 'Delete' );
+			if (current_user_can('delete_users'))
+				$actions['delete'] = __('Delete');
 		}
 
 		return $actions;
@@ -256,18 +256,18 @@ 
 	 * @param string $which Whether this is being invoked above ("top")
 	 *                      or below the table ("bottom").
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		$id = 'bottom' === $which ? 'new_role2' : 'new_role';
 	?>
 	<div class="alignleft actions">
-		<?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
-		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e( 'Change role to&hellip;' ) ?></label>
+		<?php if (current_user_can('promote_users') && $this->has_items()) : ?>
+		<label class="screen-reader-text" for="<?php echo $id ?>"><?php _e('Change role to&hellip;') ?></label>
 		<select name="<?php echo $id ?>" id="<?php echo $id ?>">
-			<option value=""><?php _e( 'Change role to&hellip;' ) ?></option>
+			<option value=""><?php _e('Change role to&hellip;') ?></option>
 			<?php wp_dropdown_roles(); ?>
 		</select>
 	<?php
-			submit_button( __( 'Change' ), '', 'changeit', false );
+			submit_button(__('Change'), '', 'changeit', false);
 		endif;
 
 		/**
@@ -279,7 +279,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'restrict_manage_users', $which );
+		do_action('restrict_manage_users', $which);
 		echo '</div>';
 	}
 
@@ -295,8 +295,8 @@ 
 	 * @return string The bulk action required.
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['changeit'] ) &&
-			( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
+		if (isset($_REQUEST['changeit']) &&
+			( ! empty($_REQUEST['new_role']) || ! empty($_REQUEST['new_role2']))) {
 			return 'promote';
 		}
 
@@ -315,15 +315,15 @@ 
 	public function get_columns() {
 		$c = array(
 			'cb'       => '<input type="checkbox" />',
-			'username' => __( 'Username' ),
-			'name'     => __( 'Name' ),
-			'email'    => __( 'Email' ),
-			'role'     => __( 'Role' ),
-			'posts'    => __( 'Posts' )
+			'username' => __('Username'),
+			'name'     => __('Name'),
+			'email'    => __('Email'),
+			'role'     => __('Role'),
+			'posts'    => __('Posts')
 		);
 
-		if ( $this->is_site_users )
-			unset( $c['posts'] );
+		if ($this->is_site_users)
+			unset($c['posts']);
 
 		return $c;
 	}
@@ -353,14 +353,14 @@ 
 	 */
 	public function display_rows() {
 		// Query the post counts for this page
-		if ( ! $this->is_site_users )
-			$post_counts = count_many_users_posts( array_keys( $this->items ) );
+		if ( ! $this->is_site_users)
+			$post_counts = count_many_users_posts(array_keys($this->items));
 
-		foreach ( $this->items as $userid => $user_object ) {
-			if ( is_multisite() && empty( $user_object->allcaps ) )
+		foreach ($this->items as $userid => $user_object) {
+			if (is_multisite() && empty($user_object->allcaps))
 				continue;
 
-			echo "\n\t" . $this->single_row( $user_object, '', '', isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+			echo "\n\t".$this->single_row($user_object, '', '', isset($post_counts) ? $post_counts[$userid] : 0);
 		}
 	}
 
@@ -379,39 +379,39 @@ 
 	 *                            to zero, as in, a new user has made zero posts.
 	 * @return string Output for a single row.
 	 */
-	public function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
-		if ( ! ( $user_object instanceof WP_User ) ) {
-			$user_object = get_userdata( (int) $user_object );
+	public function single_row($user_object, $style = '', $role = '', $numposts = 0) {
+		if ( ! ($user_object instanceof WP_User)) {
+			$user_object = get_userdata((int) $user_object);
 		}
 		$user_object->filter = 'display';
 		$email = $user_object->user_email;
 
-		if ( $this->is_site_users )
+		if ($this->is_site_users)
 			$url = "site-users.php?id={$this->site_id}&amp;";
 		else
 			$url = 'users.php?';
 
-		$user_roles = $this->get_role_list( $user_object );
+		$user_roles = $this->get_role_list($user_object);
 
 		// Set up the hover actions for this user
 		$actions = array();
 		$checkbox = '';
 		// Check if the user for this row is editable
-		if ( current_user_can( 'list_users' ) ) {
+		if (current_user_can('list_users')) {
 			// Set up the user editing link
-			$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_object->ID ) ) );
+			$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_object->ID)));
 
-			if ( current_user_can( 'edit_user',  $user_object->ID ) ) {
+			if (current_user_can('edit_user', $user_object->ID)) {
 				$edit = "<strong><a href=\"$edit_link\">$user_object->user_login</a></strong><br />";
-				$actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="'.$edit_link.'">'.__('Edit').'</a>';
 			} else {
 				$edit = "<strong>$user_object->user_login</strong><br />";
 			}
 
-			if ( !is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'delete_user', $user_object->ID ) )
-				$actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url( "users.php?action=delete&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Delete' ) . "</a>";
-			if ( is_multisite() && get_current_user_id() != $user_object->ID && current_user_can( 'remove_user', $user_object->ID ) )
-				$actions['remove'] = "<a class='submitdelete' href='" . wp_nonce_url( $url."action=remove&amp;user=$user_object->ID", 'bulk-users' ) . "'>" . __( 'Remove' ) . "</a>";
+			if ( ! is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('delete_user', $user_object->ID))
+				$actions['delete'] = "<a class='submitdelete' href='".wp_nonce_url("users.php?action=delete&amp;user=$user_object->ID", 'bulk-users')."'>".__('Delete')."</a>";
+			if (is_multisite() && get_current_user_id() != $user_object->ID && current_user_can('remove_user', $user_object->ID))
+				$actions['remove'] = "<a class='submitdelete' href='".wp_nonce_url($url."action=remove&amp;user=$user_object->ID", 'bulk-users')."'>".__('Remove')."</a>";
 
 			/**
 			 * Filters the action links displayed under each user in the Users list table.
@@ -423,49 +423,49 @@ 
 			 *                             'Edit', 'Remove' for Multisite.
 			 * @param WP_User $user_object WP_User object for the currently-listed user.
 			 */
-			$actions = apply_filters( 'user_row_actions', $actions, $user_object );
+			$actions = apply_filters('user_row_actions', $actions, $user_object);
 
 			// Role classes.
-			$role_classes = esc_attr( implode( ' ', array_keys( $user_roles ) ) );
+			$role_classes = esc_attr(implode(' ', array_keys($user_roles)));
 
 			// Set up the checkbox ( because the user is editable, otherwise it's empty )
-			$checkbox = '<label class="screen-reader-text" for="user_' . $user_object->ID . '">' . sprintf( __( 'Select %s' ), $user_object->user_login ) . '</label>'
+			$checkbox = '<label class="screen-reader-text" for="user_'.$user_object->ID.'">'.sprintf(__('Select %s'), $user_object->user_login).'</label>'
 						. "<input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='{$role_classes}' value='{$user_object->ID}' />";
 
 		} else {
-			$edit = '<strong>' . $user_object->user_login . '</strong>';
+			$edit = '<strong>'.$user_object->user_login.'</strong>';
 		}
-		$avatar = get_avatar( $user_object->ID, 32 );
+		$avatar = get_avatar($user_object->ID, 32);
 
 		// Comma-separated list of user roles.
-		$roles_list = implode( ', ', $user_roles );
+		$roles_list = implode(', ', $user_roles);
 
 		$r = "<tr id='user-$user_object->ID'>";
 
-		list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
+		list($columns, $hidden, $sortable, $primary) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
+		foreach ($columns as $column_name => $column_display_name) {
 			$classes = "$column_name column-$column_name";
-			if ( $primary === $column_name ) {
+			if ($primary === $column_name) {
 				$classes .= ' has-row-actions column-primary';
 			}
-			if ( 'posts' === $column_name ) {
+			if ('posts' === $column_name) {
 				$classes .= ' num'; // Special case for that column
 			}
 
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$classes .= ' hidden';
 			}
 
-			$data = 'data-colname="' . wp_strip_all_tags( $column_display_name ) . '"';
+			$data = 'data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
 			$attributes = "class='$classes' $data";
 
-			if ( 'cb' === $column_name ) {
+			if ('cb' === $column_name) {
 				$r .= "<th scope='row' class='check-column'>$checkbox</th>";
 			} else {
 				$r .= "<td $attributes>";
-				switch ( $column_name ) {
+				switch ($column_name) {
 					case 'username':
 						$r .= "$avatar $edit";
 						break;
@@ -473,16 +473,16 @@ 
 						$r .= "$user_object->first_name $user_object->last_name";
 						break;
 					case 'email':
-						$r .= "<a href='" . esc_url( "mailto:$email" ) . "'>$email</a>";
+						$r .= "<a href='".esc_url("mailto:$email")."'>$email</a>";
 						break;
 					case 'role':
-						$r .= esc_html( $roles_list );
+						$r .= esc_html($roles_list);
 						break;
 					case 'posts':
-						if ( $numposts > 0 ) {
+						if ($numposts > 0) {
 							$r .= "<a href='edit.php?author=$user_object->ID' class='edit'>";
-							$r .= '<span aria-hidden="true">' . $numposts . '</span>';
-							$r .= '<span class="screen-reader-text">' . sprintf( _n( '%s post by this author', '%s posts by this author', $numposts ), number_format_i18n( $numposts ) ) . '</span>';
+							$r .= '<span aria-hidden="true">'.$numposts.'</span>';
+							$r .= '<span class="screen-reader-text">'.sprintf(_n('%s post by this author', '%s posts by this author', $numposts), number_format_i18n($numposts)).'</span>';
 							$r .= '</a>';
 						} else {
 							$r .= 0;
@@ -498,11 +498,11 @@ 
 						 * @param string $column_name Column name.
 						 * @param int    $user_id     ID of the currently-listed user.
 						 */
-						$r .= apply_filters( 'manage_users_custom_column', '', $column_name, $user_object->ID );
+						$r .= apply_filters('manage_users_custom_column', '', $column_name, $user_object->ID);
 				}
 
-				if ( $primary === $column_name ) {
-					$r .= $this->row_actions( $actions );
+				if ($primary === $column_name) {
+					$r .= $this->row_actions($actions);
 				}
 				$r .= "</td>";
 			}
@@ -533,19 +533,19 @@ 
 	 * @param WP_User $user_object The WP_User object.
 	 * @return array An array of user roles.
 	 */
-	protected function get_role_list( $user_object ) {
+	protected function get_role_list($user_object) {
 		$wp_roles = wp_roles();
 
 		$role_list = array();
 
-		foreach ( $user_object->roles as $role ) {
-			if ( isset( $wp_roles->role_names[ $role ] ) ) {
-				$role_list[ $role ] = translate_user_role( $wp_roles->role_names[ $role ] );
+		foreach ($user_object->roles as $role) {
+			if (isset($wp_roles->role_names[$role])) {
+				$role_list[$role] = translate_user_role($wp_roles->role_names[$role]);
 			}
 		}
 
-		if ( empty( $role_list ) ) {
-			$role_list['none'] = _x( 'None', 'no user roles' );
+		if (empty($role_list)) {
+			$role_list['none'] = _x('None', 'no user roles');
 		}
 
 		/**
@@ -556,7 +556,7 @@ 
 		 * @param array   $role_list   An array of user roles.
 		 * @param WP_User $user_object A WP_User object.
 		 */
-		return apply_filters( 'get_role_list', $role_list, $user_object );
+		return apply_filters('get_role_list', $role_list, $user_object);
 	}
 
 }

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

Braces +20 added lines, -12 removed lines

@@ -31,15 +31,18 @@ 
 function install_themes_feature_list() {
 	_deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' );
 
-	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
-		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) ) {
+			set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
-	if ( $cache )
-		return $cache;
+	if ( $cache ) {
+			return $cache;
+	}
 
 	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) )
-		return array();
+	if ( is_wp_error( $feature_list ) ) {
+			return array();
+	}
 
 	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -56,8 +59,9 @@ 
 function install_theme_search_form( $type_selector = true ) {
 	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector )
-		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+	if ( ! $type_selector ) {
+			echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+	}
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
@@ -81,8 +85,11 @@ 
 			break;
 	}
 	?></label>
-	<?php else : ?>
-	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
+	<?php else {
+	: ?>
+	<label class="screen-reader-text" for="s"><?php _e('Search by keyword');
+}
+?></label>
 	<?php endif; ?>
 	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
 	<?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
@@ -198,8 +205,9 @@ 
 
 	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
 
-	if ( is_wp_error( $theme ) )
-		wp_die( $theme );
+	if ( is_wp_error( $theme ) ) {
+			wp_die( $theme );
+	}
 
 	iframe_header( __('Theme Install') );
 	if ( ! isset( $wp_list_table ) ) {

Spacing +41 added lines, -41 removed lines

@@ -14,7 +14,7 @@ 
 	'img' => array('src' => array(), 'class' => array(), 'alt' => array())
 );
 
-$theme_field_defaults = array( 'description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
+$theme_field_defaults = array('description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
 	'rating' => true, 'downloaded' => true, 'downloadlink' => true, 'last_updated' => true, 'homepage' => true,
 	'tags' => true, 'num_ratings' => true
 );
@@ -29,19 +29,19 @@ 
  * @return array
  */
 function install_themes_feature_list() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_theme_feature_list()' );
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_theme_feature_list()');
 
-	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
-		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( ! $cache = get_transient('wporg_theme_feature_list'))
+		set_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 
-	if ( $cache )
+	if ($cache)
 		return $cache;
 
-	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) )
+	$feature_list = themes_api('feature_list', array());
+	if (is_wp_error($feature_list))
 		return array();
 
-	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	return $feature_list;
 }
@@ -53,15 +53,15 @@ 
  *
  * @param bool $type_selector
  */
-function install_theme_search_form( $type_selector = true ) {
-	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector )
-		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+function install_theme_search_form($type_selector = true) {
+	$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+	$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
+	if ( ! $type_selector)
+		echo '<p class="install-help">'.__('Search for themes by keyword.').'</p>';
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
-	<?php if ( $type_selector ) : ?>
+	<?php if ($type_selector) : ?>
 	<label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
 	<select	name="type" id="typeselector">
 	<option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
@@ -69,15 +69,15 @@ 
 	<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
 	</select>
 	<label class="screen-reader-text" for="s"><?php
-	switch ( $type ) {
+	switch ($type) {
 		case 'term':
-			_e( 'Search by keyword' );
+			_e('Search by keyword');
 			break;
 		case 'author':
-			_e( 'Search by author' );
+			_e('Search by author');
 			break;
 		case 'tag':
-			_e( 'Search by tag' );
+			_e('Search by tag');
 			break;
 	}
 	?></label>
@@ -85,7 +85,7 @@ 
 	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
 	<?php endif; ?>
 	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
-	<?php submit_button( __( 'Search' ), '', 'search', false ); ?>
+	<?php submit_button(__('Search'), '', 'search', false); ?>
 </form>
 <?php
 }
@@ -96,10 +96,10 @@ 
  * @since 2.8.0
  */
 function install_themes_dashboard() {
-	install_theme_search_form( false );
+	install_theme_search_form(false);
 ?>
 <h4><?php _e('Feature Filter') ?></h4>
-<p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
+<p class="install-help"><?php _e('Find a theme based on specific features.'); ?></p>
 
 <form method="get">
 	<input type="hidden" name="tab" value="search" />
@@ -107,13 +107,13 @@ 
 	$feature_list = get_theme_feature_list();
 	echo '<div class="feature-filter">';
 
-	foreach ( (array) $feature_list as $feature_name => $features ) {
-		$feature_name = esc_html( $feature_name );
-		echo '<div class="feature-name">' . $feature_name . '</div>';
+	foreach ((array) $feature_list as $feature_name => $features) {
+		$feature_name = esc_html($feature_name);
+		echo '<div class="feature-name">'.$feature_name.'</div>';
 
 		echo '<ol class="feature-group">';
-		foreach ( $features as $feature => $feature_name ) {
-			$feature_name = esc_html( $feature_name );
+		foreach ($features as $feature => $feature_name) {
+			$feature_name = esc_html($feature_name);
 			$feature = esc_attr($feature);
 ?>
 
@@ -130,7 +130,7 @@ 
 
 </div>
 <br class="clear" />
-<?php submit_button( __( 'Find Themes' ), '', 'search' ); ?>
+<?php submit_button(__('Find Themes'), '', 'search'); ?>
 </form>
 <?php
 }
@@ -142,10 +142,10 @@ 
 ?>
 <p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.'); ?></p>
 <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-theme'); ?>">
-	<?php wp_nonce_field( 'theme-upload' ); ?>
-	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
+	<?php wp_nonce_field('theme-upload'); ?>
+	<label class="screen-reader-text" for="themezip"><?php _e('Theme zip file'); ?></label>
 	<input type="file" id="themezip" name="themezip" />
-	<?php submit_button( __( 'Install Now' ), '', 'install-theme-submit', false ); ?>
+	<?php submit_button(__('Install Now'), '', 'install-theme-submit', false); ?>
 </form>
 	<?php
 }
@@ -159,14 +159,14 @@ 
  *
  * @param object $theme
  */
-function display_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4.0' );
+function display_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4.0');
 	global $wp_list_table;
-	if ( ! isset( $wp_list_table ) ) {
+	if ( ! isset($wp_list_table)) {
 		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
 	$wp_list_table->prepare_items();
-	$wp_list_table->single_row( $theme );
+	$wp_list_table->single_row($theme);
 }
 
 /**
@@ -179,7 +179,7 @@ 
 function display_themes() {
 	global $wp_list_table;
 
-	if ( ! isset( $wp_list_table ) ) {
+	if ( ! isset($wp_list_table)) {
 		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
 	$wp_list_table->prepare_items();
@@ -197,16 +197,16 @@ 
 function install_theme_information() {
 	global $wp_list_table;
 
-	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
+	$theme = themes_api('theme_information', array('slug' => wp_unslash($_REQUEST['theme'])));
 
-	if ( is_wp_error( $theme ) )
-		wp_die( $theme );
+	if (is_wp_error($theme))
+		wp_die($theme);
 
-	iframe_header( __('Theme Install') );
-	if ( ! isset( $wp_list_table ) ) {
+	iframe_header(__('Theme Install'));
+	if ( ! isset($wp_list_table)) {
 		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
-	$wp_list_table->theme_installer_single( $theme );
+	$wp_list_table->theme_installer_single($theme);
 	iframe_footer();
 	exit;
 }

src/wp-admin/includes/class-wp-filesystem-direct.php

Spacing +62 added lines, -62 removed lines

@@ -55,25 +55,25 @@ 
 	 *                         Default false.
 	 * @return bool False upon failure, true otherwise.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
-		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
+	public function put_contents($file, $contents, $mode = false) {
+		$fp = @fopen($file, 'wb');
+		if ( ! $fp)
 			return false;
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
+		$data_length = strlen($contents);
 
-		$bytes_written = fwrite( $fp, $contents );
+		$bytes_written = fwrite($fp, $contents);
 
 		reset_mbstring_encoding();
 
-		fclose( $fp );
+		fclose($fp);
 
-		if ( $data_length !== $bytes_written )
+		if ($data_length !== $bytes_written)
 			return false;
 
-		$this->chmod( $file, $mode );
+		$this->chmod($file, $mode);
 
 		return true;
 	}
@@ -106,17 +106,17 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive )
+		if ( ! $recursive)
 			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
+		if ( ! $this->is_dir($file))
 			return @chgrp($file, $group);
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+			$this->chgrp($file.$filename, $group, $recursive);
 
 		return true;
 	}
@@ -131,22 +131,22 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return @chmod($file, $mode);
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		foreach ((array) $filelist as $filename => $filemeta)
+			$this->chmod($file.$filename, $mode, $recursive);
 
 		return true;
 	}
@@ -161,16 +161,16 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive )
+		if ( ! $recursive)
 			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
+		if ( ! $this->is_dir($file))
 			return @chown($file, $owner);
 		// Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename) {
-			$this->chown($file . '/' . $filename, $owner, $recursive);
+			$this->chown($file.'/'.$filename, $owner, $recursive);
 		}
 		return true;
 	}
@@ -183,9 +183,9 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
+		if ( ! $owneruid)
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		if ( ! function_exists('posix_getpwuid'))
 			return $owneruid;
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
@@ -200,7 +200,7 @@ 
 	 * @return string Mode of the file (last 3 digits).
 	 */
 	public function getchmod($file) {
-		return substr( decoct( @fileperms( $file ) ), -3 );
+		return substr(decoct(@fileperms($file)), -3);
 	}
 
 	/**
@@ -209,9 +209,9 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup($file);
-		if ( ! $gid )
+		if ( ! $gid)
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		if ( ! function_exists('posix_getgrgid'))
 			return $gid;
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
@@ -225,11 +225,11 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		$rtval = copy($source, $destination);
-		if ( $mode )
+		if ($mode)
 			$this->chmod($destination, $mode);
 		return $rtval;
 	}
@@ -241,14 +241,14 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
+		if (@rename($source, $destination))
 			return true;
 
-		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
+		if ($this->copy($source, $destination, $overwrite) && $this->exists($destination)) {
 			$this->delete($source);
 			return true;
 		} else {
@@ -263,13 +263,13 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if (empty($file)) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
-		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
+		$file = str_replace('\\', '/', $file); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
+		if ( ! $recursive && $this->is_dir($file))
 			return @rmdir($file);
 
 		// At this point it's a folder, and we're in recursive mode
@@ -277,14 +277,14 @@ 
 		$filelist = $this->dirlist($file, true);
 
 		$retval = true;
-		if ( is_array( $filelist ) ) {
-			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
+		if (is_array($filelist)) {
+			foreach ($filelist as $filename => $fileinfo) {
+				if ( ! $this->delete($file.$filename, $recursive, $fileinfo['type']))
 					$retval = false;
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
+		if (file_exists($file) && ! @rmdir($file))
 			$retval = false;
 
 		return $retval;
@@ -375,18 +375,18 @@ 
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( ! $chmod )
+		if ( ! $chmod)
 			$chmod = FS_CHMOD_DIR;
 
-		if ( ! @mkdir($path) )
+		if ( ! @mkdir($path))
 			return false;
 		$this->chmod($path, $chmod);
-		if ( $chown )
+		if ($chown)
 			$this->chown($path, $chown);
-		if ( $chgrp )
+		if ($chgrp)
 			$this->chgrp($path, $chgrp);
 		return true;
 	}
@@ -407,54 +407,54 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
 			$path = dirname($path);
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir($path))
 			return false;
 
 		$dir = @dir($path);
-		if ( ! $dir )
+		if ( ! $dir)
 			return false;
 
 		$ret = array();
 
-		while (false !== ($entry = $dir->read()) ) {
+		while (false !== ($entry = $dir->read())) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ('.' == $struc['name'] || '..' == $struc['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0])
 				continue;
 
-			if ( $limit_file && $struc['name'] != $limit_file)
+			if ($limit_file && $struc['name'] != $limit_file)
 				continue;
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
+			$struc['number'] = false;
 			$struc['owner']    	= $this->owner($path.'/'.$entry);
 			$struc['group']    	= $this->group($path.'/'.$entry);
 			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
-
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+			$struc['lastmodunix'] = $this->mtime($path.'/'.$entry);
+			$struc['lastmod']   = date('M j', $struc['lastmodunix']);
+			$struc['time']    	= date('h:i:s', $struc['lastmodunix']);
+			$struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		$dir->close();
 		unset($dir);

Braces +120 added lines, -81 removed lines

@@ -57,8 +57,9 @@ 
 	 */
 	public function put_contents( $file, $contents, $mode = false ) {
 		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
-			return false;
+		if ( ! $fp ) {
+					return false;
+		}
 
 		mbstring_binary_safe_encoding();
 
@@ -70,8 +71,9 @@ 
 
 		fclose( $fp );
 
-		if ( $data_length !== $bytes_written )
-			return false;
+		if ( $data_length !== $bytes_written ) {
+					return false;
+		}
 
 		$this->chmod( $file, $mode );
 
@@ -106,17 +108,21 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive )
-			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
-			return @chgrp($file, $group);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive ) {
+					return @chgrp($file, $group);
+		}
+		if ( ! $this->is_dir($file) ) {
+					return @chgrp($file, $group);
+		}
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+		foreach ($filelist as $filename) {
+					$this->chgrp($file . $filename, $group, $recursive);
+		}
 
 		return true;
 	}
@@ -132,21 +138,24 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return @chmod($file, $mode);
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return @chmod($file, $mode);
+		}
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		foreach ( (array)$filelist as $filename => $filemeta) {
+					$this->chmod($file . $filename, $mode, $recursive);
+		}
 
 		return true;
 	}
@@ -161,12 +170,15 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive )
-			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
-			return @chown($file, $owner);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive ) {
+					return @chown($file, $owner);
+		}
+		if ( ! $this->is_dir($file) ) {
+					return @chown($file, $owner);
+		}
 		// Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename) {
@@ -183,10 +195,12 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
-			return false;
-		if ( ! function_exists('posix_getpwuid') )
-			return $owneruid;
+		if ( ! $owneruid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getpwuid') ) {
+					return $owneruid;
+		}
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
 	}
@@ -209,10 +223,12 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup($file);
-		if ( ! $gid )
-			return false;
-		if ( ! function_exists('posix_getgrgid') )
-			return $gid;
+		if ( ! $gid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getgrgid') ) {
+					return $gid;
+		}
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
 	}
@@ -225,12 +241,14 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		$rtval = copy($source, $destination);
-		if ( $mode )
-			$this->chmod($destination, $mode);
+		if ( $mode ) {
+					$this->chmod($destination, $mode);
+		}
 		return $rtval;
 	}
 
@@ -241,12 +259,14 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
-			return true;
+		if ( @rename($source, $destination) ) {
+					return true;
+		}
 
 		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
 			$this->delete($source);
@@ -263,14 +283,18 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if ( empty( $file ) ) {
+			// Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
+		}
 		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
-			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
-			return @rmdir($file);
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return @unlink($file);
+		}
+		if ( ! $recursive && $this->is_dir($file) ) {
+					return @rmdir($file);
+		}
 
 		// At this point it's a folder, and we're in recursive mode
 		$file = trailingslashit($file);
@@ -279,13 +303,15 @@ 
 		$retval = true;
 		if ( is_array( $filelist ) ) {
 			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
-					$retval = false;
+				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) ) {
+									$retval = false;
+				}
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
-			$retval = false;
+		if ( file_exists($file) && ! @rmdir($file) ) {
+					$retval = false;
+		}
 
 		return $retval;
 	}
@@ -358,10 +384,12 @@ 
 	 * @return bool
 	 */
 	public function touch($file, $time = 0, $atime = 0) {
-		if ($time == 0)
-			$time = time();
-		if ($atime == 0)
-			$atime = time();
+		if ($time == 0) {
+					$time = time();
+		}
+		if ($atime == 0) {
+					$atime = time();
+		}
 		return @touch($file, $time, $atime);
 	}
 
@@ -375,19 +403,24 @@ 
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( ! $chmod )
-			$chmod = FS_CHMOD_DIR;
+		if ( ! $chmod ) {
+					$chmod = FS_CHMOD_DIR;
+		}
 
-		if ( ! @mkdir($path) )
-			return false;
+		if ( ! @mkdir($path) ) {
+					return false;
+		}
 		$this->chmod($path, $chmod);
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		if ( $chown ) {
+					$this->chown($path, $chown);
+		}
+		if ( $chgrp ) {
+					$this->chgrp($path, $chgrp);
+		}
 		return true;
 	}
 
@@ -414,12 +447,14 @@ 
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
-			return false;
+		if ( ! $this->is_dir($path) ) {
+					return false;
+		}
 
 		$dir = @dir($path);
-		if ( ! $dir )
-			return false;
+		if ( ! $dir ) {
+					return false;
+		}
 
 		$ret = array();
 
@@ -427,14 +462,17 @@ 
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue;
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file)
-				continue;
+			if ( $limit_file && $struc['name'] != $limit_file) {
+							continue;
+			}
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
@@ -448,10 +486,11 @@ 
 			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;

src/wp-admin/includes/menu.php

Braces +31 added lines, -22 removed lines

@@ -49,20 +49,22 @@ 
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
-			$hook_name = $hook_args['post_type'];
-		else
-			$hook_name = basename($hook_name, '.php');
+		if ( isset($hook_args['post_type']) ) {
+					$hook_name = $hook_args['post_type'];
+		} else {
+					$hook_name = basename($hook_name, '.php');
+		}
 		unset($hook_args);
 	} else {
 		$hook_name = basename($menu_page[2], '.php');
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
-		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
-		continue;
+	if ( isset($compat[$hook_name]) ) {
+			$hook_name = $compat[$hook_name];
+	} elseif ( !$hook_name ) {
+			continue;
+	}
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
 }
@@ -80,9 +82,10 @@ 
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
-		unset($submenu[$parent]);
-}
+	if ( empty($submenu[$parent]) ) {
+			unset($submenu[$parent]);
+	}
+	}
 unset($sub, $parent);
 
 /*
@@ -91,8 +94,9 @@ 
  * will have the next submenu in line be assigned as the new menu parent.
  */
 foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
-		continue;
+	if ( empty($submenu[$data[2]]) ) {
+			continue;
+	}
 	$subs = $submenu[$data[2]];
 	$first_sub = reset( $subs );
 	$old_parent = $data[2];
@@ -111,8 +115,9 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
-			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		if ( isset($_wp_submenu_nopriv[$old_parent]) ) {
+					$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		}
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
@@ -154,8 +159,9 @@ 
  * that the user does not have. Run re-parent loop again.
  */
 foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
-		$_wp_menu_nopriv[$data[2]] = true;
+	if ( ! current_user_can($data[1]) ) {
+			$_wp_menu_nopriv[$data[2]] = true;
+	}
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
@@ -164,8 +170,9 @@ 
 	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
 		$subs = $submenu[$data[2]];
 		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		if ( $data[2] == $first_sub[2] ) {
+					unset( $submenu[$data[2]] );
+		}
 	}
 
 	// If submenu is empty...
@@ -307,8 +314,9 @@ 
 		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
 			return 1;
 		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
-				return 0;
+			if ( $menu_order[$a] == $menu_order[$b] ) {
+							return 0;
+			}
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
 			return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
@@ -322,8 +330,9 @@ 
 // Remove the last menu item if it is a separator.
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] ) {
 	unset( $menu[ $last_menu_key ] );
+}
 unset( $last_menu_key );
 
 if ( !user_can_access_admin_page() ) {

Spacing +56 added lines, -56 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -16,8 +16,8 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_network_admin_menu' );
-} elseif ( is_user_admin() ) {
+	do_action('_network_admin_menu');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -27,7 +27,7 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_user_admin_menu' );
+	do_action('_user_admin_menu');
 } else {
 
 	/**
@@ -38,18 +38,18 @@ 
 	 * @private
 	 * @since 2.2.0
 	 */
-	do_action( '_admin_menu' );
+	do_action('_admin_menu');
 }
 
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {
-	if ( false !== $pos = strpos($menu_page[2], '?') ) {
+	if (false !== $pos = strpos($menu_page[2], '?')) {
 		// Handle post_type=post|page|foo pages.
 		$hook_name = substr($menu_page[2], 0, $pos);
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
+		if (isset($hook_args['post_type']))
 			$hook_name = $hook_args['post_type'];
 		else
 			$hook_name = basename($hook_name, '.php');
@@ -59,9 +59,9 @@ 
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
+	if (isset($compat[$hook_name]))
 		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
+	elseif ( ! $hook_name)
 		continue;
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
@@ -73,14 +73,14 @@ 
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ($submenu as $parent => $sub) {
 	foreach ($sub as $index => $data) {
-		if ( ! current_user_can($data[1]) ) {
+		if ( ! current_user_can($data[1])) {
 			unset($submenu[$parent][$index]);
 			$_wp_submenu_nopriv[$parent][$data[2]] = true;
 		}
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
+	if (empty($submenu[$parent]))
 		unset($submenu[$parent]);
 }
 unset($sub, $parent);
@@ -90,18 +90,18 @@ 
  * Menus for which the original parent is not accessible due to lack of privileges
  * will have the next submenu in line be assigned as the new menu parent.
  */
-foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
+foreach ($menu as $id => $data) {
+	if (empty($submenu[$data[2]]))
 		continue;
 	$subs = $submenu[$data[2]];
-	$first_sub = reset( $subs );
+	$first_sub = reset($subs);
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
 	/*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
+	if ($new_parent != $old_parent) {
 		$_wp_real_parent_file[$old_parent] = $new_parent;
 		$menu[$id][2] = $new_parent;
 
@@ -111,13 +111,13 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
+		if (isset($_wp_submenu_nopriv[$old_parent]))
 			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -126,8 +126,8 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'network_admin_menu', '' );
-} elseif ( is_user_admin() ) {
+	do_action('network_admin_menu', '');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -136,7 +136,7 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'user_admin_menu', '' );
+	do_action('user_admin_menu', '');
 } else {
 
 	/**
@@ -146,32 +146,32 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'admin_menu', '' );
+	do_action('admin_menu', '');
 }
 
 /*
  * Remove menus that have no accessible submenus and require privileges
  * that the user does not have. Run re-parent loop again.
  */
-foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
+foreach ($menu as $id => $data) {
+	if ( ! current_user_can($data[1]))
 		$_wp_menu_nopriv[$data[2]] = true;
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
+	if ( ! empty($submenu[$data[2]]) && 1 == count($submenu[$data[2]])) {
 		$subs = $submenu[$data[2]];
-		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		$first_sub = reset($subs);
+		if ($data[2] == $first_sub[2])
+			unset($submenu[$data[2]]);
 	}
 
 	// If submenu is empty...
-	if ( empty($submenu[$data[2]]) ) {
+	if (empty($submenu[$data[2]])) {
 		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
+		if (isset($_wp_menu_nopriv[$data[2]])) {
 			unset($menu[$id]);
 		}
 	}
@@ -185,7 +185,7 @@ 
  * @return string
  */
 function add_cssclass($add, $class) {
-	$class = empty($class) ? $add : $class .= ' ' . $add;
+	$class = empty($class) ? $add : $class .= ' '.$add;
 	return $class;
 }
 
@@ -198,29 +198,29 @@ 
 	$first = $lastorder = false;
 	$i = 0;
 	$mc = count($menu);
-	foreach ( $menu as $order => $top ) {
+	foreach ($menu as $order => $top) {
 		$i++;
 
-		if ( 0 == $order ) { // dashboard is always shown/single
+		if (0 == $order) { // dashboard is always shown/single
 			$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
 			$lastorder = 0;
 			continue;
 		}
 
-		if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
+		if (0 === strpos($top[2], 'separator') && false !== $lastorder) { // if separator
 			$first = true;
 			$c = $menu[$lastorder][4];
 			$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
 			continue;
 		}
 
-		if ( $first ) {
+		if ($first) {
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-first', $c);
 			$first = false;
 		}
 
-		if ( $mc == $i ) { // last item
+		if ($mc == $i) { // last item
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-last', $c);
 		}
@@ -235,7 +235,7 @@ 
 	 *
 	 * @param array $menu Associative array of administration menu items.
 	 */
-	return apply_filters( 'add_menu_classes', $menu );
+	return apply_filters('add_menu_classes', $menu);
 }
 
 uksort($menu, "strnatcasecmp"); // make it all pretty
@@ -249,9 +249,9 @@ 
  *
  * @param bool $custom Whether custom ordering is enabled. Default false.
  */
-if ( apply_filters( 'custom_menu_order', false ) ) {
+if (apply_filters('custom_menu_order', false)) {
 	$menu_order = array();
-	foreach ( $menu as $menu_item ) {
+	foreach ($menu as $menu_item) {
 		$menu_order[] = $menu_item[2];
 	}
 	unset($menu_item);
@@ -269,7 +269,7 @@ 
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order = apply_filters( 'menu_order', $menu_order );
+	$menu_order = apply_filters('menu_order', $menu_order);
 	$menu_order = array_flip($menu_order);
 	$default_menu_order = array_flip($default_menu_order);
 
@@ -286,12 +286,12 @@ 
 		global $menu_order, $default_menu_order;
 		$a = $a[2];
 		$b = $b[2];
-		if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+		if (isset($menu_order[$a]) && ! isset($menu_order[$b])) {
 			return -1;
-		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+		} elseif ( ! isset($menu_order[$a]) && isset($menu_order[$b])) {
 			return 1;
-		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
+		} elseif (isset($menu_order[$a]) && isset($menu_order[$b])) {
+			if ($menu_order[$a] == $menu_order[$b])
 				return 0;
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
@@ -305,41 +305,41 @@ 
 
 // Prevent adjacent separators
 $prev_menu_was_separator = false;
-foreach ( $menu as $id => $data ) {
-	if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+foreach ($menu as $id => $data) {
+	if (false === stristr($data[4], 'wp-menu-separator')) {
 
 		// This item is not a separator, so falsey the toggler and do nothing
 		$prev_menu_was_separator = false;
 	} else {
 
 		// The previous item was a separator, so unset this one
-		if ( true === $prev_menu_was_separator ) {
-			unset( $menu[ $id ] );
+		if (true === $prev_menu_was_separator) {
+			unset($menu[$id]);
 		}
 
 		// This item is a separator, so truthy the toggler and move on
 		$prev_menu_was_separator = true;
 	}
 }
-unset( $id, $data, $prev_menu_was_separator );
+unset($id, $data, $prev_menu_was_separator);
 
 // Remove the last menu item if it is a separator.
-$last_menu_key = array_keys( $menu );
-$last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
-	unset( $menu[ $last_menu_key ] );
-unset( $last_menu_key );
+$last_menu_key = array_keys($menu);
+$last_menu_key = array_pop($last_menu_key);
+if ( ! empty($menu) && 'wp-menu-separator' == $menu[$last_menu_key][4])
+	unset($menu[$last_menu_key]);
+unset($last_menu_key);
 
-if ( !user_can_access_admin_page() ) {
+if ( ! user_can_access_admin_page()) {
 
 	/**
 	 * Fires when access to an admin page is denied.
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'admin_page_access_denied' );
+	do_action('admin_page_access_denied');
 
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 }
 
 $menu = add_menu_classes($menu);