ntwb / wordpress

src/wp-admin/admin-functions.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php' );
+_deprecated_file(basename(__FILE__), '2.5.0', 'wp-admin/includes/admin.php');
 
 /** WordPress Administration API: Includes all Administration functions. */
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');

src/wp-admin/upload.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( __( 'Sorry, you are not allowed 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( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'Sorry, 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( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				}
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( !wp_untrash_post( $post_id ) ) {
+									wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$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( __( 'Sorry, you are not allowed to delete this item.' ) );
+				if ( !current_user_can( 'delete_post', $post_id_del ) ) {
+									wp_die( __( 'Sorry, 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;

Spacing +144 added lines, -144 removed lines

@@ -7,77 +7,77 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('upload_files') )
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+if ( ! current_user_can('upload_files'))
+	wp_die(__('Sorry, you are not allowed 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">Documentation on Media Library</a>' ) . '</p>' .
-		'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+		'<p><strong>'.__('For more information:').'</strong></p>'.
+		'<p>'.__('<a href="https://codex.wordpress.org/Media_Library_Screen">Documentation on Media Library</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/">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 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
+		<h1 class="wp-heading-inline"><?php echo esc_html($title); ?></h1>
 
 		<?php
-		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 (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
 		}
 		?>
 
@@ -86,13 +86,13 @@ 
 		<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;
 }
 
@@ -102,78 +102,78 @@ 
 // 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( __( 'Sorry, 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(__('Sorry, 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( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('Sorry, you are not allowed to restore this item from the Trash.'));
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 			}
-			$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( __( 'Sorry, 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(__('Sorry, 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;
 		default:
 			/** This action is documented in wp-admin/edit-comments.php */
-			$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $doaction, $post_ids );
+			$location = apply_filters('handle_bulk_actions-'.get_current_screen()->id, $location, $doaction, $post_ids);
 	}
 
-	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;
 }
 
@@ -182,57 +182,57 @@ 
 $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">Documentation on Media Library</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Library_Screen">Documentation on Media Library</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">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 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
+<h1 class="wp-heading-inline"><?php echo esc_html($title); ?></h1>
 
 <?php
-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 (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());
 }
 ?>
 
@@ -240,79 +240,79 @@ 
 
 <?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 } ?>
 
@@ -328,4 +328,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/async-upload.php

Spacing +43 added lines, -43 removed lines

@@ -6,70 +6,70 @@ 
  * @subpackage Administration
  */
 
-if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	define( 'DOING_AJAX', true );
+if (isset($_REQUEST['action']) && 'upload-attachment' === $_REQUEST['action']) {
+	define('DOING_AJAX', true);
 }
 
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
+if (defined('ABSPATH'))
+	require_once(ABSPATH.'wp-load.php');
 else
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+	require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
+if ( ! (isset($_REQUEST['action']) && 'upload-attachment' == $_REQUEST['action'])) {
 	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	if (is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && ! empty($_REQUEST['auth_cookie']))
 		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	elseif (empty($_COOKIE[AUTH_COOKIE]) && ! empty($_REQUEST['auth_cookie']))
 		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
+	if (empty($_COOKIE[LOGGED_IN_COOKIE]) && ! empty($_REQUEST['logged_in_cookie']))
 		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
 	unset($current_user);
 }
 
-require_once( ABSPATH . 'wp-admin/admin.php' );
+require_once(ABSPATH.'wp-admin/admin.php');
 
-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+header('Content-Type: text/html; charset='.get_option('blog_charset'));
 
-if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+if (isset($_REQUEST['action']) && 'upload-attachment' === $_REQUEST['action']) {
+	include(ABSPATH.'wp-admin/includes/ajax-actions.php');
 
 	send_nosniff_header();
 	nocache_headers();
 
 	wp_ajax_upload_attachment();
-	die( '0' );
+	die('0');
 }
 
-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+if ( ! current_user_can('upload_files')) {
+	wp_die(__('Sorry, you are not allowed to upload files.'));
 }
 
 // just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
-	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
-
-	switch ( $_REQUEST['fetch'] ) {
+if (isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch']) {
+	$post = get_post($id);
+	if ('attachment' != $post->post_type)
+		wp_die(__('Unknown post type.'));
+	if ( ! current_user_can('edit_post', $id))
+		wp_die(__('Sorry, you are not allowed to edit this item.'));
+
+	switch ($_REQUEST['fetch']) {
 		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
-				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
-			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
+			if ($thumb_url = wp_get_attachment_image_src($id, 'thumbnail', true))
+				echo '<img class="pinkynail" src="'.esc_url($thumb_url[0]).'" alt="" />';
+			echo '<a class="edit-attachment" href="'.esc_url(get_edit_post_link($id)).'" target="_blank">'._x('Edit', 'media item').'</a>';
 
 			// Title shouldn't ever be empty, but use filename just in case.
-			$file = get_attached_file( $post->ID );
-			$title = $post->post_title ? $post->post_title : wp_basename( $file );
-			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
+			$file = get_attached_file($post->ID);
+			$title = $post->post_title ? $post->post_title : wp_basename($file);
+			echo '<div class="filename new"><span class="title">'.esc_html(wp_html_excerpt($title, 60, '&hellip;')).'</span></div>';
 			break;
 		case 2 :
 			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+			echo get_media_item($id, array('send' => false, 'delete' => true));
 			break;
 		default:
 			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
@@ -82,22 +82,22 @@ 
 check_admin_referer('media-form');
 
 $post_id = 0;
-if ( isset( $_REQUEST['post_id'] ) ) {
-	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+if (isset($_REQUEST['post_id'])) {
+	$post_id = absint($_REQUEST['post_id']);
+	if ( ! get_post($post_id) || ! current_user_can('edit_post', $post_id))
 		$post_id = 0;
 }
 
-$id = media_handle_upload( 'async-upload', $post_id );
-if ( is_wp_error($id) ) {
+$id = media_handle_upload('async-upload', $post_id);
+if (is_wp_error($id)) {
 	echo '<div class="error-div error">
-	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
-	esc_html($id->get_error_message()) . '</div>';
+	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss').'</a>
+	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name'])).'</strong><br />'.
+	esc_html($id->get_error_message()).'</div>';
 	exit;
 }
 
-if ( $_REQUEST['short'] ) {
+if ($_REQUEST['short']) {
 	// Short form response - attachment ID only.
 	echo $id;
 } else {
@@ -114,5 +114,5 @@ 
 	 *
 	 * @param int $id Uploaded attachment ID.
 	 */
-	echo apply_filters( "async_upload_{$type}", $id );
+	echo apply_filters("async_upload_{$type}", $id);
 }

Braces +24 added lines, -17 removed lines

@@ -14,19 +14,22 @@ 
 	define( 'WP_ADMIN', true );
 }
 
-if ( defined('ABSPATH') )
+if ( defined('ABSPATH') ) {
 	require_once(ABSPATH . 'wp-load.php');
-else
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}
 
 if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
 	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
-		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) {
+			$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	} elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) {
+			$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	}
+	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) ) {
+			$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	}
 	unset($current_user);
 }
 
@@ -51,15 +54,18 @@ 
 // just fetch the detail form for that attachment
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	if ( 'attachment' != $post->post_type ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
+	if ( ! current_user_can( 'edit_post', $id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	}
 
 	switch ( $_REQUEST['fetch'] ) {
 		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
-				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
+							echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
 
 			// Title shouldn't ever be empty, but use filename just in case.
@@ -84,9 +90,10 @@ 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
-		$post_id = 0;
-}
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			$post_id = 0;
+	}
+	}
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {

src/wp-admin/comment.php

Braces +41 added lines, -31 removed lines

@@ -18,20 +18,23 @@ 
 global $action;
 wp_reset_vars( array('action') );
 
-if ( isset( $_POST['deletecomment'] ) )
+if ( isset( $_POST['deletecomment'] ) ) {
 	$action = 'deletecomment';
+}
 
-if ( 'cdc' == $action )
+if ( 'cdc' == $action ) {
 	$action = 'delete';
-elseif ( 'mac' == $action )
+} elseif ( 'mac' == $action ) {
 	$action = 'approve';
+}
 
 if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
-		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
-		$action = 'trash';
-}
+	if ( 'spam' == $_GET['dt'] ) {
+			$action = 'spam';
+	} elseif ( 'trash' == $_GET['dt'] ) {
+			$action = 'trash';
+	}
+	}
 
 switch( $action ) {
 
@@ -57,14 +60,17 @@ 
 
 	$comment_id = absint( $_GET['c'] );
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( !$comment = get_comment( $comment_id ) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	}
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	if ( !current_user_can( 'edit_comment', $comment_id ) ) {
+			comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	}
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ( 'trash' == $comment->comment_approved ) {
+			comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	}
 
 	$comment = get_comment_to_edit( $comment_id );
 
@@ -244,26 +250,30 @@ 
 case 'unapprovecomment' :
 	$comment_id = absint( $_REQUEST['c'] );
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
-	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			check_admin_referer( 'approve-comment_' . $comment_id );
+	} else {
+			check_admin_referer( 'delete-comment_' . $comment_id );
+	}
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
-
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
-		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
-		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
-	else
-		$redir = admin_url('edit-comments.php');
+	if ( !$comment = get_comment($comment_id) ) {
+			comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
+	}
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+	}
+
+	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') ) {
+			$redir = wp_get_referer();
+	} elseif ( '' != wp_get_original_referer() && ! $noredir ) {
+			$redir = wp_get_original_referer();
+	} elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
+			$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	} else {
+			$redir = admin_url('edit-comments.php');
+	}
 
 	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
 

Spacing +107 added lines, -107 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'edit-comments.php';
 $submenu_file = 'edit-comments.php';
@@ -16,59 +16,59 @@ 
  * @global string $action
  */
 global $action;
-wp_reset_vars( array('action') );
+wp_reset_vars(array('action'));
 
-if ( isset( $_POST['deletecomment'] ) )
+if (isset($_POST['deletecomment']))
 	$action = 'deletecomment';
 
-if ( 'cdc' == $action )
+if ('cdc' == $action)
 	$action = 'delete';
-elseif ( 'mac' == $action )
+elseif ('mac' == $action)
 	$action = 'approve';
 
-if ( isset( $_GET['dt'] ) ) {
-	if ( 'spam' == $_GET['dt'] )
+if (isset($_GET['dt'])) {
+	if ('spam' == $_GET['dt'])
 		$action = 'spam';
-	elseif ( 'trash' == $_GET['dt'] )
+	elseif ('trash' == $_GET['dt'])
 		$action = 'trash';
 }
 
-switch( $action ) {
+switch ($action) {
 
 case 'editcomment' :
 	$title = __('Edit Comment');
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __( 'You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.' ) . '</p>' .
-			'<p>' . __( 'You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.' ) . '</p>'
-	) );
+			'<p>'.__('You can edit the information left in a comment if needed. This is often useful when you notice that a commenter has made a typographical error.').'</p>'.
+			'<p>'.__('You can also moderate the comment from this screen using the Status box, where you can also change the timestamp of the comment.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Administration_Screens#Comments">Documentation on Comments</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 	);
 
 	wp_enqueue_script('comment');
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( !$comment = get_comment( $comment_id ) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'javascript:history.go(-1)') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'javascript:history.go(-1)'));
 
-	if ( !current_user_can( 'edit_comment', $comment_id ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit this comment.') );
+	if ( ! current_user_can('edit_comment', $comment_id))
+		comment_footer_die(__('Sorry, you are not allowed to edit this comment.'));
 
-	if ( 'trash' == $comment->comment_approved )
-		comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
+	if ('trash' == $comment->comment_approved)
+		comment_footer_die(__('This comment is in the Trash. Please move it out of the Trash if you want to edit it.'));
 
-	$comment = get_comment_to_edit( $comment_id );
+	$comment = get_comment_to_edit($comment_id);
 
-	include( ABSPATH . 'wp-admin/edit-form-comment.php' );
+	include(ABSPATH.'wp-admin/edit-form-comment.php');
 
 	break;
 
@@ -79,40 +79,40 @@ 
 
 	$title = __('Moderate Comment');
 
-	$comment_id = absint( $_GET['c'] );
+	$comment_id = absint($_GET['c']);
 
-	if ( ! $comment = get_comment( $comment_id ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=1') );
+	if ( ! $comment = get_comment($comment_id)) {
+		wp_redirect(admin_url('edit-comments.php?error=1'));
 		die();
 	}
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
-		wp_redirect( admin_url('edit-comments.php?error=2') );
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
+		wp_redirect(admin_url('edit-comments.php?error=2'));
 		die();
 	}
 
 	// No need to re-approve/re-trash/re-spam a comment.
-	if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
+	if ($action == str_replace('1', 'approve', $comment->comment_approved)) {
+		wp_redirect(admin_url('edit-comments.php?same='.$comment_id));
 		die();
  	}
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	$formaction    = $action . 'comment';
+	$formaction    = $action.'comment';
 	$nonce_action  = 'approve' == $action ? 'approve-comment_' : 'delete-comment_';
 	$nonce_action .= $comment_id;
 
 ?>
 <div class="wrap">
 
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
-switch ( $action ) {
+switch ($action) {
 	case 'spam' :
 		$caution_msg = __('You are about to mark the following comment as spam:');
-		$button      = _x( 'Mark as Spam', 'comment' );
+		$button      = _x('Mark as Spam', 'comment');
 		break;
 	case 'trash' :
 		$caution_msg = __('You are about to move the following comment to the Trash:');
@@ -128,9 +128,9 @@ 
 		break;
 }
 
-if ( $comment->comment_approved != '0' ) { // if not unapproved
+if ($comment->comment_approved != '0') { // if not unapproved
 	$message = '';
-	switch ( $comment->comment_approved ) {
+	switch ($comment->comment_approved) {
 		case '1' :
 			$message = __('This comment is currently approved.');
 			break;
@@ -141,68 +141,68 @@ 
 			$message  = __('This comment is currently in the Trash.');
 			break;
 	}
-	if ( $message ) {
-		echo '<div id="message" class="notice notice-info"><p>' . $message . '</p></div>';
+	if ($message) {
+		echo '<div id="message" class="notice notice-info"><p>'.$message.'</p></div>';
 	}
 }
 ?>
-<div id="message" class="notice notice-warning"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo $caution_msg; ?></p></div>
+<div id="message" class="notice notice-warning"><p><strong><?php _e('Caution:'); ?></strong> <?php echo $caution_msg; ?></p></div>
 
 <table class="form-table comment-ays">
 <tr>
 <th scope="row"><?php _e('Author'); ?></th>
-<td><?php comment_author( $comment ); ?></td>
+<td><?php comment_author($comment); ?></td>
 </tr>
-<?php if ( get_comment_author_email( $comment ) ) { ?>
+<?php if (get_comment_author_email($comment)) { ?>
 <tr>
 <th scope="row"><?php _e('Email'); ?></th>
-<td><?php comment_author_email( $comment ); ?></td>
+<td><?php comment_author_email($comment); ?></td>
 </tr>
 <?php } ?>
-<?php if ( get_comment_author_url( $comment ) ) { ?>
+<?php if (get_comment_author_url($comment)) { ?>
 <tr>
 <th scope="row"><?php _e('URL'); ?></th>
-<td><a href="<?php comment_author_url( $comment ); ?>"><?php comment_author_url( $comment ); ?></a></td>
+<td><a href="<?php comment_author_url($comment); ?>"><?php comment_author_url($comment); ?></a></td>
 </tr>
 <?php } ?>
 <tr>
-	<th scope="row"><?php /* translators: column name or table row header */ _e( 'In Response To' ); ?></th>
+	<th scope="row"><?php /* translators: column name or table row header */ _e('In Response To'); ?></th>
 	<td>
 	<?php
 		$post_id = $comment->comment_post_ID;
-		if ( current_user_can( 'edit_post', $post_id ) ) {
-			$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-			$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+		if (current_user_can('edit_post', $post_id)) {
+			$post_link = "<a href='".esc_url(get_edit_post_link($post_id))."'>";
+			$post_link .= esc_html(get_the_title($post_id)).'</a>';
 		} else {
-			$post_link = esc_html( get_the_title( $post_id ) );
+			$post_link = esc_html(get_the_title($post_id));
 		}
 		echo $post_link;
 
-		if ( $comment->comment_parent ) {
-			$parent      = get_comment( $comment->comment_parent );
-			$parent_link = esc_url( get_comment_link( $parent ) );
-			$name        = get_comment_author( $parent );
+		if ($comment->comment_parent) {
+			$parent      = get_comment($comment->comment_parent);
+			$parent_link = esc_url(get_comment_link($parent));
+			$name        = get_comment_author($parent);
 			printf(
 				/* translators: %s: comment link */
-				' | ' . __( 'In reply to %s.' ),
-				'<a href="' . $parent_link . '">' . $name . '</a>'
+				' | '.__('In reply to %s.'),
+				'<a href="'.$parent_link.'">'.$name.'</a>'
 			);
 		}
 	?>
 	</td>
 </tr>
 <tr>
-	<th scope="row"><?php _e( 'Submitted on' ); ?></th>
+	<th scope="row"><?php _e('Submitted on'); ?></th>
 	<td>
 	<?php
 		/* translators: 1: comment date, 2: comment time */
-		$submitted = sprintf( __( '%1$s at %2$s' ),
+		$submitted = sprintf(__('%1$s at %2$s'),
 			/* translators: comment date format. See https://secure.php.net/date */
-			get_comment_date( __( 'Y/m/d' ), $comment ),
-			get_comment_date( __( 'g:i a' ), $comment )
+			get_comment_date(__('Y/m/d'), $comment),
+			get_comment_date(__('g:i a'), $comment)
 		);
-		if ( 'approved' === wp_get_comment_status( $comment ) && ! empty ( $comment->comment_post_ID ) ) {
-			echo '<a href="' . esc_url( get_comment_link( $comment ) ) . '">' . $submitted . '</a>';
+		if ('approved' === wp_get_comment_status($comment) && ! empty ($comment->comment_post_ID)) {
+			echo '<a href="'.esc_url(get_comment_link($comment)).'">'.$submitted.'</a>';
 		} else {
 			echo $submitted;
 		}
@@ -212,8 +212,8 @@ 
 <tr>
 <th scope="row"><?php /* translators: field name in comment form */ _ex('Comment', 'noun'); ?></th>
 <td class="comment-content">
-	<?php comment_text( $comment ); ?>
-	<p class="edit-comment"><a href="<?php echo admin_url( "comment.php?action=editcomment&amp;c={$comment->comment_ID}" ); ?>"><?php esc_html_e( 'Edit' ); ?></a></p>
+	<?php comment_text($comment); ?>
+	<p class="edit-comment"><a href="<?php echo admin_url("comment.php?action=editcomment&amp;c={$comment->comment_ID}"); ?>"><?php esc_html_e('Edit'); ?></a></p>
 </td>
 </tr>
 </table>
@@ -221,11 +221,11 @@ 
 <form action="comment.php" method="get" class="comment-ays-submit">
 
 <p>
-	<?php submit_button( $button, 'primary', 'submit', false ); ?>
-	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+	<?php submit_button($button, 'primary', 'submit', false); ?>
+	<a href="<?php echo admin_url('edit-comments.php'); ?>" class="button-cancel"><?php esc_html_e('Cancel'); ?></a>
 </p>
 
-<?php wp_nonce_field( $nonce_action ); ?>
+<?php wp_nonce_field($nonce_action); ?>
 <input type="hidden" name="action" value="<?php echo esc_attr($formaction); ?>" />
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID); ?>" />
 <input type="hidden" name="noredir" value="1" />
@@ -242,75 +242,75 @@ 
 case 'unspamcomment'    :
 case 'approvecomment'   :
 case 'unapprovecomment' :
-	$comment_id = absint( $_REQUEST['c'] );
+	$comment_id = absint($_REQUEST['c']);
 
-	if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		check_admin_referer( 'approve-comment_' . $comment_id );
+	if (in_array($action, array('approvecomment', 'unapprovecomment')))
+		check_admin_referer('approve-comment_'.$comment_id);
 	else
-		check_admin_referer( 'delete-comment_' . $comment_id );
+		check_admin_referer('delete-comment_'.$comment_id);
 
 	$noredir = isset($_REQUEST['noredir']);
 
-	if ( !$comment = get_comment($comment_id) )
-		comment_footer_die( __( 'Invalid comment ID.' ) . sprintf(' <a href="%s">' . __('Go back') . '</a>.', 'edit-comments.php') );
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		comment_footer_die( __('Sorry, you are not allowed to edit comments on this post.') );
+	if ( ! $comment = get_comment($comment_id))
+		comment_footer_die(__('Invalid comment ID.').sprintf(' <a href="%s">'.__('Go back').'</a>.', 'edit-comments.php'));
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
+		comment_footer_die(__('Sorry, you are not allowed to edit comments on this post.'));
 
-	if ( '' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php') )
+	if ('' != wp_get_referer() && ! $noredir && false === strpos(wp_get_referer(), 'comment.php'))
 		$redir = wp_get_referer();
-	elseif ( '' != wp_get_original_referer() && ! $noredir )
+	elseif ('' != wp_get_original_referer() && ! $noredir)
 		$redir = wp_get_original_referer();
-	elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) )
-		$redir = admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
+	elseif (in_array($action, array('approvecomment', 'unapprovecomment')))
+		$redir = admin_url('edit-comments.php?p='.absint($comment->comment_post_ID));
 	else
 		$redir = admin_url('edit-comments.php');
 
-	$redir = remove_query_arg( array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir );
+	$redir = remove_query_arg(array('spammed', 'unspammed', 'trashed', 'untrashed', 'deleted', 'ids', 'approved', 'unapproved'), $redir);
 
-	switch ( $action ) {
+	switch ($action) {
 		case 'deletecomment' :
-			wp_delete_comment( $comment );
-			$redir = add_query_arg( array('deleted' => '1'), $redir );
+			wp_delete_comment($comment);
+			$redir = add_query_arg(array('deleted' => '1'), $redir);
 			break;
 		case 'trashcomment' :
-			wp_trash_comment( $comment );
-			$redir = add_query_arg( array('trashed' => '1', 'ids' => $comment_id), $redir );
+			wp_trash_comment($comment);
+			$redir = add_query_arg(array('trashed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'untrashcomment' :
-			wp_untrash_comment( $comment );
-			$redir = add_query_arg( array('untrashed' => '1'), $redir );
+			wp_untrash_comment($comment);
+			$redir = add_query_arg(array('untrashed' => '1'), $redir);
 			break;
 		case 'spamcomment' :
-			wp_spam_comment( $comment );
-			$redir = add_query_arg( array('spammed' => '1', 'ids' => $comment_id), $redir );
+			wp_spam_comment($comment);
+			$redir = add_query_arg(array('spammed' => '1', 'ids' => $comment_id), $redir);
 			break;
 		case 'unspamcomment' :
-			wp_unspam_comment( $comment );
-			$redir = add_query_arg( array('unspammed' => '1'), $redir );
+			wp_unspam_comment($comment);
+			$redir = add_query_arg(array('unspammed' => '1'), $redir);
 			break;
 		case 'approvecomment' :
-			wp_set_comment_status( $comment, 'approve' );
-			$redir = add_query_arg( array( 'approved' => 1 ), $redir );
+			wp_set_comment_status($comment, 'approve');
+			$redir = add_query_arg(array('approved' => 1), $redir);
 			break;
 		case 'unapprovecomment' :
-			wp_set_comment_status( $comment, 'hold' );
-			$redir = add_query_arg( array( 'unapproved' => 1 ), $redir );
+			wp_set_comment_status($comment, 'hold');
+			$redir = add_query_arg(array('unapproved' => 1), $redir);
 			break;
 	}
 
-	wp_redirect( $redir );
+	wp_redirect($redir);
 	die;
 
 case 'editedcomment' :
 
-	$comment_id = absint( $_POST['comment_ID'] );
-	$comment_post_id = absint( $_POST['comment_post_ID'] );
+	$comment_id = absint($_POST['comment_ID']);
+	$comment_post_id = absint($_POST['comment_post_ID']);
 
-	check_admin_referer( 'update-comment_' . $comment_id );
+	check_admin_referer('update-comment_'.$comment_id);
 
 	edit_comment();
 
-	$location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
+	$location = (empty($_POST['referredby']) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby']).'#comment-'.$comment_id;
 
 	/**
 	 * Filters the URI the user is redirected to after editing a comment in the admin.
@@ -320,14 +320,14 @@ 
 	 * @param string $location The URI the user will be redirected to.
 	 * @param int $comment_id The ID of the comment being edited.
 	 */
-	$location = apply_filters( 'comment_edit_redirect', $location, $comment_id );
-	wp_redirect( $location );
+	$location = apply_filters('comment_edit_redirect', $location, $comment_id);
+	wp_redirect($location);
 
 	exit();
 
 default:
-	wp_die( __('Unknown action.') );
+	wp_die(__('Unknown action.'));
 
 } // end switch
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/options-permalink.php

Braces +36 added lines, -23 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
@@ -53,8 +54,9 @@ 
 $permalink_structure = get_option( 'permalink_structure' );
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite() ) {
 	$prefix = '/index.php';
+}
 
 /**
  * In a subdirectory configuration of multisite, the `/blog` prefix is used by
@@ -71,11 +73,12 @@ 
 $update_required     = false;
 
 if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
-		$writable = true;
-	else
-		$writable = false;
-} elseif ( $is_nginx ) {
+	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') ) {
+			$writable = true;
+	} else {
+			$writable = false;
+	}
+	} elseif ( $is_nginx ) {
 	$writable = false;
 } else {
 	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
@@ -94,17 +97,19 @@ 
 	check_admin_referer('update-permalink');
 
 	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
-			$permalink_structure = $_POST['selection'];
-		else
-			$permalink_structure = $_POST['permalink_structure'];
+		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) {
+					$permalink_structure = $_POST['selection'];
+		} else {
+					$permalink_structure = $_POST['permalink_structure'];
+		}
 
 		if ( ! empty( $permalink_structure ) ) {
 			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
-				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
-			else
-				$permalink_structure = $blog_prefix . $permalink_structure;
+			if ( $prefix && $blog_prefix ) {
+							$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+			} else {
+							$permalink_structure = $blog_prefix . $permalink_structure;
+			}
 		}
 
 		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
@@ -114,15 +119,17 @@ 
 
 	if ( isset( $_POST['category_base'] ) ) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		if ( ! empty( $category_base ) ) {
+					$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
+		}
 		$wp_rewrite->set_category_base( $category_base );
 	}
 
 	if ( isset( $_POST['tag_base'] ) ) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		if ( ! empty( $tag_base ) ) {
+					$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
+		}
 		$wp_rewrite->set_tag_base( $tag_base );
 	}
 
@@ -241,23 +248,29 @@ 
 	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
-		<?php else : ?>
+		<?php else {
+	: ?>
 <p><?php _e('If the root directory of your site were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
+	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) );
+}
+?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
 <?php elseif ( $is_nginx ) : ?>
 	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
-<?php else:
+<?php else {
+	:
 	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() );
+}
+?></textarea></p>
 </form>
 	<?php endif; ?>
 <?php endif; ?>

Spacing +95 added lines, -95 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('Permalink Settings');
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.') . '</p>' .
-		'<p>' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change &#8212; hence the name permalink.').'</p>'.
+		'<p>'.__('This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'permalink-settings',
 	'title'   => __('Permalink Settings'),
-	'content' => '<p>' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '</p>' .
-		'<p>' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
-		'<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.').'</p>'.
+		'<p>'.__('If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.').'</p>'.
+		'<p>'.__('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes <code>%category%</code> or <code>%tag%</code>.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'custom-structures',
 	'title'   => __('Custom Structures'),
-	'content' => '<p>' . __('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('The Optional fields let you customize the &#8220;category&#8221; and &#8220;tag&#8221; base names that will appear in archive URLs. For example, the page listing all posts in the &#8220;Uncategorized&#8221; category could be <code>/topics/uncategorized</code> instead of <code>/category/uncategorized</code>.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Permalinks_Screen">Documentation on Permalinks Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Permalinks">Documentation on Using Permalinks</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Permalinks_Screen">Documentation on Permalinks Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Permalinks">Documentation on Using Permalinks</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
 add_filter('admin_head', 'options_permalink_add_js');
 
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
-$permalink_structure = get_option( 'permalink_structure' );
+$permalink_structure = get_option('permalink_structure');
 
 $prefix = $blog_prefix = '';
-if ( ! got_url_rewrite() )
+if ( ! got_url_rewrite())
 	$prefix = '/index.php';
 
 /**
@@ -62,149 +62,149 @@ 
  * network. If the `permalink_structure` option has been changed to remove this
  * base prefix, WordPress core can no longer account for the possible collision.
  */
-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
+if (is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos($permalink_structure, '/blog/')) {
 	$blog_prefix = '/blog';
 }
 
-$category_base       = get_option( 'category_base' );
-$tag_base            = get_option( 'tag_base' );
+$category_base       = get_option('category_base');
+$tag_base            = get_option('tag_base');
 $update_required     = false;
 
-if ( $iis7_permalinks ) {
-	if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') )
+if ($iis7_permalinks) {
+	if (( ! file_exists($home_path.'web.config') && win_is_writable($home_path)) || win_is_writable($home_path.'web.config'))
 		$writable = true;
 	else
 		$writable = false;
-} elseif ( $is_nginx ) {
+} elseif ($is_nginx) {
 	$writable = false;
 } else {
-	if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
+	if (( ! file_exists($home_path.'.htaccess') && is_writable($home_path)) || is_writable($home_path.'.htaccess')) {
 		$writable = true;
 	} else {
 		$writable = false;
-		$existing_rules  = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) );
-		$new_rules       = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) );
-		$update_required = ( $new_rules !== $existing_rules );
+		$existing_rules  = array_filter(extract_from_markers($home_path.'.htaccess', 'WordPress'));
+		$new_rules       = array_filter(explode("\n", $wp_rewrite->mod_rewrite_rules()));
+		$update_required = ($new_rules !== $existing_rules);
 	}
 }
 
 $using_index_permalinks = $wp_rewrite->using_index_permalinks();
 
-if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
+if (isset($_POST['permalink_structure']) || isset($_POST['category_base'])) {
 	check_admin_referer('update-permalink');
 
-	if ( isset( $_POST['permalink_structure'] ) ) {
-		if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] )
+	if (isset($_POST['permalink_structure'])) {
+		if (isset($_POST['selection']) && 'custom' != $_POST['selection'])
 			$permalink_structure = $_POST['selection'];
 		else
 			$permalink_structure = $_POST['permalink_structure'];
 
-		if ( ! empty( $permalink_structure ) ) {
-			$permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-			if ( $prefix && $blog_prefix )
-				$permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
+		if ( ! empty($permalink_structure)) {
+			$permalink_structure = preg_replace('#/+#', '/', '/'.str_replace('#', '', $permalink_structure));
+			if ($prefix && $blog_prefix)
+				$permalink_structure = $prefix.preg_replace('#^/?index\.php#', '', $permalink_structure);
 			else
-				$permalink_structure = $blog_prefix . $permalink_structure;
+				$permalink_structure = $blog_prefix.$permalink_structure;
 		}
 
-		$permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure );
+		$permalink_structure = sanitize_option('permalink_structure', $permalink_structure);
 
-		$wp_rewrite->set_permalink_structure( $permalink_structure );
+		$wp_rewrite->set_permalink_structure($permalink_structure);
 	}
 
-	if ( isset( $_POST['category_base'] ) ) {
+	if (isset($_POST['category_base'])) {
 		$category_base = $_POST['category_base'];
-		if ( ! empty( $category_base ) )
-			$category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
-		$wp_rewrite->set_category_base( $category_base );
+		if ( ! empty($category_base))
+			$category_base = $blog_prefix.preg_replace('#/+#', '/', '/'.str_replace('#', '', $category_base));
+		$wp_rewrite->set_category_base($category_base);
 	}
 
-	if ( isset( $_POST['tag_base'] ) ) {
+	if (isset($_POST['tag_base'])) {
 		$tag_base = $_POST['tag_base'];
-		if ( ! empty( $tag_base ) )
-			$tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
-		$wp_rewrite->set_tag_base( $tag_base );
+		if ( ! empty($tag_base))
+			$tag_base = $blog_prefix.preg_replace('#/+#', '/', '/'.str_replace('#', '', $tag_base));
+		$wp_rewrite->set_tag_base($tag_base);
 	}
 
-	$message = __( 'Permalink structure updated.' );
+	$message = __('Permalink structure updated.');
 
-	if ( $iis7_permalinks ) {
-		if ( $permalink_structure && ! $using_index_permalinks && ! $writable ) {
-			$message = __( 'You should update your web.config now.' );
-		} elseif ( $permalink_structure && ! $using_index_permalinks && $writable ) {
-			$message = __( 'Permalink structure updated. Remove write access on web.config file now!' );
+	if ($iis7_permalinks) {
+		if ($permalink_structure && ! $using_index_permalinks && ! $writable) {
+			$message = __('You should update your web.config now.');
+		} elseif ($permalink_structure && ! $using_index_permalinks && $writable) {
+			$message = __('Permalink structure updated. Remove write access on web.config file now!');
 		}
-	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
-		$message = __( 'You should update your .htaccess now.' );
+	} elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required) {
+		$message = __('You should update your .htaccess now.');
 	}
 
-	if ( ! get_settings_errors() ) {
-		add_settings_error( 'general', 'settings_updated', $message, 'updated' );
+	if ( ! get_settings_errors()) {
+		add_settings_error('general', 'settings_updated', $message, 'updated');
 	}
 
-	set_transient( 'settings_errors', get_settings_errors(), 30 );
+	set_transient('settings_errors', get_settings_errors(), 30);
 
-	wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) );
+	wp_redirect(admin_url('options-permalink.php?settings-updated=true'));
 	exit;
 }
 
 flush_rewrite_rules();
 
-require( ABSPATH . 'wp-admin/admin-header.php' );
+require(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 
-  <p><?php _e( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.' ); ?></p>
+  <p><?php _e('WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
-	$permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
-	$category_base = preg_replace( '|^/?blog|', '', $category_base );
-	$tag_base = preg_replace( '|^/?blog|', '', $tag_base );
+if (is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos($permalink_structure, '/blog/')) {
+	$permalink_structure = preg_replace('|^/?blog|', '', $permalink_structure);
+	$category_base = preg_replace('|^/?blog|', '', $category_base);
+	$tag_base = preg_replace('|^/?blog|', '', $tag_base);
 }
 
 $structures = array(
 	0 => '',
-	1 => $prefix . '/%year%/%monthnum%/%day%/%postname%/',
-	2 => $prefix . '/%year%/%monthnum%/%postname%/',
-	3 => $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
-	4 => $prefix . '/%postname%/',
+	1 => $prefix.'/%year%/%monthnum%/%day%/%postname%/',
+	2 => $prefix.'/%year%/%monthnum%/%postname%/',
+	3 => $prefix.'/'._x('archives', 'sample permalink base').'/%post_id%',
+	4 => $prefix.'/%postname%/',
 );
 ?>
 <h2 class="title"><?php _e('Common Settings'); ?></h2>
 <table class="form-table permalink-structure">
 	<tr>
-		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'Plain' ); ?></label></th>
+		<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e('Plain'); ?></label></th>
 		<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'.date('Y').'/'.date('m').'/'.date('d').'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'.date('Y').'/'.date('m').'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'._x('archives', 'sample permalink base').'/123'; ?></code></td>
 	</tr>
 	<tr>
 		<th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[4]); ?>" <?php checked($structures[4], $permalink_structure); ?> /> <?php _e('Post name'); ?></label></th>
-		<td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/'; ?></code></td>
+		<td><code><?php echo get_option('home').$blog_prefix.$prefix.'/'._x('sample-post', 'sample permalink structure').'/'; ?></code></td>
 	</tr>
 	<tr>
 		<th>
-			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
+			<label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( ! in_array($permalink_structure, $structures)); ?> />
 			<?php _e('Custom Structure'); ?>
 			</label>
 		</th>
 		<td>
-			<code><?php echo get_option('home') . $blog_prefix; ?></code>
+			<code><?php echo get_option('home').$blog_prefix; ?></code>
 			<input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
 		</td>
 	</tr>
@@ -213,12 +213,12 @@ 
 <h2 class="title"><?php _e('Optional'); ?></h2>
 <p><?php
 /* translators: %s is a placeholder that must come at the start of the URL. */
-printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix ); ?></p>
+printf(__('If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.'), get_option('home').$blog_prefix.$prefix); ?></p>
 
 <table class="form-table">
 	<tr>
 		<th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
+		<td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr($category_base); ?>" class="regular-text code" /></td>
 	</tr>
 	<tr>
 		<th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
@@ -231,33 +231,33 @@ 
 
 <?php submit_button(); ?>
   </form>
-<?php if ( !is_multisite() ) { ?>
-<?php if ( $iis7_permalinks ) :
-	if ( isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
-		if ( file_exists($home_path . 'web.config') ) : ?>
+<?php if ( ! is_multisite()) { ?>
+<?php if ($iis7_permalinks) :
+	if (isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable) :
+		if (file_exists($home_path.'web.config')) : ?>
 <p><?php _e('If your <code>web.config</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->iis7_url_rewrite_rules()); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.') ?></p>
 		<?php else : ?>
 <p><?php _e('If the root directory of your site were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Create a new file, called <code>web.config</code> in the root directory of your site. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this code into the <code>web.config</code> file.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules(true) ); ?></textarea></p>
+	<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p>
 </form>
 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p>
 		<?php endif; ?>
 	<?php endif; ?>
-<?php elseif ( $is_nginx ) : ?>
-	<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
+<?php elseif ($is_nginx) : ?>
+	<p><?php _e('<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.'); ?></p>
 <?php else:
-	if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
+	if ($permalink_structure && ! $using_index_permalinks && ! $writable && $update_required) : ?>
 <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
 <form action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
-	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
+	<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea($wp_rewrite->mod_rewrite_rules()); ?></textarea></p>
 </form>
 	<?php endif; ?>
 <?php endif; ?>
@@ -265,4 +265,4 @@ 
 
 </div>
 
-<?php require( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php require(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/admin.php

Braces +59 added lines, -42 removed lines

@@ -15,18 +15,21 @@ 
 	define( 'WP_ADMIN', true );
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
+if ( ! defined('WP_NETWORK_ADMIN') ) {
 	define('WP_NETWORK_ADMIN', false);
+}
 
-if ( ! defined('WP_USER_ADMIN') )
+if ( ! defined('WP_USER_ADMIN') ) {
 	define('WP_USER_ADMIN', false);
+}
 
 if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
 	define('WP_BLOG_ADMIN', true);
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') ) {
 	define('WP_LOAD_IMPORTERS', true);
+}
 
 require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
 
@@ -84,8 +87,9 @@ 
 auth_redirect();
 
 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() ) {
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
+}
 
 set_screen_options();
 
@@ -120,22 +124,25 @@ 
 	$plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) ) {
 	$typenow = $_REQUEST['post_type'];
-else
+} else {
 	$typenow = '';
+}
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) ) {
 	$taxnow = $_REQUEST['taxonomy'];
-else
+} else {
 	$taxnow = '';
+}
 
-if ( WP_NETWORK_ADMIN )
+if ( WP_NETWORK_ADMIN ) {
 	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
+} elseif ( WP_USER_ADMIN ) {
 	require(ABSPATH . 'wp-admin/user/menu.php');
-else
+} else {
 	require(ABSPATH . 'wp-admin/menu.php');
+}
 
 if ( current_user_can( 'manage_options' ) ) {
 	wp_raise_memory_limit( 'admin' );
@@ -154,20 +161,22 @@ 
 do_action( 'admin_init' );
 
 if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
-		$the_parent = $pagenow . '?post_type=' . $typenow;
-	else
-		$the_parent = $pagenow;
+	if ( !empty($typenow) ) {
+			$the_parent = $pagenow . '?post_type=' . $typenow;
+	} else {
+			$the_parent = $pagenow;
+	}
 	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
 		// Back-compat for plugins using add_management_page().
 		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
-			else
-				$query_string = 'page=' . $plugin_page;
+			if ( !empty($_SERVER[ 'QUERY_STRING' ]) ) {
+							$query_string = $_SERVER[ 'QUERY_STRING' ];
+			} else {
+							$query_string = 'page=' . $plugin_page;
+			}
 			wp_redirect( admin_url('tools.php?' . $query_string) );
 			exit;
 		}
@@ -210,8 +219,9 @@ 
 		 * @since 2.1.0
 		 */
 		do_action( 'load-' . $page_hook );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if (! isset($_GET['noheader'])) {
+					require_once(ABSPATH . 'wp-admin/admin-header.php');
+		}
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -221,11 +231,13 @@ 
 		 */
 		do_action( $page_hook );
 	} else {
-		if ( validate_file($plugin_page) )
-			wp_die(__('Invalid plugin page'));
+		if ( validate_file($plugin_page) ) {
+					wp_die(__('Invalid plugin page'));
+		}
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
-			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) ) {
+					wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
+		}
 
 		/**
 		 * Fires before a particular screen is loaded.
@@ -241,13 +253,15 @@ 
 		 */
 		do_action( 'load-' . $plugin_page );
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( !isset($_GET['noheader'])) {
+					require_once(ABSPATH . 'wp-admin/admin-header.php');
+		}
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
-		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") ) {
+					include(WPMU_PLUGIN_DIR . "/$plugin_page");
+		} else {
+					include(WP_PLUGIN_DIR . "/$plugin_page");
+		}
 	}
 
 	include(ABSPATH . 'wp-admin/admin-footer.php');
@@ -284,8 +298,9 @@ 
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if (! isset($_GET['noheader'])) {
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
+	}
 
 	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
 
@@ -333,15 +348,17 @@ 
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
 	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
-			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
-			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
+		if ( $pagenow == 'post-new.php' ) {
+					do_action( 'load-page-new.php' );
+		} elseif ( $pagenow == 'post.php' ) {
+					do_action( 'load-page.php' );
+		}
+	} elseif ( $pagenow == 'edit-tags.php' ) {
+		if ( $taxnow == 'category' ) {
+					do_action( 'load-categories.php' );
+		} elseif ( $taxnow == 'link_category' ) {
+					do_action( 'load-edit-link-categories.php' );
+		}
 	} elseif( 'term.php' === $pagenow ) {
 		do_action( 'load-edit-tags.php' );
 	}

Spacing +91 added lines, -91 removed lines

@@ -11,40 +11,40 @@ 
  *
  * @since 2.3.2
  */
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( ! defined('WP_NETWORK_ADMIN') )
+if ( ! defined('WP_NETWORK_ADMIN'))
 	define('WP_NETWORK_ADMIN', false);
 
-if ( ! defined('WP_USER_ADMIN') )
+if ( ! defined('WP_USER_ADMIN'))
 	define('WP_USER_ADMIN', false);
 
-if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN ) {
+if ( ! WP_NETWORK_ADMIN && ! WP_USER_ADMIN) {
 	define('WP_BLOG_ADMIN', true);
 }
 
-if ( isset($_GET['import']) && !defined('WP_LOAD_IMPORTERS') )
+if (isset($_GET['import']) && ! defined('WP_LOAD_IMPORTERS'))
 	define('WP_LOAD_IMPORTERS', true);
 
-require_once(dirname(dirname(__FILE__)) . '/wp-load.php');
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
 nocache_headers();
 
-if ( get_option('db_upgraded') ) {
+if (get_option('db_upgraded')) {
 	flush_rewrite_rules();
-	update_option( 'db_upgraded',  false );
+	update_option('db_upgraded', false);
 
 	/**
 	 * Fires on the next page load after a successful DB upgrade.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'after_db_upgrade' );
-} elseif ( get_option('db_version') != $wp_db_version && empty($_POST) ) {
-	if ( !is_multisite() ) {
-		wp_redirect( admin_url( 'upgrade.php?_wp_http_referer=' . urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) );
+	do_action('after_db_upgrade');
+} elseif (get_option('db_version') != $wp_db_version && empty($_POST)) {
+	if ( ! is_multisite()) {
+		wp_redirect(admin_url('upgrade.php?_wp_http_referer='.urlencode(wp_unslash($_SERVER['REQUEST_URI']))));
 		exit;
 
 	/**
@@ -61,38 +61,38 @@ 
 	 *
 	 * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
 	 */
-	} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
+	} elseif (apply_filters('do_mu_upgrade', true)) {
 		$c = get_blog_count();
 
 		/*
 		 * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
 		 * attempt to do no more than threshold value, with some +/- allowed.
 		 */
-		if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
-			require_once( ABSPATH . WPINC . '/http.php' );
-			$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+		if ($c <= 50 || ($c > 50 && mt_rand(0, (int) ($c / 50)) == 1)) {
+			require_once(ABSPATH.WPINC.'/http.php');
+			$response = wp_remote_get(admin_url('upgrade.php?step=1'), array('timeout' => 120, 'httpversion' => '1.1'));
 			/** This action is documented in wp-admin/network/upgrade.php */
-			do_action( 'after_mu_upgrade', $response );
+			do_action('after_mu_upgrade', $response);
 			unset($response);
 		}
 		unset($c);
 	}
 }
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 auth_redirect();
 
 // Schedule trash collection
-if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
+if ( ! wp_next_scheduled('wp_scheduled_delete') && ! wp_installing())
 	wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
 
 set_screen_options();
 
-$date_format = __( 'F j, Y' );
-$time_format = __( 'g:i a' );
+$date_format = __('F j, Y');
+$time_format = __('g:i a');
 
-wp_enqueue_script( 'common' );
+wp_enqueue_script('common');
 
 
 
@@ -115,30 +115,30 @@ 
 
 $editing = false;
 
-if ( isset($_GET['page']) ) {
-	$plugin_page = wp_unslash( $_GET['page'] );
+if (isset($_GET['page'])) {
+	$plugin_page = wp_unslash($_GET['page']);
 	$plugin_page = plugin_basename($plugin_page);
 }
 
-if ( isset( $_REQUEST['post_type'] ) && post_type_exists( $_REQUEST['post_type'] ) )
+if (isset($_REQUEST['post_type']) && post_type_exists($_REQUEST['post_type']))
 	$typenow = $_REQUEST['post_type'];
 else
 	$typenow = '';
 
-if ( isset( $_REQUEST['taxonomy'] ) && taxonomy_exists( $_REQUEST['taxonomy'] ) )
+if (isset($_REQUEST['taxonomy']) && taxonomy_exists($_REQUEST['taxonomy']))
 	$taxnow = $_REQUEST['taxonomy'];
 else
 	$taxnow = '';
 
-if ( WP_NETWORK_ADMIN )
-	require(ABSPATH . 'wp-admin/network/menu.php');
-elseif ( WP_USER_ADMIN )
-	require(ABSPATH . 'wp-admin/user/menu.php');
+if (WP_NETWORK_ADMIN)
+	require(ABSPATH.'wp-admin/network/menu.php');
+elseif (WP_USER_ADMIN)
+	require(ABSPATH.'wp-admin/user/menu.php');
 else
-	require(ABSPATH . 'wp-admin/menu.php');
+	require(ABSPATH.'wp-admin/menu.php');
 
-if ( current_user_can( 'manage_options' ) ) {
-	wp_raise_memory_limit( 'admin' );
+if (current_user_can('manage_options')) {
+	wp_raise_memory_limit('admin');
 }
 
 /**
@@ -151,24 +151,24 @@ 
  *
  * @since 2.5.0
  */
-do_action( 'admin_init' );
+do_action('admin_init');
 
-if ( isset($plugin_page) ) {
-	if ( !empty($typenow) )
-		$the_parent = $pagenow . '?post_type=' . $typenow;
+if (isset($plugin_page)) {
+	if ( ! empty($typenow))
+		$the_parent = $pagenow.'?post_type='.$typenow;
 	else
 		$the_parent = $pagenow;
-	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
+	if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent)) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 
 		// Back-compat for plugins using add_management_page().
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+		if (empty($page_hook) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php')) {
 			// There could be plugin specific params on the URL, so we need the whole query string
-			if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
-				$query_string = $_SERVER[ 'QUERY_STRING' ];
+			if ( ! empty($_SERVER['QUERY_STRING']))
+				$query_string = $_SERVER['QUERY_STRING'];
 			else
-				$query_string = 'page=' . $plugin_page;
-			wp_redirect( admin_url('tools.php?' . $query_string) );
+				$query_string = 'page='.$plugin_page;
+			wp_redirect(admin_url('tools.php?'.$query_string));
 			exit;
 		}
 	}
@@ -176,19 +176,19 @@ 
 }
 
 $hook_suffix = '';
-if ( isset( $page_hook ) ) {
+if (isset($page_hook)) {
 	$hook_suffix = $page_hook;
-} elseif ( isset( $plugin_page ) ) {
+} elseif (isset($plugin_page)) {
 	$hook_suffix = $plugin_page;
-} elseif ( isset( $pagenow ) ) {
+} elseif (isset($pagenow)) {
 	$hook_suffix = $pagenow;
 }
 
 set_current_screen();
 
 // Handle plugin admin pages.
-if ( isset($plugin_page) ) {
-	if ( $page_hook ) {
+if (isset($plugin_page)) {
+	if ($page_hook) {
 		/**
 		 * Fires before a particular screen is loaded.
 		 *
@@ -209,9 +209,9 @@ 
 		 *
 		 * @since 2.1.0
 		 */
-		do_action( "load-{$page_hook}" );
-		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		do_action("load-{$page_hook}");
+		if ( ! isset($_GET['noheader']))
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
 		/**
 		 * Used to call the registered callback for a plugin screen.
@@ -219,12 +219,12 @@ 
 		 * @ignore
 		 * @since 1.5.0
 		 */
-		do_action( $page_hook );
+		do_action($page_hook);
 	} else {
-		if ( validate_file($plugin_page) )
+		if (validate_file($plugin_page))
 			wp_die(__('Invalid plugin page'));
 
-		if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
+		if ( ! (file_exists(WP_PLUGIN_DIR."/$plugin_page") && is_file(WP_PLUGIN_DIR."/$plugin_page")) && ! (file_exists(WPMU_PLUGIN_DIR."/$plugin_page") && is_file(WPMU_PLUGIN_DIR."/$plugin_page")))
 			wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
 
 		/**
@@ -239,35 +239,35 @@ 
 		 *
 		 * @since 1.5.0
 		 */
-		do_action( "load-{$plugin_page}" );
+		do_action("load-{$plugin_page}");
 
-		if ( !isset($_GET['noheader']))
-			require_once(ABSPATH . 'wp-admin/admin-header.php');
+		if ( ! isset($_GET['noheader']))
+			require_once(ABSPATH.'wp-admin/admin-header.php');
 
-		if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
-			include(WPMU_PLUGIN_DIR . "/$plugin_page");
+		if (file_exists(WPMU_PLUGIN_DIR."/$plugin_page"))
+			include(WPMU_PLUGIN_DIR."/$plugin_page");
 		else
-			include(WP_PLUGIN_DIR . "/$plugin_page");
+			include(WP_PLUGIN_DIR."/$plugin_page");
 	}
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	exit();
-} elseif ( isset( $_GET['import'] ) ) {
+} elseif (isset($_GET['import'])) {
 
 	$importer = $_GET['import'];
 
-	if ( ! current_user_can( 'import' ) ) {
-		wp_die( __( 'Sorry, you are not allowed to import content.' ) );
+	if ( ! current_user_can('import')) {
+		wp_die(__('Sorry, you are not allowed to import content.'));
 	}
 
-	if ( validate_file($importer) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+	if (validate_file($importer)) {
+		wp_redirect(admin_url('import.php?invalid='.$importer));
 		exit;
 	}
 
-	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]) ) {
-		wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
+	if ( ! isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
+		wp_redirect(admin_url('import.php?invalid='.$importer));
 		exit;
 	}
 
@@ -278,16 +278,16 @@ 
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( "load-importer-{$importer}" );
+	do_action("load-importer-{$importer}");
 
 	$parent_file = 'tools.php';
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
-	if (! isset($_GET['noheader']))
-		require_once(ABSPATH . 'wp-admin/admin-header.php');
+	if ( ! isset($_GET['noheader']))
+		require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	define('WP_IMPORTING', true);
 
@@ -301,13 +301,13 @@ 
 	 *
 	 * @param bool $force Whether to force data to be filtered through kses. Default false.
 	 */
-	if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
-		kses_init_filters();  // Always filter imported data with kses on multisite.
+	if (apply_filters('force_filtered_html_on_import', false)) {
+		kses_init_filters(); // Always filter imported data with kses on multisite.
 	}
 
 	call_user_func($wp_importers[$importer][2]);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	// Make sure rules are flushed
 	flush_rewrite_rules(false);
@@ -326,28 +326,28 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( "load-{$pagenow}" );
+	do_action("load-{$pagenow}");
 
 	/*
 	 * The following hooks are fired to ensure backward compatibility.
 	 * In all other cases, 'load-' . $pagenow should be used instead.
 	 */
-	if ( $typenow == 'page' ) {
-		if ( $pagenow == 'post-new.php' )
-			do_action( 'load-page-new.php' );
-		elseif ( $pagenow == 'post.php' )
-			do_action( 'load-page.php' );
-	}  elseif ( $pagenow == 'edit-tags.php' ) {
-		if ( $taxnow == 'category' )
-			do_action( 'load-categories.php' );
-		elseif ( $taxnow == 'link_category' )
-			do_action( 'load-edit-link-categories.php' );
-	} elseif( 'term.php' === $pagenow ) {
-		do_action( 'load-edit-tags.php' );
+	if ($typenow == 'page') {
+		if ($pagenow == 'post-new.php')
+			do_action('load-page-new.php');
+		elseif ($pagenow == 'post.php')
+			do_action('load-page.php');
+	}  elseif ($pagenow == 'edit-tags.php') {
+		if ($taxnow == 'category')
+			do_action('load-categories.php');
+		elseif ($taxnow == 'link_category')
+			do_action('load-edit-link-categories.php');
+	} elseif ('term.php' === $pagenow) {
+		do_action('load-edit-tags.php');
 	}
 }
 
-if ( ! empty( $_REQUEST['action'] ) ) {
+if ( ! empty($_REQUEST['action'])) {
 	/**
 	 * Fires when an 'action' request variable is sent.
 	 *
@@ -356,5 +356,5 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	do_action( 'admin_action_' . $_REQUEST['action'] );
+	do_action('admin_action_'.$_REQUEST['action']);
 }

src/wp-admin/index.php

Braces +19 added lines, -10 removed lines

@@ -15,18 +15,21 @@ 
 wp_dashboard_setup();
 
 wp_enqueue_script( 'dashboard' );
-if ( current_user_can( 'edit_theme_options' ) )
+if ( current_user_can( 'edit_theme_options' ) ) {
 	wp_enqueue_script( 'customize-loader' );
+}
 if ( current_user_can( 'install_plugins' ) ) {
 	wp_enqueue_script( 'plugin-install' );
 	wp_enqueue_script( 'updates' );
 }
-if ( current_user_can( 'upload_files' ) )
+if ( current_user_can( 'upload_files' ) ) {
 	wp_enqueue_script( 'media-upload' );
+}
 add_thickbox();
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	wp_enqueue_script( 'jquery-touch-punch' );
+}
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
@@ -65,25 +68,29 @@ 
 ) );
 
 $help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
+if ( current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
+}
 	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
+if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
 	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
+}
+if ( ! is_multisite() && current_user_can( 'install_plugins' ) ) {
 	$help .= '<p>' . sprintf(
 		/* translators: %s: WordPress Planet URL */
 		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.' ),
 		__( 'https://planet.wordpress.org/' )
 	) . '</p>';
-else
+} else {
 	$help .= '<p>' . sprintf(
 		/* translators: %s: WordPress Planet URL */
 		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
 		__( 'https://planet.wordpress.org/' )
 	) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
+}
+if ( current_user_can( 'edit_theme_options' ) ) {
 	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+}
 
 $screen->add_help_tab( array(
 	'id'      => 'help-content',
@@ -111,8 +118,10 @@ 
 	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
 	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
-		$classes .= ' hidden'; ?>
+	if ( $hide ) {
+			$classes .= ' hidden';
+	}
+	?>
 
 	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
 		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>

Spacing +64 added lines, -64 removed lines

@@ -7,115 +7,115 @@ 
  */
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** Load WordPress dashboard API */
-require_once(ABSPATH . 'wp-admin/includes/dashboard.php');
+require_once(ABSPATH.'wp-admin/includes/dashboard.php');
 
 wp_dashboard_setup();
 
-wp_enqueue_script( 'dashboard' );
-if ( current_user_can( 'edit_theme_options' ) )
-	wp_enqueue_script( 'customize-loader' );
-if ( current_user_can( 'install_plugins' ) ) {
-	wp_enqueue_script( 'plugin-install' );
-	wp_enqueue_script( 'updates' );
+wp_enqueue_script('dashboard');
+if (current_user_can('edit_theme_options'))
+	wp_enqueue_script('customize-loader');
+if (current_user_can('install_plugins')) {
+	wp_enqueue_script('plugin-install');
+	wp_enqueue_script('updates');
 }
-if ( current_user_can( 'upload_files' ) )
-	wp_enqueue_script( 'media-upload' );
+if (current_user_can('upload_files'))
+	wp_enqueue_script('media-upload');
 add_thickbox();
 
-if ( wp_is_mobile() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 $title = __('Dashboard');
 $parent_file = 'index.php';
 
-$help = '<p>' . __( 'Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab above the screen title.' ) . '</p>';
+$help = '<p>'.__('Welcome to your WordPress Dashboard! This is the screen you will see when you log in to your site, and gives you access to all the site management features of WordPress. You can get help for any screen by clicking the Help tab above the screen title.').'</p>';
 
 $screen = get_current_screen();
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
 // Help tabs
 
-$help  = '<p>' . __( 'The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.' ) . '</p>';
-$help .= '<p>' . __( 'Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.' ) . '</p>';
+$help  = '<p>'.__('The left-hand navigation menu provides links to all of the WordPress administration screens, with submenu items displayed on hover. You can minimize this menu to a narrow icon strip by clicking on the Collapse Menu arrow at the bottom.').'</p>';
+$help .= '<p>'.__('Links in the Toolbar at the top of the screen connect your dashboard and the front end of your site, and provide access to your profile and helpful WordPress information.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-navigation',
-	'title'   => __( 'Navigation' ),
+	'title'   => __('Navigation'),
 	'content' => $help,
-) );
+));
 
-$help  = '<p>' . __( 'You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.' ) . '</p>';
-$help .= '<p>' . __( '<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.' ) . '</p>';
+$help  = '<p>'.__('You can use the following controls to arrange your Dashboard screen to suit your workflow. This is true on most other administration screens as well.').'</p>';
+$help .= '<p>'.__('<strong>Screen Options</strong> &mdash; Use the Screen Options tab to choose which Dashboard boxes to show.').'</p>';
+$help .= '<p>'.__('<strong>Drag and Drop</strong> &mdash; To rearrange the boxes, drag and drop by clicking on the title bar of the selected box and releasing when you see a gray dotted-line rectangle appear in the location you want to place the box.').'</p>';
+$help .= '<p>'.__('<strong>Box Controls</strong> &mdash; Click the title bar of the box to expand or collapse it. Some boxes added by plugins may have configurable content, and will show a &#8220;Configure&#8221; link in the title bar if you hover over it.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-layout',
-	'title'   => __( 'Layout' ),
+	'title'   => __('Layout'),
 	'content' => $help,
-) );
-
-$help  = '<p>' . __( 'The boxes on your Dashboard screen are:' ) . '</p>';
-if ( current_user_can( 'edit_posts' ) )
-	$help .= '<p>' . __( '<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.' ) . '</p>';
-	$help .= '<p>' . __( '<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.' ) . '</p>';
-if ( is_blog_admin() && current_user_can( 'edit_posts' ) )
-	$help .= '<p>' . __( "<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started." ) . '</p>';
-if ( ! is_multisite() && current_user_can( 'install_plugins' ) )
-	$help .= '<p>' . sprintf(
+));
+
+$help = '<p>'.__('The boxes on your Dashboard screen are:').'</p>';
+if (current_user_can('edit_posts'))
+	$help .= '<p>'.__('<strong>At A Glance</strong> &mdash; Displays a summary of the content on your site and identifies which theme and version of WordPress you are using.').'</p>';
+	$help .= '<p>'.__('<strong>Activity</strong> &mdash; Shows the upcoming scheduled posts, recently published posts, and the most recent comments on your posts and allows you to moderate them.').'</p>';
+if (is_blog_admin() && current_user_can('edit_posts'))
+	$help .= '<p>'.__("<strong>Quick Draft</strong> &mdash; Allows you to create a new post and save it as a draft. Also displays links to the 5 most recent draft posts you've started.").'</p>';
+if ( ! is_multisite() && current_user_can('install_plugins'))
+	$help .= '<p>'.sprintf(
 		/* translators: %s: WordPress Planet URL */
-		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.' ),
-		__( 'https://planet.wordpress.org/' )
-	) . '</p>';
+		__('<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project, the <a href="%s">WordPress Planet</a>, and popular plugins.'),
+		__('https://planet.wordpress.org/')
+	).'</p>';
 else
-	$help .= '<p>' . sprintf(
+	$help .= '<p>'.sprintf(
 		/* translators: %s: WordPress Planet URL */
-		__( '<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.' ),
-		__( 'https://planet.wordpress.org/' )
-	) . '</p>';
-if ( current_user_can( 'edit_theme_options' ) )
-	$help .= '<p>' . __( '<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.' ) . '</p>';
+		__('<strong>WordPress News</strong> &mdash; Latest news from the official WordPress project and the <a href="%s">WordPress Planet</a>.'),
+		__('https://planet.wordpress.org/')
+	).'</p>';
+if (current_user_can('edit_theme_options'))
+	$help .= '<p>'.__('<strong>Welcome</strong> &mdash; Shows links for some of the most common tasks when setting up a new site.').'</p>';
 
-$screen->add_help_tab( array(
+$screen->add_help_tab(array(
 	'id'      => 'help-content',
-	'title'   => __( 'Content' ),
+	'title'   => __('Content'),
 	'content' => $help,
-) );
+));
 
-unset( $help );
+unset($help);
 
 $screen->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Screen">Documentation on Dashboard</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Dashboard_Screen">Documentation on Dashboard</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-	<h1><?php echo esc_html( $title ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 
-<?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
+<?php if (has_action('welcome_panel') && current_user_can('edit_theme_options')) :
 	$classes = 'welcome-panel';
 
-	$option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+	$option = get_user_meta(get_current_user_id(), 'show_welcome_panel', true);
 	// 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
-	$hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
-	if ( $hide )
+	$hide = 0 == $option || (2 == $option && wp_get_current_user()->user_email != get_option('admin_email'));
+	if ($hide)
 		$classes .= ' hidden'; ?>
 
-	<div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
-		<?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
-		<a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>" aria-label="<?php esc_attr_e( 'Dismiss the welcome panel' ); ?>"><?php _e( 'Dismiss' ); ?></a>
+	<div id="welcome-panel" class="<?php echo esc_attr($classes); ?>">
+		<?php wp_nonce_field('welcome-panel-nonce', 'welcomepanelnonce', false); ?>
+		<a class="welcome-panel-close" href="<?php echo esc_url(admin_url('?welcome=0')); ?>" aria-label="<?php esc_attr_e('Dismiss the welcome panel'); ?>"><?php _e('Dismiss'); ?></a>
 		<?php
 		/**
 		 * Add content to the welcome panel on the admin dashboard.
@@ -126,7 +126,7 @@ 
 		 *
 		 * @since 3.5.0
 		 */
-		do_action( 'welcome_panel' );
+		do_action('welcome_panel');
 		?>
 	</div>
 <?php endif; ?>
@@ -138,4 +138,4 @@ 
 </div><!-- wrap -->
 
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

src/wp-includes/ms-settings.php

Spacing +34 added lines, -34 removed lines

@@ -23,19 +23,19 @@ 
 global $current_site, $current_blog;
 
 /** WP_Network class */
-require_once( ABSPATH . WPINC . '/class-wp-network.php' );
+require_once(ABSPATH.WPINC.'/class-wp-network.php');
 
 /** WP_Site class */
-require_once( ABSPATH . WPINC . '/class-wp-site.php' );
+require_once(ABSPATH.WPINC.'/class-wp-site.php');
 
 /** Multisite loader */
-require_once( ABSPATH . WPINC . '/ms-load.php' );
+require_once(ABSPATH.WPINC.'/ms-load.php');
 
 /** Default Multisite constants */
-require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
+require_once(ABSPATH.WPINC.'/ms-default-constants.php');
 
-if ( defined( 'SUNRISE' ) ) {
-	include_once( WP_CONTENT_DIR . '/sunrise.php' );
+if (defined('SUNRISE')) {
+	include_once(WP_CONTENT_DIR.'/sunrise.php');
 }
 
 /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
@@ -43,50 +43,50 @@ 
 
 // This block will process a request if the current network or current site objects
 // have not been populated in the global scope through something like `sunrise.php`.
-if ( !isset( $current_site ) || !isset( $current_blog ) ) {
-
-	$domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
-	if ( substr( $domain, -3 ) == ':80' ) {
-		$domain = substr( $domain, 0, -3 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
-	} elseif ( substr( $domain, -4 ) == ':443' ) {
-		$domain = substr( $domain, 0, -4 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
+if ( ! isset($current_site) || ! isset($current_blog)) {
+
+	$domain = strtolower(stripslashes($_SERVER['HTTP_HOST']));
+	if (substr($domain, -3) == ':80') {
+		$domain = substr($domain, 0, -3);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -3);
+	} elseif (substr($domain, -4) == ':443') {
+		$domain = substr($domain, 0, -4);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -4);
 	}
 
-	$path = stripslashes( $_SERVER['REQUEST_URI'] );
-	if ( is_admin() ) {
-		$path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path );
+	$path = stripslashes($_SERVER['REQUEST_URI']);
+	if (is_admin()) {
+		$path = preg_replace('#(.*)/wp-admin/.*#', '$1/', $path);
 	}
-	list( $path ) = explode( '?', $path );
+	list($path) = explode('?', $path);
 
-	$bootstrap_result = ms_load_current_site_and_network( $domain, $path, is_subdomain_install() );
+	$bootstrap_result = ms_load_current_site_and_network($domain, $path, is_subdomain_install());
 
-	if ( true === $bootstrap_result ) {
+	if (true === $bootstrap_result) {
 		// `$current_blog` and `$current_site are now populated.
-	} elseif ( false === $bootstrap_result ) {
-		ms_not_installed( $domain, $path );
+	} elseif (false === $bootstrap_result) {
+		ms_not_installed($domain, $path);
 	} else {
-		header( 'Location: ' . $bootstrap_result );
+		header('Location: '.$bootstrap_result);
 		exit;
 	}
-	unset( $bootstrap_result );
+	unset($bootstrap_result);
 
 	$blog_id = $current_blog->blog_id;
 	$public  = $current_blog->public;
 
-	if ( empty( $current_blog->site_id ) ) {
+	if (empty($current_blog->site_id)) {
 		// This dates to [MU134] and shouldn't be relevant anymore,
 		// but it could be possible for arguments passed to insert_blog() etc.
 		$current_blog->site_id = 1;
 	}
 
 	$site_id = $current_blog->site_id;
-	wp_load_core_site_options( $site_id );
+	wp_load_core_site_options($site_id);
 }
 
-$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
-$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
+$wpdb->set_prefix($table_prefix, false); // $table_prefix can be set in sunrise.php
+$wpdb->set_blog_id($current_blog->blog_id, $current_blog->site_id);
 $table_prefix = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
 $switched = false;
@@ -94,12 +94,12 @@ 
 // need to init cache again after blog_id is set
 wp_start_object_cache();
 
-if ( ! $current_site instanceof WP_Network ) {
-	$current_site = new WP_Network( $current_site );
+if ( ! $current_site instanceof WP_Network) {
+	$current_site = new WP_Network($current_site);
 }
 
-if ( ! $current_blog instanceof WP_Site ) {
-	$current_blog = new WP_Site( $current_blog );
+if ( ! $current_blog instanceof WP_Site) {
+	$current_blog = new WP_Site($current_blog);
 }
 
 // Define upload directory constants
@@ -111,4 +111,4 @@ 
  *
  * @since 4.6.0
  */
-do_action( 'ms_loaded' );
+do_action('ms_loaded');

src/wp-includes/embed-template.php

Spacing +2 added lines, -2 removed lines

@@ -8,6 +8,6 @@
  * @deprecated 4.5.0 Moved to wp-includes/theme-compat/embed.php
  */
 
-_deprecated_file( basename( __FILE__ ), '4.5.0', 'wp-includes/theme-compat/embed.php' );
+_deprecated_file(basename(__FILE__), '4.5.0', 'wp-includes/theme-compat/embed.php');
 
-include( ABSPATH . WPINC . '/theme-compat/embed.php' );
+include(ABSPATH.WPINC.'/theme-compat/embed.php');