ntwb / wordpress

src/wp-admin/upload.php

Spacing +143 added lines, -143 removed lines

@@ -7,90 +7,90 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('upload_files') )
-	wp_die( __( 'You do not have permission to upload files.' ) );
+if ( ! current_user_can('upload_files'))
+	wp_die(__('You do not have permission to upload files.'));
 
-$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
-$modes = array( 'grid', 'list' );
+$mode = get_user_option('media_library_mode', get_current_user_id()) ? get_user_option('media_library_mode', get_current_user_id()) : 'grid';
+$modes = array('grid', 'list');
 
-if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
+if (isset($_GET['mode']) && in_array($_GET['mode'], $modes)) {
 	$mode = $_GET['mode'];
-	update_user_option( get_current_user_id(), 'media_library_mode', $mode );
+	update_user_option(get_current_user_id(), 'media_library_mode', $mode);
 }
 
-if ( 'grid' === $mode ) {
+if ('grid' === $mode) {
 	wp_enqueue_media();
-	wp_enqueue_script( 'media-grid' );
-	wp_enqueue_script( 'media' );
+	wp_enqueue_script('media-grid');
+	wp_enqueue_script('media');
 
-	remove_action( 'admin_head', 'wp_admin_canonical_url' );
+	remove_action('admin_head', 'wp_admin_canonical_url');
 
 	$q = $_GET;
 	// let JS handle this
-	unset( $q['s'] );
-	$vars = wp_edit_attachments_query_vars( $q );
-	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
-	foreach ( $vars as $key => $value ) {
-		if ( ! $value || in_array( $key, $ignore ) ) {
-			unset( $vars[ $key ] );
+	unset($q['s']);
+	$vars = wp_edit_attachments_query_vars($q);
+	$ignore = array('mode', 'post_type', 'post_status', 'posts_per_page');
+	foreach ($vars as $key => $value) {
+		if ( ! $value || in_array($key, $ignore)) {
+			unset($vars[$key]);
 		}
 	}
 
-	wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
-		'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
+	wp_localize_script('media-grid', '_wpMediaGridSettings', array(
+		'adminUrl' => parse_url(self_admin_url(), PHP_URL_PATH),
 		'queryVars' => (object) $vars
-	) );
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'overview',
-		'title'		=> __( 'Overview' ),
+		'title'		=> __('Overview'),
 		'content'	=>
-			'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
-			'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
-			'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>'
-	) );
+			'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.').'</p>'.
+			'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'.
+			'<p>'.__('To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.').'</p>'
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'attachment-details',
-		'title'		=> __( 'Attachment Details' ),
+		'title'		=> __('Attachment Details'),
 		'content'	=>
-			'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
-			'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
-			'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>'
-	) );
+			'<p>'.__('Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.').'</p>'.
+			'<p>'.__('Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.').'</p>'.
+			'<p>'.__('You can also delete individual items and access the extended edit screen from the details dialog.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+		'<p><strong>'.__('For more information:').'</strong></p>'.
+		'<p>'.__('<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 	$title = __('Media Library');
 	$parent_file = 'upload.php';
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
 		<h1>
 		<?php
-		echo esc_html( $title );
-		if ( current_user_can( 'upload_files' ) ) { ?>
-			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+		echo esc_html($title);
+		if (current_user_can('upload_files')) { ?>
+			<a href="<?php echo admin_url('media-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 		}
 		?>
 		</h1>
 		<div class="error hide-if-js">
 			<p><?php printf(
 				/* translators: %s: list view URL */
-				__( 'The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.' ),
+				__('The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.'),
 				'upload.php?mode=list'
 			); ?></p>
 		</div>
 	</div>
 	<?php
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -100,75 +100,75 @@ 
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-media');
 
-	if ( 'delete_all' == $doaction ) {
-		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
+	if ('delete_all' == $doaction) {
+		$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'");
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
 	}
 
 	$location = 'upload.php';
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+	if ($referer = wp_get_referer()) {
+		if (false !== strpos($referer, 'upload.php'))
+			$location = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted'), $referer);
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'detach':
-			wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
+			wp_media_attach_action($_REQUEST['parent_post_id'], 'detach');
 			break;
 
 		case 'attach':
-			wp_media_attach_action( $_REQUEST['found_post_id'] );
+			wp_media_attach_action($_REQUEST['found_post_id']);
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this item to the Trash.'));
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( ! wp_trash_post($post_id))
+					wp_die(__('Error in moving to Trash.'));
 			}
-			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
+			$location = add_query_arg(array('trashed' => count($post_ids), 'ids' => join(',', $post_ids)), $location);
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this item out of the Trash.'));
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 			}
-			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
+			$location = add_query_arg('untrashed', count($post_ids), $location);
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this item.' ) );
+			foreach ((array) $post_ids as $post_id_del) {
+				if ( ! current_user_can('delete_post', $post_id_del))
+					wp_die(__('You are not allowed to delete this item.'));
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( ! wp_delete_attachment($post_id_del))
+					wp_die(__('Error in deleting.'));
 			}
-			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
+			$location = add_query_arg('deleted', count($post_ids), $location);
 			break;
 	}
 
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -177,135 +177,135 @@ 
 $title = __('Media Library');
 $parent_file = 'upload.php';
 
-wp_enqueue_script( 'media' );
+wp_enqueue_script('media');
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-	'<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
-	'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.').'</p>'.
+	'<p>'.__('You can narrow the list by file type/status or by date using the dropdown menus above the media table.').'</p>'.
+	'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'actions-links',
 'title'		=> __('Available Actions'),
 'content'	=>
-	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'attaching-files',
 'title'		=> __('Attaching Files'),
 'content'	=>
-	'<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>'
-) );
+	'<p>'.__('If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter media items list' ),
-	'heading_pagination' => __( 'Media items list navigation' ),
-	'heading_list'       => __( 'Media items list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter media items list'),
+	'heading_pagination' => __('Media items list navigation'),
+	'heading_list'       => __('Media items list'),
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1>
 <?php
-echo esc_html( $title );
-if ( current_user_can( 'upload_files' ) ) { ?>
-	<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
+echo esc_html($title);
+if (current_user_can('upload_files')) { ?>
+	<a href="<?php echo admin_url('media-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query());
 }
 ?>
 </h1>
 
 <?php
 $message = '';
-if ( ! empty( $_GET['posted'] ) ) {
-	$message = __( 'Media file updated.' );
+if ( ! empty($_GET['posted'])) {
+	$message = __('Media file updated.');
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
-	if ( 1 == $attached ) {
-		$message = __( 'Media file attached.' );
+if ( ! empty($_GET['attached']) && $attached = absint($_GET['attached'])) {
+	if (1 == $attached) {
+		$message = __('Media file attached.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file attached.', '%s media files attached.', $attached );
+		$message = _n('%s media file attached.', '%s media files attached.', $attached);
 	}
-	$message = sprintf( $message, number_format_i18n( $attached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	$message = sprintf($message, number_format_i18n($attached));
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
-	if ( 1 == $detached ) {
-		$message = __( 'Media file detached.' );
+if ( ! empty($_GET['detach']) && $detached = absint($_GET['detach'])) {
+	if (1 == $detached) {
+		$message = __('Media file detached.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file detached.', '%s media files detached.', $detached );
+		$message = _n('%s media file detached.', '%s media files detached.', $detached);
 	}
-	$message = sprintf( $message, number_format_i18n( $detached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	$message = sprintf($message, number_format_i18n($detached));
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
-	if ( 1 == $deleted ) {
-		$message = __( 'Media file permanently deleted.' );
+if ( ! empty($_GET['deleted']) && $deleted = absint($_GET['deleted'])) {
+	if (1 == $deleted) {
+		$message = __('Media file permanently deleted.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
+		$message = _n('%s media file permanently deleted.', '%s media files permanently deleted.', $deleted);
 	}
-	$message = sprintf( $message, number_format_i18n( $deleted ) );
+	$message = sprintf($message, number_format_i18n($deleted));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
-	if ( 1 == $trashed ) {
-		$message = __( 'Media file moved to the trash.' );
+if ( ! empty($_GET['trashed']) && $trashed = absint($_GET['trashed'])) {
+	if (1 == $trashed) {
+		$message = __('Media file moved to the trash.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
+		$message = _n('%s media file moved to the trash.', '%s media files moved to the trash.', $trashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $trashed ) );
-	$message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
+	$message = sprintf($message, number_format_i18n($trashed));
+	$message .= ' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
-	if ( 1 == $untrashed ) {
-		$message = __( 'Media file restored from the trash.' );
+if ( ! empty($_GET['untrashed']) && $untrashed = absint($_GET['untrashed'])) {
+	if (1 == $untrashed) {
+		$message = __('Media file restored from the trash.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
+		$message = _n('%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $untrashed ) );
+	$message = sprintf($message, number_format_i18n($untrashed));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
 }
 
-$messages[1] = __( 'Media file updated.' );
-$messages[2] = __( 'Media file permanently deleted.' );
-$messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __( 'Undo' ) . '</a>';
-$messages[5] = __( 'Media file restored from the trash.' );
+$messages[1] = __('Media file updated.');
+$messages[2] = __('Media file permanently deleted.');
+$messages[3] = __('Error saving media file.');
+$messages[4] = __('Media file moved to the trash.').' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
+$messages[5] = __('Media file restored from the trash.');
 
-if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message = $messages[ $_GET['message'] ];
+if ( ! empty($_GET['message']) && isset($messages[$_GET['message']])) {
+	$message = $messages[$_GET['message']];
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }
 
-if ( !empty($message) ) { ?>
+if ( ! empty($message)) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
 <?php } ?>
 
@@ -321,4 +321,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +32 added lines, -21 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('upload_files') )
+if ( !current_user_can('upload_files') ) {
 	wp_die( __( 'You do not have permission to upload files.' ) );
+}
 
 $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
@@ -114,8 +115,9 @@ 
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
+					$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 
 	switch ( $doaction ) {
@@ -128,38 +130,47 @@ 
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this item to the Trash.' ) );
+				}
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( !wp_trash_post( $post_id ) ) {
+									wp_die( __( 'Error in moving to Trash.' ) );
+				}
 			}
 			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'You are not allowed to move this item out of the Trash.' ) );
+				}
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( !wp_untrash_post( $post_id ) ) {
+									wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'You are not allowed to delete this item.' ) );
+				if ( !current_user_can( 'delete_post', $post_id_del ) ) {
+									wp_die( __( 'You are not allowed to delete this item.' ) );
+				}
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( !wp_delete_attachment( $post_id_del ) ) {
+									wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;

src/wp-admin/includes/upgrade.php

Spacing +558 added lines, -558 removed lines

@@ -9,16 +9,16 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
-	require (WP_CONTENT_DIR . '/install.php');
+if (file_exists(WP_CONTENT_DIR.'/install.php'))
+	require (WP_CONTENT_DIR.'/install.php');
 
 /** WordPress Administration API */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 /** WordPress Schema API */
-require_once(ABSPATH . 'wp-admin/includes/schema.php');
+require_once(ABSPATH.'wp-admin/includes/schema.php');
 
-if ( !function_exists('wp_install') ) :
+if ( ! function_exists('wp_install')) :
 /**
  * Installs the site.
  *
@@ -36,9 +36,9 @@ 
  * @param string $language      Optional. Language chosen. Default empty.
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6' );
+function wp_install($blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.6');
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -50,8 +50,8 @@ 
 	update_option('admin_email', $user_email);
 	update_option('blog_public', $public);
 
-	if ( $language ) {
-		update_option( 'WPLANG', $language );
+	if ($language) {
+		update_option('WPLANG', $language);
 	}
 
 	$guessurl = wp_guess_url();
@@ -59,7 +59,7 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
+	if ( ! $public)
 		update_option('default_pingback_flag', 0);
 
 	/*
@@ -69,13 +69,13 @@ 
 	$user_id = username_exists($user_name);
 	$user_password = trim($user_password);
 	$email_password = false;
-	if ( !$user_id && empty($user_password) ) {
-		$user_password = wp_generate_password( 12, false );
+	if ( ! $user_id && empty($user_password)) {
+		$user_password = wp_generate_password(12, false);
 		$message = __('<strong><em>Note that password</em></strong> carefully! It is a <em>random</em> password that was generated just for you.');
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
 		update_user_option($user_id, 'default_password_nag', true, true);
 		$email_password = true;
-	} elseif ( ! $user_id ) {
+	} elseif ( ! $user_id) {
 		// Password has been provided
 		$message = '<em>'.__('Your chosen password.').'</em>';
 		$user_id = wp_create_user($user_name, $user_password, $user_email);
@@ -92,7 +92,7 @@ 
 
 	flush_rewrite_rules();
 
-	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.') ) );
+	wp_new_blog_notification($blog_title, $guessurl, $user_id, ($email_password ? $user_password : __('The password you chose during the install.')));
 
 	wp_cache_flush();
 
@@ -103,13 +103,13 @@ 
 	 *
 	 * @param WP_User $user The site owner.
 	 */
-	do_action( 'wp_install', $user );
+	do_action('wp_install', $user);
 
 	return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
 endif;
 
-if ( !function_exists('wp_install_defaults') ) :
+if ( ! function_exists('wp_install_defaults')) :
 /**
  * Creates the initial content for a newly-installed site.
  *
@@ -124,7 +124,7 @@ 
  *
  * @param int $user_id User ID.
  */
-function wp_install_defaults( $user_id ) {
+function wp_install_defaults($user_id) {
 	global $wpdb, $wp_rewrite, $table_prefix;
 
 	// Default category
@@ -132,10 +132,10 @@ 
 	/* translators: Default category slug */
 	$cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
 
-	if ( global_terms_enabled() ) {
-		$cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
-		if ( $cat_id == null ) {
-			$wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
+	if (global_terms_enabled()) {
+		$cat_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug));
+		if ($cat_id == null) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)));
 			$cat_id = $wpdb->insert_id;
 		}
 		update_option('default_category', $cat_id);
@@ -143,35 +143,35 @@ 
 		$cat_id = 1;
 	}
 
-	$wpdb->insert( $wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
-	$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
+	$wpdb->insert($wpdb->terms, array('term_id' => $cat_id, 'name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0));
+	$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $cat_id, 'taxonomy' => 'category', 'description' => '', 'parent' => 0, 'count' => 1));
 	$cat_tt_id = $wpdb->insert_id;
 
 	// First post
-	$now = current_time( 'mysql' );
-	$now_gmt = current_time( 'mysql', 1 );
-	$first_post_guid = get_option( 'home' ) . '/?p=1';
+	$now = current_time('mysql');
+	$now_gmt = current_time('mysql', 1);
+	$first_post_guid = get_option('home').'/?p=1';
 
-	if ( is_multisite() ) {
-		$first_post = get_site_option( 'first_post' );
+	if (is_multisite()) {
+		$first_post = get_site_option('first_post');
 
-		if ( ! $first_post ) {
+		if ( ! $first_post) {
 			/* translators: %s: site link */
-			$first_post = __( 'Welcome to %s. This is your first post. Edit or delete it, then start blogging!' );
+			$first_post = __('Welcome to %s. This is your first post. Edit or delete it, then start blogging!');
 		}
 
-		$first_post = sprintf( $first_post,
-			sprintf( '<a href="%s">%s</a>', esc_url( network_home_url() ), get_current_site()->site_name )
+		$first_post = sprintf($first_post,
+			sprintf('<a href="%s">%s</a>', esc_url(network_home_url()), get_current_site()->site_name)
 		);
 
 		// Back-compat for pre-4.4
-		$first_post = str_replace( 'SITE_URL', esc_url( network_home_url() ), $first_post );
-		$first_post = str_replace( 'SITE_NAME', get_current_site()->site_name, $first_post );
+		$first_post = str_replace('SITE_URL', esc_url(network_home_url()), $first_post);
+		$first_post = str_replace('SITE_NAME', get_current_site()->site_name, $first_post);
 	} else {
-		$first_post = __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!' );
+		$first_post = __('Welcome to WordPress. This is your first post. Edit or delete it, then start writing!');
 	}
 
-	$wpdb->insert( $wpdb->posts, array(
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
@@ -179,7 +179,7 @@ 
 		'post_excerpt' => '',
 		'post_title' => __('Hello world!'),
 		/* translators: Default post slug */
-		'post_name' => sanitize_title( _x('hello-world', 'Default post slug') ),
+		'post_name' => sanitize_title(_x('hello-world', 'Default post slug')),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -188,19 +188,19 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1) );
+	$wpdb->insert($wpdb->term_relationships, array('term_taxonomy_id' => $cat_tt_id, 'object_id' => 1));
 
 	// Default comment
 	$first_comment_author = __('Mr WordPress');
 	$first_comment_url = 'https://wordpress.org/';
 	$first_comment = __('Hi, this is a comment.
 To delete a comment, just log in and view the post&#039;s comments. There you will have the option to edit or delete them.');
-	if ( is_multisite() ) {
-		$first_comment_author = get_site_option( 'first_comment_author', $first_comment_author );
-		$first_comment_url = get_site_option( 'first_comment_url', network_home_url() );
-		$first_comment = get_site_option( 'first_comment', $first_comment );
+	if (is_multisite()) {
+		$first_comment_author = get_site_option('first_comment_author', $first_comment_author);
+		$first_comment_url = get_site_option('first_comment_url', network_home_url());
+		$first_comment = get_site_option('first_comment', $first_comment);
 	}
-	$wpdb->insert( $wpdb->comments, array(
+	$wpdb->insert($wpdb->comments, array(
 		'comment_post_ID' => 1,
 		'comment_author' => $first_comment_author,
 		'comment_author_email' => '',
@@ -211,7 +211,7 @@ 
 	));
 
 	// First Page
-	$first_page = sprintf( __( "This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
+	$first_page = sprintf(__("This is an example page. It's different from a blog post because it will stay in one place and will show up in your site navigation (in most themes). Most people start with an About page that introduces them to potential site visitors. It might say something like this:
 
 <blockquote>Hi there! I'm a bike messenger by day, aspiring actor by night, and this is my website. I live in Los Angeles, have a great dog named Jack, and I like pi&#241;a coladas. (And gettin' caught in the rain.)</blockquote>
 
@@ -219,20 +219,20 @@ 
 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
-As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
-	$first_post_guid = get_option('home') . '/?page_id=2';
-	$wpdb->insert( $wpdb->posts, array(
+As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url());
+	if (is_multisite())
+		$first_page = get_site_option('first_page', $first_page);
+	$first_post_guid = get_option('home').'/?page_id=2';
+	$wpdb->insert($wpdb->posts, array(
 		'post_author' => $user_id,
 		'post_date' => $now,
 		'post_date_gmt' => $now_gmt,
 		'post_content' => $first_page,
 		'post_excerpt' => '',
 		'comment_status' => 'closed',
-		'post_title' => __( 'Sample Page' ),
+		'post_title' => __('Sample Page'),
 		/* translators: Default page slug */
-		'post_name' => __( 'sample-page' ),
+		'post_name' => __('sample-page'),
 		'post_modified' => $now,
 		'post_modified_gmt' => $now_gmt,
 		'guid' => $first_post_guid,
@@ -241,37 +241,37 @@ 
 		'pinged' => '',
 		'post_content_filtered' => ''
 	));
-	$wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
+	$wpdb->insert($wpdb->postmeta, array('post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default'));
 
 	// Set up default widgets for default theme.
-	update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_archives', array ( 2 => array ( 'title' => '', 'count' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_categories', array ( 2 => array ( 'title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0 ), '_multiwidget' => 1 ) );
-	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
-	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
-
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
-
-	if ( is_multisite() ) {
+	update_option('widget_search', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('widget_recent-posts', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_recent-comments', array(2 => array('title' => '', 'number' => 5), '_multiwidget' => 1));
+	update_option('widget_archives', array(2 => array('title' => '', 'count' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_categories', array(2 => array('title' => '', 'count' => 0, 'hierarchical' => 0, 'dropdown' => 0), '_multiwidget' => 1));
+	update_option('widget_meta', array(2 => array('title' => ''), '_multiwidget' => 1));
+	update_option('sidebars_widgets', array('wp_inactive_widgets' => array(), 'sidebar-1' => array(0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2',), 'array_version' => 3));
+
+	if ( ! is_multisite())
+		update_user_meta($user_id, 'show_welcome_panel', 1);
+	elseif ( ! is_super_admin($user_id) && ! metadata_exists('user', $user_id, 'show_welcome_panel'))
+		update_user_meta($user_id, 'show_welcome_panel', 2);
+
+	if (is_multisite()) {
 		// Flush rules to pick up the new page.
 		$wp_rewrite->init();
 		$wp_rewrite->flush_rules();
 
 		$user = new WP_User($user_id);
-		$wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
+		$wpdb->update($wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email'));
 
 		// Remove all perms except for the login user.
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level') );
-		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'user_level'));
+		$wpdb->query($wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities'));
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( ! is_super_admin($user_id) && $user_id != 1)
+			$wpdb->delete($wpdb->usermeta, array('user_id' => $user_id, 'meta_key' => $wpdb->base_prefix.'1_capabilities'));
 	}
 }
 endif;
@@ -291,7 +291,7 @@ 
 	global $wp_rewrite;
 
 	// Bail if a permalink structure is already enabled.
-	if ( get_option( 'permalink_structure' ) ) {
+	if (get_option('permalink_structure')) {
 		return true;
 	}
 
@@ -308,20 +308,20 @@ 
 		'/index.php/%year%/%monthnum%/%day%/%postname%/'
 	);
 
-	foreach ( (array) $permalink_structures as $permalink_structure ) {
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+	foreach ((array) $permalink_structures as $permalink_structure) {
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 
 		/*
 	 	 * Flush rules with the hard option to force refresh of the web-server's
 	 	 * rewrite config file (e.g. .htaccess or web.config).
 	 	 */
-		$wp_rewrite->flush_rules( true );
+		$wp_rewrite->flush_rules(true);
 
 		// Test against a real WordPress Post, or if none were created, a random 404 page.
-		$test_url = get_permalink( 1 );
+		$test_url = get_permalink(1);
 
-		if ( ! $test_url ) {
-			$test_url = home_url( '/wordpress-check-for-rewrites/' );
+		if ( ! $test_url) {
+			$test_url = home_url('/wordpress-check-for-rewrites/');
 		}
 
 		/*
@@ -331,11 +331,11 @@ 
 	 	 * Uses wp_remote_get() instead of wp_remote_head() because web servers
 	 	 * can block head requests.
 	 	 */
-		$response          = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
-		$x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
-		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
+		$response          = wp_remote_get($test_url, array('timeout' => 5));
+		$x_pingback_header = wp_remote_retrieve_header($response, 'x-pingback');
+		$pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo('pingback_url');
 
-		if ( $pretty_permalinks ) {
+		if ($pretty_permalinks) {
 			return true;
 		}
 	}
@@ -344,13 +344,13 @@ 
 	 * If it makes it this far, pretty permalinks failed.
 	 * Fallback to query-string permalinks.
 	 */
-	$wp_rewrite->set_permalink_structure( '' );
-	$wp_rewrite->flush_rules( true );
+	$wp_rewrite->set_permalink_structure('');
+	$wp_rewrite->flush_rules(true);
 
 	return false;
 }
 
-if ( !function_exists('wp_new_blog_notification') ) :
+if ( ! function_exists('wp_new_blog_notification')) :
 /**
  * Notifies the site admin that the setup is complete.
  *
@@ -365,11 +365,11 @@ 
  * @param string $password   User's Password.
  */
 function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 	$email = $user->user_email;
 	$name = $user->user_login;
 	$login_url = wp_login_url();
-	$message = sprintf( __( "Your new WordPress site has been successfully set up at:
+	$message = sprintf(__("Your new WordPress site has been successfully set up at:
 
 %1\$s
 
@@ -383,13 +383,13 @@ 
 
 --The WordPress Team
 https://wordpress.org/
-"), $blog_url, $name, $password, $login_url );
+"), $blog_url, $name, $password, $login_url);
 
 	@wp_mail($email, __('New WordPress Site'), $message);
 }
 endif;
 
-if ( !function_exists('wp_upgrade') ) :
+if ( ! function_exists('wp_upgrade')) :
 /**
  * Runs WordPress Upgrade functions.
  *
@@ -407,10 +407,10 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
-	if ( ! is_blog_installed() )
+	if ( ! is_blog_installed())
 		return;
 
 	wp_check_mysql_version();
@@ -418,15 +418,15 @@ 
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
+	if (is_multisite() && is_main_site())
 		upgrade_network();
 	wp_cache_flush();
 
-	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+	if (is_multisite()) {
+		if ($wpdb->get_row("SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'"))
+			$wpdb->query("UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'");
 		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+			$wpdb->query("INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());");
 	}
 
 	/**
@@ -437,7 +437,7 @@ 
 	 * @param int $wp_db_version         The new $wp_db_version.
 	 * @param int $wp_current_db_version The old (current) $wp_db_version.
 	 */
-	do_action( 'wp_upgrade', $wp_db_version, $wp_current_db_version );
+	do_action('wp_upgrade', $wp_db_version, $wp_current_db_version);
 }
 endif;
 
@@ -458,106 +458,106 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
+	if ($wp_db_version == $wp_current_db_version)
 		return;
 
 	// If the version is not set in the DB, try to guess the version.
-	if ( empty($wp_current_db_version) ) {
+	if (empty($wp_current_db_version)) {
 		$wp_current_db_version = 0;
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
+		if ( ! empty($template))
 			$wp_current_db_version = 2541;
 	}
 
-	if ( $wp_current_db_version < 6039 )
+	if ($wp_current_db_version < 6039)
 		upgrade_230_options_table();
 
 	populate_options();
 
-	if ( $wp_current_db_version < 2541 ) {
+	if ($wp_current_db_version < 2541) {
 		upgrade_100();
 		upgrade_101();
 		upgrade_110();
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
+	if ($wp_current_db_version < 3308)
 		upgrade_160();
 
-	if ( $wp_current_db_version < 4772 )
+	if ($wp_current_db_version < 4772)
 		upgrade_210();
 
-	if ( $wp_current_db_version < 4351 )
+	if ($wp_current_db_version < 4351)
 		upgrade_old_slugs();
 
-	if ( $wp_current_db_version < 5539 )
+	if ($wp_current_db_version < 5539)
 		upgrade_230();
 
-	if ( $wp_current_db_version < 6124 )
+	if ($wp_current_db_version < 6124)
 		upgrade_230_old_tables();
 
-	if ( $wp_current_db_version < 7499 )
+	if ($wp_current_db_version < 7499)
 		upgrade_250();
 
-	if ( $wp_current_db_version < 7935 )
+	if ($wp_current_db_version < 7935)
 		upgrade_252();
 
-	if ( $wp_current_db_version < 8201 )
+	if ($wp_current_db_version < 8201)
 		upgrade_260();
 
-	if ( $wp_current_db_version < 8989 )
+	if ($wp_current_db_version < 8989)
 		upgrade_270();
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		upgrade_280();
 
-	if ( $wp_current_db_version < 11958 )
+	if ($wp_current_db_version < 11958)
 		upgrade_290();
 
-	if ( $wp_current_db_version < 15260 )
+	if ($wp_current_db_version < 15260)
 		upgrade_300();
 
-	if ( $wp_current_db_version < 19389 )
+	if ($wp_current_db_version < 19389)
 		upgrade_330();
 
-	if ( $wp_current_db_version < 20080 )
+	if ($wp_current_db_version < 20080)
 		upgrade_340();
 
-	if ( $wp_current_db_version < 22422 )
+	if ($wp_current_db_version < 22422)
 		upgrade_350();
 
-	if ( $wp_current_db_version < 25824 )
+	if ($wp_current_db_version < 25824)
 		upgrade_370();
 
-	if ( $wp_current_db_version < 26148 )
+	if ($wp_current_db_version < 26148)
 		upgrade_372();
 
-	if ( $wp_current_db_version < 26691 )
+	if ($wp_current_db_version < 26691)
 		upgrade_380();
 
-	if ( $wp_current_db_version < 29630 )
+	if ($wp_current_db_version < 29630)
 		upgrade_400();
 
-	if ( $wp_current_db_version < 33055 )
+	if ($wp_current_db_version < 33055)
 		upgrade_430();
 
-	if ( $wp_current_db_version < 33056 )
+	if ($wp_current_db_version < 33056)
 		upgrade_431();
 
-	if ( $wp_current_db_version < 35700 )
+	if ($wp_current_db_version < 35700)
 		upgrade_440();
 
-	if ( $wp_current_db_version < 36686 )
+	if ($wp_current_db_version < 36686)
 		upgrade_450();
 
 	maybe_disable_link_manager();
 
 	maybe_disable_automattic_widgets();
 
-	update_option( 'db_version', $wp_db_version );
-	update_option( 'db_upgraded', true );
+	update_option('db_version', $wp_db_version);
+	update_option('db_upgraded', true);
 }
 
 /**
@@ -577,7 +577,7 @@ 
 		foreach ($posts as $post) {
 			if ('' == $post->post_name) {
 				$newtitle = sanitize_title($post->post_title);
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID));
 			}
 		}
 	}
@@ -586,7 +586,7 @@ 
 	foreach ($categories as $category) {
 		if ('' == $category->category_nicename) {
 			$newtitle = sanitize_title($category->cat_name);
-			$wpdb->update( $wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID) );
+			$wpdb->update($wpdb->categories, array('category_nicename' => $newtitle), array('cat_ID' => $category->cat_ID));
 		}
 	}
 
@@ -594,7 +594,7 @@ 
 		SET option_value = REPLACE(option_value, 'wp-links/links-images/', 'wp-images/links/')
 		WHERE option_name LIKE %s
 		AND option_value LIKE %s";
-	$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( 'links_rating_image' ) . '%', $wpdb->esc_like( 'wp-links/links-images/' ) . '%' ) );
+	$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('links_rating_image').'%', $wpdb->esc_like('wp-links/links-images/').'%'));
 
 	$done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $wpdb->post2cat");
 	if ($done_ids) :
@@ -602,7 +602,7 @@ 
 		foreach ($done_ids as $done_id) :
 			$done_posts[] = $done_id->post_id;
 		endforeach;
-		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
+		$catwhere = ' AND ID NOT IN ('.implode(',', $done_posts).')';
 	else:
 		$catwhere = '';
 	endif;
@@ -611,9 +611,9 @@ 
 	if ($allposts) :
 		foreach ($allposts as $post) {
 			// Check to see if it's already been imported
-			$cat = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category) );
-			if (!$cat && 0 != $post->post_category) { // If there's no result
-				$wpdb->insert( $wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category) );
+			$cat = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->post2cat WHERE post_id = %d AND category_id = %d", $post->ID, $post->post_category));
+			if ( ! $cat && 0 != $post->post_category) { // If there's no result
+				$wpdb->insert($wpdb->post2cat, array('post_id' => $post->ID, 'category_id' => $post->post_category));
 			}
 		}
 	endif;
@@ -636,8 +636,8 @@ 
 	add_clean_index($wpdb->categories, 'category_nicename');
 	add_clean_index($wpdb->comments, 'comment_approved');
 	add_clean_index($wpdb->comments, 'comment_post_ID');
-	add_clean_index($wpdb->links , 'link_category');
-	add_clean_index($wpdb->links , 'link_visible');
+	add_clean_index($wpdb->links, 'link_category');
+	add_clean_index($wpdb->links, 'link_visible');
 }
 
 /**
@@ -656,14 +656,14 @@ 
 	foreach ($users as $user) {
 		if ('' == $user->user_nicename) {
 			$newname = sanitize_title($user->user_nickname);
-			$wpdb->update( $wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID) );
+			$wpdb->update($wpdb->users, array('user_nicename' => $newname), array('ID' => $user->ID));
 		}
 	}
 
 	$users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
 	foreach ($users as $row) {
-		if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-			$wpdb->update( $wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID) );
+		if ( ! preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
+			$wpdb->update($wpdb->users, array('user_pass' => md5($row->user_pass)), array('ID' => $row->ID));
 		}
 	}
 
@@ -672,7 +672,7 @@ 
 
 	$time_difference = $all_options->time_difference;
 
-		$server_time = time()+date('Z');
+		$server_time = time() + date('Z');
 	$weblogger_time = $server_time + $time_difference * HOUR_IN_SECONDS;
 	$gmt_time = time();
 
@@ -689,7 +689,7 @@ 
 	// <michel_v> I just slapped myself silly for not thinking about it earlier
 	$got_gmt_fields = ! ($wpdb->get_var("SELECT MAX(post_date_gmt) FROM $wpdb->posts") == '0000-00-00 00:00:00');
 
-	if (!$got_gmt_fields) {
+	if ( ! $got_gmt_fields) {
 
 		// Add or subtract time to all dates, to get GMT dates
 		$add_hours = intval($diff_gmt_weblogger);
@@ -721,12 +721,12 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
+			if (empty($post->guid))
 				$guid = get_permalink($post->ID);
 			else
 				$guid = $post->guid;
 
-			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
+			$wpdb->update($wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID));
 
 		}
 	}
@@ -738,7 +738,7 @@ 
 			$comment_content = deslash($comment->comment_content);
 			$comment_author = deslash($comment->comment_author);
 
-			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID) );
+			$wpdb->update($wpdb->comments, compact('comment_content', 'comment_author'), array('comment_ID' => $comment->comment_ID));
 		}
 	}
 
@@ -749,7 +749,7 @@ 
 			$link_name = deslash($link->link_name);
 			$link_description = deslash($link->link_description);
 
-			$wpdb->update( $wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id) );
+			$wpdb->update($wpdb->links, compact('link_name', 'link_description'), array('link_id' => $link->link_id));
 		}
 	}
 
@@ -759,16 +759,16 @@ 
 	 * If plugins are not stored in an array, they're stored in the old
 	 * newline separated format. Convert to new format.
 	 */
-	if ( !is_array( $active_plugins ) ) {
+	if ( ! is_array($active_plugins)) {
 		$active_plugins = explode("\n", trim($active_plugins));
 		update_option('active_plugins', $active_plugins);
 	}
 
 	// Obsolete tables
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiontypes');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroups');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optiongroup_options');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optionvalues');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiontypes');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroups');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'optiongroup_options');
 
 	// Update comments table to use comment_type
 	$wpdb->query("UPDATE $wpdb->comments SET comment_type='trackback', comment_content = REPLACE(comment_content, '<trackback />', '') WHERE comment_content LIKE '<trackback />%'");
@@ -776,11 +776,11 @@ 
 
 	// Some versions have multiple duplicate option_name rows with the same values
 	$options = $wpdb->get_results("SELECT option_name, COUNT(option_name) AS dupes FROM `$wpdb->options` GROUP BY option_name");
-	foreach ( $options as $option ) {
-		if ( 1 != $option->dupes ) { // Could this be done in the query?
+	foreach ($options as $option) {
+		if (1 != $option->dupes) { // Could this be done in the query?
 			$limit = $option->dupes - 1;
-			$dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
-			if ( $dupe_ids ) {
+			$dupe_ids = $wpdb->get_col($wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit));
+			if ($dupe_ids) {
 				$dupe_ids = join($dupe_ids, ',');
 				$wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
 			}
@@ -805,27 +805,27 @@ 
 	populate_roles_160();
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
-	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
-
-		if ( isset( $user->user_idmode ) ):
+	foreach ($users as $user) :
+		if ( ! empty($user->user_firstname))
+			update_user_meta($user->ID, 'first_name', wp_slash($user->user_firstname));
+		if ( ! empty($user->user_lastname))
+			update_user_meta($user->ID, 'last_name', wp_slash($user->user_lastname));
+		if ( ! empty($user->user_nickname))
+			update_user_meta($user->ID, 'nickname', wp_slash($user->user_nickname));
+		if ( ! empty($user->user_level))
+			update_user_meta($user->ID, $wpdb->prefix.'user_level', $user->user_level);
+		if ( ! empty($user->user_icq))
+			update_user_meta($user->ID, 'icq', wp_slash($user->user_icq));
+		if ( ! empty($user->user_aim))
+			update_user_meta($user->ID, 'aim', wp_slash($user->user_aim));
+		if ( ! empty($user->user_msn))
+			update_user_meta($user->ID, 'msn', wp_slash($user->user_msn));
+		if ( ! empty($user->user_yim))
+			update_user_meta($user->ID, 'yim', wp_slash($user->user_icq));
+		if ( ! empty($user->user_description))
+			update_user_meta($user->ID, 'description', wp_slash($user->user_description));
+
+		if (isset($user->user_idmode)):
 			$idmode = $user->user_idmode;
 			if ($idmode == 'nickname') $id = $user->user_nickname;
 			if ($idmode == 'login') $id = $user->user_login;
@@ -833,46 +833,46 @@ 
 			if ($idmode == 'lastname') $id = $user->user_lastname;
 			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
 			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
-			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
+			if ( ! $idmode) $id = $user->user_nickname;
+			$wpdb->update($wpdb->users, array('display_name' => $id), array('ID' => $user->ID));
 		endif;
 
 		// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
-		$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
-		if ( empty($caps) || defined('RESET_CAPS') ) {
-			$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
+		$caps = get_user_meta($user->ID, $wpdb->prefix.'capabilities');
+		if (empty($caps) || defined('RESET_CAPS')) {
+			$level = get_user_meta($user->ID, $wpdb->prefix.'user_level', true);
 			$role = translate_level_to_role($level);
-			update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
+			update_user_meta($user->ID, $wpdb->prefix.'capabilities', array($role => true));
 		}
 
 	endforeach;
-	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
+	$old_user_fields = array('user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level');
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
+	foreach ($old_user_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
-	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
+	$comments = $wpdb->get_results("SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID");
+	if (is_array($comments))
 		foreach ($comments as $comment)
-			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+			$wpdb->update($wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID));
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
 	 * and put the mime type in post_type instead of post_mime_type.
 	 */
-	if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
+	if ($wp_current_db_version > 2541 && $wp_current_db_version <= 3091) {
 		$objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
 		foreach ($objects as $object) {
-			$wpdb->update( $wpdb->posts, array(	'post_status' => 'attachment',
+			$wpdb->update($wpdb->posts, array('post_status' => 'attachment',
 												'post_mime_type' => $object->post_type,
 												'post_type' => ''),
-										 array( 'ID' => $object->ID ) );
+										 array('ID' => $object->ID));
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']))
+				update_attached_file($object->ID, $meta['file']);
 		}
 	}
 }
@@ -889,38 +889,38 @@ 
 function upgrade_210() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 3506 ) {
+	if ($wp_current_db_version < 3506) {
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts)) foreach ($posts as $post) {
 			$status = $post->post_status;
 			$type = 'post';
 
-			if ( 'static' == $status ) {
+			if ('static' == $status) {
 				$status = 'publish';
 				$type = 'page';
-			} elseif ( 'attachment' == $status ) {
+			} elseif ('attachment' == $status) {
 				$status = 'inherit';
 				$type = 'attachment';
 			}
 
-			$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID) );
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_status = %s, post_type = %s WHERE ID = %d", $status, $type, $post->ID));
 		}
 	}
 
-	if ( $wp_current_db_version < 3845 ) {
+	if ($wp_current_db_version < 3845) {
 		populate_roles_210();
 	}
 
-	if ( $wp_current_db_version < 3531 ) {
+	if ($wp_current_db_version < 3531) {
 		// Give future posts a post_status of future.
 		$now = gmdate('Y-m-d H:i:59');
-		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
+		$wpdb->query("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( ! empty($posts))
+			foreach ($posts as $post)
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
 	}
 }
@@ -937,7 +937,7 @@ 
 function upgrade_230() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 5200 ) {
+	if ($wp_current_db_version < 5200) {
 		populate_roles_230();
 	}
 
@@ -954,78 +954,78 @@ 
 		$term_group = 0;
 
 		// Associate terms with the same slug in a term group and make slugs unique.
-		if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+		if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 			$term_group = $exists[0]->term_group;
 			$id = $exists[0]->term_id;
 			$num = 2;
 			do {
-				$alt_slug = $slug . "-$num";
+				$alt_slug = $slug."-$num";
 				$num++;
-				$slug_check = $wpdb->get_var( $wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug) );
-			} while ( $slug_check );
+				$slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM $wpdb->terms WHERE slug = %s", $alt_slug));
+			} while ($slug_check);
 
 			$slug = $alt_slug;
 
-			if ( empty( $term_group ) ) {
+			if (empty($term_group)) {
 				$term_group = $wpdb->get_var("SELECT MAX(term_group) FROM $wpdb->terms GROUP BY term_group") + 1;
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->terms SET term_group = %d WHERE term_id = %d", $term_group, $id));
 			}
 		}
 
-		$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
-		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
+		$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
+		(%d, %s, %s, %d)", $term_id, $name, $slug, $term_group));
 
 		$count = 0;
-		if ( !empty($category->category_count) ) {
+		if ( ! empty($category->category_count)) {
 			$count = (int) $category->category_count;
 			$taxonomy = 'category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->link_count) ) {
+		if ( ! empty($category->link_count)) {
 			$count = (int) $category->link_count;
 			$taxonomy = 'link_category';
-			$wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count) );
+			$wpdb->query($wpdb->prepare("INSERT INTO $wpdb->term_taxonomy (term_id, taxonomy, description, parent, count) VALUES ( %d, %s, %s, %d, %d)", $term_id, $taxonomy, $description, $parent, $count));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( !empty($category->tag_count) ) {
+		if ( ! empty($category->tag_count)) {
 			$have_tags = true;
 			$count = (int) $category->tag_count;
 			$taxonomy = 'post_tag';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 
-		if ( empty($count) ) {
+		if (empty($count)) {
 			$count = 0;
 			$taxonomy = 'category';
-			$wpdb->insert( $wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count') );
+			$wpdb->insert($wpdb->term_taxonomy, compact('term_id', 'taxonomy', 'description', 'parent', 'count'));
 			$tt_ids[$term_id][$taxonomy] = (int) $wpdb->insert_id;
 		}
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
+	if ($have_tags)
 		$select .= ', rel_type';
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
+		if ( ! empty($post->rel_type) && 'tag' == $post->rel_type)
 			$taxonomy = 'tag';
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
+		if (empty($tt_id))
 			continue;
 
-		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
+		$wpdb->insert($wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id));
 	}
 
 	// < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
-	if ( $wp_current_db_version < 3570 ) {
+	if ($wp_current_db_version < 3570) {
 		/*
 		 * Create link_category terms for link categories. Create a map of link
 		 * cat IDs to link_category terms.
@@ -1033,8 +1033,8 @@ 
 		$link_cat_id_map = array();
 		$default_link_cat = 0;
 		$tt_ids = array();
-		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM " . $wpdb->prefix . 'linkcategories');
-		foreach ( $link_cats as $category) {
+		$link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM ".$wpdb->prefix.'linkcategories');
+		foreach ($link_cats as $category) {
 			$cat_id = (int) $category->cat_id;
 			$term_id = 0;
 			$name = wp_slash($category->cat_name);
@@ -1042,66 +1042,66 @@ 
 			$term_group = 0;
 
 			// Associate terms with the same slug in a term group and make slugs unique.
-			if ( $exists = $wpdb->get_results( $wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug) ) ) {
+			if ($exists = $wpdb->get_results($wpdb->prepare("SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug))) {
 				$term_group = $exists[0]->term_group;
 				$term_id = $exists[0]->term_id;
 			}
 
-			if ( empty($term_id) ) {
-				$wpdb->insert( $wpdb->terms, compact('name', 'slug', 'term_group') );
+			if (empty($term_id)) {
+				$wpdb->insert($wpdb->terms, compact('name', 'slug', 'term_group'));
 				$term_id = (int) $wpdb->insert_id;
 			}
 
 			$link_cat_id_map[$cat_id] = $term_id;
 			$default_link_cat = $term_id;
 
-			$wpdb->insert( $wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0) );
+			$wpdb->insert($wpdb->term_taxonomy, array('term_id' => $term_id, 'taxonomy' => 'link_category', 'description' => '', 'parent' => 0, 'count' => 0));
 			$tt_ids[$term_id] = (int) $wpdb->insert_id;
 		}
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
-			if ( 0 == $link->link_category )
+		if ( ! empty($links)) foreach ($links as $link) {
+			if (0 == $link->link_category)
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
+			if ( ! isset($link_cat_id_map[$link->link_category]))
 				continue;
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
 
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id));
 		}
 
 		// Set default to the last category we grabbed during the upgrade loop.
 		update_option('default_link_category', $default_link_cat);
 	} else {
 		$links = $wpdb->get_results("SELECT link_id, category_id FROM $wpdb->link2cat GROUP BY link_id, category_id");
-		foreach ( $links as $link ) {
+		foreach ($links as $link) {
 			$link_id = (int) $link->link_id;
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
+			if (empty($tt_id))
 				continue;
-			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
+			$wpdb->insert($wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id));
 		}
 	}
 
-	if ( $wp_current_db_version < 4772 ) {
+	if ($wp_current_db_version < 4772) {
 		// Obsolete linkcategories table
-		$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'linkcategories');
+		$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'linkcategories');
 	}
 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
-	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+	foreach ((array) $terms as $term) {
+		if (('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy))
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id));
 		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
+			$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id));
+		$wpdb->update($wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id));
 	}
 }
 
@@ -1115,9 +1115,9 @@ 
  */
 function upgrade_230_options_table() {
 	global $wpdb;
-	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
+	$old_options_fields = array('option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level');
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
+	foreach ($old_options_fields as $old)
 		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
 	$wpdb->show_errors();
 }
@@ -1132,9 +1132,9 @@ 
  */
 function upgrade_230_old_tables() {
 	global $wpdb;
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'categories');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'link2cat');
-	$wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'post2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'categories');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'link2cat');
+	$wpdb->query('DROP TABLE IF EXISTS '.$wpdb->prefix.'post2cat');
 }
 
 /**
@@ -1162,7 +1162,7 @@ 
 function upgrade_250() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 6689 ) {
+	if ($wp_current_db_version < 6689) {
 		populate_roles_250();
 	}
 
@@ -1193,7 +1193,7 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
+	if ($wp_current_db_version < 8000)
 		populate_roles_260();
 }
 
@@ -1209,12 +1209,12 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
+	if ($wp_current_db_version < 8980)
 		populate_roles_270();
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	if ($wp_current_db_version < 8921)
+		$wpdb->query("UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'");
 }
 
 /**
@@ -1229,22 +1229,22 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
+	if ($wp_current_db_version < 10360)
 		populate_roles_280();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
-			foreach ( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->option_value ) {
-					update_option( $row->option_name, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->option_value) {
+					update_option($row->option_name, $value);
 				}
 			}
 			$start += 20;
 		}
-		refresh_blog_details( $wpdb->blogid );
+		refresh_blog_details($wpdb->blogid);
 	}
 }
 
@@ -1259,11 +1259,11 @@ 
 function upgrade_290() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 11958 ) {
+	if ($wp_current_db_version < 11958) {
 		// Previously, setting depth to 1 would redundantly disable threading, but now 2 is the minimum depth to avoid confusion
-		if ( get_option( 'thread_comments_depth' ) == '1' ) {
-			update_option( 'thread_comments_depth', 2 );
-			update_option( 'thread_comments', 0 );
+		if (get_option('thread_comments_depth') == '1') {
+			update_option('thread_comments_depth', 2);
+			update_option('thread_comments', 0);
 		}
 	}
 }
@@ -1280,14 +1280,14 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
+	if ($wp_current_db_version < 15093)
 		populate_roles_300();
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ($wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined('MULTISITE') && get_site_option('siteurl') === false)
+		add_site_option('siteurl', '');
 
 	// 3.0 screen options key name changes.
-	if ( wp_should_upgrade_global_tables() ) {
+	if (wp_should_upgrade_global_tables()) {
 		$sql = "DELETE FROM $wpdb->usermeta
 			WHERE meta_key LIKE %s
 			OR meta_key LIKE %s
@@ -1301,15 +1301,15 @@ 
 			OR meta_key = 'manageeditcolumnshidden'
 			OR meta_key = 'categories_per_page'
 			OR meta_key = 'edit_tags_per_page'";
-		$prefix = $wpdb->esc_like( $wpdb->base_prefix );
-		$wpdb->query( $wpdb->prepare( $sql,
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'closedpostboxes' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'manage-'	   ) . '%' . $wpdb->esc_like( '-columns-hidden' ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'meta-box-order'  ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'metaboxorder'    ) . '%',
-			$prefix . '%' . $wpdb->esc_like( 'screen_layout'   ) . '%'
-		) );
+		$prefix = $wpdb->esc_like($wpdb->base_prefix);
+		$wpdb->query($wpdb->prepare($sql,
+			$prefix.'%'.$wpdb->esc_like('meta-box-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('closedpostboxes').'%',
+			$prefix.'%'.$wpdb->esc_like('manage-').'%'.$wpdb->esc_like('-columns-hidden').'%',
+			$prefix.'%'.$wpdb->esc_like('meta-box-order').'%',
+			$prefix.'%'.$wpdb->esc_like('metaboxorder').'%',
+			$prefix.'%'.$wpdb->esc_like('screen_layout').'%'
+		));
 	}
 
 }
@@ -1328,52 +1328,52 @@ 
 function upgrade_330() {
 	global $wp_current_db_version, $wpdb, $wp_registered_widgets, $sidebars_widgets;
 
-	if ( $wp_current_db_version < 19061 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
+	if ($wp_current_db_version < 19061 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')");
 	}
 
-	if ( $wp_current_db_version >= 11548 )
+	if ($wp_current_db_version >= 11548)
 		return;
 
-	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
+	$sidebars_widgets = get_option('sidebars_widgets', array());
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
+	if (isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets))
 		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
+	elseif ( ! isset($sidebars_widgets['array_version']))
 		$sidebars_widgets['array_version'] = 1;
 
-	switch ( $sidebars_widgets['array_version'] ) {
+	switch ($sidebars_widgets['array_version']) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
-			foreach ( (array) $sidebar as $i => $name ) {
+			foreach ((array) $sidebars_widgets as $index => $sidebar)
+			if (is_array($sidebar))
+			foreach ((array) $sidebar as $i => $name) {
 				$id = strtolower($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 				$id = sanitize_title($name);
-				if ( isset($wp_registered_widgets[$id]) ) {
+				if (isset($wp_registered_widgets[$id])) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
 				}
 
 				$found = false;
 
-				foreach ( $wp_registered_widgets as $widget_id => $widget ) {
-					if ( strtolower($widget['name']) == strtolower($name) ) {
+				foreach ($wp_registered_widgets as $widget_id => $widget) {
+					if (strtolower($widget['name']) == strtolower($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
-					} elseif ( sanitize_title($widget['name']) == sanitize_title($name) ) {
+					} elseif (sanitize_title($widget['name']) == sanitize_title($name)) {
 						$_sidebars_widgets[$index][$i] = $widget['id'];
 						$found = true;
 						break;
 					}
 				}
 
-				if ( $found )
+				if ($found)
 					continue;
 
 				unset($_sidebars_widgets[$index][$i]);
@@ -1385,7 +1385,7 @@ 
 		case 2 :
 			$sidebars_widgets = retrieve_widgets();
 			$sidebars_widgets['array_version'] = 3;
-			update_option( 'sidebars_widgets', $sidebars_widgets );
+			update_option('sidebars_widgets', $sidebars_widgets);
 	}
 }
 
@@ -1401,27 +1401,27 @@ 
 function upgrade_340() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 19798 ) {
+	if ($wp_current_db_version < 19798) {
 		$wpdb->hide_errors();
-		$wpdb->query( "ALTER TABLE $wpdb->options DROP COLUMN blog_id" );
+		$wpdb->query("ALTER TABLE $wpdb->options DROP COLUMN blog_id");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 19799 ) {
+	if ($wp_current_db_version < 19799) {
 		$wpdb->hide_errors();
 		$wpdb->query("ALTER TABLE $wpdb->comments DROP INDEX comment_approved");
 		$wpdb->show_errors();
 	}
 
-	if ( $wp_current_db_version < 20022 && wp_should_upgrade_global_tables() ) {
-		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'" );
+	if ($wp_current_db_version < 20022 && wp_should_upgrade_global_tables()) {
+		$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key = 'themes_last_view'");
 	}
 
-	if ( $wp_current_db_version < 20080 ) {
-		if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
-			$uninstall_plugins = get_option( 'uninstall_plugins' );
-			delete_option( 'uninstall_plugins' );
-			add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
+	if ($wp_current_db_version < 20080) {
+		if ('yes' == $wpdb->get_var("SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'")) {
+			$uninstall_plugins = get_option('uninstall_plugins');
+			delete_option('uninstall_plugins');
+			add_option('uninstall_plugins', $uninstall_plugins, null, 'no');
 		}
 	}
 }
@@ -1438,23 +1438,23 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ($wp_current_db_version < 22006 && $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 1); // Previously set to 0 by populate_options()
 
-	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 21811 && wp_should_upgrade_global_tables()) {
 		$meta_keys = array();
-		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+		foreach (array_merge(get_post_types(), get_taxonomies()) as $name) {
+			if (false !== strpos($name, '-'))
+			$meta_keys[] = 'edit_'.str_replace('-', '_', $name).'_per_page';
 		}
-		if ( $meta_keys ) {
-			$meta_keys = implode( "', '", $meta_keys );
-			$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')" );
+		if ($meta_keys) {
+			$meta_keys = implode("', '", $meta_keys);
+			$wpdb->query("DELETE FROM $wpdb->usermeta WHERE meta_key IN ('$meta_keys')");
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
+	if ($wp_current_db_version < 22422 && $term = get_term_by('slug', 'post-format-standard', 'post_format'))
+		wp_delete_term($term->term_id, 'post_format');
 }
 
 /**
@@ -1467,8 +1467,8 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	if ($wp_current_db_version < 25824)
+		wp_clear_scheduled_hook('wp_auto_updates_maybe_update');
 }
 
 /**
@@ -1482,8 +1482,8 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 26148)
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 }
 
 /**
@@ -1496,8 +1496,8 @@ 
  */
 function upgrade_380() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26691 ) {
-		deactivate_plugins( array( 'mp6/mp6.php' ), true );
+	if ($wp_current_db_version < 26691) {
+		deactivate_plugins(array('mp6/mp6.php'), true);
 	}
 }
 
@@ -1511,12 +1511,12 @@ 
  */
 function upgrade_400() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 29630 ) {
-		if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
-			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) {
-				update_option( 'WPLANG', WPLANG );
+	if ($wp_current_db_version < 29630) {
+		if ( ! is_multisite() && false === get_option('WPLANG')) {
+			if (defined('WPLANG') && ('' !== WPLANG) && in_array(WPLANG, get_available_languages())) {
+				update_option('WPLANG', WPLANG);
 			} else {
-				update_option( 'WPLANG', '' );
+				update_option('WPLANG', '');
 			}
 		}
 	}
@@ -1545,29 +1545,29 @@ 
 function upgrade_430() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 32364 ) {
+	if ($wp_current_db_version < 32364) {
 		upgrade_430_fix_comments();
 	}
 
 	// Shared terms are split in a separate process.
-	if ( $wp_current_db_version < 32814 ) {
-		update_option( 'finished_splitting_shared_terms', 0 );
-		wp_schedule_single_event( time() + ( 1 * MINUTE_IN_SECONDS ), 'wp_split_shared_term_batch' );
+	if ($wp_current_db_version < 32814) {
+		update_option('finished_splitting_shared_terms', 0);
+		wp_schedule_single_event(time() + (1 * MINUTE_IN_SECONDS), 'wp_split_shared_term_batch');
 	}
 
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( is_multisite() ) {
-			$tables = $wpdb->tables( 'blog' );
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (is_multisite()) {
+			$tables = $wpdb->tables('blog');
 		} else {
-			$tables = $wpdb->tables( 'all' );
-			if ( ! wp_should_upgrade_global_tables() ) {
-				$global_tables = $wpdb->tables( 'global' );
-				$tables = array_diff_assoc( $tables, $global_tables );
+			$tables = $wpdb->tables('all');
+			if ( ! wp_should_upgrade_global_tables()) {
+				$global_tables = $wpdb->tables('global');
+				$tables = array_diff_assoc($tables, $global_tables);
 			}
 		}
 
-		foreach ( $tables as $table ) {
-			maybe_convert_table_to_utf8mb4( $table );
+		foreach ($tables as $table) {
+			maybe_convert_table_to_utf8mb4($table);
 		}
 	}
 }
@@ -1584,18 +1584,18 @@ 
 function upgrade_430_fix_comments() {
 	global $wp_current_db_version, $wpdb;
 
-	$content_length = $wpdb->get_col_length( $wpdb->comments, 'comment_content' );
+	$content_length = $wpdb->get_col_length($wpdb->comments, 'comment_content');
 
-	if ( is_wp_error( $content_length ) ) {
+	if (is_wp_error($content_length)) {
 		return;
 	}
 
-	if ( false === $content_length ) {
+	if (false === $content_length) {
 		$content_length = array(
 			'type'   => 'byte',
 			'length' => 65535,
 		);
-	} elseif ( ! is_array( $content_length ) ) {
+	} elseif ( ! is_array($content_length)) {
 		$length = (int) $content_length > 0 ? (int) $content_length : 65535;
 		$content_length = array(
 			'type'	 => 'byte',
@@ -1603,12 +1603,12 @@ 
 		);
 	}
 
-	if ( 'byte' !== $content_length['type'] || 0 === $content_length['length'] ) {
+	if ('byte' !== $content_length['type'] || 0 === $content_length['length']) {
 		// Sites with malformed DB schemas are on their own.
 		return;
 	}
 
-	$allowed_length = intval( $content_length['length'] ) - 10;
+	$allowed_length = intval($content_length['length']) - 10;
 
 	$comments = $wpdb->get_results(
 		"SELECT `comment_ID` FROM `{$wpdb->comments}`
@@ -1617,8 +1617,8 @@ 
 			AND ( `comment_content` LIKE '%<%' OR `comment_content` LIKE '%>%' )"
 	);
 
-	foreach ( $comments as $comment ) {
-		wp_delete_comment( $comment->comment_ID, true );
+	foreach ($comments as $comment) {
+		wp_delete_comment($comment->comment_ID, true);
 	}
 }
 
@@ -1631,9 +1631,9 @@ 
 function upgrade_431() {
 	// Fix incorrect cron entries for term splitting
 	$cron_array = _get_cron_array();
-	if ( isset( $cron_array['wp_batch_split_terms'] ) ) {
-		unset( $cron_array['wp_batch_split_terms'] );
-		_set_cron_array( $cron_array );
+	if (isset($cron_array['wp_batch_split_terms'])) {
+		unset($cron_array['wp_batch_split_terms']);
+		_set_cron_array($cron_array);
 	}
 }
 
@@ -1649,15 +1649,15 @@ 
 function upgrade_440() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 34030 ) {
-		$wpdb->query( "ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)" );
+	if ($wp_current_db_version < 34030) {
+		$wpdb->query("ALTER TABLE {$wpdb->options} MODIFY option_name VARCHAR(191)");
 	}
 
 	// Remove the unused 'add_users' role.
 	$roles = wp_roles();
-	foreach ( $roles->role_objects as $role ) {
-		if ( $role->has_cap( 'add_users' ) ) {
-			$role->remove_cap( 'add_users' );
+	foreach ($roles->role_objects as $role) {
+		if ($role->has_cap('add_users')) {
+			$role->remove_cap('add_users');
 		}
 	}
 }
@@ -1674,17 +1674,17 @@ 
 function upgrade_450() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 36180 ) {
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	if ($wp_current_db_version < 36180) {
+		wp_clear_scheduled_hook('wp_maybe_auto_update');
 	}
 
 	// Remove unused email confirmation options, moved to usermeta.
-	if ( $wp_current_db_version < 36679 && is_multisite() ) {
-		$wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" );
+	if ($wp_current_db_version < 36679 && is_multisite()) {
+		$wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'");
 	}
 
 	// Remove unused user setting for wpLink.
-	delete_user_setting( 'wplink' );
+	delete_user_setting('wplink');
 }
 
 /**
@@ -1699,7 +1699,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Always.
-	if ( is_main_network() ) {
+	if (is_main_network()) {
 		/*
 		 * Deletes all expired transients. The multi-table delete syntax is used
 		 * to delete the transient record from table a, and the corresponding
@@ -1711,32 +1711,32 @@ 
 			AND a.meta_key NOT LIKE %s
 			AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
 			AND b.meta_value < %d";
-		$wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
+		$wpdb->query($wpdb->prepare($sql, $wpdb->esc_like('_site_transient_').'%', $wpdb->esc_like('_site_transient_timeout_').'%', $time));
 	}
 
 	// 2.8.
-	if ( $wp_current_db_version < 11549 ) {
-		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
-		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
-		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
+	if ($wp_current_db_version < 11549) {
+		$wpmu_sitewide_plugins = get_site_option('wpmu_sitewide_plugins');
+		$active_sitewide_plugins = get_site_option('active_sitewide_plugins');
+		if ($wpmu_sitewide_plugins) {
+			if ( ! $active_sitewide_plugins)
 				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
 			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+				$sitewide_plugins = array_merge((array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins);
 
-			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
+			update_site_option('active_sitewide_plugins', $sitewide_plugins);
 		}
-		delete_site_option( 'wpmu_sitewide_plugins' );
-		delete_site_option( 'deactivated_sitewide_plugins' );
+		delete_site_option('wpmu_sitewide_plugins');
+		delete_site_option('deactivated_sitewide_plugins');
 
 		$start = 0;
-		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
-			foreach ( $rows as $row ) {
+		while ($rows = $wpdb->get_results("SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20")) {
+			foreach ($rows as $row) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
-				if ( $value !== $row->meta_value ) {
-					update_site_option( $row->meta_key, $value );
+				if ( ! @unserialize($value))
+					$value = stripslashes($value);
+				if ($value !== $row->meta_value) {
+					update_site_option($row->meta_key, $value);
 				}
 			}
 			$start += 20;
@@ -1744,95 +1744,95 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ($wp_current_db_version < 13576)
+		update_site_option('global_terms_enabled', '1');
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ($wp_current_db_version < 19390)
+		update_site_option('initial_db_version', $wp_current_db_version);
 
-	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+	if ($wp_current_db_version < 19470) {
+		if (false === get_site_option('active_sitewide_plugins'))
+			update_site_option('active_sitewide_plugins', array());
 	}
 
 	// 3.4
-	if ( $wp_current_db_version < 20148 ) {
+	if ($wp_current_db_version < 20148) {
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		$allowedthemes  = get_site_option( 'allowedthemes'  );
-		$allowed_themes = get_site_option( 'allowed_themes' );
-		if ( false === $allowedthemes && is_array( $allowed_themes ) && $allowed_themes ) {
+		$allowedthemes  = get_site_option('allowedthemes');
+		$allowed_themes = get_site_option('allowed_themes');
+		if (false === $allowedthemes && is_array($allowed_themes) && $allowed_themes) {
 			$converted = array();
 			$themes = wp_get_themes();
-			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+			foreach ($themes as $stylesheet => $theme_data) {
+				if (isset($allowed_themes[$theme_data->get('Name')]))
+					$converted[$stylesheet] = true;
 			}
-			update_site_option( 'allowedthemes', $converted );
-			delete_site_option( 'allowed_themes' );
+			update_site_option('allowedthemes', $converted);
+			delete_site_option('allowed_themes');
 		}
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ($wp_current_db_version < 21823)
+		update_site_option('ms_files_rewriting', '1');
 
 	// 3.5.2
-	if ( $wp_current_db_version < 24448 ) {
-		$illegal_names = get_site_option( 'illegal_names' );
-		if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) {
-			$illegal_name = reset( $illegal_names );
-			$illegal_names = explode( ' ', $illegal_name );
-			update_site_option( 'illegal_names', $illegal_names );
+	if ($wp_current_db_version < 24448) {
+		$illegal_names = get_site_option('illegal_names');
+		if (is_array($illegal_names) && count($illegal_names) === 1) {
+			$illegal_name = reset($illegal_names);
+			$illegal_names = explode(' ', $illegal_name);
+			update_site_option('illegal_names', $illegal_names);
 		}
 	}
 
 	// 4.2
-	if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
-		if ( wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
-			$wpdb->query( "ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+	if ($wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4') {
+		if (wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))");
+			$wpdb->query("ALTER TABLE $wpdb->sitemeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
 
 	// 4.3
-	if ( $wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset ) {
-		if ( wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 33055 && 'utf8mb4' === $wpdb->charset) {
+		if (wp_should_upgrade_global_tables()) {
 			$upgrade = false;
-			$indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
-			foreach ( $indexes as $index ) {
-				if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
+			$indexes = $wpdb->get_results("SHOW INDEXES FROM $wpdb->signups");
+			foreach ($indexes as $index) {
+				if ('domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part) {
 					$upgrade = true;
 					break;
 				}
 			}
 
-			if ( $upgrade ) {
-				$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))" );
+			if ($upgrade) {
+				$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain_path, ADD INDEX domain_path(domain(140),path(51))");
 			}
 
-			$tables = $wpdb->tables( 'global' );
+			$tables = $wpdb->tables('global');
 
 			// sitecategories may not exist.
-			if ( ! $wpdb->get_var( "SHOW TABLES LIKE '{$tables['sitecategories']}'" ) ) {
-				unset( $tables['sitecategories'] );
+			if ( ! $wpdb->get_var("SHOW TABLES LIKE '{$tables['sitecategories']}'")) {
+				unset($tables['sitecategories']);
 			}
 
-			foreach ( $tables as $table ) {
-				maybe_convert_table_to_utf8mb4( $table );
+			foreach ($tables as $table) {
+				maybe_convert_table_to_utf8mb4($table);
 			}
 		}
 	}
@@ -1860,9 +1860,9 @@ 
 function maybe_create_table($table_name, $create_ddl) {
 	global $wpdb;
 
-	$query = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $table_name ) );
+	$query = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($table_name));
 
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 
@@ -1870,7 +1870,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	if ( $wpdb->get_var( $query ) == $table_name ) {
+	if ($wpdb->get_var($query) == $table_name) {
 		return true;
 	}
 	return false;
@@ -1931,7 +1931,7 @@ 
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
 	global $wpdb;
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1941,7 +1941,7 @@ 
 	$wpdb->query($create_ddl);
 
 	// We cannot directly tell that whether this succeeded!
-	foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+	foreach ($wpdb->get_col("DESC $table_name", 0) as $column) {
 		if ($column == $column_name) {
 			return true;
 		}
@@ -1959,37 +1959,37 @@ 
  * @param string $table The table to convert.
  * @return bool true if the table was converted, false if it wasn't.
  */
-function maybe_convert_table_to_utf8mb4( $table ) {
+function maybe_convert_table_to_utf8mb4($table) {
 	global $wpdb;
 
-	$results = $wpdb->get_results( "SHOW FULL COLUMNS FROM `$table`" );
-	if ( ! $results ) {
+	$results = $wpdb->get_results("SHOW FULL COLUMNS FROM `$table`");
+	if ( ! $results) {
 		return false;
 	}
 
-	foreach ( $results as $column ) {
-		if ( $column->Collation ) {
-			list( $charset ) = explode( '_', $column->Collation );
-			$charset = strtolower( $charset );
-			if ( 'utf8' !== $charset && 'utf8mb4' !== $charset ) {
+	foreach ($results as $column) {
+		if ($column->Collation) {
+			list($charset) = explode('_', $column->Collation);
+			$charset = strtolower($charset);
+			if ('utf8' !== $charset && 'utf8mb4' !== $charset) {
 				// Don't upgrade tables that have non-utf8 columns.
 				return false;
 			}
 		}
 	}
 
-	$table_details = $wpdb->get_row( "SHOW TABLE STATUS LIKE '$table'" );
-	if ( ! $table_details ) {
+	$table_details = $wpdb->get_row("SHOW TABLE STATUS LIKE '$table'");
+	if ( ! $table_details) {
 		return false;
 	}
 
-	list( $table_charset ) = explode( '_', $table_details->Collation );
-	$table_charset = strtolower( $table_charset );
-	if ( 'utf8mb4' === $table_charset ) {
+	list($table_charset) = explode('_', $table_details->Collation);
+	$table_charset = strtolower($table_charset);
+	if ('utf8mb4' === $table_charset) {
 		return true;
 	}
 
-	return $wpdb->query( "ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci" );
+	return $wpdb->query("ALTER TABLE $table CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
 }
 
 /**
@@ -2004,11 +2004,11 @@ 
 function get_alloptions_110() {
 	global $wpdb;
 	$all_options = new stdClass;
-	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
-		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
-			$all_options->{$option->option_name} = stripslashes( $option->option_value );
+	if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
+		foreach ($options as $option) {
+			if ('siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name)
+				$option->option_value = untrailingslashit($option->option_value);
+			$all_options->{$option->option_name} = stripslashes($option->option_value);
 		}
 	}
 	return $all_options;
@@ -2029,21 +2029,21 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ($setting == 'home' && defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ($setting == 'siteurl' && defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 
-	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
+	$option = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting));
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ('home' == $setting && '' == $option)
+		return __get_option('siteurl');
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ('siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting)
+		$option = untrailingslashit($option);
 
-	return maybe_unserialize( $option );
+	return maybe_unserialize($option);
 }
 
 /**
@@ -2091,16 +2091,16 @@ 
  *                              Default true.
  * @return array Strings containing the results of the various update queries.
  */
-function dbDelta( $queries = '', $execute = true ) {
+function dbDelta($queries = '', $execute = true) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if (in_array($queries, array('', 'all', 'blog', 'global', 'ms_global'), true))
+	    $queries = wp_get_db_schema($queries);
 
 	// Separate individual queries into an array
-	if ( !is_array($queries) ) {
-		$queries = explode( ';', $queries );
-		$queries = array_filter( $queries );
+	if ( ! is_array($queries)) {
+		$queries = explode(';', $queries);
+		$queries = array_filter($queries);
 	}
 
 	/**
@@ -2110,7 +2110,7 @@ 
 	 *
 	 * @param array $queries An array of dbDelta SQL queries.
 	 */
-	$queries = apply_filters( 'dbdelta_queries', $queries );
+	$queries = apply_filters('dbdelta_queries', $queries);
 
 	$cqueries = array(); // Creation Queries
 	$iqueries = array(); // Insertion Queries
@@ -2118,14 +2118,14 @@ 
 
 	// Create a tablename index for an array ($cqueries) of queries
 	foreach ($queries as $qry) {
-		if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
-			$cqueries[ trim( $matches[1], '`' ) ] = $qry;
+		if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
+			$cqueries[trim($matches[1], '`')] = $qry;
 			$for_update[$matches[1]] = 'Created table '.$matches[1];
-		} elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
-			array_unshift( $cqueries, $qry );
-		} elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
+			array_unshift($cqueries, $qry);
+		} elseif (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
-		} elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
+		} elseif (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
 			$iqueries[] = $qry;
 		} else {
 			// Unrecognized query type
@@ -2141,7 +2141,7 @@ 
 	 *
 	 * @param array $cqueries An array of dbDelta create SQL queries.
 	 */
-	$cqueries = apply_filters( 'dbdelta_create_queries', $cqueries );
+	$cqueries = apply_filters('dbdelta_create_queries', $cqueries);
 
 	/**
 	 * Filter the dbDelta SQL queries for inserting or updating.
@@ -2152,22 +2152,22 @@ 
 	 *
 	 * @param array $iqueries An array of dbDelta insert or update SQL queries.
 	 */
-	$iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
+	$iqueries = apply_filters('dbdelta_insert_queries', $iqueries);
 
-	$global_tables = $wpdb->tables( 'global' );
-	foreach ( $cqueries as $table => $qry ) {
+	$global_tables = $wpdb->tables('global');
+	foreach ($cqueries as $table => $qry) {
 		// Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
-		if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) {
-			unset( $cqueries[ $table ], $for_update[ $table ] );
+		if (in_array($table, $global_tables) && ! wp_should_upgrade_global_tables()) {
+			unset($cqueries[$table], $for_update[$table]);
 			continue;
 		}
 
 		// Fetch the table column structure from the database
 		$suppress = $wpdb->suppress_errors();
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
-		$wpdb->suppress_errors( $suppress );
+		$wpdb->suppress_errors($suppress);
 
-		if ( ! $tablefields )
+		if ( ! $tablefields)
 			continue;
 
 		// Clear the field and index arrays.
@@ -2188,7 +2188,7 @@ 
 
 			// Extract the field name.
 			preg_match("|^([^ ]*)|", trim($fld), $fvals);
-			$fieldname = trim( $fvals[1], '`' );
+			$fieldname = trim($fvals[1], '`');
 
 			// Verify the found field name.
 			$validfield = true;
@@ -2224,7 +2224,7 @@ 
 				// Is actual field type different from the field type in query?
 				if ($tablefield->Type != $fieldtype) {
 					// Add a query to change the column type
-					$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
+					$cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} ".$cfields[strtolower($tablefield->Field)];
 					$for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
 				}
 
@@ -2267,7 +2267,7 @@ 
 				// Add the index to the index data array.
 				$keyname = $tableindex->Key_name;
 				$index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
-				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
+				$index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0) ? true : false;
 				$index_ary[$keyname]['index_type'] = $tableindex->Index_type;
 			}
 
@@ -2278,10 +2278,10 @@ 
 				$index_string = '';
 				if ($index_name == 'PRIMARY') {
 					$index_string .= 'PRIMARY ';
-				} elseif ( $index_data['unique'] ) {
+				} elseif ($index_data['unique']) {
 					$index_string .= 'UNIQUE ';
 				}
-				if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
+				if ('FULLTEXT' === strtoupper($index_data['index_type'])) {
 					$index_string .= 'FULLTEXT ';
 				}
 				$index_string .= 'KEY ';
@@ -2302,7 +2302,7 @@ 
 				}
 
 				// The alternative index string doesn't care about subparts
-				$alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
+				$alt_index_columns = preg_replace('/\([^)]*\)/', '', $index_columns);
 
 				// Add the column list to the index create string.
 				$index_strings = array(
@@ -2310,9 +2310,9 @@ 
 					"$index_string ($alt_index_columns)",
 				);
 
-				foreach ( $index_strings as $index_string ) {
-					if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
-						unset( $indices[ $aindex ] );
+				foreach ($index_strings as $index_string) {
+					if ( ! (($aindex = array_search($index_string, $indices)) === false)) {
+						unset($indices[$aindex]);
 						break;
 						// todo: Remove this?
 						//echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
@@ -2324,14 +2324,14 @@ 
 		}
 
 		// For every remaining index specified for the table.
-		foreach ( (array) $indices as $index ) {
+		foreach ((array) $indices as $index) {
 			// Push a query line into $cqueries that adds the index to that table.
 			$cqueries[] = "ALTER TABLE {$table} ADD $index";
-			$for_update[] = 'Added index ' . $table . ' ' . $index;
+			$for_update[] = 'Added index '.$table.' '.$index;
 		}
 
 		// Remove the original table creation query from processing.
-		unset( $cqueries[ $table ], $for_update[ $table ] );
+		unset($cqueries[$table], $for_update[$table]);
 	}
 
 	$allqueries = array_merge($cqueries, $iqueries);
@@ -2358,8 +2358,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current( $tables = 'all' ) {
-	$alterations = dbDelta( $tables );
+function make_db_current($tables = 'all') {
+	$alterations = dbDelta($tables);
 	echo "<ol>\n";
 	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
 	echo "</ol>\n";
@@ -2377,8 +2377,8 @@ 
  *
  * @param string $tables Optional. Which set of tables to update. Default is 'all'.
  */
-function make_db_current_silent( $tables = 'all' ) {
-	dbDelta( $tables );
+function make_db_current_silent($tables = 'all') {
+	dbDelta($tables);
 }
 
 /**
@@ -2394,9 +2394,9 @@ 
  */
 function make_site_theme_from_oldschool($theme_name, $template) {
 	$home_path = get_home_path();
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
+	if ( ! file_exists("$home_path/index.php"))
 		return false;
 
 	/*
@@ -2415,7 +2415,7 @@ 
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
+				if ( ! @copy(WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME.'/index.php', "$site_dir/$newfile"))
 					return false;
 
 				// Don't copy anything.
@@ -2423,7 +2423,7 @@ 
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
+		if ( ! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
 			return false;
 
 		chmod("$site_dir/$newfile", 0777);
@@ -2435,7 +2435,7 @@ 
 
 			foreach ($lines as $line) {
 				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+					$line = '//'.$line;
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2450,7 +2450,7 @@ 
 	}
 
 	// Add a theme header.
-	$header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option('siteurl') . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
+	$header = "/*\nTheme Name: $theme_name\nTheme URI: ".__get_option('siteurl')."\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
 
 	$stylelines = file_get_contents("$site_dir/style.css");
 	if ($stylelines) {
@@ -2476,18 +2476,18 @@ 
  * @return false|void
  */
 function make_site_theme_from_default($theme_name, $template) {
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
-	$default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
+	$default_dir = WP_CONTENT_DIR.'/themes/'.WP_DEFAULT_THEME;
 
 	// Copy files from the default theme to the site theme.
 	//$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
-		while(($theme_file = readdir( $theme_dir )) !== false) {
+		while (($theme_file = readdir($theme_dir)) !== false) {
 			if (is_dir("$default_dir/$theme_file"))
 				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
+			if ( ! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
 				return;
 			chmod("$site_dir/$theme_file", 0777);
 		}
@@ -2500,28 +2500,28 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
+			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: '.$theme_name;
+			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: '.__get_option('url');
 			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
 			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
 			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
-			fwrite($f, $line . "\n");
+			fwrite($f, $line."\n");
 		}
 		fclose($f);
 	}
 
 	// Copy the images.
 	umask(0);
-	if (! mkdir("$site_dir/images", 0777)) {
+	if ( ! mkdir("$site_dir/images", 0777)) {
 		return false;
 	}
 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
-		while(($image = readdir($images_dir)) !== false) {
+		while (($image = readdir($images_dir)) !== false) {
 			if (is_dir("$default_dir/images/$image"))
 				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
+			if ( ! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
 				return;
 			chmod("$site_dir/images/$image", 0777);
 		}
@@ -2542,30 +2542,30 @@ 
 	// Name the theme after the blog.
 	$theme_name = __get_option('blogname');
 	$template = sanitize_title($theme_name);
-	$site_dir = WP_CONTENT_DIR . "/themes/$template";
+	$site_dir = WP_CONTENT_DIR."/themes/$template";
 
 	// If the theme already exists, nothing to do.
-	if ( is_dir($site_dir)) {
+	if (is_dir($site_dir)) {
 		return false;
 	}
 
 	// We must be able to write to the themes dir.
-	if (! is_writable(WP_CONTENT_DIR . "/themes")) {
+	if ( ! is_writable(WP_CONTENT_DIR."/themes")) {
 		return false;
 	}
 
 	umask(0);
-	if (! mkdir($site_dir, 0777)) {
+	if ( ! mkdir($site_dir, 0777)) {
 		return false;
 	}
 
-	if (file_exists(ABSPATH . 'wp-layout.css')) {
-		if (! make_site_theme_from_oldschool($theme_name, $template)) {
+	if (file_exists(ABSPATH.'wp-layout.css')) {
+		if ( ! make_site_theme_from_oldschool($theme_name, $template)) {
 			// TODO: rm -rf the site theme directory.
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
+		if ( ! make_site_theme_from_default($theme_name, $template))
 			// TODO: rm -rf the site theme directory.
 			return false;
 	}
@@ -2618,8 +2618,8 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
+	if (is_wp_error($result))
+		die($result->get_error_message());
 }
 
 /**
@@ -2628,12 +2628,12 @@ 
  * @since 2.2.0
  */
 function maybe_disable_automattic_widgets() {
-	$plugins = __get_option( 'active_plugins' );
+	$plugins = __get_option('active_plugins');
 
-	foreach ( (array) $plugins as $plugin ) {
-		if ( basename( $plugin ) == 'widgets.php' ) {
-			array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
-			update_option( 'active_plugins', $plugins );
+	foreach ((array) $plugins as $plugin) {
+		if (basename($plugin) == 'widgets.php') {
+			array_splice($plugins, array_search($plugin, $plugins), 1);
+			update_option('active_plugins', $plugins);
 			break;
 		}
 	}
@@ -2650,8 +2650,8 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
+	if ($wp_current_db_version >= 22006 && get_option('link_manager_enabled') && ! $wpdb->get_var("SELECT link_id FROM $wpdb->links LIMIT 1"))
+		update_option('link_manager_enabled', 0);
 }
 
 /**
@@ -2666,7 +2666,7 @@ 
 	global $wp_current_db_version, $wpdb;
 
 	// Upgrade versions prior to 2.9
-	if ( $wp_current_db_version < 11557 ) {
+	if ($wp_current_db_version < 11557) {
 		// Delete duplicate options. Keep the option with the highest option_id.
 		$wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
 
@@ -2678,40 +2678,40 @@ 
 	}
 
 	// Multisite schema upgrades.
-	if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {
+	if ($wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables()) {
 
 		// Upgrade verions prior to 3.7
-		if ( $wp_current_db_version < 25179 ) {
+		if ($wp_current_db_version < 25179) {
 			// New primary key for signups.
-			$wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
-			$wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+			$wpdb->query("ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+			$wpdb->query("ALTER TABLE $wpdb->signups DROP INDEX domain");
 		}
 
-		if ( $wp_current_db_version < 25448 ) {
+		if ($wp_current_db_version < 25448) {
 			// Convert archived from enum to tinyint.
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
-			$wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'");
+			$wpdb->query("ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0");
 		}
 	}
 
 	// Upgrade versions prior to 4.2.
-	if ( $wp_current_db_version < 31351 ) {
-		if ( ! is_multisite() && wp_should_upgrade_global_tables() ) {
-			$wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
+	if ($wp_current_db_version < 31351) {
+		if ( ! is_multisite() && wp_should_upgrade_global_tables()) {
+			$wpdb->query("ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
 		}
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-		$wpdb->query( "ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))" );
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX slug, ADD INDEX slug(slug(191))");
+		$wpdb->query("ALTER TABLE $wpdb->terms DROP INDEX name, ADD INDEX name(name(191))");
+		$wpdb->query("ALTER TABLE $wpdb->commentmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->postmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+		$wpdb->query("ALTER TABLE $wpdb->posts DROP INDEX post_name, ADD INDEX post_name(post_name(191))");
 	}
 
 	// Upgrade versions prior to 4.4.
-	if ( $wp_current_db_version < 34978 ) {
+	if ($wp_current_db_version < 34978) {
 		// If compatible termmeta table is found, use it, but enforce a proper index and update collation.
-		if ( $wpdb->get_var( "SHOW TABLES LIKE '{$wpdb->termmeta}'" ) && $wpdb->get_results( "SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'" ) ) {
-			$wpdb->query( "ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
-			maybe_convert_table_to_utf8mb4( $wpdb->termmeta );
+		if ($wpdb->get_var("SHOW TABLES LIKE '{$wpdb->termmeta}'") && $wpdb->get_results("SHOW INDEX FROM {$wpdb->termmeta} WHERE Column_name = 'meta_key'")) {
+			$wpdb->query("ALTER TABLE $wpdb->termmeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))");
+			maybe_convert_table_to_utf8mb4($wpdb->termmeta);
 		}
 	}
 }
@@ -2724,7 +2724,7 @@ 
  * @global wpdb   $wpdb
  * @global string $charset_collate
  */
-if ( !function_exists( 'install_global_terms' ) ) :
+if ( ! function_exists('install_global_terms')) :
 function install_global_terms() {
 	global $wpdb, $charset_collate;
 	$ms_queries = "
@@ -2739,7 +2739,7 @@ 
 ) $charset_collate;
 ";
 // now create tables
-	dbDelta( $ms_queries );
+	dbDelta($ms_queries);
 }
 endif;
 
@@ -2764,7 +2764,7 @@ 
 function wp_should_upgrade_global_tables() {
 
 	// Return false early if explicitly not upgrading
-	if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+	if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
 		return false;
 	}
 
@@ -2772,12 +2772,12 @@ 
 	$should_upgrade = true;
 
 	// Set to false if not on main network (does not matter if not multi-network)
-	if ( ! is_main_network() ) {
+	if ( ! is_main_network()) {
 		$should_upgrade = false;
 	}
 
 	// Set to false if not on main site of current network (does not matter if not multi-site)
-	if ( ! is_main_site() ) {
+	if ( ! is_main_site()) {
 		$should_upgrade = false;
 	}
 
@@ -2786,5 +2786,5 @@ 
 	 *
 	 * @param bool $should_upgrade Whether to run the upgrade routines on global tables.
 	 */
-	return apply_filters( 'wp_should_upgrade_global_tables', $should_upgrade );
+	return apply_filters('wp_should_upgrade_global_tables', $should_upgrade);
 }

Braces +368 added lines, -237 removed lines

@@ -9,8 +9,9 @@ 
  */
 
 /** Include user install customize script. */
-if ( file_exists(WP_CONTENT_DIR . '/install.php') )
+if ( file_exists(WP_CONTENT_DIR . '/install.php') ) {
 	require (WP_CONTENT_DIR . '/install.php');
+}
 
 /** WordPress Administration API */
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
@@ -37,8 +38,9 @@ 
  * @return array Array keys 'url', 'user_id', 'password', and 'password_message'.
  */
 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '', $language = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.6' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.6' );
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
@@ -59,8 +61,9 @@ 
 	update_option('siteurl', $guessurl);
 
 	// If not a public blog, don't ping.
-	if ( ! $public )
-		update_option('default_pingback_flag', 0);
+	if ( ! $public ) {
+			update_option('default_pingback_flag', 0);
+	}
 
 	/*
 	 * Create default user. If the user already exists, the user tables are
@@ -220,8 +223,9 @@ 
 <blockquote>The XYZ Doohickey Company was founded in 1971, and has been providing quality doohickeys to the public ever since. Located in Gotham City, XYZ employs over 2,000 people and does all kinds of awesome things for the Gotham community.</blockquote>
 
 As a new WordPress user, you should go to <a href=\"%s\">your dashboard</a> to delete this page and create new pages for your content. Have fun!" ), admin_url() );
-	if ( is_multisite() )
-		$first_page = get_site_option( 'first_page', $first_page );
+	if ( is_multisite() ) {
+			$first_page = get_site_option( 'first_page', $first_page );
+	}
 	$first_post_guid = get_option('home') . '/?page_id=2';
 	$wpdb->insert( $wpdb->posts, array(
 		'post_author' => $user_id,
@@ -252,10 +256,11 @@ 
 	update_option( 'widget_meta', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
 	update_option( 'sidebars_widgets', array ( 'wp_inactive_widgets' => array (), 'sidebar-1' => array ( 0 => 'search-2', 1 => 'recent-posts-2', 2 => 'recent-comments-2', 3 => 'archives-2', 4 => 'categories-2', 5 => 'meta-2', ), 'array_version' => 3 ) );
 
-	if ( ! is_multisite() )
-		update_user_meta( $user_id, 'show_welcome_panel', 1 );
-	elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) )
-		update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	if ( ! is_multisite() ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 1 );
+	} elseif ( ! is_super_admin( $user_id ) && ! metadata_exists( 'user', $user_id, 'show_welcome_panel' ) ) {
+			update_user_meta( $user_id, 'show_welcome_panel', 2 );
+	}
 
 	if ( is_multisite() ) {
 		// Flush rules to pick up the new page.
@@ -270,8 +275,9 @@ 
 		$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id != %d AND meta_key = %s", $user_id, $table_prefix.'capabilities') );
 
 		// Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.) TODO: Get previous_blog_id.
-		if ( !is_super_admin( $user_id ) && $user_id != 1 )
-			$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		if ( !is_super_admin( $user_id ) && $user_id != 1 ) {
+					$wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
+		}
 	}
 }
 endif;
@@ -407,26 +413,30 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
-	if ( ! is_blog_installed() )
-		return;
+	if ( ! is_blog_installed() ) {
+			return;
+	}
 
 	wp_check_mysql_version();
 	wp_cache_flush();
 	pre_schema_upgrade();
 	make_db_current_silent();
 	upgrade_all();
-	if ( is_multisite() && is_main_site() )
-		upgrade_network();
+	if ( is_multisite() && is_main_site() ) {
+			upgrade_network();
+	}
 	wp_cache_flush();
 
 	if ( is_multisite() ) {
-		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) )
-			$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
-		else
-			$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
+					$wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+		} else {
+					$wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+		}
 	}
 
 	/**
@@ -458,8 +468,9 @@ 
 	$wp_current_db_version = __get_option('db_version');
 
 	// We are up-to-date. Nothing to do.
-	if ( $wp_db_version == $wp_current_db_version )
-		return;
+	if ( $wp_db_version == $wp_current_db_version ) {
+			return;
+	}
 
 	// If the version is not set in the DB, try to guess the version.
 	if ( empty($wp_current_db_version) ) {
@@ -467,12 +478,14 @@ 
 
 		// If the template option exists, we have 1.5.
 		$template = __get_option('template');
-		if ( !empty($template) )
-			$wp_current_db_version = 2541;
+		if ( !empty($template) ) {
+					$wp_current_db_version = 2541;
+		}
 	}
 
-	if ( $wp_current_db_version < 6039 )
-		upgrade_230_options_table();
+	if ( $wp_current_db_version < 6039 ) {
+			upgrade_230_options_table();
+	}
 
 	populate_options();
 
@@ -483,74 +496,97 @@ 
 		upgrade_130();
 	}
 
-	if ( $wp_current_db_version < 3308 )
-		upgrade_160();
+	if ( $wp_current_db_version < 3308 ) {
+			upgrade_160();
+	}
 
-	if ( $wp_current_db_version < 4772 )
-		upgrade_210();
+	if ( $wp_current_db_version < 4772 ) {
+			upgrade_210();
+	}
 
-	if ( $wp_current_db_version < 4351 )
-		upgrade_old_slugs();
+	if ( $wp_current_db_version < 4351 ) {
+			upgrade_old_slugs();
+	}
 
-	if ( $wp_current_db_version < 5539 )
-		upgrade_230();
+	if ( $wp_current_db_version < 5539 ) {
+			upgrade_230();
+	}
 
-	if ( $wp_current_db_version < 6124 )
-		upgrade_230_old_tables();
+	if ( $wp_current_db_version < 6124 ) {
+			upgrade_230_old_tables();
+	}
 
-	if ( $wp_current_db_version < 7499 )
-		upgrade_250();
+	if ( $wp_current_db_version < 7499 ) {
+			upgrade_250();
+	}
 
-	if ( $wp_current_db_version < 7935 )
-		upgrade_252();
+	if ( $wp_current_db_version < 7935 ) {
+			upgrade_252();
+	}
 
-	if ( $wp_current_db_version < 8201 )
-		upgrade_260();
+	if ( $wp_current_db_version < 8201 ) {
+			upgrade_260();
+	}
 
-	if ( $wp_current_db_version < 8989 )
-		upgrade_270();
+	if ( $wp_current_db_version < 8989 ) {
+			upgrade_270();
+	}
 
-	if ( $wp_current_db_version < 10360 )
-		upgrade_280();
+	if ( $wp_current_db_version < 10360 ) {
+			upgrade_280();
+	}
 
-	if ( $wp_current_db_version < 11958 )
-		upgrade_290();
+	if ( $wp_current_db_version < 11958 ) {
+			upgrade_290();
+	}
 
-	if ( $wp_current_db_version < 15260 )
-		upgrade_300();
+	if ( $wp_current_db_version < 15260 ) {
+			upgrade_300();
+	}
 
-	if ( $wp_current_db_version < 19389 )
-		upgrade_330();
+	if ( $wp_current_db_version < 19389 ) {
+			upgrade_330();
+	}
 
-	if ( $wp_current_db_version < 20080 )
-		upgrade_340();
+	if ( $wp_current_db_version < 20080 ) {
+			upgrade_340();
+	}
 
-	if ( $wp_current_db_version < 22422 )
-		upgrade_350();
+	if ( $wp_current_db_version < 22422 ) {
+			upgrade_350();
+	}
 
-	if ( $wp_current_db_version < 25824 )
-		upgrade_370();
+	if ( $wp_current_db_version < 25824 ) {
+			upgrade_370();
+	}
 
-	if ( $wp_current_db_version < 26148 )
-		upgrade_372();
+	if ( $wp_current_db_version < 26148 ) {
+			upgrade_372();
+	}
 
-	if ( $wp_current_db_version < 26691 )
-		upgrade_380();
+	if ( $wp_current_db_version < 26691 ) {
+			upgrade_380();
+	}
 
-	if ( $wp_current_db_version < 29630 )
-		upgrade_400();
+	if ( $wp_current_db_version < 29630 ) {
+			upgrade_400();
+	}
 
-	if ( $wp_current_db_version < 33055 )
-		upgrade_430();
+	if ( $wp_current_db_version < 33055 ) {
+			upgrade_430();
+	}
 
-	if ( $wp_current_db_version < 33056 )
-		upgrade_431();
+	if ( $wp_current_db_version < 33056 ) {
+			upgrade_431();
+	}
 
-	if ( $wp_current_db_version < 35700 )
-		upgrade_440();
+	if ( $wp_current_db_version < 35700 ) {
+			upgrade_440();
+	}
 
-	if ( $wp_current_db_version < 36686 )
-		upgrade_450();
+	if ( $wp_current_db_version < 36686 ) {
+			upgrade_450();
+	}
 
 	maybe_disable_link_manager();
 
@@ -603,8 +639,10 @@ 
 			$done_posts[] = $done_id->post_id;
 		endforeach;
 		$catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
-	else:
+	else {
+		:
 		$catwhere = '';
+	}
 	endif;
 
 	$allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
@@ -721,10 +759,11 @@ 
 			$post_content = addslashes(deslash($post->post_content));
 			$post_title = addslashes(deslash($post->post_title));
 			$post_excerpt = addslashes(deslash($post->post_excerpt));
-			if ( empty($post->guid) )
-				$guid = get_permalink($post->ID);
-			else
-				$guid = $post->guid;
+			if ( empty($post->guid) ) {
+							$guid = get_permalink($post->ID);
+			} else {
+							$guid = $post->guid;
+			}
 
 			$wpdb->update( $wpdb->posts, compact('post_title', 'post_content', 'post_excerpt', 'guid'), array('ID' => $post->ID) );
 
@@ -806,34 +845,57 @@ 
 
 	$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
 	foreach ( $users as $user ) :
-		if ( !empty( $user->user_firstname ) )
-			update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
-		if ( !empty( $user->user_lastname ) )
-			update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
-		if ( !empty( $user->user_nickname ) )
-			update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
-		if ( !empty( $user->user_level ) )
-			update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
-		if ( !empty( $user->user_icq ) )
-			update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_aim ) )
-			update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
-		if ( !empty( $user->user_msn ) )
-			update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
-		if ( !empty( $user->user_yim ) )
-			update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
-		if ( !empty( $user->user_description ) )
-			update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		if ( !empty( $user->user_firstname ) ) {
+					update_user_meta( $user->ID, 'first_name', wp_slash($user->user_firstname) );
+		}
+		if ( !empty( $user->user_lastname ) ) {
+					update_user_meta( $user->ID, 'last_name', wp_slash($user->user_lastname) );
+		}
+		if ( !empty( $user->user_nickname ) ) {
+					update_user_meta( $user->ID, 'nickname', wp_slash($user->user_nickname) );
+		}
+		if ( !empty( $user->user_level ) ) {
+					update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
+		}
+		if ( !empty( $user->user_icq ) ) {
+					update_user_meta( $user->ID, 'icq', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_aim ) ) {
+					update_user_meta( $user->ID, 'aim', wp_slash($user->user_aim) );
+		}
+		if ( !empty( $user->user_msn ) ) {
+					update_user_meta( $user->ID, 'msn', wp_slash($user->user_msn) );
+		}
+		if ( !empty( $user->user_yim ) ) {
+					update_user_meta( $user->ID, 'yim', wp_slash($user->user_icq) );
+		}
+		if ( !empty( $user->user_description ) ) {
+					update_user_meta( $user->ID, 'description', wp_slash($user->user_description) );
+		}
 
 		if ( isset( $user->user_idmode ) ):
 			$idmode = $user->user_idmode;
-			if ($idmode == 'nickname') $id = $user->user_nickname;
-			if ($idmode == 'login') $id = $user->user_login;
-			if ($idmode == 'firstname') $id = $user->user_firstname;
-			if ($idmode == 'lastname') $id = $user->user_lastname;
-			if ($idmode == 'namefl') $id = $user->user_firstname.' '.$user->user_lastname;
-			if ($idmode == 'namelf') $id = $user->user_lastname.' '.$user->user_firstname;
-			if (!$idmode) $id = $user->user_nickname;
+			if ($idmode == 'nickname') {
+				$id = $user->user_nickname;
+			}
+			if ($idmode == 'login') {
+				$id = $user->user_login;
+			}
+			if ($idmode == 'firstname') {
+				$id = $user->user_firstname;
+			}
+			if ($idmode == 'lastname') {
+				$id = $user->user_lastname;
+			}
+			if ($idmode == 'namefl') {
+				$id = $user->user_firstname.' '.$user->user_lastname;
+			}
+			if ($idmode == 'namelf') {
+				$id = $user->user_lastname.' '.$user->user_firstname;
+			}
+			if (!$idmode) {
+				$id = $user->user_nickname;
+			}
 			$wpdb->update( $wpdb->users, array('display_name' => $id), array('ID' => $user->ID) );
 		endif;
 
@@ -848,15 +910,17 @@ 
 	endforeach;
 	$old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_user_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	foreach ( $old_user_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->users DROP $old");
+	}
 	$wpdb->show_errors();
 
 	// Populate comment_count field of posts table.
 	$comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-	if ( is_array( $comments ) )
-		foreach ($comments as $comment)
+	if ( is_array( $comments ) ) {
+			foreach ($comments as $comment)
 			$wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
+	}
 
 	/*
 	 * Some alpha versions used a post status of object instead of attachment
@@ -871,8 +935,9 @@ 
 										 array( 'ID' => $object->ID ) );
 
 			$meta = get_post_meta($object->ID, 'imagedata', true);
-			if ( ! empty($meta['file']) )
-				update_attached_file( $object->ID, $meta['file'] );
+			if ( ! empty($meta['file']) ) {
+							update_attached_file( $object->ID, $meta['file'] );
+			}
 		}
 	}
 }
@@ -893,8 +958,10 @@ 
 		// Update status and type.
 		$posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
 
-		if ( ! empty($posts) ) foreach ($posts as $post) {
+		if ( ! empty($posts) ) {
+			foreach ($posts as $post) {
 			$status = $post->post_status;
+		}
 			$type = 'post';
 
 			if ( 'static' == $status ) {
@@ -919,9 +986,10 @@ 
 		$wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
 
 		$posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
-		if ( !empty($posts) )
-			foreach ( $posts as $post )
+		if ( !empty($posts) ) {
+					foreach ( $posts as $post )
 				wp_schedule_single_event(mysql2date('U', $post->post_date, false), 'publish_future_post', array($post->ID));
+		}
 	}
 }
 
@@ -1007,19 +1075,22 @@ 
 	}
 
 	$select = 'post_id, category_id';
-	if ( $have_tags )
-		$select .= ', rel_type';
+	if ( $have_tags ) {
+			$select .= ', rel_type';
+	}
 
 	$posts = $wpdb->get_results("SELECT $select FROM $wpdb->post2cat GROUP BY post_id, category_id");
 	foreach ( $posts as $post ) {
 		$post_id = (int) $post->post_id;
 		$term_id = (int) $post->category_id;
 		$taxonomy = 'category';
-		if ( !empty($post->rel_type) && 'tag' == $post->rel_type)
-			$taxonomy = 'tag';
+		if ( !empty($post->rel_type) && 'tag' == $post->rel_type) {
+					$taxonomy = 'tag';
+		}
 		$tt_id = $tt_ids[$term_id][$taxonomy];
-		if ( empty($tt_id) )
-			continue;
+		if ( empty($tt_id) ) {
+					continue;
+		}
 
 		$wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
 	}
@@ -1061,15 +1132,19 @@ 
 
 		// Associate links to cats.
 		$links = $wpdb->get_results("SELECT link_id, link_category FROM $wpdb->links");
-		if ( !empty($links) ) foreach ( $links as $link ) {
+		if ( !empty($links) ) {
+			foreach ( $links as $link ) {
 			if ( 0 == $link->link_category )
 				continue;
-			if ( ! isset($link_cat_id_map[$link->link_category]) )
-				continue;
+		}
+			if ( ! isset($link_cat_id_map[$link->link_category]) ) {
+							continue;
+			}
 			$term_id = $link_cat_id_map[$link->link_category];
 			$tt_id = $tt_ids[$term_id];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link->link_id, 'term_taxonomy_id' => $tt_id) );
 		}
@@ -1083,8 +1158,9 @@ 
 			$term_id = (int) $link->category_id;
 			$taxonomy = 'link_category';
 			$tt_id = $tt_ids[$term_id][$taxonomy];
-			if ( empty($tt_id) )
-				continue;
+			if ( empty($tt_id) ) {
+							continue;
+			}
 			$wpdb->insert( $wpdb->term_relationships, array('object_id' => $link_id, 'term_taxonomy_id' => $tt_id) );
 		}
 	}
@@ -1097,10 +1173,11 @@ 
 	// Recalculate all counts
 	$terms = $wpdb->get_results("SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy");
 	foreach ( (array) $terms as $term ) {
-		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) )
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
-		else
-			$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		if ( ('post_tag' == $term->taxonomy) || ('category' == $term->taxonomy) ) {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		} else {
+					$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id) );
+		}
 		$wpdb->update( $wpdb->term_taxonomy, array('count' => $count), array('term_taxonomy_id' => $term->term_taxonomy_id) );
 	}
 }
@@ -1117,8 +1194,9 @@ 
 	global $wpdb;
 	$old_options_fields = array( 'option_can_override', 'option_type', 'option_width', 'option_height', 'option_description', 'option_admin_level' );
 	$wpdb->hide_errors();
-	foreach ( $old_options_fields as $old )
-		$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	foreach ( $old_options_fields as $old ) {
+			$wpdb->query("ALTER TABLE $wpdb->options DROP $old");
+	}
 	$wpdb->show_errors();
 }
 
@@ -1193,9 +1271,10 @@ 
 function upgrade_260() {
 	global $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8000 )
-		populate_roles_260();
-}
+	if ( $wp_current_db_version < 8000 ) {
+			populate_roles_260();
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.7.
@@ -1209,13 +1288,15 @@ 
 function upgrade_270() {
 	global $wpdb, $wp_current_db_version;
 
-	if ( $wp_current_db_version < 8980 )
-		populate_roles_270();
+	if ( $wp_current_db_version < 8980 ) {
+			populate_roles_270();
+	}
 
 	// Update post_date for unpublished posts with empty timestamp
-	if ( $wp_current_db_version < 8921 )
-		$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
-}
+	if ( $wp_current_db_version < 8921 ) {
+			$wpdb->query( "UPDATE $wpdb->posts SET post_date = post_modified WHERE post_date = '0000-00-00 00:00:00'" );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 2.8.
@@ -1229,15 +1310,17 @@ 
 function upgrade_280() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 10360 )
-		populate_roles_280();
+	if ( $wp_current_db_version < 10360 ) {
+			populate_roles_280();
+	}
 	if ( is_multisite() ) {
 		$start = 0;
 		while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->option_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->option_value ) {
 					update_option( $row->option_name, $value );
 				}
@@ -1280,11 +1363,13 @@ 
 function upgrade_300() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 15093 )
-		populate_roles_300();
+	if ( $wp_current_db_version < 15093 ) {
+			populate_roles_300();
+	}
 
-	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false )
-		add_site_option( 'siteurl', '' );
+	if ( $wp_current_db_version < 14139 && is_multisite() && is_main_site() && ! defined( 'MULTISITE' ) && get_site_option( 'siteurl' ) === false ) {
+			add_site_option( 'siteurl', '' );
+	}
 
 	// 3.0 screen options key name changes.
 	if ( wp_should_upgrade_global_tables() ) {
@@ -1332,23 +1417,26 @@ 
 		$wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
 	}
 
-	if ( $wp_current_db_version >= 11548 )
-		return;
+	if ( $wp_current_db_version >= 11548 ) {
+			return;
+	}
 
 	$sidebars_widgets = get_option( 'sidebars_widgets', array() );
 	$_sidebars_widgets = array();
 
-	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) )
-		$sidebars_widgets['array_version'] = 3;
-	elseif ( !isset($sidebars_widgets['array_version']) )
-		$sidebars_widgets['array_version'] = 1;
+	if ( isset($sidebars_widgets['wp_inactive_widgets']) || empty($sidebars_widgets) ) {
+			$sidebars_widgets['array_version'] = 3;
+	} elseif ( !isset($sidebars_widgets['array_version']) ) {
+			$sidebars_widgets['array_version'] = 1;
+	}
 
 	switch ( $sidebars_widgets['array_version'] ) {
 		case 1 :
-			foreach ( (array) $sidebars_widgets as $index => $sidebar )
-			if ( is_array($sidebar) )
+			foreach ( (array) $sidebars_widgets as $index => $sidebar ) {
+						if ( is_array($sidebar) )
 			foreach ( (array) $sidebar as $i => $name ) {
 				$id = strtolower($name);
+			}
 				if ( isset($wp_registered_widgets[$id]) ) {
 					$_sidebars_widgets[$index][$i] = $id;
 					continue;
@@ -1373,8 +1461,9 @@ 
 					}
 				}
 
-				if ( $found )
-					continue;
+				if ( $found ) {
+									continue;
+				}
 
 				unset($_sidebars_widgets[$index][$i]);
 			}
@@ -1438,14 +1527,17 @@ 
 function upgrade_350() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
+	if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 1 );
+	}
+	// Previously set to 0 by populate_options()
 
 	if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
 		$meta_keys = array();
 		foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
-			if ( false !== strpos( $name, '-' ) )
-			$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			if ( false !== strpos( $name, '-' ) ) {
+						$meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
+			}
 		}
 		if ( $meta_keys ) {
 			$meta_keys = implode( "', '", $meta_keys );
@@ -1453,9 +1545,10 @@ 
 		}
 	}
 
-	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) )
-		wp_delete_term( $term->term_id, 'post_format' );
-}
+	if ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
+			wp_delete_term( $term->term_id, 'post_format' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.
@@ -1467,9 +1560,10 @@ 
  */
 function upgrade_370() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 25824 )
-		wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
-}
+	if ( $wp_current_db_version < 25824 ) {
+			wp_clear_scheduled_hook( 'wp_auto_updates_maybe_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.7.2.
@@ -1482,9 +1576,10 @@ 
  */
 function upgrade_372() {
 	global $wp_current_db_version;
-	if ( $wp_current_db_version < 26148 )
-		wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
-}
+	if ( $wp_current_db_version < 26148 ) {
+			wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+	}
+	}
 
 /**
  * Execute changes made in WordPress 3.8.0.
@@ -1719,10 +1814,11 @@ 
 		$wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
 		$active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
 		if ( $wpmu_sitewide_plugins ) {
-			if ( !$active_sitewide_plugins )
-				$sitewide_plugins = (array) $wpmu_sitewide_plugins;
-			else
-				$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			if ( !$active_sitewide_plugins ) {
+							$sitewide_plugins = (array) $wpmu_sitewide_plugins;
+			} else {
+							$sitewide_plugins = array_merge( (array) $active_sitewide_plugins, (array) $wpmu_sitewide_plugins );
+			}
 
 			update_site_option( 'active_sitewide_plugins', $sitewide_plugins );
 		}
@@ -1733,8 +1829,9 @@ 
 		while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
 			foreach ( $rows as $row ) {
 				$value = $row->meta_value;
-				if ( !@unserialize( $value ) )
-					$value = stripslashes( $value );
+				if ( !@unserialize( $value ) ) {
+									$value = stripslashes( $value );
+				}
 				if ( $value !== $row->meta_value ) {
 					update_site_option( $row->meta_key, $value );
 				}
@@ -1744,16 +1841,19 @@ 
 	}
 
 	// 3.0
-	if ( $wp_current_db_version < 13576 )
-		update_site_option( 'global_terms_enabled', '1' );
+	if ( $wp_current_db_version < 13576 ) {
+			update_site_option( 'global_terms_enabled', '1' );
+	}
 
 	// 3.3
-	if ( $wp_current_db_version < 19390 )
-		update_site_option( 'initial_db_version', $wp_current_db_version );
+	if ( $wp_current_db_version < 19390 ) {
+			update_site_option( 'initial_db_version', $wp_current_db_version );
+	}
 
 	if ( $wp_current_db_version < 19470 ) {
-		if ( false === get_site_option( 'active_sitewide_plugins' ) )
-			update_site_option( 'active_sitewide_plugins', array() );
+		if ( false === get_site_option( 'active_sitewide_plugins' ) ) {
+					update_site_option( 'active_sitewide_plugins', array() );
+		}
 	}
 
 	// 3.4
@@ -1765,8 +1865,9 @@ 
 			$converted = array();
 			$themes = wp_get_themes();
 			foreach ( $themes as $stylesheet => $theme_data ) {
-				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) )
-					$converted[ $stylesheet ] = true;
+				if ( isset( $allowed_themes[ $theme_data->get('Name') ] ) ) {
+									$converted[ $stylesheet ] = true;
+				}
 			}
 			update_site_option( 'allowedthemes', $converted );
 			delete_site_option( 'allowed_themes' );
@@ -1774,8 +1875,9 @@ 
 	}
 
 	// 3.5
-	if ( $wp_current_db_version < 21823 )
-		update_site_option( 'ms_files_rewriting', '1' );
+	if ( $wp_current_db_version < 21823 ) {
+			update_site_option( 'ms_files_rewriting', '1' );
+	}
 
 	// 3.5.2
 	if ( $wp_current_db_version < 24448 ) {
@@ -2006,8 +2108,9 @@ 
 	$all_options = new stdClass;
 	if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
 		foreach ( $options as $option ) {
-			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name )
-				$option->option_value = untrailingslashit( $option->option_value );
+			if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
+							$option->option_value = untrailingslashit( $option->option_value );
+			}
 			$all_options->{$option->option_name} = stripslashes( $option->option_value );
 		}
 	}
@@ -2029,19 +2132,23 @@ 
 function __get_option($setting) {
 	global $wpdb;
 
-	if ( $setting == 'home' && defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 
-	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 
 	$option = $wpdb->get_var( $wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
 
-	if ( 'home' == $setting && '' == $option )
-		return __get_option( 'siteurl' );
+	if ( 'home' == $setting && '' == $option ) {
+			return __get_option( 'siteurl' );
+	}
 
-	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting )
-		$option = untrailingslashit( $option );
+	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
+			$option = untrailingslashit( $option );
+	}
 
 	return maybe_unserialize( $option );
 }
@@ -2094,8 +2201,9 @@ 
 function dbDelta( $queries = '', $execute = true ) {
 	global $wpdb;
 
-	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) )
-	    $queries = wp_get_db_schema( $queries );
+	if ( in_array( $queries, array( '', 'all', 'blog', 'global', 'ms_global' ), true ) ) {
+		    $queries = wp_get_db_schema( $queries );
+	}
 
 	// Separate individual queries into an array
 	if ( !is_array($queries) ) {
@@ -2167,8 +2275,9 @@ 
 		$tablefields = $wpdb->get_results("DESCRIBE {$table};");
 		$wpdb->suppress_errors( $suppress );
 
-		if ( ! $tablefields )
-			continue;
+		if ( ! $tablefields ) {
+					continue;
+		}
 
 		// Clear the field and index arrays.
 		$cfields = $indices = array();
@@ -2292,7 +2401,9 @@ 
 
 				// For each column in the index.
 				foreach ($index_data['columns'] as $column_data) {
-					if ($index_columns != '') $index_columns .= ',';
+					if ($index_columns != '') {
+						$index_columns .= ',';
+					}
 
 					// Add the field to the column list string.
 					$index_columns .= $column_data['fieldname'];
@@ -2361,7 +2472,9 @@ 
 function make_db_current( $tables = 'all' ) {
 	$alterations = dbDelta( $tables );
 	echo "<ol>\n";
-	foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
+	foreach ($alterations as $alteration) {
+		echo "<li>$alteration</li>\n";
+	}
 	echo "</ol>\n";
 }
 
@@ -2396,8 +2509,9 @@ 
 	$home_path = get_home_path();
 	$site_dir = WP_CONTENT_DIR . "/themes/$template";
 
-	if (! file_exists("$home_path/index.php"))
-		return false;
+	if (! file_exists("$home_path/index.php")) {
+			return false;
+	}
 
 	/*
 	 * Copy files from the old locations to the site theme.
@@ -2406,25 +2520,28 @@ 
 	$files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 
 	foreach ($files as $oldfile => $newfile) {
-		if ($oldfile == 'index.php')
-			$oldpath = $home_path;
-		else
-			$oldpath = ABSPATH;
+		if ($oldfile == 'index.php') {
+					$oldpath = $home_path;
+		} else {
+					$oldpath = ABSPATH;
+		}
 
 		// Check to make sure it's not a new index.
 		if ($oldfile == 'index.php') {
 			$index = implode('', file("$oldpath/$oldfile"));
 			if (strpos($index, 'WP_USE_THEMES') !== false) {
-				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
-					return false;
+				if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile")) {
+									return false;
+				}
 
 				// Don't copy anything.
 				continue;
 			}
 		}
 
-		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile"))
-			return false;
+		if (! @copy("$oldpath/$oldfile", "$site_dir/$newfile")) {
+					return false;
+		}
 
 		chmod("$site_dir/$newfile", 0777);
 
@@ -2434,8 +2551,9 @@ 
 			$f = fopen("$site_dir/$newfile", 'w');
 
 			foreach ($lines as $line) {
-				if (preg_match('/require.*wp-blog-header/', $line))
-					$line = '//' . $line;
+				if (preg_match('/require.*wp-blog-header/', $line)) {
+									$line = '//' . $line;
+				}
 
 				// Update stylesheet references.
 				$line = str_replace("<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line);
@@ -2485,10 +2603,12 @@ 
 	$theme_dir = @ opendir($default_dir);
 	if ($theme_dir) {
 		while(($theme_file = readdir( $theme_dir )) !== false) {
-			if (is_dir("$default_dir/$theme_file"))
-				continue;
-			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file"))
-				return;
+			if (is_dir("$default_dir/$theme_file")) {
+							continue;
+			}
+			if (! @copy("$default_dir/$theme_file", "$site_dir/$theme_file")) {
+							return;
+			}
 			chmod("$site_dir/$theme_file", 0777);
 		}
 	}
@@ -2500,11 +2620,17 @@ 
 		$f = fopen("$site_dir/style.css", 'w');
 
 		foreach ($stylelines as $line) {
-			if (strpos($line, 'Theme Name:') !== false) $line = 'Theme Name: ' . $theme_name;
-			elseif (strpos($line, 'Theme URI:') !== false) $line = 'Theme URI: ' . __get_option('url');
-			elseif (strpos($line, 'Description:') !== false) $line = 'Description: Your theme.';
-			elseif (strpos($line, 'Version:') !== false) $line = 'Version: 1';
-			elseif (strpos($line, 'Author:') !== false) $line = 'Author: You';
+			if (strpos($line, 'Theme Name:') !== false) {
+				$line = 'Theme Name: ' . $theme_name;
+			} elseif (strpos($line, 'Theme URI:') !== false) {
+				$line = 'Theme URI: ' . __get_option('url');
+			} elseif (strpos($line, 'Description:') !== false) {
+				$line = 'Description: Your theme.';
+			} elseif (strpos($line, 'Version:') !== false) {
+				$line = 'Version: 1';
+			} elseif (strpos($line, 'Author:') !== false) {
+				$line = 'Author: You';
+			}
 			fwrite($f, $line . "\n");
 		}
 		fclose($f);
@@ -2519,10 +2645,12 @@ 
 	$images_dir = @ opendir("$default_dir/images");
 	if ($images_dir) {
 		while(($image = readdir($images_dir)) !== false) {
-			if (is_dir("$default_dir/images/$image"))
-				continue;
-			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image"))
-				return;
+			if (is_dir("$default_dir/images/$image")) {
+							continue;
+			}
+			if (! @copy("$default_dir/images/$image", "$site_dir/images/$image")) {
+							return;
+			}
 			chmod("$site_dir/images/$image", 0777);
 		}
 	}
@@ -2565,9 +2693,10 @@ 
 			return false;
 		}
 	} else {
-		if (! make_site_theme_from_default($theme_name, $template))
-			// TODO: rm -rf the site theme directory.
+		if (! make_site_theme_from_default($theme_name, $template)) {
+					// TODO: rm -rf the site theme directory.
 			return false;
+		}
 	}
 
 	// Make the new site theme active.
@@ -2618,9 +2747,10 @@ 
 function wp_check_mysql_version() {
 	global $wpdb;
 	$result = $wpdb->check_database_version();
-	if ( is_wp_error( $result ) )
-		die( $result->get_error_message() );
-}
+	if ( is_wp_error( $result ) ) {
+			die( $result->get_error_message() );
+	}
+	}
 
 /**
  * Disables the Automattic widgets plugin, which was merged into core.
@@ -2650,9 +2780,10 @@ 
 function maybe_disable_link_manager() {
 	global $wp_current_db_version, $wpdb;
 
-	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
-		update_option( 'link_manager_enabled', 0 );
-}
+	if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) ) {
+			update_option( 'link_manager_enabled', 0 );
+	}
+	}
 
 /**
  * Runs before the schema is upgraded.

src/wp-admin/includes/update.php

Switch Indentation +7 added lines, -7 removed lines

@@ -199,15 +199,15 @@
 		$cur->response = '';
 
 	switch ( $cur->response ) {
-	case 'development' :
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		case 'development' :
+			return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
 
-	case 'upgrade' :
-		return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		case 'upgrade' :
+			return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
 
-	case 'latest' :
-	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		case 'latest' :
+		default :
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 }
 

Spacing +151 added lines, -151 removed lines

@@ -13,10 +13,10 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
+	if ( ! is_array($updates))
 		return false;
-	if ( empty( $updates ) )
-		return (object) array( 'response' => 'latest' );
+	if (empty($updates))
+		return (object) array('response' => 'latest');
 	return $updates[0];
 }
 
@@ -27,31 +27,31 @@ 
  * 	                     set $options['available'] to false to skip not-dismissed updates.
  * @return array|false Array of the update objects on success, false on failure.
  */
-function get_core_updates( $options = array() ) {
-	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
-	$dismissed = get_site_option( 'dismissed_update_core' );
+function get_core_updates($options = array()) {
+	$options = array_merge(array('available' => true, 'dismissed' => false), $options);
+	$dismissed = get_site_option('dismissed_update_core');
 
-	if ( ! is_array( $dismissed ) )
+	if ( ! is_array($dismissed))
 		$dismissed = array();
 
-	$from_api = get_site_transient( 'update_core' );
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
 	$result = array();
-	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
+	foreach ($updates as $update) {
+		if ($update->response == 'autoupdate')
 			continue;
 
-		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
-			if ( $options['dismissed'] ) {
+		if (array_key_exists($update->current.'|'.$update->locale, $dismissed)) {
+			if ($options['dismissed']) {
 				$update->dismissed = true;
 				$result[] = $update;
 			}
 		} else {
-			if ( $options['available'] ) {
+			if ($options['available']) {
 				$update->dismissed = false;
 				$result[] = $update;
 			}
@@ -70,22 +70,22 @@ 
  * @return array|false False on failure, otherwise the core update offering.
  */
 function find_core_auto_update() {
-	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
+	$updates = get_site_transient('update_core');
+	if ( ! $updates || empty($updates->updates))
 		return false;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
 	$auto_update = false;
 	$upgrader = new WP_Automatic_Updater;
-	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
+	foreach ($updates->updates as $update) {
+		if ('autoupdate' != $update->response)
 			continue;
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
+		if ( ! $upgrader->should_update('core', $update, ABSPATH))
 			continue;
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
+		if ( ! $auto_update || version_compare($update->current, $auto_update->current, '>'))
 			$auto_update = $update;
 	}
 	return $auto_update;
@@ -100,29 +100,29 @@ 
  * @param string $locale  Locale to query.
  * @return bool|array False on failure. An array of checksums on success.
  */
-function get_core_checksums( $version, $locale ) {
-	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
+function get_core_checksums($version, $locale) {
+	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?'.http_build_query(compact('version', 'locale'), null, '&');
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
 	$options = array(
-		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+		'timeout' => ((defined('DOING_CRON') && DOING_CRON) ? 30 : 3),
 	);
 
-	$response = wp_remote_get( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
-		trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-		$response = wp_remote_get( $http_url, $options );
+	$response = wp_remote_get($url, $options);
+	if ($ssl && is_wp_error($response)) {
+		trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+		$response = wp_remote_get($http_url, $options);
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+	if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 		return false;
 
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
+	$body = trim(wp_remote_retrieve_body($response));
+	$body = json_decode($body, true);
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
+	if ( ! is_array($body) || ! isset($body['checksums']) || ! is_array($body['checksums']))
 		return false;
 
 	return $body['checksums'];
@@ -133,10 +133,10 @@ 
  * @param object $update
  * @return bool
  */
-function dismiss_core_update( $update ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$dismissed[ $update->current . '|' . $update->locale ] = true;
-	return update_site_option( 'dismissed_update_core', $dismissed );
+function dismiss_core_update($update) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$dismissed[$update->current.'|'.$update->locale] = true;
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -145,15 +145,15 @@ 
  * @param string $locale
  * @return bool
  */
-function undismiss_core_update( $version, $locale ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$key = $version . '|' . $locale;
+function undismiss_core_update($version, $locale) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$key = $version.'|'.$locale;
 
-	if ( ! isset( $dismissed[$key] ) )
+	if ( ! isset($dismissed[$key]))
 		return false;
 
-	unset( $dismissed[$key] );
-	return update_site_option( 'dismissed_update_core', $dismissed );
+	unset($dismissed[$key]);
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -162,15 +162,15 @@ 
  * @param string $locale
  * @return object|false
  */
-function find_core_update( $version, $locale ) {
-	$from_api = get_site_transient( 'update_core' );
+function find_core_update($version, $locale) {
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
-	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
+	foreach ($updates as $update) {
+		if ($update->current == $version && $update->locale == $locale)
 			return $update;
 	}
 	return false;
@@ -181,33 +181,33 @@ 
  * @param string $msg
  * @return string
  */
-function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+function core_update_footer($msg = '') {
+	if ( ! current_user_can('update_core'))
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
+	if ( ! is_object($cur))
 		$cur = new stdClass;
 
-	if ( ! isset( $cur->current ) )
+	if ( ! isset($cur->current))
 		$cur->current = '';
 
-	if ( ! isset( $cur->url ) )
+	if ( ! isset($cur->url))
 		$cur->url = '';
 
-	if ( ! isset( $cur->response ) )
+	if ( ! isset($cur->response))
 		$cur->response = '';
 
-	switch ( $cur->response ) {
+	switch ($cur->response) {
 	case 'development' :
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		return sprintf(__('You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.'), get_bloginfo('version', 'display'), network_admin_url('update-core.php'));
 
 	case 'upgrade' :
-		return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		return '<strong><a href="'.network_admin_url('update-core.php').'">'.sprintf(__('Get Version %s'), $cur->current).'</a></strong>';
 
 	case 'latest' :
 	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 	}
 }
 
@@ -217,23 +217,23 @@ 
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
+	if (is_multisite() && ! current_user_can('update_core'))
 		return false;
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
+	if ('update-core.php' == $pagenow)
 		return;
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
+	if ( ! isset($cur->response) || $cur->response != 'upgrade')
 		return false;
 
-	if ( current_user_can('update_core') ) {
-		$msg = sprintf( __( '<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s" aria-label="Please update WordPress now">Please update now</a>.' ), $cur->current, network_admin_url( 'update-core.php' ) );
+	if (current_user_can('update_core')) {
+		$msg = sprintf(__('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s" aria-label="Please update WordPress now">Please update now</a>.'), $cur->current, network_admin_url('update-core.php'));
 	} else {
-		$msg = sprintf( __('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
+		$msg = sprintf(__('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current);
 	}
 	echo "<div class='update-nag'>$msg</div>";
 }
@@ -241,21 +241,21 @@ 
 // Called directly from dashboard
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) ) {
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+	if (current_user_can('switch_themes')) {
+		$theme_name = sprintf('<a href="themes.php">%1$s</a>', $theme_name);
 	}
 
 	$msg = '';
 
-	if ( current_user_can('update_core') ) {
+	if (current_user_can('update_core')) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		if (isset($cur->response) && $cur->response == 'upgrade')
+			$msg .= '<a href="'.network_admin_url('update-core.php').'" class="button" aria-describedby="wp-version">'.sprintf(__('Update to %s'), $cur->current ? $cur->current : __('Latest')).'</a> ';
 	}
 
 	/* translators: 1: version number, 2: theme name */
-	$content = __( 'WordPress %1$s running %2$s theme.' );
+	$content = __('WordPress %1$s running %2$s theme.');
 
 	/**
 	 * Filter the text displayed in the 'At a Glance' dashboard widget.
@@ -266,9 +266,9 @@ 
 	 *
 	 * @param string $content Default text.
 	 */
-	$content = apply_filters( 'update_right_now_text', $content );
+	$content = apply_filters('update_right_now_text', $content);
 
-	$msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+	$msg .= sprintf('<span id="wp-version">'.$content.'</span>', get_bloginfo('version', 'display'), $theme_name);
 
 	echo "<p id='wp-version-message'>$msg</p>";
 }
@@ -281,11 +281,11 @@ 
 function get_plugin_updates() {
 	$all_plugins = get_plugins();
 	$upgrade_plugins = array();
-	$current = get_site_transient( 'update_plugins' );
-	foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
-		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ] = (object) $plugin_data;
-			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
+	$current = get_site_transient('update_plugins');
+	foreach ((array) $all_plugins as $plugin_file => $plugin_data) {
+		if (isset($current->response[$plugin_file])) {
+			$upgrade_plugins[$plugin_file] = (object) $plugin_data;
+			$upgrade_plugins[$plugin_file]->update = $current->response[$plugin_file];
 		}
 	}
 
@@ -296,14 +296,14 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
+	if ( ! current_user_can('update_plugins'))
 		return;
 
-	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset($plugins->response) && is_array($plugins->response) ) {
-		$plugins = array_keys( $plugins->response );
-		foreach ( $plugins as $plugin_file ) {
-			add_action( "after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2 );
+	$plugins = get_site_transient('update_plugins');
+	if (isset($plugins->response) && is_array($plugins->response)) {
+		$plugins = array_keys($plugins->response);
+		foreach ($plugins as $plugin_file) {
+			add_action("after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2);
 		}
 	}
 }
@@ -314,58 +314,58 @@ 
  * @param array  $plugin_data
  * @return false|void
  */
-function wp_plugin_update_row( $file, $plugin_data ) {
-	$current = get_site_transient( 'update_plugins' );
-	if ( !isset( $current->response[ $file ] ) )
+function wp_plugin_update_row($file, $plugin_data) {
+	$current = get_site_transient('update_plugins');
+	if ( ! isset($current->response[$file]))
 		return false;
 
-	$r = $current->response[ $file ];
+	$r = $current->response[$file];
 
-	$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
-	$plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
+	$plugins_allowedtags = array('a' => array('href' => array(), 'title' => array()), 'abbr' => array('title' => array()), 'acronym' => array('title' => array()), 'code' => array(), 'em' => array(), 'strong' => array());
+	$plugin_name = wp_kses($plugin_data['Name'], $plugins_allowedtags);
 
-	$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&section=changelog&TB_iframe=true&width=600&height=800');
+	$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin='.$r->slug.'&section=changelog&TB_iframe=true&width=600&height=800');
 
 	$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 
-	if ( is_network_admin() || !is_multisite() ) {
-		if ( is_network_admin() ) {
-			$active_class = is_plugin_active_for_network( $file ) ? ' active': '';
+	if (is_network_admin() || ! is_multisite()) {
+		if (is_network_admin()) {
+			$active_class = is_plugin_active_for_network($file) ? ' active' : '';
 		} else {
-			$active_class = is_plugin_active( $file ) ? ' active' : '';
+			$active_class = is_plugin_active($file) ? ' active' : '';
 		}
 
-		echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $r->slug . '-update' ) . '" data-slug="' . esc_attr( $r->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message">';
+		echo '<tr class="plugin-update-tr'.$active_class.'" id="'.esc_attr($r->slug.'-update').'" data-slug="'.esc_attr($r->slug).'" data-plugin="'.esc_attr($file).'"><td colspan="'.esc_attr($wp_list_table->get_column_count()).'" class="plugin-update colspanchange"><div class="update-message">';
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
+		if ( ! current_user_can('update_plugins')) {
 			/* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				/* translators: 1: plugin name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $r->new_version)),
 				$r->new_version
 			);
-		} elseif ( empty( $r->package ) ) {
+		} elseif (empty($r->package)) {
 			/* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				/* translators: 1: plugin name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $r->new_version)),
 				$r->new_version
 			);
 		} else {
 			/* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				/* translators: 1: plugin name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $r->new_version)),
 				$r->new_version,
-				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
+				wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$file, 'upgrade-plugin_'.$file),
 				/* translators: %s: plugin name */
-				esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
+				esc_attr(sprintf(__('Update %s now'), $plugin_name))
 			);
 		}
 		/**
@@ -403,7 +403,7 @@ 
 	 	 *     @type string $package      Plugin update package URL.
 	 	 * }
 		 */
-		do_action( "in_plugin_update_message-{$file}", $plugin_data, $r );
+		do_action("in_plugin_update_message-{$file}", $plugin_data, $r);
 
 		echo '</div></td></tr>';
 	}
@@ -416,13 +416,13 @@ 
 function get_theme_updates() {
 	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) )
+	if ( ! isset($current->response))
 		return array();
 
 	$update_themes = array();
-	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
-		$update_themes[ $stylesheet ]->update = $data;
+	foreach ($current->response as $stylesheet => $data) {
+		$update_themes[$stylesheet] = wp_get_theme($stylesheet);
+		$update_themes[$stylesheet]->update = $data;
 	}
 
 	return $update_themes;
@@ -432,15 +432,15 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return;
 
-	$themes = get_site_transient( 'update_themes' );
-	if ( isset($themes->response) && is_array($themes->response) ) {
-		$themes = array_keys( $themes->response );
+	$themes = get_site_transient('update_themes');
+	if (isset($themes->response) && is_array($themes->response)) {
+		$themes = array_keys($themes->response);
 
-		foreach ( $themes as $theme ) {
-			add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
+		foreach ($themes as $theme) {
+			add_action("after_theme_row_$theme", 'wp_theme_update_row', 10, 2);
 		}
 	}
 }
@@ -451,51 +451,51 @@ 
  * @param WP_Theme $theme
  * @return false|void
  */
-function wp_theme_update_row( $theme_key, $theme ) {
-	$current = get_site_transient( 'update_themes' );
-	if ( !isset( $current->response[ $theme_key ] ) )
+function wp_theme_update_row($theme_key, $theme) {
+	$current = get_site_transient('update_themes');
+	if ( ! isset($current->response[$theme_key]))
 		return false;
 
-	$r = $current->response[ $theme_key ];
+	$r = $current->response[$theme_key];
 
 	$theme_name = $theme['Name'];
 
-	$details_url = add_query_arg( array( 'TB_iframe' => 'true', 'width' => 1024, 'height' => 800 ), $current->response[ $theme_key ]['url'] );
+	$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $current->response[$theme_key]['url']);
 
 	$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
-	$active = $theme->is_allowed( 'network' ) ? ' active': '';
+	$active = $theme->is_allowed('network') ? ' active' : '';
 
-	echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
-	if ( ! current_user_can('update_themes') ) {
+	echo '<tr class="plugin-update-tr'.$active.'" id="'.esc_attr($theme->get_stylesheet().'-update').'" data-slug="'.esc_attr($theme->get_stylesheet()).'"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
+	if ( ! current_user_can('update_themes')) {
 		/* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.'),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.'),
 			$theme_name,
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: theme name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $r['new_version'])),
 			$r['new_version']
 		);
-	} elseif ( empty( $r['package'] ) ) {
+	} elseif (empty($r['package'])) {
 		/* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'),
 			$theme_name,
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: theme name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $r['new_version'])),
 			$r['new_version']
 		);
 	} else {
 		/* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.'),
 			$theme_name,
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: theme name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $r['new_version'])),
 			$r['new_version'],
-			wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
+			wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=').$theme_key, 'upgrade-theme_'.$theme_key),
 			/* translators: %s: theme name */
-			esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) )
+			esc_attr(sprintf(__('Update %s now'), $theme_name))
 		);
 	}
 	/**
@@ -516,7 +516,7 @@ 
 	 *     @type string $package     Theme update package URL.
 	 * }
 	 */
-	do_action( "in_theme_update_message-{$theme_key}", $theme, $r );
+	do_action("in_theme_update_message-{$theme_key}", $theme, $r);
 
 	echo '</div></td></tr>';
 }
@@ -527,11 +527,11 @@ 
  * @return false|void
  */
 function maintenance_nag() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 	global $upgrading;
-	$nag = isset( $upgrading );
-	if ( ! $nag ) {
-		$failed = get_site_option( 'auto_core_update_failed' );
+	$nag = isset($upgrading);
+	if ( ! $nag) {
+		$failed = get_site_option('auto_core_update_failed');
 		/*
 		 * If an update failed critically, we may have copied over version.php but not other files.
 		 * In that case, if the install claims we're running the version we attempted, nag.
@@ -542,16 +542,16 @@ 
 		 *
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
-		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
+		$comparison = ! empty($failed['critical']) ? '>=' : '>';
+		if (version_compare($failed['attempted'], $wp_version, $comparison))
 			$nag = true;
 	}
 
-	if ( ! $nag )
+	if ( ! $nag)
 		return false;
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
+	if (current_user_can('update_core'))
+		$msg = sprintf(__('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php');
 	else
 		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 

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

Indentation +14 added lines, -14 removed lines

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

Spacing +207 added lines, -207 removed lines

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

src/wp-admin/includes/class-wp-plugin-install-list-table.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Plugin_Install_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Plugin_Install_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying plugins to install in a list table.

Spacing +129 added lines, -129 removed lines

@@ -46,15 +46,15 @@ 
 	protected function get_installed_plugin_slugs() {
 		$slugs = array();
 
-		$plugin_info = get_site_transient( 'update_plugins' );
-		if ( isset( $plugin_info->no_update ) ) {
-			foreach ( $plugin_info->no_update as $plugin ) {
+		$plugin_info = get_site_transient('update_plugins');
+		if (isset($plugin_info->no_update)) {
+			foreach ($plugin_info->no_update as $plugin) {
 				$slugs[] = $plugin->slug;
 			}
 		}
 
-		if ( isset( $plugin_info->response ) ) {
-			foreach ( $plugin_info->response as $plugin ) {
+		if (isset($plugin_info->response)) {
+			foreach ($plugin_info->response as $plugin) {
 				$slugs[] = $plugin->slug;
 			}
 		}
@@ -72,11 +72,11 @@ 
 	 * @global string $wp_version
 	 */
 	public function prepare_items() {
-		include( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+		include(ABSPATH.'wp-admin/includes/plugin-install.php');
 
 		global $tabs, $tab, $paged, $type, $term;
 
-		wp_reset_vars( array( 'tab' ) );
+		wp_reset_vars(array('tab'));
 
 		$paged = $this->get_pagenum();
 
@@ -85,23 +85,23 @@ 
 		// These are the tabs which are shown on the page
 		$tabs = array();
 
-		if ( 'search' === $tab ) {
-			$tabs['search'] = __( 'Search Results' );
+		if ('search' === $tab) {
+			$tabs['search'] = __('Search Results');
 		}
-		if ( $tab === 'beta' || false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
-			$tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
+		if ($tab === 'beta' || false !== strpos($GLOBALS['wp_version'], '-')) {
+			$tabs['beta'] = _x('Beta Testing', 'Plugin Installer');
 		}
-		$tabs['featured']    = _x( 'Featured', 'Plugin Installer' );
-		$tabs['popular']     = _x( 'Popular', 'Plugin Installer' );
-		$tabs['recommended'] = _x( 'Recommended', 'Plugin Installer' );
-		$tabs['favorites']   = _x( 'Favorites', 'Plugin Installer' );
-		if ( current_user_can( 'upload_plugins' ) ) {
+		$tabs['featured']    = _x('Featured', 'Plugin Installer');
+		$tabs['popular']     = _x('Popular', 'Plugin Installer');
+		$tabs['recommended'] = _x('Recommended', 'Plugin Installer');
+		$tabs['favorites']   = _x('Favorites', 'Plugin Installer');
+		if (current_user_can('upload_plugins')) {
 			// No longer a real tab. Here for filter compatibility.
 			// Gets skipped in get_views().
-			$tabs['upload'] = __( 'Upload Plugin' );
+			$tabs['upload'] = __('Upload Plugin');
 		}
 
-		$nonmenu_tabs = array( 'plugin-information' ); // Valid actions to perform which do not have a Menu item.
+		$nonmenu_tabs = array('plugin-information'); // Valid actions to perform which do not have a Menu item.
 
 		/**
 		 * Filter the tabs shown on the Plugin Install screen.
@@ -111,7 +111,7 @@ 
 		 * @param array $tabs The tabs shown on the Plugin Install screen. Defaults include 'featured', 'popular',
 		 *                    'recommended', 'favorites', and 'upload'.
 		 */
-		$tabs = apply_filters( 'install_plugins_tabs', $tabs );
+		$tabs = apply_filters('install_plugins_tabs', $tabs);
 
 		/**
 		 * Filter tabs not associated with a menu item on the Plugin Install screen.
@@ -120,11 +120,11 @@ 
 		 *
 		 * @param array $nonmenu_tabs The tabs that don't have a Menu item on the Plugin Install screen.
 		 */
-		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
+		$nonmenu_tabs = apply_filters('install_plugins_nonmenu_tabs', $nonmenu_tabs);
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if (empty($tab) || ( ! isset($tabs[$tab]) && ! in_array($tab, (array) $nonmenu_tabs)))
+			$tab = key($tabs);
 
 		$args = array(
 			'page' => $paged,
@@ -139,14 +139,14 @@ 
 			'installed_plugins' => $this->get_installed_plugin_slugs(),
 		);
 
-		switch ( $tab ) {
+		switch ($tab) {
 			case 'search':
-				$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-				$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
+				$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+				$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
 
-				switch ( $type ) {
+				switch ($type) {
 					case 'tag':
-						$args['tag'] = sanitize_title_with_dashes( $term );
+						$args['tag'] = sanitize_title_with_dashes($term);
 						break;
 					case 'term':
 						$args['search'] = $term;
@@ -170,14 +170,14 @@ 
 				break;
 
 			case 'favorites':
-				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
-				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-				if ( $user )
+				$user = isset($_GET['user']) ? wp_unslash($_GET['user']) : get_user_option('wporg_favorites');
+				update_user_meta(get_current_user_id(), 'wporg_favorites', $user);
+				if ($user)
 					$args['user'] = $user;
 				else
 					$args = false;
 
-				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
+				add_action('install_plugins_favorites', 'install_plugins_favorites_form', 9, 0);
 				break;
 
 			default:
@@ -195,30 +195,30 @@ 
 		 *
 		 * @param array|bool $args Plugin Install API arguments.
 		 */
-		$args = apply_filters( "install_plugins_table_api_args_$tab", $args );
+		$args = apply_filters("install_plugins_table_api_args_$tab", $args);
 
-		if ( !$args )
+		if ( ! $args)
 			return;
 
-		$api = plugins_api( 'query_plugins', $args );
+		$api = plugins_api('query_plugins', $args);
 
-		if ( is_wp_error( $api ) ) {
+		if (is_wp_error($api)) {
 			$this->error = $api;
 			return;
 		}
 
 		$this->items = $api->plugins;
 
-		if ( $this->orderby ) {
-			uasort( $this->items, array( $this, 'order_callback' ) );
+		if ($this->orderby) {
+			uasort($this->items, array($this, 'order_callback'));
 		}
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $api->info['results'],
 			'per_page' => $args['per_page'],
-		) );
+		));
 
-		if ( isset( $api->info['groups'] ) ) {
+		if (isset($api->info['groups'])) {
 			$this->groups = $api->info['groups'];
 		}
 	}
@@ -227,12 +227,12 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $this->error ) ) {
-			$message = $this->error->get_error_message() . '<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">' . __( 'Try again' ) . '</a></p>';
+		if (isset($this->error)) {
+			$message = $this->error->get_error_message().'<p class="hide-if-no-js"><a href="#" class="button" onclick="document.location.reload(); return false;">'.__('Try again').'</a></p>';
 		} else {
-			$message = __( 'No plugins match your request.' );
+			$message = __('No plugins match your request.');
 		}
-		echo '<div class="no-plugin-results">' . $message . '</div>';
+		echo '<div class="no-plugin-results">'.$message.'</div>';
 	}
 
 	/**
@@ -246,13 +246,13 @@ 
 		global $tabs, $tab;
 
 		$display_tabs = array();
-		foreach ( (array) $tabs as $action => $text ) {
-			$class = ( $action === $tab ) ? ' current' : '';
-			$href = self_admin_url('plugin-install.php?tab=' . $action);
+		foreach ((array) $tabs as $action => $text) {
+			$class = ($action === $tab) ? ' current' : '';
+			$href = self_admin_url('plugin-install.php?tab='.$action);
 			$display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
 		}
 		// No longer a real tab.
-		unset( $display_tabs['plugin-install-upload'] );
+		unset($display_tabs['plugin-install-upload']);
 
 		return $display_tabs;
 	}
@@ -264,23 +264,23 @@ 
 		$views = $this->get_views();
 
 		/** This filter is documented in wp-admin/inclues/class-wp-list-table.php */
-		$views = apply_filters( "views_{$this->screen->id}", $views );
+		$views = apply_filters("views_{$this->screen->id}", $views);
 
-		$this->screen->render_screen_reader_content( 'heading_views' );
+		$this->screen->render_screen_reader_content('heading_views');
 ?>
 <div class="wp-filter">
 	<ul class="filter-links">
 		<?php
-		if ( ! empty( $views ) ) {
-			foreach ( $views as $class => $view ) {
-				$views[ $class ] = "\t<li class='$class'>$view";
+		if ( ! empty($views)) {
+			foreach ($views as $class => $view) {
+				$views[$class] = "\t<li class='$class'>$view";
 			}
-			echo implode( " </li>\n", $views ) . "</li>\n";
+			echo implode(" </li>\n", $views)."</li>\n";
 		}
 		?>
 	</ul>
 
-	<?php install_search_form( isset( $views['plugin-install-search'] ) ); ?>
+	<?php install_search_form(isset($views['plugin-install-search'])); ?>
 </div>
 <?php
 	}
@@ -293,23 +293,23 @@ 
 
 		$data_attr = '';
 
-		if ( $singular ) {
+		if ($singular) {
 			$data_attr = " data-wp-lists='list:$singular'";
 		}
 
-		$this->display_tablenav( 'top' );
+		$this->display_tablenav('top');
 
 ?>
-<div class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+<div class="wp-list-table <?php echo implode(' ', $this->get_table_classes()); ?>">
 <?php
-	$this->screen->render_screen_reader_content( 'heading_list' );
+	$this->screen->render_screen_reader_content('heading_list');
 ?>
 	<div id="the-list"<?php echo $data_attr; ?>>
 		<?php $this->display_rows_or_placeholder(); ?>
 	</div>
 </div>
 <?php
-		$this->display_tablenav( 'bottom' );
+		$this->display_tablenav('bottom');
 	}
 
 	/**
@@ -317,12 +317,12 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( $GLOBALS['tab'] === 'featured' ) {
+	protected function display_tablenav($which) {
+		if ($GLOBALS['tab'] === 'featured') {
 			return;
 		}
 
-		if ( 'top' === $which ) {
+		if ('top' === $which) {
 			wp_referer_field();
 		?>
 			<div class="tablenav top">
@@ -333,14 +333,14 @@ 
 					 *
 					 * @since 2.7.0
 					 */
-					do_action( 'install_plugins_table_header' ); ?>
+					do_action('install_plugins_table_header'); ?>
 				</div>
-				<?php $this->pagination( $which ); ?>
+				<?php $this->pagination($which); ?>
 				<br class="clear" />
 			</div>
 		<?php } else { ?>
 			<div class="tablenav bottom">
-				<?php $this->pagination( $which ); ?>
+				<?php $this->pagination($which); ?>
 				<br class="clear" />
 			</div>
 		<?php
@@ -351,7 +351,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -366,23 +366,23 @@ 
 	 * @param object $plugin_b
 	 * @return int
 	 */
-	private function order_callback( $plugin_a, $plugin_b ) {
+	private function order_callback($plugin_a, $plugin_b) {
 		$orderby = $this->orderby;
-		if ( ! isset( $plugin_a->$orderby, $plugin_b->$orderby ) ) {
+		if ( ! isset($plugin_a->$orderby, $plugin_b->$orderby)) {
 			return 0;
 		}
 
 		$a = $plugin_a->$orderby;
 		$b = $plugin_b->$orderby;
 
-		if ( $a == $b ) {
+		if ($a == $b) {
 			return 0;
 		}
 
-		if ( 'DESC' === $this->order ) {
-			return ( $a < $b ) ? 1 : -1;
+		if ('DESC' === $this->order) {
+			return ($a < $b) ? 1 : -1;
 		} else {
-			return ( $a < $b ) ? -1 : 1;
+			return ($a < $b) ? -1 : 1;
 		}
 	}
 
@@ -391,98 +391,98 @@ 
 	 */
 	public function display_rows() {
 		$plugins_allowedtags = array(
-			'a' => array( 'href' => array(),'title' => array(), 'target' => array() ),
-			'abbr' => array( 'title' => array() ),'acronym' => array( 'title' => array() ),
-			'code' => array(), 'pre' => array(), 'em' => array(),'strong' => array(),
+			'a' => array('href' => array(), 'title' => array(), 'target' => array()),
+			'abbr' => array('title' => array()), 'acronym' => array('title' => array()),
+			'code' => array(), 'pre' => array(), 'em' => array(), 'strong' => array(),
 			'ul' => array(), 'ol' => array(), 'li' => array(), 'p' => array(), 'br' => array()
 		);
 
 		$plugins_group_titles = array(
-			'Performance' => _x( 'Performance', 'Plugin installer group title' ),
-			'Social'      => _x( 'Social',      'Plugin installer group title' ),
-			'Tools'       => _x( 'Tools',       'Plugin installer group title' ),
+			'Performance' => _x('Performance', 'Plugin installer group title'),
+			'Social'      => _x('Social', 'Plugin installer group title'),
+			'Tools'       => _x('Tools', 'Plugin installer group title'),
 		);
 
 		$group = null;
 
-		foreach ( (array) $this->items as $plugin ) {
-			if ( is_object( $plugin ) ) {
+		foreach ((array) $this->items as $plugin) {
+			if (is_object($plugin)) {
 				$plugin = (array) $plugin;
 			}
 
 			// Display the group heading if there is one
-			if ( isset( $plugin['group'] ) && $plugin['group'] != $group ) {
-				if ( isset( $this->groups[ $plugin['group'] ] ) ) {
-					$group_name = $this->groups[ $plugin['group'] ];
-					if ( isset( $plugins_group_titles[ $group_name ] ) ) {
-						$group_name = $plugins_group_titles[ $group_name ];
+			if (isset($plugin['group']) && $plugin['group'] != $group) {
+				if (isset($this->groups[$plugin['group']])) {
+					$group_name = $this->groups[$plugin['group']];
+					if (isset($plugins_group_titles[$group_name])) {
+						$group_name = $plugins_group_titles[$group_name];
 					}
 				} else {
 					$group_name = $plugin['group'];
 				}
 
 				// Starting a new group, close off the divs of the last one
-				if ( ! empty( $group ) ) {
+				if ( ! empty($group)) {
 					echo '</div></div>';
 				}
 
-				echo '<div class="plugin-group"><h3>' . esc_html( $group_name ) . '</h3>';
+				echo '<div class="plugin-group"><h3>'.esc_html($group_name).'</h3>';
 				// needs an extra wrapping div for nth-child selectors to work
 				echo '<div class="plugin-items">';
 
 				$group = $plugin['group'];
 			}
-			$title = wp_kses( $plugin['name'], $plugins_allowedtags );
+			$title = wp_kses($plugin['name'], $plugins_allowedtags);
 
 			// Remove any HTML from the description.
-			$description = strip_tags( $plugin['short_description'] );
-			$version = wp_kses( $plugin['version'], $plugins_allowedtags );
+			$description = strip_tags($plugin['short_description']);
+			$version = wp_kses($plugin['version'], $plugins_allowedtags);
 
-			$name = strip_tags( $title . ' ' . $version );
+			$name = strip_tags($title.' '.$version);
 
-			$author = wp_kses( $plugin['author'], $plugins_allowedtags );
-			if ( ! empty( $author ) ) {
-				$author = ' <cite>' . sprintf( __( 'By %s' ), $author ) . '</cite>';
+			$author = wp_kses($plugin['author'], $plugins_allowedtags);
+			if ( ! empty($author)) {
+				$author = ' <cite>'.sprintf(__('By %s'), $author).'</cite>';
 			}
 
 			$action_links = array();
 
-			if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
-				$status = install_plugin_install_status( $plugin );
+			if (current_user_can('install_plugins') || current_user_can('update_plugins')) {
+				$status = install_plugin_install_status($plugin);
 
-				switch ( $status['status'] ) {
+				switch ($status['status']) {
 					case 'install':
-						if ( $status['url'] ) {
+						if ($status['url']) {
 							/* translators: 1: Plugin name and version. */
-							$action_links[] = '<a class="install-now button" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Install %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Install Now' ) . '</a>';
+							$action_links[] = '<a class="install-now button" data-slug="'.esc_attr($plugin['slug']).'" href="'.esc_url($status['url']).'" aria-label="'.esc_attr(sprintf(__('Install %s now'), $name)).'" data-name="'.esc_attr($name).'">'.__('Install Now').'</a>';
 						}
 
 						break;
 					case 'update_available':
-						if ( $status['url'] ) {
+						if ($status['url']) {
 							/* translators: 1: Plugin name and version */
-							$action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="' . esc_attr( $status['file'] ) . '" data-slug="' . esc_attr( $plugin['slug'] ) . '" href="' . esc_url( $status['url'] ) . '" aria-label="' . esc_attr( sprintf( __( 'Update %s now' ), $name ) ) . '" data-name="' . esc_attr( $name ) . '">' . __( 'Update Now' ) . '</a>';
+							$action_links[] = '<a class="update-now button aria-button-if-js" data-plugin="'.esc_attr($status['file']).'" data-slug="'.esc_attr($plugin['slug']).'" href="'.esc_url($status['url']).'" aria-label="'.esc_attr(sprintf(__('Update %s now'), $name)).'" data-name="'.esc_attr($name).'">'.__('Update Now').'</a>';
 						}
 
 						break;
 					case 'latest_installed':
 					case 'newer_installed':
-						$action_links[] = '<span class="button button-disabled">' . _x( 'Installed', 'plugin' ) . '</span>';
+						$action_links[] = '<span class="button button-disabled">'._x('Installed', 'plugin').'</span>';
 						break;
 				}
 			}
 
-			$details_link   = self_admin_url( 'plugin-install.php?tab=plugin-information&amp;plugin=' . $plugin['slug'] .
-								'&amp;TB_iframe=true&amp;width=600&amp;height=550' );
+			$details_link = self_admin_url('plugin-install.php?tab=plugin-information&amp;plugin='.$plugin['slug'].
+								'&amp;TB_iframe=true&amp;width=600&amp;height=550');
 
 			/* translators: 1: Plugin name and version. */
-			$action_links[] = '<a href="' . esc_url( $details_link ) . '" class="thickbox open-plugin-details-modal" aria-label="' . esc_attr( sprintf( __( 'More information about %s' ), $name ) ) . '" data-title="' . esc_attr( $name ) . '">' . __( 'More Details' ) . '</a>';
+			$action_links[] = '<a href="'.esc_url($details_link).'" class="thickbox open-plugin-details-modal" aria-label="'.esc_attr(sprintf(__('More information about %s'), $name)).'" data-title="'.esc_attr($name).'">'.__('More Details').'</a>';
 
-			if ( !empty( $plugin['icons']['svg'] ) ) {
+			if ( ! empty($plugin['icons']['svg'])) {
 				$plugin_icon_url = $plugin['icons']['svg'];
-			} elseif ( !empty( $plugin['icons']['2x'] ) ) {
+			} elseif ( ! empty($plugin['icons']['2x'])) {
 				$plugin_icon_url = $plugin['icons']['2x'];
-			} elseif ( !empty( $plugin['icons']['1x'] ) ) {
+			} elseif ( ! empty($plugin['icons']['1x'])) {
 				$plugin_icon_url = $plugin['icons']['1x'];
 			} else {
 				$plugin_icon_url = $plugin['icons']['default'];
@@ -496,24 +496,24 @@ 
 			 * @param array $action_links An array of plugin action hyperlinks. Defaults are links to Details and Install Now.
 			 * @param array $plugin       The plugin currently being listed.
 			 */
-			$action_links = apply_filters( 'plugin_install_action_links', $action_links, $plugin );
+			$action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
 
-			$last_updated_timestamp = strtotime( $plugin['last_updated'] );
+			$last_updated_timestamp = strtotime($plugin['last_updated']);
 		?>
-		<div class="plugin-card plugin-card-<?php echo sanitize_html_class( $plugin['slug'] ); ?>">
+		<div class="plugin-card plugin-card-<?php echo sanitize_html_class($plugin['slug']); ?>">
 			<div class="plugin-card-top">
 				<div class="name column-name">
 					<h3>
-						<a href="<?php echo esc_url( $details_link ); ?>" class="thickbox open-plugin-details-modal">
+						<a href="<?php echo esc_url($details_link); ?>" class="thickbox open-plugin-details-modal">
 						<?php echo $title; ?>
-						<img src="<?php echo esc_attr( $plugin_icon_url ) ?>" class="plugin-icon" alt="">
+						<img src="<?php echo esc_attr($plugin_icon_url) ?>" class="plugin-icon" alt="">
 						</a>
 					</h3>
 				</div>
 				<div class="action-links">
 					<?php
-						if ( $action_links ) {
-							echo '<ul class="plugin-action-buttons"><li>' . implode( '</li><li>', $action_links ) . '</li></ul>';
+						if ($action_links) {
+							echo '<ul class="plugin-action-buttons"><li>'.implode('</li><li>', $action_links).'</li></ul>';
 						}
 					?>
 				</div>
@@ -524,30 +524,30 @@ 
 			</div>
 			<div class="plugin-card-bottom">
 				<div class="vers column-rating">
-					<?php wp_star_rating( array( 'rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'] ) ); ?>
-					<span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n( $plugin['num_ratings'] ); ?>)</span>
+					<?php wp_star_rating(array('rating' => $plugin['rating'], 'type' => 'percent', 'number' => $plugin['num_ratings'])); ?>
+					<span class="num-ratings" aria-hidden="true">(<?php echo number_format_i18n($plugin['num_ratings']); ?>)</span>
 				</div>
 				<div class="column-updated">
-					<strong><?php _e( 'Last Updated:' ); ?></strong> <?php printf( __( '%s ago' ), human_time_diff( $last_updated_timestamp ) ); ?>
+					<strong><?php _e('Last Updated:'); ?></strong> <?php printf(__('%s ago'), human_time_diff($last_updated_timestamp)); ?>
 				</div>
 				<div class="column-downloaded">
 					<?php
-					if ( $plugin['active_installs'] >= 1000000 ) {
-						$active_installs_text = _x( '1+ Million', 'Active plugin installs' );
+					if ($plugin['active_installs'] >= 1000000) {
+						$active_installs_text = _x('1+ Million', 'Active plugin installs');
 					} else {
-						$active_installs_text = number_format_i18n( $plugin['active_installs'] ) . '+';
+						$active_installs_text = number_format_i18n($plugin['active_installs']).'+';
 					}
-					printf( __( '%s Active Installs' ), $active_installs_text );
+					printf(__('%s Active Installs'), $active_installs_text);
 					?>
 				</div>
 				<div class="column-compatibility">
 					<?php
-					if ( ! empty( $plugin['tested'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['tested'] ) ), $plugin['tested'], '>' ) ) {
-						echo '<span class="compatibility-untested">' . __( 'Untested with your version of WordPress' ) . '</span>';
-					} elseif ( ! empty( $plugin['requires'] ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $plugin['requires'] ) ), $plugin['requires'], '<' ) ) {
-						echo '<span class="compatibility-incompatible">' . __( '<strong>Incompatible</strong> with your version of WordPress' ) . '</span>';
+					if ( ! empty($plugin['tested']) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($plugin['tested'])), $plugin['tested'], '>')) {
+						echo '<span class="compatibility-untested">'.__('Untested with your version of WordPress').'</span>';
+					} elseif ( ! empty($plugin['requires']) && version_compare(substr($GLOBALS['wp_version'], 0, strlen($plugin['requires'])), $plugin['requires'], '<')) {
+						echo '<span class="compatibility-incompatible">'.__('<strong>Incompatible</strong> with your version of WordPress').'</span>';
 					} else {
-						echo '<span class="compatibility-compatible">' . __( '<strong>Compatible</strong> with your version of WordPress' ) . '</span>';
+						echo '<span class="compatibility-compatible">'.__('<strong>Compatible</strong> with your version of WordPress').'</span>';
 					}
 					?>
 				</div>
@@ -557,7 +557,7 @@ 
 		}
 
 		// Close off the group divs of the last one
-		if ( ! empty( $group ) ) {
+		if ( ! empty($group)) {
 			echo '</div></div>';
 		}
 	}

Braces +11 added lines, -8 removed lines

@@ -123,8 +123,9 @@ 
 		$nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
 
 		// If a non-valid menu tab has been selected, And it's not a non-menu action.
-		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
-			$tab = key( $tabs );
+		if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) ) {
+					$tab = key( $tabs );
+		}
 
 		$args = array(
 			'page' => $paged,
@@ -172,10 +173,11 @@ 
 			case 'favorites':
 				$user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' );
 				update_user_meta( get_current_user_id(), 'wporg_favorites', $user );
-				if ( $user )
-					$args['user'] = $user;
-				else
-					$args = false;
+				if ( $user ) {
+									$args['user'] = $user;
+				} else {
+									$args = false;
+				}
 
 				add_action( 'install_plugins_favorites', 'install_plugins_favorites_form', 9, 0 );
 				break;
@@ -197,8 +199,9 @@ 
 		 */
 		$args = apply_filters( "install_plugins_table_api_args_$tab", $args );
 
-		if ( !$args )
-			return;
+		if ( !$args ) {
+					return;
+		}
 
 		$api = plugins_api( 'query_plugins', $args );
 

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

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Plugins_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+							 * List Table API: WP_Plugins_List_Table class
+							 *
+							 * @package WordPress
+							 * @subpackage Administration
+							 * @since 3.1.0
+							 */
 
 /**
  * Core class used to implement displaying installed plugins in a list table.

Spacing +220 added lines, -220 removed lines

@@ -30,20 +30,20 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $status, $page;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'plugins',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
+		if (isset($_REQUEST['plugin_status']) && in_array($_REQUEST['plugin_status'], array('active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search')))
 			$status = $_REQUEST['plugin_status'];
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if (isset($_REQUEST['s']))
+			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']));
 
 		$page = $this->get_pagenum();
 	}
@@ -52,7 +52,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', $this->_args['plural'] );
+		return array('widefat', $this->_args['plural']);
 	}
 
 	/**
@@ -75,7 +75,7 @@ 
 	public function prepare_items() {
 		global $status, $plugins, $totals, $page, $orderby, $order, $s;
 
-		wp_reset_vars( array( 'orderby', 'order' ) );
+		wp_reset_vars(array('orderby', 'order'));
 
 		/**
 		 * Filters the full array of plugins to list in the Plugins list table.
@@ -86,7 +86,7 @@ 
 		 *
 		 * @param array $all_plugins An array of plugins to display in the list table.
 		 */
-		$all_plugins = apply_filters( 'all_plugins', get_plugins() );
+		$all_plugins = apply_filters('all_plugins', get_plugins());
 
 		$plugins = array(
 			'all'                => $all_plugins,
@@ -101,7 +101,7 @@ 
 
 		$screen = $this->screen;
 
-		if ( ! is_multisite() || ( $screen->in_admin( 'network' ) && current_user_can( 'manage_network_plugins' ) ) ) {
+		if ( ! is_multisite() || ($screen->in_admin('network') && current_user_can('manage_network_plugins'))) {
 
 			/**
 			 * Filter whether to display the advanced plugins list table.
@@ -118,27 +118,27 @@ 
 			 *                     plugin type. Default true.
 			 * @param string $type The plugin type. Accepts 'mustuse', 'dropins'.
 			 */
-			if ( apply_filters( 'show_advanced_plugins', true, 'mustuse' ) ) {
+			if (apply_filters('show_advanced_plugins', true, 'mustuse')) {
 				$plugins['mustuse'] = get_mu_plugins();
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
+			if (apply_filters('show_advanced_plugins', true, 'dropins'))
 				$plugins['dropins'] = get_dropins();
 
-			if ( current_user_can( 'update_plugins' ) ) {
-				$current = get_site_transient( 'update_plugins' );
-				foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-					if ( isset( $current->response[ $plugin_file ] ) ) {
-						$plugins['all'][ $plugin_file ]['update'] = true;
-						$plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+			if (current_user_can('update_plugins')) {
+				$current = get_site_transient('update_plugins');
+				foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
+					if (isset($current->response[$plugin_file])) {
+						$plugins['all'][$plugin_file]['update'] = true;
+						$plugins['upgrade'][$plugin_file] = $plugins['all'][$plugin_file];
 					}
 				}
 			}
 		}
 
-		if ( ! $screen->in_admin( 'network' ) ) {
-			$show = current_user_can( 'manage_network_plugins' );
+		if ( ! $screen->in_admin('network')) {
+			$show = current_user_can('manage_network_plugins');
 			/**
 			 * Filter whether to display network-active plugins alongside plugins active for the current site.
 			 *
@@ -152,121 +152,121 @@ 
 			 * @param bool $show Whether to show network-active plugins. Default is whether the current
 			 *                   user can manage network plugins (ie. a Super Admin).
 			 */
-			$show_network_active = apply_filters( 'show_network_active_plugins', $show );
+			$show_network_active = apply_filters('show_network_active_plugins', $show);
 		}
 
-		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
+		set_transient('plugin_slugs', array_keys($plugins['all']), DAY_IN_SECONDS);
 
-		if ( $screen->in_admin( 'network' ) ) {
-			$recently_activated = get_site_option( 'recently_activated', array() );
+		if ($screen->in_admin('network')) {
+			$recently_activated = get_site_option('recently_activated', array());
 		} else {
-			$recently_activated = get_option( 'recently_activated', array() );
+			$recently_activated = get_option('recently_activated', array());
 		}
 
-		foreach ( $recently_activated as $key => $time ) {
-			if ( $time + WEEK_IN_SECONDS < time() ) {
-				unset( $recently_activated[$key] );
+		foreach ($recently_activated as $key => $time) {
+			if ($time + WEEK_IN_SECONDS < time()) {
+				unset($recently_activated[$key]);
 			}
 		}
 
-		if ( $screen->in_admin( 'network' ) ) {
-			update_site_option( 'recently_activated', $recently_activated );
+		if ($screen->in_admin('network')) {
+			update_site_option('recently_activated', $recently_activated);
 		} else {
-			update_option( 'recently_activated', $recently_activated );
+			update_option('recently_activated', $recently_activated);
 		}
 
-		$plugin_info = get_site_transient( 'update_plugins' );
+		$plugin_info = get_site_transient('update_plugins');
 
-		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+		foreach ((array) $plugins['all'] as $plugin_file => $plugin_data) {
 			// Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
-			if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+			if (isset($plugin_info->response[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->response[$plugin_file], $plugin_data);
 				}
 
-			} elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
-				$plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+			} elseif (isset($plugin_info->no_update[$plugin_file])) {
+				$plugins['all'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				// Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
-				if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+				if (isset($plugins['upgrade'][$plugin_file])) {
+					$plugins['upgrade'][$plugin_file] = $plugin_data = array_merge((array) $plugin_info->no_update[$plugin_file], $plugin_data);
 				}
 			}
 
 			// Filter into individual sections
-			if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
-				if ( $show_network_active ) {
+			if (is_multisite() && ! $screen->in_admin('network') && is_network_only_plugin($plugin_file) && ! is_plugin_active($plugin_file)) {
+				if ($show_network_active) {
 					// On the non-network screen, show inactive network-only plugins if allowed
-					$plugins['inactive'][ $plugin_file ] = $plugin_data;
+					$plugins['inactive'][$plugin_file] = $plugin_data;
 				} else {
 					// On the non-network screen, filter out network-only plugins as long as they're not individually active
-					unset( $plugins['all'][ $plugin_file ] );
+					unset($plugins['all'][$plugin_file]);
 				}
-			} elseif ( ! $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) {
-				if ( $show_network_active ) {
+			} elseif ( ! $screen->in_admin('network') && is_plugin_active_for_network($plugin_file)) {
+				if ($show_network_active) {
 					// On the non-network screen, show network-active plugins if allowed
-					$plugins['active'][ $plugin_file ] = $plugin_data;
+					$plugins['active'][$plugin_file] = $plugin_data;
 				} else {
 					// On the non-network screen, filter out network-active plugins
-					unset( $plugins['all'][ $plugin_file ] );
+					unset($plugins['all'][$plugin_file]);
 				}
-			} elseif ( ( ! $screen->in_admin( 'network' ) && is_plugin_active( $plugin_file ) )
-				|| ( $screen->in_admin( 'network' ) && is_plugin_active_for_network( $plugin_file ) ) ) {
+			} elseif (( ! $screen->in_admin('network') && is_plugin_active($plugin_file))
+				|| ($screen->in_admin('network') && is_plugin_active_for_network($plugin_file))) {
 				// On the non-network screen, populate the active list with plugins that are individually activated
 				// On the network-admin screen, populate the active list with plugins that are network activated
-				$plugins['active'][ $plugin_file ] = $plugin_data;
+				$plugins['active'][$plugin_file] = $plugin_data;
 			} else {
-				if ( isset( $recently_activated[ $plugin_file ] ) ) {
+				if (isset($recently_activated[$plugin_file])) {
 					// Populate the recently activated list with plugins that have been recently activated
-					$plugins['recently_activated'][ $plugin_file ] = $plugin_data;
+					$plugins['recently_activated'][$plugin_file] = $plugin_data;
 				}
 				// Populate the inactive list with plugins that aren't activated
-				$plugins['inactive'][ $plugin_file ] = $plugin_data;
+				$plugins['inactive'][$plugin_file] = $plugin_data;
 			}
 		}
 
-		if ( strlen( $s ) ) {
+		if (strlen($s)) {
 			$status = 'search';
-			$plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
+			$plugins['search'] = array_filter($plugins['all'], array($this, '_search_callback'));
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ($plugins as $type => $list)
+			$totals[$type] = count($list);
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
+		if (empty($plugins[$status]) && ! in_array($status, array('all', 'search')))
 			$status = 'all';
 
 		$this->items = array();
-		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
+		foreach ($plugins[$status] as $plugin_file => $plugin_data) {
 			// Translate, Don't Apply Markup, Sanitize HTML
-			$this->items[$plugin_file] = _get_plugin_data_markup_translate( $plugin_file, $plugin_data, false, true );
+			$this->items[$plugin_file] = _get_plugin_data_markup_translate($plugin_file, $plugin_data, false, true);
 		}
 
-		$total_this_page = $totals[ $status ];
+		$total_this_page = $totals[$status];
 
-		if ( ! $orderby ) {
+		if ( ! $orderby) {
 			$orderby = 'Name';
 		} else {
-			$orderby = ucfirst( $orderby );
+			$orderby = ucfirst($orderby);
 		}
 
-		$order = strtoupper( $order );
+		$order = strtoupper($order);
 
-		uasort( $this->items, array( $this, '_order_callback' ) );
+		uasort($this->items, array($this, '_order_callback'));
 
-		$plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
+		$plugins_per_page = $this->get_items_per_page(str_replace('-', '_', $screen->id.'_per_page'), 999);
 
-		$start = ( $page - 1 ) * $plugins_per_page;
+		$start = ($page - 1) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ($total_this_page > $plugins_per_page)
+			$this->items = array_slice($this->items, $start, $plugins_per_page);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_this_page,
 			'per_page' => $plugins_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -275,11 +275,11 @@ 
 	 * @param array $plugin
 	 * @return bool
 	 */
-	public function _search_callback( $plugin ) {
+	public function _search_callback($plugin) {
 		global $s;
 
-		foreach ( $plugin as $value ) {
-			if ( is_string( $value ) && false !== stripos( strip_tags( $value ), urldecode( $s ) ) ) {
+		foreach ($plugin as $value) {
+			if (is_string($value) && false !== stripos(strip_tags($value), urldecode($s))) {
 				return true;
 			}
 		}
@@ -294,19 +294,19 @@ 
 	 * @param array $plugin_b
 	 * @return int
 	 */
-	public function _order_callback( $plugin_a, $plugin_b ) {
+	public function _order_callback($plugin_a, $plugin_b) {
 		global $orderby, $order;
 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
+		if ($a == $b)
 			return 0;
 
-		if ( 'DESC' === $order ) {
-			return strcasecmp( $b, $a );
+		if ('DESC' === $order) {
+			return strcasecmp($b, $a);
 		} else {
-			return strcasecmp( $a, $b );
+			return strcasecmp($a, $b);
 		}
 	}
 
@@ -317,19 +317,19 @@ 
 	public function no_items() {
 		global $plugins;
 
-		if ( ! empty( $_REQUEST['s'] ) ) {
-			$s = esc_html( wp_unslash( $_REQUEST['s'] ) );
+		if ( ! empty($_REQUEST['s'])) {
+			$s = esc_html(wp_unslash($_REQUEST['s']));
 
-			printf( __( 'No plugins found for &#8220;%s&#8221;.' ), $s );
+			printf(__('No plugins found for &#8220;%s&#8221;.'), $s);
 
 			// We assume that somebody who can install plugins in multisite is experienced enough to not need this helper link.
-			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
-				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
+			if ( ! is_multisite() && current_user_can('install_plugins')) {
+				echo ' <a href="'.esc_url(admin_url('plugin-install.php?tab=search&s='.urlencode($s))).'">'.__('Search for plugins in the WordPress Plugin Directory.').'</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
+		} elseif ( ! empty($plugins['all']))
+			_e('No plugins found.');
 		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+			_e('You do not appear to have any plugins available at this time.');
 	}
 
 	/**
@@ -341,9 +341,9 @@ 
 		global $status;
 
 		return array(
-			'cb'          => !in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
-			'name'        => __( 'Plugin' ),
-			'description' => __( 'Description' ),
+			'cb'          => ! in_array($status, array('mustuse', 'dropins')) ? '<input type="checkbox" />' : '',
+			'name'        => __('Plugin'),
+			'description' => __('Description'),
 		);
 	}
 
@@ -364,39 +364,39 @@ 
 		global $totals, $status;
 
 		$status_links = array();
-		foreach ( $totals as $type => $count ) {
-			if ( !$count )
+		foreach ($totals as $type => $count) {
+			if ( ! $count)
 				continue;
 
-			switch ( $type ) {
+			switch ($type) {
 				case 'all':
-					$text = _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins' );
+					$text = _nx('All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $count, 'plugins');
 					break;
 				case 'active':
-					$text = _n( 'Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count );
+					$text = _n('Active <span class="count">(%s)</span>', 'Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'recently_activated':
-					$text = _n( 'Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count );
+					$text = _n('Recently Active <span class="count">(%s)</span>', 'Recently Active <span class="count">(%s)</span>', $count);
 					break;
 				case 'inactive':
-					$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
+					$text = _n('Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count);
 					break;
 				case 'mustuse':
-					$text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
+					$text = _n('Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count);
 					break;
 				case 'dropins':
-					$text = _n( 'Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count );
+					$text = _n('Drop-ins <span class="count">(%s)</span>', 'Drop-ins <span class="count">(%s)</span>', $count);
 					break;
 				case 'upgrade':
-					$text = _n( 'Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count );
+					$text = _n('Update Available <span class="count">(%s)</span>', 'Update Available <span class="count">(%s)</span>', $count);
 					break;
 			}
 
-			if ( 'search' !== $type ) {
-				$status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
+			if ('search' !== $type) {
+				$status_links[$type] = sprintf("<a href='%s' %s>%s</a>",
 					add_query_arg('plugin_status', $type, 'plugins.php'),
-					( $type === $status ) ? ' class="current"' : '',
-					sprintf( $text, number_format_i18n( $count ) )
+					($type === $status) ? ' class="current"' : '',
+					sprintf($text, number_format_i18n($count))
 					);
 			}
 		}
@@ -414,17 +414,17 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ('active' != $status)
+			$actions['activate-selected'] = $this->screen->in_admin('network') ? __('Network Activate') : __('Activate');
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ('inactive' != $status && 'recent' != $status)
+			$actions['deactivate-selected'] = $this->screen->in_admin('network') ? __('Network Deactivate') : __('Deactivate');
 
-		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+		if ( ! is_multisite() || $this->screen->in_admin('network')) {
+			if (current_user_can('update_plugins'))
+				$actions['update-selected'] = __('Update');
+			if (current_user_can('delete_plugins') && ('active' != $status))
+				$actions['delete-selected'] = __('Delete');
 		}
 
 		return $actions;
@@ -434,39 +434,39 @@ 
 	 * @global string $status
 	 * @param string $which
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		parent::bulk_actions( $which );
+		parent::bulk_actions($which);
 	}
 
 	/**
 	 * @global string $status
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins')))
 			return;
 
 		echo '<div class="alignleft actions">';
 
-		if ( 'recently_activated' == $status ) {
-			submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
-		} elseif ( 'top' === $which && 'mustuse' === $status ) {
+		if ('recently_activated' == $status) {
+			submit_button(__('Clear List'), 'button', 'clear-recent-list', false);
+		} elseif ('top' === $which && 'mustuse' === $status) {
 			/* translators: %s: mu-plugins directory name */
-			echo '<p>' . sprintf( __( 'Files in the %s directory are executed automatically.' ),
-				'<code>' . str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) . '</code>'
-			) . '</p>';
-		} elseif ( 'top' === $which && 'dropins' === $status ) {
+			echo '<p>'.sprintf(__('Files in the %s directory are executed automatically.'),
+				'<code>'.str_replace(ABSPATH, '/', WPMU_PLUGIN_DIR).'</code>'
+			).'</p>';
+		} elseif ('top' === $which && 'dropins' === $status) {
 			/* translators: %s: wp-content directory name */
-			echo '<p>' . sprintf( __( 'Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.' ),
-				'<code>' . str_replace( ABSPATH, '', WP_CONTENT_DIR ) . '</code>'
-			) . '</p>';
+			echo '<p>'.sprintf(__('Drop-ins are advanced plugins in the %s directory that replace WordPress functionality when present.'),
+				'<code>'.str_replace(ABSPATH, '', WP_CONTENT_DIR).'</code>'
+			).'</p>';
 		}
 		echo '</div>';
 	}
@@ -475,7 +475,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
+		if (isset($_POST['clear-recent-list']))
 			return 'clear-recent-list';
 
 		return parent::current_action();
@@ -488,11 +488,11 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
+		if (is_multisite() && ! $this->screen->in_admin('network') && in_array($status, array('mustuse', 'dropins')))
 			return;
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ($this->items as $plugin_file => $plugin_data)
+			$this->single_row(array($plugin_file, $plugin_data));
 	}
 
 	/**
@@ -503,10 +503,10 @@ 
 	 *
 	 * @param array $item
 	 */
-	public function single_row( $item ) {
+	public function single_row($item) {
 		global $status, $page, $s, $totals;
 
-		list( $plugin_file, $plugin_data ) = $item;
+		list($plugin_file, $plugin_data) = $item;
 		$context = $status;
 		$screen = $this->screen;
 
@@ -523,88 +523,88 @@ 
 		$restrict_network_active = false;
 		$restrict_network_only = false;
 
-		if ( 'mustuse' === $context ) {
+		if ('mustuse' === $context) {
 			$is_active = true;
-		} elseif ( 'dropins' === $context ) {
+		} elseif ('dropins' === $context) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
-			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
+			if ($plugin_file != $plugin_data['Name'])
+				$plugin_name .= '<br/>'.$plugin_data['Name'];
+			if (true === ($dropins[$plugin_file][1])) { // Doesn't require a constant
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
-			} elseif ( defined( $dropins[ $plugin_file ][1] ) && constant( $dropins[ $plugin_file ][1] ) ) { // Constant is true
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
+			} elseif (defined($dropins[$plugin_file][1]) && constant($dropins[$plugin_file][1])) { // Constant is true
 				$is_active = true;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
+				$description = '<p><strong>'.$dropins[$plugin_file][0].'</strong></p>';
 			} else {
 				$is_active = false;
-				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . ' <span class="error-message">' . __( 'Inactive:' ) . '</span></strong> ' .
+				$description = '<p><strong>'.$dropins[$plugin_file][0].' <span class="error-message">'.__('Inactive:').'</span></strong> '.
 					/* translators: 1: drop-in constant name, 2: wp-config.php */
-					sprintf( __( 'Requires %1$s in %2$s file.' ),
-						"<code>define('" . $dropins[ $plugin_file ][1] . "', true);</code>",
+					sprintf(__('Requires %1$s in %2$s file.'),
+						"<code>define('".$dropins[$plugin_file][1]."', true);</code>",
 						'<code>wp-config.php</code>'
-					) . '</p>';
+					).'</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ($plugin_data['Description'])
+				$description .= '<p>'.$plugin_data['Description'].'</p>';
 		} else {
-			if ( $screen->in_admin( 'network' ) ) {
-				$is_active = is_plugin_active_for_network( $plugin_file );
+			if ($screen->in_admin('network')) {
+				$is_active = is_plugin_active_for_network($plugin_file);
 			} else {
-				$is_active = is_plugin_active( $plugin_file );
-				$restrict_network_active = ( is_multisite() && is_plugin_active_for_network( $plugin_file ) );
-				$restrict_network_only = ( is_multisite() && is_network_only_plugin( $plugin_file ) && ! $is_active );
+				$is_active = is_plugin_active($plugin_file);
+				$restrict_network_active = (is_multisite() && is_plugin_active_for_network($plugin_file));
+				$restrict_network_only = (is_multisite() && is_network_only_plugin($plugin_file) && ! $is_active);
 			}
 
-			if ( $screen->in_admin( 'network' ) ) {
-				if ( $is_active ) {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+			if ($screen->in_admin('network')) {
+				if ($is_active) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Network deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Deactivate' ) . '</a>';
+						$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(__('Network deactivate %s'), $plugin_data['Name'])).'">'.__('Network Deactivate').'</a>';
 						}
 				} else {
-					if ( current_user_can( 'manage_network_plugins' ) ) {
+					if (current_user_can('manage_network_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Network Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Network Activate' ) . '</a>';
+						$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(__('Network Activate %s'), $plugin_data['Name'])).'">'.__('Network Activate').'</a>';
 					}
-					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) {
+					if (current_user_can('delete_plugins') && ! is_plugin_active($plugin_file)) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(__('Delete %s'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				}
 			} else {
-				if ( $restrict_network_active ) {
+				if ($restrict_network_active) {
 					$actions = array(
-						'network_active' => __( 'Network Active' ),
+						'network_active' => __('Network Active'),
 					);
-				} elseif ( $restrict_network_only ) {
+				} elseif ($restrict_network_only) {
 					$actions = array(
-						'network_only' => __( 'Network Only' ),
+						'network_only' => __('Network Only'),
 					);
-				} elseif ( $is_active ) {
+				} elseif ($is_active) {
 					/* translators: %s: plugin name */
-					$actions['deactivate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file ) . '" aria-label="' . esc_attr( sprintf( __( 'Deactivate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+					$actions['deactivate'] = '<a href="'.wp_nonce_url('plugins.php?action=deactivate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'deactivate-plugin_'.$plugin_file).'" aria-label="'.esc_attr(sprintf(__('Deactivate %s'), $plugin_data['Name'])).'">'.__('Deactivate').'</a>';
 				} else {
 					/* translators: %s: plugin name */
-					$actions['activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file ) . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Activate %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Activate' ) . '</a>';
+					$actions['activate'] = '<a href="'.wp_nonce_url('plugins.php?action=activate&amp;plugin='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'activate-plugin_'.$plugin_file).'" class="edit" aria-label="'.esc_attr(sprintf(__('Activate %s'), $plugin_data['Name'])).'">'.__('Activate').'</a>';
 
-					if ( ! is_multisite() && current_user_can( 'delete_plugins' ) ) {
+					if ( ! is_multisite() && current_user_can('delete_plugins')) {
 						/* translators: %s: plugin name */
-						$actions['delete'] = '<a href="' . wp_nonce_url( 'plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins' ) . '" class="delete" aria-label="' . esc_attr( sprintf( __( 'Delete %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Delete' ) . '</a>';
+						$actions['delete'] = '<a href="'.wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]='.$plugin_file.'&amp;plugin_status='.$context.'&amp;paged='.$page.'&amp;s='.$s, 'bulk-plugins').'" class="delete" aria-label="'.esc_attr(sprintf(__('Delete %s'), $plugin_data['Name'])).'">'.__('Delete').'</a>';
 					}
 				} // end if $is_active
 
 			 } // end if $screen->in_admin( 'network' )
 
-			if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can( 'edit_plugins' ) && is_writable( WP_PLUGIN_DIR . '/' . $plugin_file ) ) {
+			if (( ! is_multisite() || $screen->in_admin('network')) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR.'/'.$plugin_file)) {
 				/* translators: %s: plugin name */
-				$actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" class="edit" aria-label="' . esc_attr( sprintf( __( 'Edit %s' ), $plugin_data['Name'] ) ) . '">' . __( 'Edit' ) . '</a>';
+				$actions['edit'] = '<a href="plugin-editor.php?file='.$plugin_file.'" class="edit" aria-label="'.esc_attr(sprintf(__('Edit %s'), $plugin_data['Name'])).'">'.__('Edit').'</a>';
 			}
 		} // end if $context
 
-		$actions = array_filter( $actions );
+		$actions = array_filter($actions);
 
-		if ( $screen->in_admin( 'network' ) ) {
+		if ($screen->in_admin('network')) {
 
 			/**
 			 * Filter the action links displayed for each plugin in the Network Admin Plugins list table.
@@ -622,7 +622,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( 'network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters('network_admin_plugin_action_links', $actions, $plugin_file, $plugin_data, $context);
 
 			/**
 			 * Filter the list of action links displayed for a specific plugin in the Network Admin Plugins list table.
@@ -640,7 +640,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( "network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters("network_admin_plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context);
 
 		} else {
 
@@ -661,7 +661,7 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters('plugin_action_links', $actions, $plugin_file, $plugin_data, $context);
 
 			/**
 			 * Filter the list of action links displayed for a specific plugin in the Plugins list table.
@@ -679,48 +679,48 @@ 
 			 *                            'Inactive', 'Recently Activated', 'Upgrade',
 			 *                            'Must-Use', 'Drop-ins', 'Search'.
 			 */
-			$actions = apply_filters( "plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context );
+			$actions = apply_filters("plugin_action_links_{$plugin_file}", $actions, $plugin_file, $plugin_data, $context);
 
 		}
 
 		$class = $is_active ? 'active' : 'inactive';
-		$checkbox_id =  "checkbox_" . md5($plugin_data['Name']);
-		if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+		$checkbox_id = "checkbox_".md5($plugin_data['Name']);
+		if ($restrict_network_active || $restrict_network_only || in_array($status, array('mustuse', 'dropins'))) {
 			$checkbox = '';
 		} else {
-			$checkbox = "<label class='screen-reader-text' for='" . $checkbox_id . "' >" . sprintf( __( 'Select %s' ), $plugin_data['Name'] ) . "</label>"
-				. "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' />";
+			$checkbox = "<label class='screen-reader-text' for='".$checkbox_id."' >".sprintf(__('Select %s'), $plugin_data['Name'])."</label>"
+				. "<input type='checkbox' name='checked[]' value='".esc_attr($plugin_file)."' id='".$checkbox_id."' />";
 		}
-		if ( 'dropins' != $context ) {
-			$description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
+		if ('dropins' != $context) {
+			$description = '<p>'.($plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;').'</p>';
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+		if ( ! empty($totals['upgrade']) && ! empty($plugin_data['update']))
 			$class .= ' update';
 
-		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
-		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
-			esc_attr( $class ),
-			esc_attr( $plugin_slug ),
-			esc_attr( $plugin_file )
+		$plugin_slug = isset($plugin_data['slug']) ? $plugin_data['slug'] : sanitize_title($plugin_name);
+		printf('<tr class="%s" data-slug="%s" data-plugin="%s">',
+			esc_attr($class),
+			esc_attr($plugin_slug),
+			esc_attr($plugin_file)
 		);
 
-		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) {
 			$extra_classes = '';
-			if ( in_array( $column_name, $hidden ) ) {
+			if (in_array($column_name, $hidden)) {
 				$extra_classes = ' hidden';
 			}
 
-			switch ( $column_name ) {
+			switch ($column_name) {
 				case 'cb':
 					echo "<th scope='row' class='check-column'>$checkbox</th>";
 					break;
 				case 'name':
 					echo "<td class='plugin-title column-primary'><strong>$plugin_name</strong>";
-					echo $this->row_actions( $actions, true );
+					echo $this->row_actions($actions, true);
 					echo "</td>";
 					break;
 				case 'description':
@@ -731,28 +731,28 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
-					if ( !empty( $plugin_data['Author'] ) ) {
+					if ( ! empty($plugin_data['Version']))
+						$plugin_meta[] = sprintf(__('Version %s'), $plugin_data['Version']);
+					if ( ! empty($plugin_data['Author'])) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
-						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
+						if ( ! empty($plugin_data['AuthorURI']))
+							$author = '<a href="'.$plugin_data['AuthorURI'].'">'.$plugin_data['Author'].'</a>';
+						$plugin_meta[] = sprintf(__('By %s'), $author);
 					}
 
 					// Details link using API info, if available
-					if ( isset( $plugin_data['slug'] ) && current_user_can( 'install_plugins' ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
-							esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
-								'&TB_iframe=true&width=600&height=550' ) ),
-							esc_attr( sprintf( __( 'More information about %s' ), $plugin_name ) ),
-							esc_attr( $plugin_name ),
-							__( 'View details' )
+					if (isset($plugin_data['slug']) && current_user_can('install_plugins')) {
+						$plugin_meta[] = sprintf('<a href="%s" class="thickbox open-plugin-details-modal" aria-label="%s" data-title="%s">%s</a>',
+							esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin='.$plugin_data['slug'].
+								'&TB_iframe=true&width=600&height=550')),
+							esc_attr(sprintf(__('More information about %s'), $plugin_name)),
+							esc_attr($plugin_name),
+							__('View details')
 						);
-					} elseif ( ! empty( $plugin_data['PluginURI'] ) ) {
-						$plugin_meta[] = sprintf( '<a href="%s">%s</a>',
-							esc_url( $plugin_data['PluginURI'] ),
-							__( 'Visit plugin site' )
+					} elseif ( ! empty($plugin_data['PluginURI'])) {
+						$plugin_meta[] = sprintf('<a href="%s">%s</a>',
+							esc_url($plugin_data['PluginURI']),
+							__('Visit plugin site')
 						);
 					}
 
@@ -770,8 +770,8 @@ 
 					 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 					 *                            'Drop-ins', 'Search'.
 					 */
-					$plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
-					echo implode( ' | ', $plugin_meta );
+					$plugin_meta = apply_filters('plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status);
+					echo implode(' | ', $plugin_meta);
 
 					echo "</div></td>";
 					break;
@@ -789,7 +789,7 @@ 
 					 * @param string $plugin_file Path to the plugin file.
 					 * @param array  $plugin_data An array of plugin data.
 					 */
-					do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
+					do_action('manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data);
 
 					echo "</td>";
 			}
@@ -808,7 +808,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( 'after_plugin_row', $plugin_file, $plugin_data, $status );
+		do_action('after_plugin_row', $plugin_file, $plugin_data, $status);
 
 		/**
 		 * Fires after each specific row in the Plugins list table.
@@ -824,7 +824,7 @@ 
 		 *                            'Inactive', 'Recently Activated', 'Upgrade', 'Must-Use',
 		 *                            'Drop-ins', 'Search'.
 		 */
-		do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
+		do_action("after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status);
 	}
 
 	/**

Braces +71 added lines, -48 removed lines

@@ -39,11 +39,13 @@ 
 		) );
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
-			$status = $_REQUEST['plugin_status'];
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) ) {
+					$status = $_REQUEST['plugin_status'];
+		}
 
-		if ( isset($_REQUEST['s']) )
-			$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		if ( isset($_REQUEST['s']) ) {
+					$_SERVER['REQUEST_URI'] = add_query_arg('s', wp_unslash($_REQUEST['s']) );
+		}
 
 		$page = $this->get_pagenum();
 	}
@@ -123,8 +125,9 @@ 
 			}
 
 			/** This action is documented in wp-admin/includes/class-wp-plugins-list-table.php */
-			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
-				$plugins['dropins'] = get_dropins();
+			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) ) {
+							$plugins['dropins'] = get_dropins();
+			}
 
 			if ( current_user_can( 'update_plugins' ) ) {
 				$current = get_site_transient( 'update_plugins' );
@@ -232,11 +235,13 @@ 
 		}
 
 		$totals = array();
-		foreach ( $plugins as $type => $list )
-			$totals[ $type ] = count( $list );
+		foreach ( $plugins as $type => $list ) {
+					$totals[ $type ] = count( $list );
+		}
 
-		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) )
-			$status = 'all';
+		if ( empty( $plugins[ $status ] ) && !in_array( $status, array( 'all', 'search' ) ) ) {
+					$status = 'all';
+		}
 
 		$this->items = array();
 		foreach ( $plugins[ $status ] as $plugin_file => $plugin_data ) {
@@ -260,8 +265,9 @@ 
 
 		$start = ( $page - 1 ) * $plugins_per_page;
 
-		if ( $total_this_page > $plugins_per_page )
-			$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		if ( $total_this_page > $plugins_per_page ) {
+					$this->items = array_slice( $this->items, $start, $plugins_per_page );
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total_this_page,
@@ -300,8 +306,9 @@ 
 		$a = $plugin_a[$orderby];
 		$b = $plugin_b[$orderby];
 
-		if ( $a == $b )
-			return 0;
+		if ( $a == $b ) {
+					return 0;
+		}
 
 		if ( 'DESC' === $order ) {
 			return strcasecmp( $b, $a );
@@ -326,10 +333,11 @@ 
 			if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 				echo ' <a href="' . esc_url( admin_url( 'plugin-install.php?tab=search&s=' . urlencode( $s ) ) ) . '">' . __( 'Search for plugins in the WordPress Plugin Directory.' ) . '</a>';
 			}
-		} elseif ( ! empty( $plugins['all'] ) )
-			_e( 'No plugins found.' );
-		else
-			_e( 'You do not appear to have any plugins available at this time.' );
+		} elseif ( ! empty( $plugins['all'] ) ) {
+					_e( 'No plugins found.' );
+		} else {
+					_e( 'You do not appear to have any plugins available at this time.' );
+		}
 	}
 
 	/**
@@ -365,8 +373,9 @@ 
 
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
-			if ( !$count )
-				continue;
+			if ( !$count ) {
+							continue;
+			}
 
 			switch ( $type ) {
 				case 'all':
@@ -414,17 +423,21 @@ 
 
 		$actions = array();
 
-		if ( 'active' != $status )
-			$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		if ( 'active' != $status ) {
+					$actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+		}
 
-		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		if ( 'inactive' != $status && 'recent' != $status ) {
+					$actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+		}
 
 		if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
-			if ( current_user_can( 'update_plugins' ) )
-				$actions['update-selected'] = __( 'Update' );
-			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) )
-				$actions['delete-selected'] = __( 'Delete' );
+			if ( current_user_can( 'update_plugins' ) ) {
+							$actions['update-selected'] = __( 'Update' );
+			}
+			if ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
+							$actions['delete-selected'] = __( 'Delete' );
+			}
 		}
 
 		return $actions;
@@ -437,8 +450,9 @@ 
 	public function bulk_actions( $which = '' ) {
 		global $status;
 
-		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
 		parent::bulk_actions( $which );
 	}
@@ -450,8 +464,9 @@ 
 	protected function extra_tablenav( $which ) {
 		global $status;
 
-		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) )
-			return;
+		if ( ! in_array($status, array('recently_activated', 'mustuse', 'dropins') ) ) {
+					return;
+		}
 
 		echo '<div class="alignleft actions">';
 
@@ -475,8 +490,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset($_POST['clear-recent-list']) )
-			return 'clear-recent-list';
+		if ( isset($_POST['clear-recent-list']) ) {
+					return 'clear-recent-list';
+		}
 
 		return parent::current_action();
 	}
@@ -488,11 +504,13 @@ 
 	public function display_rows() {
 		global $status;
 
-		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) )
-			return;
+		if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
+					return;
+		}
 
-		foreach ( $this->items as $plugin_file => $plugin_data )
-			$this->single_row( array( $plugin_file, $plugin_data ) );
+		foreach ( $this->items as $plugin_file => $plugin_data ) {
+					$this->single_row( array( $plugin_file, $plugin_data ) );
+		}
 	}
 
 	/**
@@ -528,8 +546,9 @@ 
 		} elseif ( 'dropins' === $context ) {
 			$dropins = _get_dropins();
 			$plugin_name = $plugin_file;
-			if ( $plugin_file != $plugin_data['Name'] )
-				$plugin_name .= '<br/>' . $plugin_data['Name'];
+			if ( $plugin_file != $plugin_data['Name'] ) {
+							$plugin_name .= '<br/>' . $plugin_data['Name'];
+			}
 			if ( true === ( $dropins[ $plugin_file ][1] ) ) { // Doesn't require a constant
 				$is_active = true;
 				$description = '<p><strong>' . $dropins[ $plugin_file ][0] . '</strong></p>';
@@ -545,8 +564,9 @@ 
 						'<code>wp-config.php</code>'
 					) . '</p>';
 			}
-			if ( $plugin_data['Description'] )
-				$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			if ( $plugin_data['Description'] ) {
+							$description .= '<p>' . $plugin_data['Description'] . '</p>';
+			}
 		} else {
 			if ( $screen->in_admin( 'network' ) ) {
 				$is_active = is_plugin_active_for_network( $plugin_file );
@@ -696,8 +716,9 @@ 
 			$plugin_name = $plugin_data['Name'];
 		}
 
-		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
-			$class .= ' update';
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) ) {
+					$class .= ' update';
+		}
 
 		$plugin_slug = isset( $plugin_data['slug'] ) ? $plugin_data['slug'] : sanitize_title( $plugin_name );
 		printf( '<tr class="%s" data-slug="%s" data-plugin="%s">',
@@ -731,12 +752,14 @@ 
 						<div class='$class second plugin-version-author-uri'>";
 
 					$plugin_meta = array();
-					if ( !empty( $plugin_data['Version'] ) )
-						$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					if ( !empty( $plugin_data['Version'] ) ) {
+											$plugin_meta[] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+					}
 					if ( !empty( $plugin_data['Author'] ) ) {
 						$author = $plugin_data['Author'];
-						if ( !empty( $plugin_data['AuthorURI'] ) )
-							$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						if ( !empty( $plugin_data['AuthorURI'] ) ) {
+													$author = '<a href="' . $plugin_data['AuthorURI'] . '">' . $plugin_data['Author'] . '</a>';
+						}
 						$plugin_meta[] = sprintf( __( 'By %s' ), $author );
 					}
 

src/wp-admin/includes/nav-menu.php

Indentation +6 added lines, -6 removed lines

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

Spacing +269 added lines, -269 removed lines

@@ -8,10 +8,10 @@ 
  */
 
 /** Walker_Nav_Menu_Edit class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-edit.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-edit.php');
 
 /** Walker_Nav_Menu_Checklist class */
-require_once( ABSPATH . 'wp-admin/includes/class-walker-nav-menu-checklist.php' );
+require_once(ABSPATH.'wp-admin/includes/class-walker-nav-menu-checklist.php');
 
 /**
  * Prints the appropriate response to a menu quick search.
@@ -20,41 +20,41 @@ 
  *
  * @param array $request The unsanitized request values.
  */
-function _wp_ajax_menu_quick_search( $request = array() ) {
+function _wp_ajax_menu_quick_search($request = array()) {
 	$args = array();
-	$type = isset( $request['type'] ) ? $request['type'] : '';
-	$object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
-	$query = isset( $request['q'] ) ? $request['q'] : '';
-	$response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
+	$type = isset($request['type']) ? $request['type'] : '';
+	$object_type = isset($request['object_type']) ? $request['object_type'] : '';
+	$query = isset($request['q']) ? $request['q'] : '';
+	$response_format = isset($request['response-format']) && in_array($request['response-format'], array('json', 'markup')) ? $request['response-format'] : 'json';
 
-	if ( 'markup' == $response_format ) {
+	if ('markup' == $response_format) {
 		$args['walker'] = new Walker_Nav_Menu_Checklist;
 	}
 
-	if ( 'get-post-item' == $type ) {
-		if ( post_type_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+	if ('get-post-item' == $type) {
+		if (post_type_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($object_id))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
-							'post_title' => get_the_title( $object_id ),
-							'post_type' => get_post_type( $object_id ),
+							'post_title' => get_the_title($object_id),
+							'post_type' => get_post_type($object_id),
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( taxonomy_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+		} elseif (taxonomy_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
-					$post_obj = get_term( $object_id, $object_type );
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_term($object_id, $object_type))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
+					$post_obj = get_term($object_id, $object_type);
 					echo wp_json_encode(
 						array(
 							'ID' => $object_id,
@@ -68,21 +68,21 @@ 
 
 		}
 
-	} elseif ( preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches) ) {
-		if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
+	} elseif (preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches)) {
+		if ('posttype' == $matches[1] && get_post_type_object($matches[2])) {
 			query_posts(array(
 				'posts_per_page' => 10,
 				'post_type' => $matches[2],
 				's' => $query,
 			));
-			if ( ! have_posts() )
+			if ( ! have_posts())
 				return;
-			while ( have_posts() ) {
+			while (have_posts()) {
 				the_post();
-				if ( 'markup' == $response_format ) {
+				if ('markup' == $response_format) {
 					$var_by_ref = get_the_ID();
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($var_by_ref))), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => get_the_ID(),
@@ -93,17 +93,17 @@ 
 					echo "\n";
 				}
 			}
-		} elseif ( 'taxonomy' == $matches[1] ) {
-			$terms = get_terms( $matches[2], array(
+		} elseif ('taxonomy' == $matches[1]) {
+			$terms = get_terms($matches[2], array(
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
+			if (empty($terms) || is_wp_error($terms))
 				return;
-			foreach ( (array) $terms as $term ) {
-				if ( 'markup' == $response_format ) {
-					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
-				} elseif ( 'json' == $response_format ) {
+			foreach ((array) $terms as $term) {
+				if ('markup' == $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array($term)), 0, (object) $args);
+				} elseif ('json' == $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID' => $term->term_id,
@@ -126,17 +126,17 @@ 
 function wp_nav_menu_setup() {
 	// Register meta boxes
 	wp_nav_menu_post_type_meta_boxes();
-	add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+	add_meta_box('add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default');
 	wp_nav_menu_taxonomy_meta_boxes();
 
 	// Register advanced menu items (columns)
-	add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
+	add_filter('manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
 
 	// If first time editing, disable advanced items by default.
-	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
+	if (false === get_user_option('managenav-menuscolumnshidden')) {
 		$user = wp_get_current_user();
 		update_user_option($user->ID, 'managenav-menuscolumnshidden',
-			array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
+			array(0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute',),
 			true);
 	}
 }
@@ -151,17 +151,17 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
+	if (get_user_option('metaboxhidden_nav-menus') !== false || ! is_array($wp_meta_boxes))
 		return;
 
-	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
+	$initial_meta_boxes = array('add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category');
 	$hidden_meta_boxes = array();
 
-	foreach ( array_keys($wp_meta_boxes['nav-menus']) as $context ) {
-		foreach ( array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority ) {
-			foreach ( $wp_meta_boxes['nav-menus'][$context][$priority] as $box ) {
-				if ( in_array( $box['id'], $initial_meta_boxes ) ) {
-					unset( $box['id'] );
+	foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+		foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+			foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+				if (in_array($box['id'], $initial_meta_boxes)) {
+					unset($box['id']);
 				} else {
 					$hidden_meta_boxes[] = $box['id'];
 				}
@@ -170,7 +170,7 @@ 
 	}
 
 	$user = wp_get_current_user();
-	update_user_option( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true );
+	update_user_option($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes, true);
 }
 
 /**
@@ -179,12 +179,12 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_post_type_meta_boxes() {
-	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+	$post_types = get_post_types(array('show_in_nav_menus' => true), 'object');
 
-	if ( ! $post_types )
+	if ( ! $post_types)
 		return;
 
-	foreach ( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		/**
 		 * Filter whether a menu items meta box will be added for the current
 		 * object type.
@@ -197,12 +197,12 @@ 
 		 * @param object $meta_box_object The current object to add a menu items
 		 *                                meta box for.
 		 */
-		$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
-		if ( $post_type ) {
+		$post_type = apply_filters('nav_menu_meta_box_object', $post_type);
+		if ($post_type) {
 			$id = $post_type->name;
 			// Give pages a higher priority.
-			$priority = ( 'page' == $post_type->name ? 'core' : 'default' );
-			add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
+			$priority = ('page' == $post_type->name ? 'core' : 'default');
+			add_meta_box("add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type);
 		}
 	}
 }
@@ -213,17 +213,17 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
+	$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'object');
 
-	if ( !$taxonomies )
+	if ( ! $taxonomies)
 		return;
 
-	foreach ( $taxonomies as $tax ) {
+	foreach ($taxonomies as $tax) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
-		$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
-		if ( $tax ) {
+		$tax = apply_filters('nav_menu_meta_box_object', $tax);
+		if ($tax) {
 			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+			add_meta_box("add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax);
 		}
 	}
 }
@@ -238,13 +238,13 @@ 
  * @param int|string $nav_menu_selected_id (id, name or slug) of the currently-selected menu
  * @return string Disabled attribute if at least one menu exists, false if not
  */
-function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
+function wp_nav_menu_disabled_check($nav_menu_selected_id) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
+	if ($one_theme_location_no_menus)
 		return false;
 
-	return disabled( $nav_menu_selected_id, 0 );
+	return disabled($nav_menu_selected_id, 0);
 }
 
 /**
@@ -264,18 +264,18 @@ 
 	<div class="customlinkdiv" id="customlinkdiv">
 		<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
 		<p id="menu-item-url-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
+			<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
 			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text" class="code menu-item-textbox" value="http://" />
 		</p>
 
 		<p id="menu-item-name-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
+			<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
 			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text" class="regular-text menu-item-textbox" />
 		</p>
 
 		<p class="button-controls wp-clearfix">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -295,15 +295,15 @@ 
  * @param string $object Not used.
  * @param string $post_type The post type object.
  */
-function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
+function wp_nav_menu_item_post_type_meta_box($object, $post_type) {
 	global $_nav_menu_placeholder, $nav_menu_selected_id;
 
 	$post_type_name = $post_type['args']->name;
 
 	// Paginate browsing for large numbers of post objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$post_type_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'offset' => $offset,
@@ -316,23 +316,23 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $post_type['args']->_default_query ) )
-		$args = array_merge($args, (array) $post_type['args']->_default_query );
+	if (isset($post_type['args']->_default_query))
+		$args = array_merge($args, (array) $post_type['args']->_default_query);
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
-	$posts = $get_posts->query( $args );
-	if ( ! $get_posts->post_count ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	$posts = $get_posts->query($args);
+	if ( ! $get_posts->post_count) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
 	$num_pages = $get_posts->max_num_pages;
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$post_type_name . '-tab' => 'all',
+				$post_type_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'post_type',
 				'item-object' => $post_type_name,
@@ -346,18 +346,18 @@ 
 	));
 
 	$db_fields = false;
-	if ( is_post_type_hierarchical( $post_type_name ) ) {
-		$db_fields = array( 'parent' => 'post_parent', 'id' => 'ID' );
+	if (is_post_type_hierarchical($post_type_name)) {
+		$db_fields = array('parent' => 'post_parent', 'id' => 'ID');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-recent';
-	if ( isset( $_REQUEST[$post_type_name . '-tab'] ) && in_array( $_REQUEST[$post_type_name . '-tab'], array('all', 'search') ) ) {
-		$current_tab = $_REQUEST[$post_type_name . '-tab'];
+	if (isset($_REQUEST[$post_type_name.'-tab']) && in_array($_REQUEST[$post_type_name.'-tab'], array('all', 'search'))) {
+		$current_tab = $_REQUEST[$post_type_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-posttype-'.$post_type_name])) {
 		$current_tab = 'search';
 	}
 
@@ -373,30 +373,30 @@ 
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
-					<?php _e( 'Most Recent' ); ?>
+			<li <?php echo ('most-recent' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-most-recent" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+					<?php _e('Most Recent'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="<?php echo esc_attr($post_type_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
-					<?php _e( 'Search'); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-search" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($post_type_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
 		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php
-			echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
-				$most_recent = $get_posts->query( $recent_args );
+				$recent_args = array_merge($args, array('orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15));
+				$most_recent = $get_posts->query($recent_args);
 				$args['walker'] = $walker;
 
 				/**
@@ -411,50 +411,50 @@ 
 				 * @param array  $args        An array of WP_Query arguments.
 				 * @param object $post_type   The current post type object for this menu item meta box.
 				 */
-				$most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type );
+				$most_recent = apply_filters("nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $post_type);
 
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 			<?php
-			if ( isset( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-posttype-' . $post_type_name] );
-				$search_results = get_posts( array( 's' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC', ) );
+			if (isset($_REQUEST['quick-search-posttype-'.$post_type_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-posttype-'.$post_type_name]);
+				$search_results = get_posts(array('s' => $searched, 'post_type' => $post_type_name, 'fields' => 'all', 'order' => 'DESC',));
 			} else {
 				$searched = '';
 				$search_results = array();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php submit_button(__('Search'), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array('id' => 'submit-quick-search-posttype-'.$post_type_name)); ?>
 			</p>
 
 			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -467,15 +467,15 @@ 
 				 * If we're dealing with pages, let's put a checkbox for the front
 				 * page at the top of the list.
 				 */
-				if ( 'page' == $post_type_name ) {
-					$front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
-					if ( ! empty( $front_page ) ) {
-						$front_page_obj = get_post( $front_page );
+				if ('page' == $post_type_name) {
+					$front_page = 'page' == get_option('show_on_front') ? (int) get_option('page_on_front') : 0;
+					if ( ! empty($front_page)) {
+						$front_page_obj = get_post($front_page);
 						$front_page_obj->front_or_home = true;
-						array_unshift( $posts, $front_page_obj );
+						array_unshift($posts, $front_page_obj);
 					} else {
-						$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-						array_unshift( $posts, (object) array(
+						$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+						array_unshift($posts, (object) array(
 							'front_or_home' => true,
 							'ID' => 0,
 							'object_id' => $_nav_menu_placeholder,
@@ -486,15 +486,15 @@ 
 							'post_type' => 'nav_menu_item',
 							'type' => 'custom',
 							'url' => home_url('/'),
-						) );
+						));
 					}
 				}
 
-				$post_type = get_post_type_object( $post_type_name );
-				$archive_link = get_post_type_archive_link( $post_type_name );
-				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval($_nav_menu_placeholder) - 1 : -1;
-					array_unshift( $posts, (object) array(
+				$post_type = get_post_type_object($post_type_name);
+				$archive_link = get_post_type_archive_link($post_type_name);
+				if ($post_type->has_archive) {
+					$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? intval($_nav_menu_placeholder) - 1 : -1;
+					array_unshift($posts, (object) array(
 						'ID' => 0,
 						'object_id' => $_nav_menu_placeholder,
 						'object'     => $post_type_name,
@@ -503,8 +503,8 @@ 
 						'post_title' => $post_type->labels->archives,
 						'post_type' => 'nav_menu_item',
 						'type' => 'post_type_archive',
-						'url' => get_post_type_archive_link( $post_type_name ),
-					) );
+						'url' => get_post_type_archive_link($post_type_name),
+					));
 				}
 
 				/**
@@ -522,10 +522,10 @@ 
 				 * @param array  $args      An array of WP_Query arguments.
 				 * @param object $post_type The current post type object for this menu item meta box.
 				 */
-				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
-				$checkbox_items = walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args );
+				$posts = apply_filters("nav_menu_items_{$post_type_name}", $posts, $args, $post_type);
+				$checkbox_items = walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args);
 
-				if ( 'all' == $current_tab && ! empty( $_REQUEST['selectall'] ) ) {
+				if ('all' == $current_tab && ! empty($_REQUEST['selectall'])) {
 					$checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items);
 
 				}
@@ -533,7 +533,7 @@ 
 				echo $checkbox_items;
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -543,18 +543,18 @@ 
 		<p class="button-controls wp-clearfix">
 			<span class="list-controls">
 				<a href="<?php
-					echo esc_url( add_query_arg(
+					echo esc_url(add_query_arg(
 						array(
-							$post_type_name . '-tab' => 'all',
+							$post_type_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
-						remove_query_arg( $removed_args )
+						remove_query_arg($removed_args)
 					));
 				?>#posttype-<?php echo $post_type_name; ?>" class="select-all"><?php _e('Select All'); ?></a>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr('submit-posttype-'.$post_type_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -573,14 +573,14 @@ 
  * @param string $object Not used.
  * @param string $taxonomy The taxonomy object.
  */
-function wp_nav_menu_item_taxonomy_meta_box( $object, $taxonomy ) {
+function wp_nav_menu_item_taxonomy_meta_box($object, $taxonomy) {
 	global $nav_menu_selected_id;
 	$taxonomy_name = $taxonomy['args']->name;
 
 	// Paginate browsing for large numbers of objects.
 	$per_page = 50;
-	$pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum = isset($_REQUEST[$taxonomy_name.'-tab']) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'child_of' => 0,
@@ -595,19 +595,19 @@ 
 		'pad_counts' => false,
 	);
 
-	$terms = get_terms( $taxonomy_name, $args );
+	$terms = get_terms($taxonomy_name, $args);
 
-	if ( ! $terms || is_wp_error($terms) ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	if ( ! $terms || is_wp_error($terms)) {
+		echo '<p>'.__('No items.').'</p>';
 		return;
 	}
 
-	$num_pages = ceil( wp_count_terms( $taxonomy_name , array_merge( $args, array('number' => '', 'offset' => '') ) ) / $per_page );
+	$num_pages = ceil(wp_count_terms($taxonomy_name, array_merge($args, array('number' => '', 'offset' => ''))) / $per_page);
 
-	$page_links = paginate_links( array(
+	$page_links = paginate_links(array(
 		'base' => add_query_arg(
 			array(
-				$taxonomy_name . '-tab' => 'all',
+				$taxonomy_name.'-tab' => 'all',
 				'paged' => '%#%',
 				'item-type' => 'taxonomy',
 				'item-object' => $taxonomy_name,
@@ -621,18 +621,18 @@ 
 	));
 
 	$db_fields = false;
-	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-		$db_fields = array( 'parent' => 'parent', 'id' => 'term_id' );
+	if (is_taxonomy_hierarchical($taxonomy_name)) {
+		$db_fields = array('parent' => 'parent', 'id' => 'term_id');
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-used';
-	if ( isset( $_REQUEST[$taxonomy_name . '-tab'] ) && in_array( $_REQUEST[$taxonomy_name . '-tab'], array('all', 'most-used', 'search') ) ) {
-		$current_tab = $_REQUEST[$taxonomy_name . '-tab'];
+	if (isset($_REQUEST[$taxonomy_name.'-tab']) && in_array($_REQUEST[$taxonomy_name.'-tab'], array('all', 'most-used', 'search'))) {
+		$current_tab = $_REQUEST[$taxonomy_name.'-tab'];
 	}
 
-	if ( ! empty( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
+	if ( ! empty($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
 		$current_tab = 'search';
 	}
 
@@ -648,39 +648,39 @@ 
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
-					<?php _e( 'Most Used' ); ?>
+			<li <?php echo ('most-used' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-pop" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+					<?php _e('Most Used'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-all" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
-					<?php _e( 'Search' ); ?>
+			<li <?php echo ('search' == $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr($taxonomy_name); ?>" href="<?php if ($nav_menu_selected_id) echo esc_url(add_query_arg($taxonomy_name.'-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php
-			echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
-				$popular_terms = get_terms( $taxonomy_name, array( 'orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false ) );
+				$popular_terms = get_terms($taxonomy_name, array('orderby' => 'count', 'order' => 'DESC', 'number' => 10, 'hierarchical' => false));
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
 		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php
-			echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>">
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -688,10 +688,10 @@ 
 			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args);
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if ( ! empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -699,33 +699,33 @@ 
 		</div><!-- /.tabs-panel -->
 
 		<div class="tabs-panel <?php
-			echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
+			echo ('search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive');
 		?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 			<?php
-			if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
-				$searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
-				$search_results = get_terms( $taxonomy_name, array( 'name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false ) );
+			if (isset($_REQUEST['quick-search-taxonomy-'.$taxonomy_name])) {
+				$searched = esc_attr($_REQUEST['quick-search-taxonomy-'.$taxonomy_name]);
+				$search_results = get_terms($taxonomy_name, array('name__like' => $searched, 'fields' => 'all', 'orderby' => 'count', 'order' => 'DESC', 'hierarchical' => false));
 			} else {
 				$searched = '';
 				$search_results = array();
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php submit_button(__('Search'), 'button-small quick-search-submit button-secondary hide-if-js', 'submit', false, array('id' => 'submit-quick-search-taxonomy-'.$taxonomy_name)); ?>
 			</p>
 
 			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if ( ! empty($search_results) && ! is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
+			<?php elseif ( ! empty($searched)) : ?>
 				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
@@ -736,7 +736,7 @@ 
 				<a href="<?php
 					echo esc_url(add_query_arg(
 						array(
-							$taxonomy_name . '-tab' => 'all',
+							$taxonomy_name.'-tab' => 'all',
 							'selectall' => 1,
 						),
 						remove_query_arg($removed_args)
@@ -745,7 +745,7 @@ 
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button-secondary submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr('submit-taxonomy-'.$taxonomy_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -763,25 +763,25 @@ 
  * @param array $menu_data The unsanitized posted menu item data.
  * @return array The database IDs of the items saved
  */
-function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
+function wp_save_nav_menu_items($menu_id = 0, $menu_data = array()) {
 	$menu_id = (int) $menu_id;
 	$items_saved = array();
 
-	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+	if (0 == $menu_id || is_nav_menu($menu_id)) {
 
 		// Loop through all the menu items' POST values.
-		foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
+		foreach ((array) $menu_data as $_possible_db_id => $_item_object_data) {
 			if (
 				// Checkbox is not checked.
-				empty( $_item_object_data['menu-item-object-id'] ) &&
+				empty($_item_object_data['menu-item-object-id']) &&
 				(
 					// And item type either isn't set.
-					! isset( $_item_object_data['menu-item-type'] ) ||
+					! isset($_item_object_data['menu-item-type']) ||
 					// Or URL is the default.
-					in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
-					! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
+					in_array($_item_object_data['menu-item-url'], array('http://', '')) ||
+					! ('custom' == $_item_object_data['menu-item-type'] && ! isset($_item_object_data['menu-item-db-id'])) || // or it's not a custom menu item (but not the custom home page)
 					// Or it *is* a custom menu item that already exists.
-					! empty( $_item_object_data['menu-item-db-id'] )
+					! empty($_item_object_data['menu-item-db-id'])
 				)
 			) {
 				// Then this potential menu item is not getting added to this menu.
@@ -790,8 +790,8 @@ 
 
 			// If this possible menu item doesn't actually have a menu database ID yet.
 			if (
-				empty( $_item_object_data['menu-item-db-id'] ) ||
-				( 0 > $_possible_db_id ) ||
+				empty($_item_object_data['menu-item-db-id']) ||
+				(0 > $_possible_db_id) ||
 				$_possible_db_id != $_item_object_data['menu-item-db-id']
 			) {
 				$_actual_db_id = 0;
@@ -800,22 +800,22 @@ 
 			}
 
 			$args = array(
-				'menu-item-db-id' => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
-				'menu-item-object-id' => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
-				'menu-item-object' => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
-				'menu-item-parent-id' => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
-				'menu-item-position' => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
-				'menu-item-type' => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
-				'menu-item-title' => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
-				'menu-item-url' => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
-				'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ),
-				'menu-item-attr-title' => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
-				'menu-item-target' => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
-				'menu-item-classes' => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
-				'menu-item-xfn' => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
+				'menu-item-db-id' => (isset($_item_object_data['menu-item-db-id']) ? $_item_object_data['menu-item-db-id'] : ''),
+				'menu-item-object-id' => (isset($_item_object_data['menu-item-object-id']) ? $_item_object_data['menu-item-object-id'] : ''),
+				'menu-item-object' => (isset($_item_object_data['menu-item-object']) ? $_item_object_data['menu-item-object'] : ''),
+				'menu-item-parent-id' => (isset($_item_object_data['menu-item-parent-id']) ? $_item_object_data['menu-item-parent-id'] : ''),
+				'menu-item-position' => (isset($_item_object_data['menu-item-position']) ? $_item_object_data['menu-item-position'] : ''),
+				'menu-item-type' => (isset($_item_object_data['menu-item-type']) ? $_item_object_data['menu-item-type'] : ''),
+				'menu-item-title' => (isset($_item_object_data['menu-item-title']) ? $_item_object_data['menu-item-title'] : ''),
+				'menu-item-url' => (isset($_item_object_data['menu-item-url']) ? $_item_object_data['menu-item-url'] : ''),
+				'menu-item-description' => (isset($_item_object_data['menu-item-description']) ? $_item_object_data['menu-item-description'] : ''),
+				'menu-item-attr-title' => (isset($_item_object_data['menu-item-attr-title']) ? $_item_object_data['menu-item-attr-title'] : ''),
+				'menu-item-target' => (isset($_item_object_data['menu-item-target']) ? $_item_object_data['menu-item-target'] : ''),
+				'menu-item-classes' => (isset($_item_object_data['menu-item-classes']) ? $_item_object_data['menu-item-classes'] : ''),
+				'menu-item-xfn' => (isset($_item_object_data['menu-item-xfn']) ? $_item_object_data['menu-item-xfn'] : ''),
 			);
 
-			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
+			$items_saved[] = wp_update_nav_menu_item($menu_id, $_actual_db_id, $args);
 
 		}
 	}
@@ -832,23 +832,23 @@ 
  * @param object $object The post type or taxonomy meta-object.
  * @return object The post type of taxonomy object.
  */
-function _wp_nav_menu_meta_box_object( $object = null ) {
-	if ( isset( $object->name ) ) {
+function _wp_nav_menu_meta_box_object($object = null) {
+	if (isset($object->name)) {
 
-		if ( 'page' == $object->name ) {
+		if ('page' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'menu_order title',
 				'post_status' => 'publish',
 			);
 
 		// Posts should show only published items.
-		} elseif ( 'post' == $object->name ) {
+		} elseif ('post' == $object->name) {
 			$object->_default_query = array(
 				'post_status' => 'publish',
 			);
 
 		// Categories should be in reverse chronological order.
-		} elseif ( 'category' == $object->name ) {
+		} elseif ('category' == $object->name) {
 			$object->_default_query = array(
 				'orderby' => 'id',
 				'order' => 'DESC',
@@ -873,19 +873,19 @@ 
  * @param int $menu_id Optional. The ID of the menu to format. Default 0.
  * @return string|WP_Error $output The menu formatted to edit or error object on failure.
  */
-function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
-	$menu = wp_get_nav_menu_object( $menu_id );
+function wp_get_nav_menu_to_edit($menu_id = 0) {
+	$menu = wp_get_nav_menu_object($menu_id);
 
 	// If the menu exists, get its items.
-	if ( is_nav_menu( $menu ) ) {
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array('post_status' => 'any') );
+	if (is_nav_menu($menu)) {
+		$menu_items = wp_get_nav_menu_items($menu->term_id, array('post_status' => 'any'));
 		$result = '<div id="menu-instructions" class="post-body-plain';
-		$result .= ( ! empty($menu_items) ) ? ' menu-instructions-inactive">' : '">';
-		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
+		$result .= ( ! empty($menu_items)) ? ' menu-instructions-inactive">' : '">';
+		$result .= '<p>'.__('Add menu items from the column on the left.').'</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if (empty($menu_items))
+			return $result.' <ul class="menu" id="menu-to-edit"> </ul>';
 
 		/**
 		 * Filter the Walker class used when adding nav menu items.
@@ -895,38 +895,38 @@ 
 		 * @param string $class   The walker class to use. Default 'Walker_Nav_Menu_Edit'.
 		 * @param int    $menu_id ID of the menu being rendered.
 		 */
-		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
+		$walker_class_name = apply_filters('wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id);
 
-		if ( class_exists( $walker_class_name ) ) {
+		if (class_exists($walker_class_name)) {
 			$walker = new $walker_class_name;
 		} else {
-			return new WP_Error( 'menu_walker_not_exist',
+			return new WP_Error('menu_walker_not_exist',
 				/* translators: %s: walker class name */
-				sprintf( __( 'The Walker class named %s does not exist.' ),
-					'<strong>' . $walker_class_name . '</strong>'
+				sprintf(__('The Walker class named %s does not exist.'),
+					'<strong>'.$walker_class_name.'</strong>'
 				)
 			);
 		}
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
-		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
+		foreach ((array) $menu_items as $menu_item) {
+			if (isset($menu_item->post_status) && 'draft' == $menu_item->post_status)
 				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
+			if ( ! empty($menu_item->_invalid))
 				$some_invalid_menu_items = true;
 		}
 
-		if ( $some_pending_menu_items )
-			$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		if ($some_pending_menu_items)
+			$result .= '<div class="updated inline"><p>'.__('Click Save Menu to make pending menu items public.').'</p></div>';
 
-		if ( $some_invalid_menu_items )
-			$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		if ($some_invalid_menu_items)
+			$result .= '<div class="error inline"><p>'.__('There are some invalid menu items. Please check or delete them.').'</p></div>';
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
+		$result .= walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker));
 		$result .= ' </ul> ';
 		return $result;
-	} elseif ( is_wp_error( $menu ) ) {
+	} elseif (is_wp_error($menu)) {
 		return $menu;
 	}
 
@@ -941,13 +941,13 @@ 
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'_title'      => __( 'Show advanced menu properties' ),
+		'_title'      => __('Show advanced menu properties'),
 		'cb'          => '<input type="checkbox" />',
-		'link-target' => __( 'Link Target' ),
-		'attr-title'  => __( 'Title Attribute' ),
-		'css-classes' => __( 'CSS Classes' ),
-		'xfn'         => __( 'Link Relationship (XFN)' ),
-		'description' => __( 'Description' ),
+		'link-target' => __('Link Target'),
+		'attr-title'  => __('Title Attribute'),
+		'css-classes' => __('CSS Classes'),
+		'xfn'         => __('Link Relationship (XFN)'),
+		'description' => __('Description'),
 	);
 }
 
@@ -961,13 +961,13 @@ 
  */
 function _wp_delete_orphaned_draft_menu_items() {
 	global $wpdb;
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp));
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_items_to_delete as $menu_item_id)
+		wp_delete_post($menu_item_id, true);
 }
 
 /**
@@ -979,12 +979,12 @@ 
  * @param string $nav_menu_selected_title Title of the currently-selected menu
  * @return array $messages The menu updated message
  */
-function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
-	$unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
+function wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title) {
+	$unsorted_menu_items = wp_get_nav_menu_items($nav_menu_selected_id, array('orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish'));
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
+	foreach ($unsorted_menu_items as $_item)
 		$menu_items[$_item->db_id] = $_item;
 
 	$post_fields = array(
@@ -994,66 +994,66 @@ 
 		'menu-item-attr-title', 'menu-item-target', 'menu-item-classes', 'menu-item-xfn'
 	);
 
-	wp_defer_term_counting( true );
+	wp_defer_term_counting(true);
 	// Loop through all the menu items' POST variables
-	if ( ! empty( $_POST['menu-item-db-id'] ) ) {
-		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+	if ( ! empty($_POST['menu-item-db-id'])) {
+		foreach ((array) $_POST['menu-item-db-id'] as $_key => $k) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
+			if ( ! isset($_POST['menu-item-title'][$_key]) || '' == $_POST['menu-item-title'][$_key])
 				continue;
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ($post_fields as $field)
+				$args[$field] = isset($_POST[$field][$_key]) ? $_POST[$field][$_key] : '';
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item($nav_menu_selected_id, ($_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key), $args);
 
-			if ( is_wp_error( $menu_item_db_id ) ) {
-				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+			if (is_wp_error($menu_item_db_id)) {
+				$messages[] = '<div id="message" class="error"><p>'.$menu_item_db_id->get_error_message().'</p></div>';
 			} else {
-				unset( $menu_items[ $menu_item_db_id ] );
+				unset($menu_items[$menu_item_db_id]);
 			}
 		}
 	}
 
 	// Remove menu items from the menu that weren't in $_POST
-	if ( ! empty( $menu_items ) ) {
-		foreach ( array_keys( $menu_items ) as $menu_item_id ) {
-			if ( is_nav_menu_item( $menu_item_id ) ) {
-				wp_delete_post( $menu_item_id );
+	if ( ! empty($menu_items)) {
+		foreach (array_keys($menu_items) as $menu_item_id) {
+			if (is_nav_menu_item($menu_item_id)) {
+				wp_delete_post($menu_item_id);
 			}
 		}
 	}
 
 	// Store 'auto-add' pages.
-	$auto_add = ! empty( $_POST['auto-add-pages'] );
-	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
+	$auto_add = ! empty($_POST['auto-add-pages']);
+	$nav_menu_option = (array) get_option('nav_menu_options');
+	if ( ! isset($nav_menu_option['auto_add']))
 		$nav_menu_option['auto_add'] = array();
-	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
+	if ($auto_add) {
+		if ( ! in_array($nav_menu_selected_id, $nav_menu_option['auto_add']))
 			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if (false !== ($key = array_search($nav_menu_selected_id, $nav_menu_option['auto_add'])))
+			unset($nav_menu_option['auto_add'][$key]);
 	}
 	// Remove nonexistent/deleted menus
-	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
-	update_option( 'nav_menu_options', $nav_menu_option );
+	$nav_menu_option['auto_add'] = array_intersect($nav_menu_option['auto_add'], wp_get_nav_menus(array('fields' => 'ids')));
+	update_option('nav_menu_options', $nav_menu_option);
 
-	wp_defer_term_counting( false );
+	wp_defer_term_counting(false);
 
 	/** This action is documented in wp-includes/nav-menu.php */
-	do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
+	do_action('wp_update_nav_menu', $nav_menu_selected_id);
 
-	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
+	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>'.
 		/* translators: %s: nav menu title */
-		sprintf( __( '%s has been updated.' ),
-			'<strong>' . $nav_menu_selected_title . '</strong>'
-		) . '</p></div>';
+		sprintf(__('%s has been updated.'),
+			'<strong>'.$nav_menu_selected_title.'</strong>'
+		).'</p></div>';
 
-	unset( $menu_items, $unsorted_menu_items );
+	unset($menu_items, $unsorted_menu_items);
 
 	return $messages;
 }

Braces +82 added lines, -45 removed lines

@@ -75,8 +75,9 @@ 
 				'post_type' => $matches[2],
 				's' => $query,
 			));
-			if ( ! have_posts() )
-				return;
+			if ( ! have_posts() ) {
+							return;
+			}
 			while ( have_posts() ) {
 				the_post();
 				if ( 'markup' == $response_format ) {
@@ -98,8 +99,9 @@ 
 				'name__like' => $query,
 				'number' => 10,
 			));
-			if ( empty( $terms ) || is_wp_error( $terms ) )
-				return;
+			if ( empty( $terms ) || is_wp_error( $terms ) ) {
+							return;
+			}
 			foreach ( (array) $terms as $term ) {
 				if ( 'markup' == $response_format ) {
 					echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
@@ -151,8 +153,9 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) )
-		return;
+	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array($wp_meta_boxes) ) {
+			return;
+	}
 
 	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
 	$hidden_meta_boxes = array();
@@ -181,8 +184,9 @@ 
 function wp_nav_menu_post_type_meta_boxes() {
 	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( ! $post_types )
-		return;
+	if ( ! $post_types ) {
+			return;
+	}
 
 	foreach ( $post_types as $post_type ) {
 		/**
@@ -215,8 +219,9 @@ 
 function wp_nav_menu_taxonomy_meta_boxes() {
 	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
 
-	if ( !$taxonomies )
-		return;
+	if ( !$taxonomies ) {
+			return;
+	}
 
 	foreach ( $taxonomies as $tax ) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
@@ -241,8 +246,9 @@ 
 function wp_nav_menu_disabled_check( $nav_menu_selected_id ) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus )
-		return false;
+	if ( $one_theme_location_no_menus ) {
+			return false;
+	}
 
 	return disabled( $nav_menu_selected_id, 0 );
 }
@@ -316,8 +322,9 @@ 
 		'update_post_meta_cache' => false
 	);
 
-	if ( isset( $post_type['args']->_default_query ) )
-		$args = array_merge($args, (array) $post_type['args']->_default_query );
+	if ( isset( $post_type['args']->_default_query ) ) {
+			$args = array_merge($args, (array) $post_type['args']->_default_query );
+	}
 
 	// @todo transient caching of these results with proper invalidation on updating of a post of this type
 	$get_posts = new WP_Query;
@@ -374,17 +381,26 @@ 
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'most-recent', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
 					<?php _e( 'Most Recent' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#<?php echo $post_type_name; ?>-all">
+				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#<?php echo $post_type_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
 					<?php _e( 'Search'); ?>
 				</a>
 			</li>
@@ -649,17 +665,26 @@ 
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
 			<li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'most-used', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
 					<?php _e( 'Most Used' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args))); ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'all', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
 					<?php _e( 'View All' ); ?>
 				</a>
 			</li>
 			<li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args))); ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php if ( $nav_menu_selected_id ) {
+	echo esc_url(add_query_arg($taxonomy_name . '-tab', 'search', remove_query_arg($removed_args)));
+}
+?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
 					<?php _e( 'Search' ); ?>
 				</a>
 			</li>
@@ -884,8 +909,9 @@ 
 		$result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
 		$result .= '</div>';
 
-		if ( empty($menu_items) )
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		if ( empty($menu_items) ) {
+					return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+		}
 
 		/**
 		 * Filter the Walker class used when adding nav menu items.
@@ -910,17 +936,21 @@ 
 
 		$some_pending_menu_items = $some_invalid_menu_items = false;
 		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
-				$some_pending_menu_items = true;
-			if ( ! empty( $menu_item->_invalid ) )
-				$some_invalid_menu_items = true;
+			if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
+							$some_pending_menu_items = true;
+			}
+			if ( ! empty( $menu_item->_invalid ) ) {
+							$some_invalid_menu_items = true;
+			}
 		}
 
-		if ( $some_pending_menu_items )
-			$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		if ( $some_pending_menu_items ) {
+					$result .= '<div class="updated inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
+		}
 
-		if ( $some_invalid_menu_items )
-			$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		if ( $some_invalid_menu_items ) {
+					$result .= '<div class="error inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
+		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
 		$result .= walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker ) );
@@ -966,9 +996,10 @@ 
 	// Delete orphaned draft menu items.
 	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_timestamp ) );
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id )
-		wp_delete_post( $menu_item_id, true );
-}
+	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
+			wp_delete_post( $menu_item_id, true );
+	}
+	}
 
 /**
  * Saves nav menu items
@@ -984,8 +1015,9 @@ 
 	$messages = array();
 	$menu_items = array();
 	// Index menu items by db ID
-	foreach ( $unsorted_menu_items as $_item )
-		$menu_items[$_item->db_id] = $_item;
+	foreach ( $unsorted_menu_items as $_item ) {
+			$menu_items[$_item->db_id] = $_item;
+	}
 
 	$post_fields = array(
 		'menu-item-db-id', 'menu-item-object-id', 'menu-item-object',
@@ -1000,12 +1032,14 @@ 
 		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
 
 			// Menu item title can't be blank
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
-				continue;
+			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
+							continue;
+			}
 
 			$args = array();
-			foreach ( $post_fields as $field )
-				$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			foreach ( $post_fields as $field ) {
+							$args[$field] = isset( $_POST[$field][$_key] ) ? $_POST[$field][$_key] : '';
+			}
 
 			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
 
@@ -1029,14 +1063,17 @@ 
 	// Store 'auto-add' pages.
 	$auto_add = ! empty( $_POST['auto-add-pages'] );
 	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-	if ( ! isset( $nav_menu_option['auto_add'] ) )
-		$nav_menu_option['auto_add'] = array();
+	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
+			$nav_menu_option['auto_add'] = array();
+	}
 	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) )
-			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) {
+					$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
+		}
 	} else {
-		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) )
-			unset( $nav_menu_option['auto_add'][$key] );
+		if ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
+					unset( $nav_menu_option['auto_add'][$key] );
+		}
 	}
 	// Remove nonexistent/deleted menus
 	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );

src/wp-admin/includes/class-wp-press-this.php

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Press This class and display functionality
- *
- * @package WordPress
- * @subpackage Press_This
- * @since 4.2.0
- */
+	 * Press This class and display functionality
+	 *
+	 * @package WordPress
+	 * @subpackage Press_This
+	 * @since 4.2.0
+	 */
 
 /**
  * Press This class.
@@ -1049,7 +1049,7 @@ 
 	 * @since 4.2.0
 	 * @access public
 	 *
- 	 * @param array $data The site's data.
+	 * @param array $data The site's data.
 	 * @return string Discovered canonical URL, or empty
 	 */
 	public function get_canonical_link( $data ) {

Spacing +395 added lines, -395 removed lines

@@ -48,7 +48,7 @@ 
 			 *
 			 * @param bool $redirect Whether to redirect in parent window or not. Default false.
 			 */
-			'redirInParent' => apply_filters( 'press_this_redirect_in_parent', false ),
+			'redirInParent' => apply_filters('press_this_redirect_in_parent', false),
 		);
 	}
 
@@ -62,37 +62,37 @@ 
 	 * @param string $content Optional. Current expected markup for Press This. Expects slashed. Default empty.
 	 * @return string New markup with old image URLs replaced with the local attachment ones if swapped.
 	 */
-	public function side_load_images( $post_id, $content = '' ) {
-		$content = wp_unslash( $content );
+	public function side_load_images($post_id, $content = '') {
+		$content = wp_unslash($content);
 
-		if ( preg_match_all( '/<img [^>]+>/', $content, $matches ) && current_user_can( 'upload_files' ) ) {
-			foreach ( (array) $matches[0] as $image ) {
+		if (preg_match_all('/<img [^>]+>/', $content, $matches) && current_user_can('upload_files')) {
+			foreach ((array) $matches[0] as $image) {
 				// This is inserted from our JS so HTML attributes should always be in double quotes.
-				if ( ! preg_match( '/src="([^"]+)"/', $image, $url_matches ) ) {
+				if ( ! preg_match('/src="([^"]+)"/', $image, $url_matches)) {
 					continue;
 				}
 
 				$image_src = $url_matches[1];
 
 				// Don't try to sideload a file without a file extension, leads to WP upload error.
-				if ( ! preg_match( '/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src ) ) {
+				if ( ! preg_match('/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src)) {
 					continue;
 				}
 
 				// Sideload image, which gives us a new image src.
-				$new_src = media_sideload_image( $image_src, $post_id, null, 'src' );
+				$new_src = media_sideload_image($image_src, $post_id, null, 'src');
 
-				if ( ! is_wp_error( $new_src ) ) {
+				if ( ! is_wp_error($new_src)) {
 					// Replace the POSTED content <img> with correct uploaded ones.
 					// Need to do it in two steps so we don't replace links to the original image if any.
-					$new_image = str_replace( $image_src, $new_src, $image );
-					$content = str_replace( $image, $new_image, $content );
+					$new_image = str_replace($image_src, $new_src, $image);
+					$content = str_replace($image, $new_image, $content);
 				}
 			}
 		}
 
 		// Expected slashed
-		return wp_slash( $content );
+		return wp_slash($content);
 	}
 
 	/**
@@ -102,36 +102,36 @@ 
 	 * @access public
 	 */
 	public function save_post() {
-		if ( empty( $_POST['post_ID'] ) || ! $post_id = (int) $_POST['post_ID'] ) {
-			wp_send_json_error( array( 'errorMessage' => __( 'Missing post ID.' ) ) );
+		if (empty($_POST['post_ID']) || ! $post_id = (int) $_POST['post_ID']) {
+			wp_send_json_error(array('errorMessage' => __('Missing post ID.')));
 		}
 
-		if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'update-post_' . $post_id ) ||
-			! current_user_can( 'edit_post', $post_id ) ) {
+		if (empty($_POST['_wpnonce']) || ! wp_verify_nonce($_POST['_wpnonce'], 'update-post_'.$post_id) ||
+			! current_user_can('edit_post', $post_id)) {
 
-			wp_send_json_error( array( 'errorMessage' => __( 'Invalid post.' ) ) );
+			wp_send_json_error(array('errorMessage' => __('Invalid post.')));
 		}
 
 		$post_data = array(
 			'ID'            => $post_id,
-			'post_title'    => ( ! empty( $_POST['post_title'] ) ) ? sanitize_text_field( trim( $_POST['post_title'] ) ) : '',
-			'post_content'  => ( ! empty( $_POST['post_content'] ) ) ? trim( $_POST['post_content'] ) : '',
+			'post_title'    => ( ! empty($_POST['post_title'])) ? sanitize_text_field(trim($_POST['post_title'])) : '',
+			'post_content'  => ( ! empty($_POST['post_content'])) ? trim($_POST['post_content']) : '',
 			'post_type'     => 'post',
 			'post_status'   => 'draft',
-			'post_format'   => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',
-			'tax_input'     => ( ! empty( $_POST['tax_input'] ) ) ? $_POST['tax_input'] : array(),
-			'post_category' => ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array(),
+			'post_format'   => ( ! empty($_POST['post_format'])) ? sanitize_text_field($_POST['post_format']) : '',
+			'tax_input'     => ( ! empty($_POST['tax_input'])) ? $_POST['tax_input'] : array(),
+			'post_category' => ( ! empty($_POST['post_category'])) ? $_POST['post_category'] : array(),
 		);
 
-		if ( ! empty( $_POST['post_status'] ) && 'publish' === $_POST['post_status'] ) {
-			if ( current_user_can( 'publish_posts' ) ) {
+		if ( ! empty($_POST['post_status']) && 'publish' === $_POST['post_status']) {
+			if (current_user_can('publish_posts')) {
 				$post_data['post_status'] = 'publish';
 			} else {
 				$post_data['post_status'] = 'pending';
 			}
 		}
 
-		$post_data['post_content'] = $this->side_load_images( $post_id, $post_data['post_content'] );
+		$post_data['post_content'] = $this->side_load_images($post_id, $post_data['post_content']);
 
 		/**
 		 * Filter the post data of a Press This post before saving/updating, after
@@ -141,28 +141,28 @@ 
 		 *
 		 * @param array $post_data The post data.
 		 */
-		$post_data = apply_filters( 'press_this_save_post', $post_data );
+		$post_data = apply_filters('press_this_save_post', $post_data);
 
-		$updated = wp_update_post( $post_data, true );
+		$updated = wp_update_post($post_data, true);
 
-		if ( is_wp_error( $updated ) ) {
-			wp_send_json_error( array( 'errorMessage' => $updated->get_error_message() ) );
+		if (is_wp_error($updated)) {
+			wp_send_json_error(array('errorMessage' => $updated->get_error_message()));
 		} else {
-			if ( isset( $post_data['post_format'] ) ) {
-				if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) ) {
-					set_post_format( $post_id, $post_data['post_format'] );
-				} elseif ( $post_data['post_format'] ) {
-					set_post_format( $post_id, false );
+			if (isset($post_data['post_format'])) {
+				if (current_theme_supports('post-formats', $post_data['post_format'])) {
+					set_post_format($post_id, $post_data['post_format']);
+				} elseif ($post_data['post_format']) {
+					set_post_format($post_id, false);
 				}
 			}
 
 			$forceRedirect = false;
 
-			if ( 'publish' === get_post_status( $post_id ) ) {
-				$redirect = get_post_permalink( $post_id );
-			} elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+			if ('publish' === get_post_status($post_id)) {
+				$redirect = get_post_permalink($post_id);
+			} elseif (isset($_POST['pt-force-redirect']) && $_POST['pt-force-redirect'] === 'true') {
 				$forceRedirect = true;
-				$redirect = get_edit_post_link( $post_id, 'js' );
+				$redirect = get_edit_post_link($post_id, 'js');
 			} else {
 				$redirect = false;
 			}
@@ -177,12 +177,12 @@ 
 			 * @param int    $post_id Post ID.
 			 * @param string $status  Post status.
 			 */
-			$redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post_data['post_status'] );
+			$redirect = apply_filters('press_this_save_redirect', $redirect, $post_id, $post_data['post_status']);
 
-			if ( $redirect ) {
-				wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
+			if ($redirect) {
+				wp_send_json_success(array('redirect' => $redirect, 'force' => $forceRedirect));
 			} else {
-				wp_send_json_success( array( 'postSaved' => true ) );
+				wp_send_json_success(array('postSaved' => true));
 			}
 		}
 	}
@@ -194,57 +194,57 @@ 
 	 * @access public
 	 */
 	public function add_category() {
-		if ( false === wp_verify_nonce( $_POST['new_cat_nonce'], 'add-category' ) ) {
+		if (false === wp_verify_nonce($_POST['new_cat_nonce'], 'add-category')) {
 			wp_send_json_error();
 		}
 
-		$taxonomy = get_taxonomy( 'category' );
+		$taxonomy = get_taxonomy('category');
 
-		if ( ! current_user_can( $taxonomy->cap->edit_terms ) || empty( $_POST['name'] ) ) {
+		if ( ! current_user_can($taxonomy->cap->edit_terms) || empty($_POST['name'])) {
 			wp_send_json_error();
 		}
 
-		$parent = isset( $_POST['parent'] ) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
-		$names = explode( ',', $_POST['name'] );
+		$parent = isset($_POST['parent']) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
+		$names = explode(',', $_POST['name']);
 		$added = $data = array();
 
-		foreach ( $names as $cat_name ) {
-			$cat_name = trim( $cat_name );
-			$cat_nicename = sanitize_title( $cat_name );
+		foreach ($names as $cat_name) {
+			$cat_name = trim($cat_name);
+			$cat_nicename = sanitize_title($cat_name);
 
-			if ( empty( $cat_nicename ) ) {
+			if (empty($cat_nicename)) {
 				continue;
 			}
 
 			// @todo Find a more performant way to check existence, maybe get_term() with a separate parent check.
-			if ( term_exists( $cat_name, $taxonomy->name, $parent ) ) {
-				if ( count( $names ) === 1 ) {
-					wp_send_json_error( array( 'errorMessage' => __( 'This category already exists.' ) ) );
+			if (term_exists($cat_name, $taxonomy->name, $parent)) {
+				if (count($names) === 1) {
+					wp_send_json_error(array('errorMessage' => __('This category already exists.')));
 				} else {
 					continue;
 				}
 			}
 
-			$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+			$cat_id = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
 
-			if ( is_wp_error( $cat_id ) ) {
+			if (is_wp_error($cat_id)) {
 				continue;
-			} elseif ( is_array( $cat_id ) ) {
+			} elseif (is_array($cat_id)) {
 				$cat_id = $cat_id['term_id'];
 			}
 
 			$added[] = $cat_id;
 		}
 
-		if ( empty( $added ) ) {
-			wp_send_json_error( array( 'errorMessage' => __( 'This category cannot be added. Please change the name and try again.' ) ) );
+		if (empty($added)) {
+			wp_send_json_error(array('errorMessage' => __('This category cannot be added. Please change the name and try again.')));
 		}
 
-		foreach ( $added as $new_cat_id ) {
-			$new_cat = get_category( $new_cat_id );
+		foreach ($added as $new_cat_id) {
+			$new_cat = get_category($new_cat_id);
 
-			if ( is_wp_error( $new_cat ) ) {
-				wp_send_json_error( array( 'errorMessage' => __( 'Error while adding the category. Please try again later.' ) ) );
+			if (is_wp_error($new_cat)) {
+				wp_send_json_error(array('errorMessage' => __('Error while adding the category. Please try again later.')));
 			}
 
 			$data[] = array(
@@ -253,7 +253,7 @@ 
 				'parent' => $new_cat->parent,
 			);
 		}
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 
 	/**
@@ -265,20 +265,20 @@ 
 	 * @param string $url URL to scan.
 	 * @return string Source's HTML sanitized markup
 	 */
-	public function fetch_source_html( $url ) {
+	public function fetch_source_html($url) {
 		global $wp_version;
 
-		if ( empty( $url ) ) {
-			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+		if (empty($url)) {
+			return new WP_Error('invalid-url', __('A valid URL was not provided.'));
 		}
 
-		$remote_url = wp_safe_remote_get( $url, array(
+		$remote_url = wp_safe_remote_get($url, array(
 			'timeout' => 30,
 			// Use an explicit user-agent for Press This
-			'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
-		) );
+			'user-agent' => 'Press This (WordPress/'.$wp_version.'); '.get_bloginfo('url')
+		));
 
-		if ( is_wp_error( $remote_url ) ) {
+		if (is_wp_error($remote_url)) {
 			return $remote_url;
 		}
 
@@ -303,8 +303,8 @@ 
 			)
 		);
 
-		$source_content = wp_remote_retrieve_body( $remote_url );
-		$source_content = wp_kses( $source_content, $allowed_elements );
+		$source_content = wp_remote_retrieve_body($remote_url);
+		$source_content = wp_kses($source_content, $allowed_elements);
 
 		return $source_content;
 	}
@@ -318,10 +318,10 @@ 
 	 * @param array $value Array to limit.
 	 * @return array Original array if fewer than 50 values, limited array, empty array otherwise.
 	 */
-	private function _limit_array( $value ) {
-		if ( is_array( $value ) ) {
-			if ( count( $value ) > 50 ) {
-				return array_slice( $value, 0, 50 );
+	private function _limit_array($value) {
+		if (is_array($value)) {
+			if (count($value) > 50) {
+				return array_slice($value, 0, 50);
 			}
 
 			return $value;
@@ -341,20 +341,20 @@ 
 	 *                         if fewer than 5,000 characters, a truncated version, otherwise an
 	 *                         empty string.
 	 */
-	private function _limit_string( $value ) {
+	private function _limit_string($value) {
 		$return = '';
 
-		if ( is_numeric( $value ) || is_bool( $value ) ) {
+		if (is_numeric($value) || is_bool($value)) {
 			$return = $value;
-		} else if ( is_string( $value ) ) {
-			if ( mb_strlen( $value ) > 5000 ) {
-				$return = mb_substr( $value, 0, 5000 );
+		} else if (is_string($value)) {
+			if (mb_strlen($value) > 5000) {
+				$return = mb_substr($value, 0, 5000);
 			} else {
 				$return = $value;
 			}
 
-			$return = html_entity_decode( $return, ENT_QUOTES, 'UTF-8' );
-			$return = sanitize_text_field( trim( $return ) );
+			$return = html_entity_decode($return, ENT_QUOTES, 'UTF-8');
+			$return = sanitize_text_field(trim($return));
 		}
 
 		return $return;
@@ -369,32 +369,32 @@ 
 	 * @param string $url URL to check for length and validity.
 	 * @return string Escaped URL if of valid length (< 2048) and makeup. Empty string otherwise.
 	 */
-	private function _limit_url( $url ) {
-		if ( ! is_string( $url ) ) {
+	private function _limit_url($url) {
+		if ( ! is_string($url)) {
 			return '';
 		}
 
 		// HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048.
-		if ( strlen( $url ) > 2048 ) {
+		if (strlen($url) > 2048) {
 			return ''; // Return empty rather than a truncated/invalid URL
 		}
 
 		// Does not look like a URL.
-		if ( ! preg_match( '/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url ) ) {
+		if ( ! preg_match('/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url)) {
 			return '';
 		}
 
 		// If the URL is root-relative, prepend the protocol and domain name
-		if ( $url && $this->domain && preg_match( '%^/[^/]+%', $url ) ) {
-			$url = $this->domain . $url;
+		if ($url && $this->domain && preg_match('%^/[^/]+%', $url)) {
+			$url = $this->domain.$url;
 		}
 
 		// Not absolute or protocol-relative URL.
-		if ( ! preg_match( '%^(?:https?:)?//[^/]+%', $url ) ) {
+		if ( ! preg_match('%^(?:https?:)?//[^/]+%', $url)) {
 			return '';
 		}
 
-		return esc_url_raw( $url, array( 'http', 'https' ) );
+		return esc_url_raw($url, array('http', 'https'));
 	}
 
 	/**
@@ -409,34 +409,34 @@ 
 	 * @param string $src Image source URL.
 	 * @return string If not matched an excluded URL type, the original URL, empty string otherwise.
 	 */
-	private function _limit_img( $src ) {
-		$src = $this->_limit_url( $src );
+	private function _limit_img($src) {
+		$src = $this->_limit_url($src);
 
-		if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
+		if (preg_match('!/ad[sx]?/!i', $src)) {
 			// Ads
 			return '';
-		} else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
+		} else if (preg_match('!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src)) {
 			// Share-this type button
 			return '';
-		} else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
+		} else if (preg_match('!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src)) {
 			// Loaders, spinners, spacers
 			return '';
-		} else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
+		} else if (preg_match('!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src)) {
 			// Fancy loaders, spinners, spacers
 			return '';
-		} else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
+		} else if (preg_match('!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src)) {
 			// Thumbnails, too small, usually irrelevant to context
 			return '';
-		} else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+		} else if (false !== stripos($src, '/wp-includes/')) {
 			// Classic WordPress interface images
 			return '';
-		} else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
+		} else if (preg_match('![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src)) {
 			// Most often tiny buttons/thumbs (< 100px wide)
 			return '';
-		} else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
+		} else if (preg_match('!/pixel\.(mathtag|quantserve)\.com!i', $src)) {
 			// See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
 			return '';
-		} else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+		} else if (preg_match('!/[gb]\.gif(\?.+)?$!i', $src)) {
 			// WordPress.com stats gif
 			return '';
 		}
@@ -456,32 +456,32 @@ 
 	 * @param string $src Embed source URL.
 	 * @return string If not from a supported provider, an empty string. Otherwise, a reformattd embed URL.
 	 */
-	private function _limit_embed( $src ) {
-		$src = $this->_limit_url( $src );
+	private function _limit_embed($src) {
+		$src = $this->_limit_url($src);
 
-		if ( empty( $src ) )
+		if (empty($src))
 			return '';
 
-		if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
+		if (preg_match('!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches)) {
 			// Embedded Youtube videos (www or mobile)
-			$src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
-		} else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
+			$src = 'https://www.youtube.com/watch?v='.$src_matches[3];
+		} else if (preg_match('!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches)) {
 			// Embedded Vimeo iframe videos
-			$src = 'https://vimeo.com/' . (int) $src_matches[1];
-		} else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
+			$src = 'https://vimeo.com/'.(int) $src_matches[1];
+		} else if (preg_match('!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches)) {
 			// Embedded Vimeo Flash videos
-			$src = 'https://vimeo.com/' . (int) $src_matches[1];
-		} else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
+			$src = 'https://vimeo.com/'.(int) $src_matches[1];
+		} else if (preg_match('!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches)) {
 			// Embedded Vine videos
-			$src = 'https://vine.co/v/' . $src_matches[1];
-		} else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
+			$src = 'https://vine.co/v/'.$src_matches[1];
+		} else if (preg_match('!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches)) {
 			// Embedded Daily Motion videos
-			$src = 'https://www.dailymotion.com/video/' . $src_matches[2];
+			$src = 'https://www.dailymotion.com/video/'.$src_matches[2];
 		} else {
-			require_once( ABSPATH . WPINC . '/class-oembed.php' );
+			require_once(ABSPATH.WPINC.'/class-oembed.php');
 			$oembed = _wp_oembed_get_object();
 
-			if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+			if ( ! $oembed->get_provider($src, array('discover' => false))) {
 				$src = '';
 			}
 		}
@@ -500,21 +500,21 @@ 
 	 * @param array  $data       Associative array of source data.
 	 * @return array Processed data array.
 	 */
-	private function _process_meta_entry( $meta_name, $meta_value, $data ) {
-		if ( preg_match( '/:?(title|description|keywords|site_name)$/', $meta_name ) ) {
-			$data['_meta'][ $meta_name ] = $meta_value;
+	private function _process_meta_entry($meta_name, $meta_value, $data) {
+		if (preg_match('/:?(title|description|keywords|site_name)$/', $meta_name)) {
+			$data['_meta'][$meta_name] = $meta_value;
 		} else {
-			switch ( $meta_name ) {
+			switch ($meta_name) {
 				case 'og:url':
 				case 'og:video':
 				case 'og:video:secure_url':
-					$meta_value = $this->_limit_embed( $meta_value );
+					$meta_value = $this->_limit_embed($meta_value);
 
-					if ( ! isset( $data['_embeds'] ) ) {
+					if ( ! isset($data['_embeds'])) {
 						$data['_embeds'] = array();
 					}
 
-					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_embeds'] ) ) {
+					if ( ! empty($meta_value) && ! in_array($meta_value, $data['_embeds'])) {
 						$data['_embeds'][] = $meta_value;
 					}
 
@@ -525,13 +525,13 @@ 
 				case 'twitter:image0':
 				case 'twitter:image:src':
 				case 'twitter:image':
-					$meta_value = $this->_limit_img( $meta_value );
+					$meta_value = $this->_limit_img($meta_value);
 
-					if ( ! isset( $data['_images'] ) ) {
+					if ( ! isset($data['_images'])) {
 						$data['_images'] = array();
 					}
 
-					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_images'] ) ) {
+					if ( ! empty($meta_value) && ! in_array($meta_value, $data['_images'])) {
 						$data['_images'][] = $meta_value;
 					}
 
@@ -552,58 +552,58 @@ 
 	 * @param array  $data Optional. Existing data array if you have one. Default empty array.
 	 * @return array New data array.
 	 */
-	public function source_data_fetch_fallback( $url, $data = array() ) {
-		if ( empty( $url ) ) {
+	public function source_data_fetch_fallback($url, $data = array()) {
+		if (empty($url)) {
 			return array();
 		}
 
 		// Download source page to tmp file.
-		$source_content = $this->fetch_source_html( $url );
-		if ( is_wp_error( $source_content ) ) {
-			return array( 'errors' => $source_content->get_error_messages() );
+		$source_content = $this->fetch_source_html($url);
+		if (is_wp_error($source_content)) {
+			return array('errors' => $source_content->get_error_messages());
 		}
 
 		// Fetch and gather <meta> data first, so discovered media is offered 1st to user.
-		if ( empty( $data['_meta'] ) ) {
+		if (empty($data['_meta'])) {
 			$data['_meta'] = array();
 		}
 
-		if ( preg_match_all( '/<meta [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<meta [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches ) ) {
-					$meta_name  = $this->_limit_string( $new_matches[2] );
-					$meta_value = $this->_limit_string( $new_matches[3] );
+			foreach ($items as $value) {
+				if (preg_match('/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches)) {
+					$meta_name  = $this->_limit_string($new_matches[2]);
+					$meta_value = $this->_limit_string($new_matches[3]);
 
 					// Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
-					if ( strlen( $meta_name ) > 100 ) {
+					if (strlen($meta_name) > 100) {
 						continue;
 					}
 
-					$data = $this->_process_meta_entry( $meta_name, $meta_value, $data );
+					$data = $this->_process_meta_entry($meta_name, $meta_value, $data);
 				}
 			}
 		}
 
 		// Fetch and gather <img> data.
-		if ( empty( $data['_images'] ) ) {
+		if (empty($data['_images'])) {
 			$data['_images'] = array();
 		}
 
-		if ( preg_match_all( '/<img [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<img [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( ( preg_match( '/width=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 256 ) ||
-					( preg_match( '/height=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 128 ) ) {
+			foreach ($items as $value) {
+				if ((preg_match('/width=(\'|")(\d+)\\1/i', $value, $new_matches) && $new_matches[2] < 256) ||
+					(preg_match('/height=(\'|")(\d+)\\1/i', $value, $new_matches) && $new_matches[2] < 128)) {
 
 					continue;
 				}
 
-				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches ) ) {
-					$src = $this->_limit_img( $new_matches[2] );
-					if ( ! empty( $src ) && ! in_array( $src, $data['_images'] ) ) {
+				if (preg_match('/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches)) {
+					$src = $this->_limit_img($new_matches[2]);
+					if ( ! empty($src) && ! in_array($src, $data['_images'])) {
 						$data['_images'][] = $src;
 					}
 				}
@@ -611,18 +611,18 @@ 
 		}
 
 		// Fetch and gather <iframe> data.
-		if ( empty( $data['_embeds'] ) ) {
+		if (empty($data['_embeds'])) {
 			$data['_embeds'] = array();
 		}
 
-		if ( preg_match_all( '/<iframe [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<iframe [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/', $value, $new_matches ) ) {
-					$src = $this->_limit_embed( $new_matches[2] );
+			foreach ($items as $value) {
+				if (preg_match('/src=(\'|")([^\'"]+)\\1/', $value, $new_matches)) {
+					$src = $this->_limit_embed($new_matches[2]);
 
-					if ( ! empty( $src ) && ! in_array( $src, $data['_embeds'] ) ) {
+					if ( ! empty($src) && ! in_array($src, $data['_embeds'])) {
 						$data['_embeds'][] = $src;
 					}
 				}
@@ -630,20 +630,20 @@ 
 		}
 
 		// Fetch and gather <link> data.
-		if ( empty( $data['_links'] ) ) {
+		if (empty($data['_links'])) {
 			$data['_links'] = array();
 		}
 
-		if ( preg_match_all( '/<link [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<link [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel ) && preg_match( '/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url ) ) {
+			foreach ($items as $value) {
+				if (preg_match('/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel) && preg_match('/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url)) {
 					$rel = $matches_rel[1];
-					$url = $this->_limit_url( $matches_url[1] );
+					$url = $this->_limit_url($matches_url[1]);
 
-					if ( ! empty( $url ) && empty( $data['_links'][ $rel ] ) ) {
-						$data['_links'][ $rel ] = $url;
+					if ( ! empty($url) && empty($data['_links'][$rel])) {
+						$data['_links'][$rel] = $url;
 					}
 				}
 			}
@@ -665,27 +665,27 @@ 
 		$data = array();
 
 		// Only instantiate the keys we want. Sanity check and sanitize each one.
-		foreach ( array( 'u', 's', 't', 'v' ) as $key ) {
-			if ( ! empty( $_POST[ $key ] ) ) {
-				$value = wp_unslash( $_POST[ $key ] );
-			} else if ( ! empty( $_GET[ $key ] ) ) {
-				$value = wp_unslash( $_GET[ $key ] );
+		foreach (array('u', 's', 't', 'v') as $key) {
+			if ( ! empty($_POST[$key])) {
+				$value = wp_unslash($_POST[$key]);
+			} else if ( ! empty($_GET[$key])) {
+				$value = wp_unslash($_GET[$key]);
 			} else {
 				continue;
 			}
 
-			if ( 'u' === $key ) {
-				$value = $this->_limit_url( $value );
+			if ('u' === $key) {
+				$value = $this->_limit_url($value);
 
-				if ( preg_match( '%^(?:https?:)?//[^/]+%i', $value, $domain_match ) ) {
+				if (preg_match('%^(?:https?:)?//[^/]+%i', $value, $domain_match)) {
 					$this->domain = $domain_match[0];
 				}
 			} else {
-				$value = $this->_limit_string( $value );
+				$value = $this->_limit_string($value);
 			}
 
-			if ( ! empty( $value ) ) {
-				$data[ $key ] = $value;
+			if ( ! empty($value)) {
+				$data[$key] = $value;
 			}
 		}
 
@@ -696,58 +696,58 @@ 
 		 *
 		 * @param bool $enable Whether to enable media discovery.
 		 */
-		if ( apply_filters( 'enable_press_this_media_discovery', true ) ) {
+		if (apply_filters('enable_press_this_media_discovery', true)) {
 			/*
 			 * If no title, _images, _embed, and _meta was passed via $_POST, fetch data from source as fallback,
 			 * making PT fully backward compatible with the older bookmarklet.
 			 */
-			if ( empty( $_POST ) && ! empty( $data['u'] ) ) {
-				$data = $this->source_data_fetch_fallback( $data['u'], $data );
+			if (empty($_POST) && ! empty($data['u'])) {
+				$data = $this->source_data_fetch_fallback($data['u'], $data);
 			} else {
-				foreach ( array( '_images', '_embeds' ) as $type ) {
-					if ( empty( $_POST[ $type ] ) ) {
+				foreach (array('_images', '_embeds') as $type) {
+					if (empty($_POST[$type])) {
 						continue;
 					}
 
-					$data[ $type ] = array();
-					$items = $this->_limit_array( $_POST[ $type ] );
+					$data[$type] = array();
+					$items = $this->_limit_array($_POST[$type]);
 
-					foreach ( $items as $key => $value ) {
-						if ( $type === '_images' ) {
-							$value = $this->_limit_img( wp_unslash( $value ) );
+					foreach ($items as $key => $value) {
+						if ($type === '_images') {
+							$value = $this->_limit_img(wp_unslash($value));
 						} else {
-							$value = $this->_limit_embed( wp_unslash( $value ) );
+							$value = $this->_limit_embed(wp_unslash($value));
 						}
 
-						if ( ! empty( $value ) ) {
-							$data[ $type ][] = $value;
+						if ( ! empty($value)) {
+							$data[$type][] = $value;
 						}
 					}
 				}
 
-				foreach ( array( '_meta', '_links' ) as $type ) {
-					if ( empty( $_POST[ $type ] ) ) {
+				foreach (array('_meta', '_links') as $type) {
+					if (empty($_POST[$type])) {
 						continue;
 					}
 
-					$data[ $type ] = array();
-					$items = $this->_limit_array( $_POST[ $type ] );
+					$data[$type] = array();
+					$items = $this->_limit_array($_POST[$type]);
 
-					foreach ( $items as $key => $value ) {
+					foreach ($items as $key => $value) {
 						// Sanity check. These are associative arrays, $key is usually things like 'title', 'description', 'keywords', etc.
-						if ( empty( $key ) || strlen( $key ) > 100 ) {
+						if (empty($key) || strlen($key) > 100) {
 							continue;
 						}
 
-						if ( $type === '_meta' ) {
-							$value = $this->_limit_string( wp_unslash( $value ) );
+						if ($type === '_meta') {
+							$value = $this->_limit_string(wp_unslash($value));
 
-							if ( ! empty( $value ) ) {
-								$data = $this->_process_meta_entry( $key, $value, $data );
+							if ( ! empty($value)) {
+								$data = $this->_process_meta_entry($key, $value, $data);
 							}
 						} else {
-							if ( in_array( $key, array( 'canonical', 'shortlink', 'icon' ), true ) ) {
-								$data[ $type ][ $key ] = $this->_limit_url( wp_unslash( $value ) );
+							if (in_array($key, array('canonical', 'shortlink', 'icon'), true)) {
+								$data[$type][$key] = $this->_limit_url(wp_unslash($value));
 							}
 						}
 					}
@@ -755,11 +755,11 @@ 
 			}
 
 			// Support passing a single image src as `i`
-			if ( ! empty( $_REQUEST['i'] ) && ( $img_src = $this->_limit_img( wp_unslash( $_REQUEST['i'] ) ) ) ) {
-				if ( empty( $data['_images'] ) ) {
-					$data['_images'] = array( $img_src );
-				} elseif ( ! in_array( $img_src, $data['_images'], true ) ) {
-					array_unshift( $data['_images'], $img_src );
+			if ( ! empty($_REQUEST['i']) && ($img_src = $this->_limit_img(wp_unslash($_REQUEST['i'])))) {
+				if (empty($data['_images'])) {
+					$data['_images'] = array($img_src);
+				} elseif ( ! in_array($img_src, $data['_images'], true)) {
+					array_unshift($data['_images'], $img_src);
 				}
 			}
 		}
@@ -771,7 +771,7 @@ 
 		 *
 		 * @param array $data Press This Data array.
 		 */
-		return apply_filters( 'press_this_data', $data );
+		return apply_filters('press_this_data', $data);
 	}
 
 	/**
@@ -783,14 +783,14 @@ 
 	 * @param string $styles URL to editor stylesheet.
 	 * @return string Possibly modified stylesheets list.
 	 */
-	public function add_editor_style( $styles ) {
-		if ( ! empty( $styles ) ) {
+	public function add_editor_style($styles) {
+		if ( ! empty($styles)) {
 			$styles .= ',';
 		}
 
-		$press_this = admin_url( 'css/press-this-editor.css' );
-		if ( is_rtl() ) {
-			$press_this = str_replace( '.css', '-rtl.css', $press_this );
+		$press_this = admin_url('css/press-this-editor.css');
+		if (is_rtl()) {
+			$press_this = str_replace('.css', '-rtl.css', $press_this);
 		}
 
 		$open_sans_font_url = '';
@@ -798,31 +798,31 @@ 
 		/* translators: If there are characters in your language that are not supported
 		 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 		 */
-		if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+		if ('off' !== _x('on', 'Open Sans font: on or off')) {
 			$subsets = 'latin,latin-ext';
 
 			/* translators: To add an additional Open Sans character subset specific to your language,
 			 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 			 */
-			$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+			$subset = _x('no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)');
 
-			if ( 'cyrillic' == $subset ) {
+			if ('cyrillic' == $subset) {
 				$subsets .= ',cyrillic,cyrillic-ext';
-			} elseif ( 'greek' == $subset ) {
+			} elseif ('greek' == $subset) {
 				$subsets .= ',greek,greek-ext';
-			} elseif ( 'vietnamese' == $subset ) {
+			} elseif ('vietnamese' == $subset) {
 				$subsets .= ',vietnamese';
 			}
 
 			$query_args = array(
-				'family' => urlencode( 'Open Sans:400italic,700italic,400,600,700' ),
-				'subset' => urlencode( $subsets ),
+				'family' => urlencode('Open Sans:400italic,700italic,400,600,700'),
+				'subset' => urlencode($subsets),
 			);
 
-			$open_sans_font_url = ',' . add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+			$open_sans_font_url = ','.add_query_arg($query_args, 'https://fonts.googleapis.com/css');
 		}
 
-		return $styles . $press_this . $open_sans_font_url;
+		return $styles.$press_this.$open_sans_font_url;
 	}
 
 	/**
@@ -833,35 +833,35 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function post_formats_html( $post ) {
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
-			$post_formats = get_theme_support( 'post-formats' );
+	public function post_formats_html($post) {
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) {
+			$post_formats = get_theme_support('post-formats');
 
-			if ( is_array( $post_formats[0] ) ) {
-				$post_format = get_post_format( $post->ID );
+			if (is_array($post_formats[0])) {
+				$post_format = get_post_format($post->ID);
 
-				if ( ! $post_format ) {
+				if ( ! $post_format) {
 					$post_format = '0';
 				}
 
 				// Add in the current one if it isn't there yet, in case the current theme doesn't support it.
-				if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
+				if ($post_format && ! in_array($post_format, $post_formats[0])) {
 					$post_formats[0][] = $post_format;
 				}
 
 				?>
 				<div id="post-formats-select">
-				<fieldset><legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
-					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> />
-					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
+				<fieldset><legend class="screen-reader-text"><?php _e('Post Formats'); ?></legend>
+					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked($post_format, '0'); ?> />
+					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string('standard'); ?></label>
 					<?php
 
-					foreach ( $post_formats[0] as $format ) {
-						$attr_format = esc_attr( $format );
+					foreach ($post_formats[0] as $format) {
+						$attr_format = esc_attr($format);
 						?>
 						<br />
-						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked( $post_format, $format ); ?> />
-						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked($post_format, $format); ?> />
+						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html(get_post_format_string($format)); ?></label>
 						<?php
 					 }
 
@@ -881,45 +881,45 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function categories_html( $post ) {
-		$taxonomy = get_taxonomy( 'category' );
+	public function categories_html($post) {
+		$taxonomy = get_taxonomy('category');
 
-		if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
+		if (current_user_can($taxonomy->cap->edit_terms)) {
 			?>
 			<button type="button" class="add-cat-toggle button-link" aria-expanded="false">
-				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e( 'Toggle add category' ); ?></span>
+				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e('Toggle add category'); ?></span>
 			</button>
 			<div class="add-category is-hidden">
 				<label class="screen-reader-text" for="new-category"><?php echo $taxonomy->labels->add_new_item; ?></label>
-				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" value="" aria-required="true">
+				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" value="" aria-required="true">
 				<label class="screen-reader-text" for="new-category-parent"><?php echo $taxonomy->labels->parent_item_colon; ?></label>
 				<div class="postform-wrapper">
 					<?php
-					wp_dropdown_categories( array(
+					wp_dropdown_categories(array(
 						'taxonomy'         => 'category',
 						'hide_empty'       => 0,
 						'name'             => 'new-category-parent',
 						'orderby'          => 'name',
 						'hierarchical'     => 1,
-						'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;'
-					) );
+						'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;'
+					));
 					?>
 				</div>
-				<button type="button" class="add-cat-submit"><?php _e( 'Add' ); ?></button>
+				<button type="button" class="add-cat-submit"><?php _e('Add'); ?></button>
 			</div>
 			<?php
 
 		}
 		?>
 		<div class="categories-search-wrapper">
-			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e( 'Search categories by name' ) ?>">
+			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e('Search categories by name') ?>">
 			<label for="categories-search">
-				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e( 'Search categories' ); ?></span>
+				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e('Search categories'); ?></span>
 			</label>
 		</div>
-		<div aria-label="<?php esc_attr_e( 'Categories' ); ?>">
+		<div aria-label="<?php esc_attr_e('Categories'); ?>">
 			<ul class="categories-select">
-				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'category', 'list_only' => true ) ); ?>
+				<?php wp_terms_checklist($post->ID, array('taxonomy' => 'category', 'list_only' => true)); ?>
 			</ul>
 		</div>
 		<?php
@@ -933,12 +933,12 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function tags_html( $post ) {
-		$taxonomy              = get_taxonomy( 'post_tag' );
-		$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-		$esc_tags              = get_terms_to_edit( $post->ID, 'post_tag' );
+	public function tags_html($post) {
+		$taxonomy              = get_taxonomy('post_tag');
+		$user_can_assign_terms = current_user_can($taxonomy->cap->assign_terms);
+		$esc_tags              = get_terms_to_edit($post->ID, 'post_tag');
 
-		if ( ! $esc_tags || is_wp_error( $esc_tags ) ) {
+		if ( ! $esc_tags || is_wp_error($esc_tags)) {
 			$esc_tags = '';
 		}
 
@@ -948,13 +948,13 @@ 
 			<input type="hidden" name="tax_input[post_tag]" class="the-tags" value="<?php echo $esc_tags; // escaped in get_terms_to_edit() ?>">
 		 	<?php
 
-			if ( $user_can_assign_terms ) {
+			if ($user_can_assign_terms) {
 				?>
 				<div class="ajaxtag hide-if-no-js">
-					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e( 'Tags' ); ?></label>
+					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e('Tags'); ?></label>
 					<p>
 						<input type="text" id="new-tag-post_tag" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" aria-describedby="new-tag-desc" />
-						<button type="button" class="tagadd"><?php _e( 'Add' ); ?></button>
+						<button type="button" class="tagadd"><?php _e('Add'); ?></button>
 					</p>
 				</div>
 				<p class="howto" id="new-tag-desc">
@@ -969,7 +969,7 @@ 
 		</div>
 		<?php
 
-		if ( $user_can_assign_terms ) {
+		if ($user_can_assign_terms) {
 			?>
 			<button type="button" class="button-link tagcloud-link" id="link-post_tag"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
 			<?php
@@ -985,19 +985,19 @@ 
 	 * @param array $data The site's data.
 	 * @return array Embeds selected to be available.
 	 */
-	public function get_embeds( $data ) {
+	public function get_embeds($data) {
 		$selected_embeds = array();
 
 		// Make sure to add the Pressed page if it's a valid oembed itself
-		if ( ! empty ( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+		if ( ! empty ($data['u']) && $this->_limit_embed($data['u'])) {
 			$data['_embeds'][] = $data['u'];
 		}
 
-		if ( ! empty( $data['_embeds'] ) ) {
-			foreach ( $data['_embeds'] as $src ) {
-				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+		if ( ! empty($data['_embeds'])) {
+			foreach ($data['_embeds'] as $src) {
+				$prot_relative_src = preg_replace('/^https?:/', '', $src);
 
-				if ( in_array( $prot_relative_src, $this->embeds ) ) {
+				if (in_array($prot_relative_src, $this->embeds)) {
 					continue;
 				}
 
@@ -1018,19 +1018,19 @@ 
 	 * @param array $data The site's data.
 	 * @return array
 	 */
-	public function get_images( $data ) {
+	public function get_images($data) {
 		$selected_images = array();
 
-		if ( ! empty( $data['_images'] ) ) {
-			foreach ( $data['_images'] as $src ) {
-				if ( false !== strpos( $src, 'gravatar.com' ) ) {
-					$src = preg_replace( '%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src );
+		if ( ! empty($data['_images'])) {
+			foreach ($data['_images'] as $src) {
+				if (false !== strpos($src, 'gravatar.com')) {
+					$src = preg_replace('%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src);
 				}
 
-				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+				$prot_relative_src = preg_replace('/^https?:/', '', $src);
 
-				if ( in_array( $prot_relative_src, $this->images ) ||
-					( false !== strpos( $src, 'avatar' ) && count( $this->images ) > 15 ) ) {
+				if (in_array($prot_relative_src, $this->images) ||
+					(false !== strpos($src, 'avatar') && count($this->images) > 15)) {
 					// Skip: already selected or some type of avatar and we've already gathered more than 15 images.
 					continue;
 				}
@@ -1052,22 +1052,22 @@ 
  	 * @param array $data The site's data.
 	 * @return string Discovered canonical URL, or empty
 	 */
-	public function get_canonical_link( $data ) {
+	public function get_canonical_link($data) {
 		$link = '';
 
-		if ( ! empty( $data['_links']['canonical'] ) ) {
+		if ( ! empty($data['_links']['canonical'])) {
 			$link = $data['_links']['canonical'];
-		} elseif ( ! empty( $data['u'] ) ) {
+		} elseif ( ! empty($data['u'])) {
 			$link = $data['u'];
-		} elseif ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:url'] ) ) {
+		} elseif ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:url'])) {
 				$link = $data['_meta']['twitter:url'];
-			} else if ( ! empty( $data['_meta']['og:url'] ) ) {
+			} else if ( ! empty($data['_meta']['og:url'])) {
 				$link = $data['_meta']['og:url'];
 			}
 		}
 
-		if ( empty( $link ) && ! empty( $data['_links']['shortlink'] ) ) {
+		if (empty($link) && ! empty($data['_links']['shortlink'])) {
 			$link = $data['_links']['shortlink'];
 		}
 
@@ -1083,13 +1083,13 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered site name, or empty
 	 */
-	public function get_source_site_name( $data ) {
+	public function get_source_site_name($data) {
 		$name = '';
 
-		if ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['og:site_name'] ) ) {
+		if ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['og:site_name'])) {
 				$name = $data['_meta']['og:site_name'];
-			} else if ( ! empty( $data['_meta']['application-name'] ) ) {
+			} else if ( ! empty($data['_meta']['application-name'])) {
 				$name = $data['_meta']['application-name'];
 			}
 		}
@@ -1106,17 +1106,17 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered page title, or empty
 	 */
-	public function get_suggested_title( $data ) {
+	public function get_suggested_title($data) {
 		$title = '';
 
-		if ( ! empty( $data['t'] ) ) {
+		if ( ! empty($data['t'])) {
 			$title = $data['t'];
-		} elseif ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:title'] ) ) {
+		} elseif ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:title'])) {
 				$title = $data['_meta']['twitter:title'];
-			} else if ( ! empty( $data['_meta']['og:title'] ) ) {
+			} else if ( ! empty($data['_meta']['og:title'])) {
 				$title = $data['_meta']['og:title'];
-			} else if ( ! empty( $data['_meta']['title'] ) ) {
+			} else if ( ! empty($data['_meta']['title'])) {
 				$title = $data['_meta']['title'];
 			}
 		}
@@ -1135,38 +1135,38 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered content, or empty
 	 */
-	public function get_suggested_content( $data ) {
+	public function get_suggested_content($data) {
 		$content = $text = '';
 
-		if ( ! empty( $data['s'] ) ) {
+		if ( ! empty($data['s'])) {
 			$text = $data['s'];
-		} else if ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:description'] ) ) {
+		} else if ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:description'])) {
 				$text = $data['_meta']['twitter:description'];
-			} else if ( ! empty( $data['_meta']['og:description'] ) ) {
+			} else if ( ! empty($data['_meta']['og:description'])) {
 				$text = $data['_meta']['og:description'];
-			} else if ( ! empty( $data['_meta']['description'] ) ) {
+			} else if ( ! empty($data['_meta']['description'])) {
 				$text = $data['_meta']['description'];
 			}
 
 			// If there is an ellipsis at the end, the description is very likely auto-generated. Better to ignore it.
-			if ( $text && substr( $text, -3 ) === '...' ) {
+			if ($text && substr($text, -3) === '...') {
 				$text = '';
 			}
 		}
 
-		$default_html = array( 'quote' => '', 'link' => '', 'embed' => '' );
+		$default_html = array('quote' => '', 'link' => '', 'embed' => '');
 
-		if ( ! empty( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
-			$default_html['embed'] = '<p>[embed]' . $data['u'] . '[/embed]</p>';
+		if ( ! empty($data['u']) && $this->_limit_embed($data['u'])) {
+			$default_html['embed'] = '<p>[embed]'.$data['u'].'[/embed]</p>';
 
-			if ( ! empty( $data['s'] ) ) {
+			if ( ! empty($data['s'])) {
 				// If the user has selected some text, do quote it.
 				$default_html['quote'] = '<blockquote>%1$s</blockquote>';
 			}
 		} else {
 			$default_html['quote'] = '<blockquote>%1$s</blockquote>';
-			$default_html['link'] = '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+			$default_html['link'] = '<p>'._x('Source:', 'Used in Press This to indicate where the content comes from.').
 				' <em><a href="%1$s">%2$s</a></em></p>';
 		}
 
@@ -1183,28 +1183,28 @@ 
 		 *                                - 'embed' which contains an [embed] shortcode when the source page offers embeddable content.
 		 * @param array $data         Associative array containing the data from the source page.
 		 */
-		$default_html = apply_filters( 'press_this_suggested_html', $default_html, $data );
+		$default_html = apply_filters('press_this_suggested_html', $default_html, $data);
 
-		if ( ! empty( $default_html['embed'] ) ) {
+		if ( ! empty($default_html['embed'])) {
 			$content .= $default_html['embed'];
 		}
 
 		// Wrap suggested content in the specified HTML.
-		if ( ! empty( $default_html['quote'] ) && $text ) {
-			$content .= sprintf( $default_html['quote'], $text );
+		if ( ! empty($default_html['quote']) && $text) {
+			$content .= sprintf($default_html['quote'], $text);
 		}
 
 		// Add source attribution if there is one available.
-		if ( ! empty( $default_html['link'] ) ) {
-			$title = $this->get_suggested_title( $data );
-			$url = $this->get_canonical_link( $data );
+		if ( ! empty($default_html['link'])) {
+			$title = $this->get_suggested_title($data);
+			$url = $this->get_canonical_link($data);
 
-			if ( ! $title ) {
-				$title = $this->get_source_site_name( $data );
+			if ( ! $title) {
+				$title = $this->get_source_site_name($data);
 			}
 
-			if ( $url && $title ) {
-				$content .= sprintf( $default_html['link'], $url, $title );
+			if ($url && $title) {
+				$content .= sprintf($default_html['link'], $url, $title);
 			}
 		}
 
@@ -1227,41 +1227,41 @@ 
 		// Get data, new (POST) and old (GET).
 		$data = $this->merge_or_fetch_data();
 
-		$post_title = $this->get_suggested_title( $data );
+		$post_title = $this->get_suggested_title($data);
 
-		$post_content = $this->get_suggested_content( $data );
+		$post_content = $this->get_suggested_content($data);
 
 		// Get site settings array/data.
 		$site_settings = $this->site_settings();
 
 		// Pass the images and embeds
-		$images = $this->get_images( $data );
-		$embeds = $this->get_embeds( $data );
+		$images = $this->get_images($data);
+		$embeds = $this->get_embeds($data);
 
 		$site_data = array(
-			'v' => ! empty( $data['v'] ) ? $data['v'] : '',
-			'u' => ! empty( $data['u'] ) ? $data['u'] : '',
-			'hasData' => ! empty( $data ),
+			'v' => ! empty($data['v']) ? $data['v'] : '',
+			'u' => ! empty($data['u']) ? $data['u'] : '',
+			'hasData' => ! empty($data),
 		);
 
-		if ( ! empty( $images ) ) {
+		if ( ! empty($images)) {
 			$site_data['_images'] = $images;
 		}
 
-		if ( ! empty( $embeds ) ) {
+		if ( ! empty($embeds)) {
 			$site_data['_embeds'] = $embeds;
 		}
 
 		// Add press-this-editor.css and remove theme's editor-style.css, if any.
 		remove_editor_styles();
 
-		add_filter( 'mce_css', array( $this, 'add_editor_style' ) );
+		add_filter('mce_css', array($this, 'add_editor_style'));
 
-		if ( ! empty( $GLOBALS['is_IE'] ) ) {
-			@header( 'X-UA-Compatible: IE=edge' );
+		if ( ! empty($GLOBALS['is_IE'])) {
+			@header('X-UA-Compatible: IE=edge');
 		}
 
-		@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 ?>
 <!DOCTYPE html>
@@ -1269,22 +1269,22 @@ 
 <!--[if IE 8]>         <html class="lt-ie9" <?php language_attributes(); ?>> <![endif]-->
 <!--[if gt IE 8]><!--> <html <?php language_attributes(); ?>> <!--<![endif]-->
 <head>
-	<meta http-equiv="Content-Type" content="<?php echo esc_attr( get_bloginfo( 'html_type' ) ); ?>; charset=<?php echo esc_attr( get_option( 'blog_charset' ) ); ?>" />
+	<meta http-equiv="Content-Type" content="<?php echo esc_attr(get_bloginfo('html_type')); ?>; charset=<?php echo esc_attr(get_option('blog_charset')); ?>" />
 	<meta name="viewport" content="width=device-width">
-	<title><?php esc_html_e( 'Press This!' ) ?></title>
+	<title><?php esc_html_e('Press This!') ?></title>
 
 	<script>
-		window.wpPressThisData   = <?php echo wp_json_encode( $site_data ); ?>;
-		window.wpPressThisConfig = <?php echo wp_json_encode( $site_settings ); ?>;
+		window.wpPressThisData   = <?php echo wp_json_encode($site_data); ?>;
+		window.wpPressThisConfig = <?php echo wp_json_encode($site_settings); ?>;
 	</script>
 
 	<script type="text/javascript">
-		var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+		var ajaxurl = '<?php echo esc_js(admin_url('admin-ajax.php', 'relative')); ?>',
 			pagenow = 'press-this',
 			typenow = 'post',
 			adminpage = 'press-this-php',
-			thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-			decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+			thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+			decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 			isRtl = <?php echo (int) is_rtl(); ?>;
 	</script>
 
@@ -1293,82 +1293,82 @@ 
 		 * $post->ID is needed for the embed shortcode so we can show oEmbed previews in the editor.
 		 * Maybe find a way without it.
 		 */
-		$post = get_default_post_to_edit( 'post', true );
+		$post = get_default_post_to_edit('post', true);
 		$post_ID = (int) $post->ID;
 
-		wp_enqueue_media( array( 'post' => $post_ID ) );
-		wp_enqueue_style( 'press-this' );
-		wp_enqueue_script( 'press-this' );
-		wp_enqueue_script( 'json2' );
-		wp_enqueue_script( 'editor' );
+		wp_enqueue_media(array('post' => $post_ID));
+		wp_enqueue_style('press-this');
+		wp_enqueue_script('press-this');
+		wp_enqueue_script('json2');
+		wp_enqueue_script('editor');
 
 		$supports_formats = false;
 		$post_format      = 0;
 
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) {
 			$supports_formats = true;
 
-			if ( ! ( $post_format = get_post_format( $post_ID ) ) ) {
+			if ( ! ($post_format = get_post_format($post_ID))) {
 				$post_format = 0;
 			}
 		}
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_enqueue_scripts', 'press-this.php' );
+		do_action('admin_enqueue_scripts', 'press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles-press-this.php' );
+		do_action('admin_print_styles-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles' );
+		do_action('admin_print_styles');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts-press-this.php' );
+		do_action('admin_print_scripts-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts' );
+		do_action('admin_print_scripts');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_head-press-this.php' );
+		do_action('admin_head-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_head' );
+		do_action('admin_head');
 	?>
 </head>
 <?php
 
 	$admin_body_class  = 'press-this';
-	$admin_body_class .= ( is_rtl() ) ? ' rtl' : '';
-	$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
-	$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
-	$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+	$admin_body_class .= (is_rtl()) ? ' rtl' : '';
+	$admin_body_class .= ' branch-'.str_replace(array('.', ','), '-', floatval($wp_version));
+	$admin_body_class .= ' version-'.str_replace('.', '-', preg_replace('/^([.0-9]+).*/', '$1', $wp_version));
+	$admin_body_class .= ' admin-color-'.sanitize_html_class(get_user_option('admin_color'), 'fresh');
+	$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
 	/** This filter is documented in wp-admin/admin-header.php */
-	$admin_body_classes = apply_filters( 'admin_body_class', '' );
+	$admin_body_classes = apply_filters('admin_body_class', '');
 
 ?>
-<body class="wp-admin wp-core-ui <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 	<div id="adminbar" class="adminbar">
 		<h1 id="current-site" class="current-site">
-			<a class="current-site-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" target="_blank" rel="home">
+			<a class="current-site-link" href="<?php echo esc_url(home_url('/')); ?>" target="_blank" rel="home">
 				<span class="dashicons dashicons-wordpress"></span>
-				<span class="current-site-name"><?php bloginfo( 'name' ); ?></span>
+				<span class="current-site-name"><?php bloginfo('name'); ?></span>
 			</a>
 		</h1>
 		<button type="button" class="options button-link closed">
 			<span class="dashicons dashicons-tag on-closed"></span>
-			<span class="screen-reader-text on-closed"><?php _e( 'Show post options' ); ?></span>
-			<span aria-hidden="true" class="on-open"><?php _e( 'Done' ); ?></span>
-			<span class="screen-reader-text on-open"><?php _e( 'Hide post options' ); ?></span>
+			<span class="screen-reader-text on-closed"><?php _e('Show post options'); ?></span>
+			<span aria-hidden="true" class="on-open"><?php _e('Done'); ?></span>
+			<span class="screen-reader-text on-open"><?php _e('Hide post options'); ?></span>
 		</button>
 	</div>
 
 	<div id="scanbar" class="scan">
 		<form method="GET">
-			<label for="url-scan" class="screen-reader-text"><?php _e( 'Scan site for content' ); ?></label>
-			<input type="url" name="u" id="url-scan" class="scan-url" value="" placeholder="<?php esc_attr_e( 'Enter a URL to scan' ) ?>" />
-			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e( 'Scan' ) ?>" />
+			<label for="url-scan" class="screen-reader-text"><?php _e('Scan site for content'); ?></label>
+			<input type="url" name="u" id="url-scan" class="scan-url" value="" placeholder="<?php esc_attr_e('Enter a URL to scan') ?>" />
+			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e('Scan') ?>" />
 		</form>
 	</div>
 
@@ -1381,8 +1381,8 @@ 
 		<input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
 		<?php
 
-		wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
-		wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false );
+		wp_nonce_field('update-post_'.$post_ID, '_wpnonce', false);
+		wp_nonce_field('add-category', '_ajax_nonce-add-category', false);
 
 		?>
 
@@ -1391,10 +1391,10 @@ 
 			<div class="alerts" role="alert" aria-live="assertive" aria-relevant="all" aria-atomic="true">
 				<?php
 
-				if ( isset( $data['v'] ) && $this->version > $data['v'] ) {
+				if (isset($data['v']) && $this->version > $data['v']) {
 					?>
 					<p class="alert is-notice">
-						<?php printf( __( 'You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!' ), admin_url( 'tools.php' ) ); ?>
+						<?php printf(__('You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!'), admin_url('tools.php')); ?>
 					</p>
 					<?php
 				}
@@ -1403,18 +1403,18 @@ 
 			</div>
 
 			<div id="app-container" class="editor">
-				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e( 'Post title' ); ?></span>
-				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e( 'Post title' ); ?>" tabindex="0"><?php echo esc_html( $post_title ); ?></h2>
+				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e('Post title'); ?></span>
+				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e('Post title'); ?>" tabindex="0"><?php echo esc_html($post_title); ?></h2>
 
 				<div class="media-list-container">
 					<div class="media-list-inner-container">
-						<h2 class="screen-reader-text"><?php _e( 'Suggested media' ); ?></h2>
+						<h2 class="screen-reader-text"><?php _e('Suggested media'); ?></h2>
 						<ul class="media-list"></ul>
 					</div>
 				</div>
 
 				<?php
-				wp_editor( $post_content, 'pressthis', array(
+				wp_editor($post_content, 'pressthis', array(
 					'drag_drop_upload' => true,
 					'editor_height'    => 600,
 					'media_buttons'    => false,
@@ -1434,7 +1434,7 @@ 
 					'quicktags' => array(
 						'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
 					),
-				) );
+				));
 
 				?>
 			</div>
@@ -1444,55 +1444,55 @@ 
 		<div class="options-panel is-off-screen is-hidden" tabindex="-1">
 			<div class="post-options">
 
-				<?php if ( $supports_formats ) : ?>
+				<?php if ($supports_formats) : ?>
 					<button type="button" class="button-link post-option">
 						<span class="dashicons dashicons-admin-post"></span>
-						<span class="post-option-title"><?php _ex( 'Format', 'post format' ); ?></span>
-						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html( get_post_format_string( $post_format ) ); ?></span>
+						<span class="post-option-title"><?php _ex('Format', 'post format'); ?></span>
+						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html(get_post_format_string($post_format)); ?></span>
 						<span class="dashicons post-option-forward"></span>
 					</button>
 				<?php endif; ?>
 
 				<button type="button" class="button-link post-option">
 					<span class="dashicons dashicons-category"></span>
-					<span class="post-option-title"><?php _e( 'Categories' ); ?></span>
+					<span class="post-option-title"><?php _e('Categories'); ?></span>
 					<span class="dashicons post-option-forward"></span>
 				</button>
 
 				<button type="button" class="button-link post-option">
 					<span class="dashicons dashicons-tag"></span>
-					<span class="post-option-title"><?php _e( 'Tags' ); ?></span>
+					<span class="post-option-title"><?php _e('Tags'); ?></span>
 					<span class="dashicons post-option-forward"></span>
 				</button>
 			</div>
 
-			<?php if ( $supports_formats ) : ?>
+			<?php if ($supports_formats) : ?>
 				<div class="setting-modal is-off-screen is-hidden">
 					<button type="button" class="button-link modal-close">
 						<span class="dashicons post-option-back"></span>
-						<span class="setting-title" aria-hidden="true"><?php _ex( 'Format', 'post format' ); ?></span>
-						<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+						<span class="setting-title" aria-hidden="true"><?php _ex('Format', 'post format'); ?></span>
+						<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 					</button>
-					<?php $this->post_formats_html( $post ); ?>
+					<?php $this->post_formats_html($post); ?>
 				</div>
 			<?php endif; ?>
 
 			<div class="setting-modal is-off-screen is-hidden">
 				<button type="button" class="button-link modal-close">
 					<span class="dashicons post-option-back"></span>
-					<span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
-					<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+					<span class="setting-title" aria-hidden="true"><?php _e('Categories'); ?></span>
+					<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 				</button>
-				<?php $this->categories_html( $post ); ?>
+				<?php $this->categories_html($post); ?>
 			</div>
 
 			<div class="setting-modal tags is-off-screen is-hidden">
 				<button type="button" class="button-link modal-close">
 					<span class="dashicons post-option-back"></span>
-					<span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
-					<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+					<span class="setting-title" aria-hidden="true"><?php _e('Tags'); ?></span>
+					<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 				</button>
-				<?php $this->tags_html( $post ); ?>
+				<?php $this->tags_html($post); ?>
 			</div>
 		</div><!-- .options-panel -->
 	</div><!-- .wrapper -->
@@ -1501,7 +1501,7 @@ 
 		<div class="pressthis-media-buttons">
 			<button type="button" class="insert-media button-link" data-editor="pressthis">
 				<span class="dashicons dashicons-admin-media"></span>
-				<span class="screen-reader-text"><?php _e( 'Add Media' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Add Media'); ?></span>
 			</button>
 		</div>
 		<div class="post-actions">
@@ -1509,17 +1509,17 @@ 
 			<div class="split-button">
 				<div class="split-button-head">
 					<button type="button" class="publish-button split-button-primary" aria-live="polite">
-						<span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
-						<span class="saving-draft"><?php _e( 'Saving&hellip;' ); ?></span>
+						<span class="publish"><?php echo (current_user_can('publish_posts')) ? __('Publish') : __('Submit for Review'); ?></span>
+						<span class="saving-draft"><?php _e('Saving&hellip;'); ?></span>
 					</button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
 						<i class="dashicons dashicons-arrow-down-alt2"></i>
 						<span class="screen-reader-text"><?php _e('More actions'); ?></span>
 					</button>
 				</div>
 				<ul class="split-button-body">
-					<li><button type="button" class="button-link draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
-					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
-					<li><button type="button" class="button-link preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
+					<li><button type="button" class="button-link draft-button split-button-option"><?php _e('Save Draft'); ?></button></li>
+					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e('Standard Editor'); ?></button></li>
+					<li><button type="button" class="button-link preview-button split-button-option"><?php _e('Preview'); ?></button></li>
 				</ul>
 			</div>
 		</div>
@@ -1528,13 +1528,13 @@ 
 
 	<?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer' );
+	do_action('admin_footer');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer-press-this.php' );
+	do_action('admin_footer-press-this.php');
 	?>
 </body>
 </html>

src/wp-admin/includes/file.php

Indentation +10 added lines, -10 removed lines

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

Spacing +366 added lines, -366 removed lines

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

Braces +213 added lines, -122 removed lines

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