ntwb / wordpress

src/wp-admin/revision.php

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * Revisions administration panel
- *
- * Requires wp-admin/includes/revision.php.
- *
- * @package WordPress
- * @subpackage Administration
- * @since 2.6.0
- *
- * @param int    revision Optional. The revision ID.
- * @param string action   The action to take.
- *                        Accepts 'restore', 'view' or 'edit'.
- * @param int    from     The revision to compare from.
- * @param int    to       Optional, required if revision missing. The revision to compare to.
- */
+	 * Revisions administration panel
+	 *
+	 * Requires wp-admin/includes/revision.php.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 2.6.0
+	 *
+	 * @param int    revision Optional. The revision ID.
+	 * @param string action   The action to take.
+	 *                        Accepts 'restore', 'view' or 'edit'.
+	 * @param int    from     The revision to compare from.
+	 * @param int    to       Optional, required if revision missing. The revision to compare to.
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Switch Indentation +42 added lines, -42 removed lines

@@ -30,56 +30,56 @@
 $redirect = 'edit.php';
 
 switch ( $action ) {
-case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
+	case 'restore' :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+			break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
 
-	// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
-	if ( ! wp_revisions_enabled( $post ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
+		// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
+		if ( ! wp_revisions_enabled( $post ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
 
-	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
+		// Don't allow revision restore when post is locked
+		if ( wp_check_post_lock( $post->ID ) )
+			break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+		check_admin_referer( "restore-post_{$revision->ID}" );
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-	break;
-case 'view' :
-case 'edit' :
-default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+		wp_restore_post_revision( $revision->ID );
+		$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	case 'view' :
+	case 'edit' :
+	default :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
+
+		if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
+			break;
+
+		// Revisions disabled and we're not looking at an autosave
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
+
+		$post_edit_link = get_edit_post_link();
+		$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+		$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+		$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to post editor' ) . '</a>';
+		$title          = __( 'Revisions' );
+
+		$redirect = false;
 		break;
-
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
-		break;
-
-	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
-
-	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to post editor' ) . '</a>';
-	$title          = __( 'Revisions' );
-
-	$redirect = false;
-	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.

Spacing +48 added lines, -48 removed lines

@@ -16,112 +16,112 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require ABSPATH . 'wp-admin/includes/revision.php';
+require ABSPATH.'wp-admin/includes/revision.php';
 
-wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) );
+wp_reset_vars(array('revision', 'action', 'from', 'to'));
 
-$revision_id = absint( $revision );
+$revision_id = absint($revision);
 
-$from = is_numeric( $from ) ? absint( $from ) : null;
-if ( ! $revision_id )
-	$revision_id = absint( $to );
+$from = is_numeric($from) ? absint($from) : null;
+if ( ! $revision_id)
+	$revision_id = absint($to);
 $redirect = 'edit.php';
 
-switch ( $action ) {
+switch ($action) {
 case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	if ( ! $revision = wp_get_post_revision($revision_id))
 		break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+	if ( ! current_user_can('edit_post', $revision->post_parent))
 		break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
+	if ( ! $post = get_post($revision->post_parent))
 		break;
 
 	// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
-	if ( ! wp_revisions_enabled( $post ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
+	if ( ! wp_revisions_enabled($post)) {
+		$redirect = 'edit.php?post_type='.$post->post_type;
 		break;
 	}
 
 	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
+	if (wp_check_post_lock($post->ID))
 		break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+	check_admin_referer("restore-post_{$revision->ID}");
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
+	wp_restore_post_revision($revision->ID);
+	$redirect = add_query_arg(array('message' => 5, 'revision' => $revision->ID), get_edit_post_link($post->ID, 'url'));
 	break;
 case 'view' :
 case 'edit' :
 default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	if ( ! $revision = wp_get_post_revision($revision_id))
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	if ( ! $post = get_post($revision->post_parent))
 		break;
 
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
+	if ( ! current_user_can('read_post', $revision->ID) || ! current_user_can('read_post', $post->ID))
 		break;
 
 	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
+	if ( ! wp_revisions_enabled($post) && ! wp_is_post_autosave($revision)) {
+		$redirect = 'edit.php?post_type='.$post->post_type;
 		break;
 	}
 
 	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to post editor' ) . '</a>';
-	$title          = __( 'Revisions' );
+	$post_title     = '<a href="'.$post_edit_link.'">'._draft_or_post_title().'</a>';
+	$h1             = sprintf(__('Compare Revisions of &#8220;%1$s&#8221;'), $post_title);
+	$return_to_post = '<a href="'.$post_edit_link.'">'.__('&larr; Return to post editor').'</a>';
+	$title          = __('Revisions');
 
 	$redirect = false;
 	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) )
+if ( ! $redirect && empty($post->post_type))
 	$redirect = 'edit.php';
 
-if ( ! empty( $redirect ) ) {
-	wp_redirect( $redirect );
+if ( ! empty($redirect)) {
+	wp_redirect($redirect);
 	exit;
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
-	$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
+if ( ! empty($post->post_type) && 'post' != $post->post_type)
+	$parent_file = $submenu_file = 'edit.php?post_type='.$post->post_type;
 else
 	$parent_file = $submenu_file = 'edit.php';
 
-wp_enqueue_script( 'revisions' );
-wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
+wp_enqueue_script('revisions');
+wp_localize_script('revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js($post, $revision_id, $from));
 
 /* Revisions Help Tab */
 
-$revisions_overview  = '<p>' . __( 'This screen is used for managing your content revisions.' ) . '</p>';
-$revisions_overview .= '<p>' . __( 'Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.' ) . '</p>';
-$revisions_overview .= '<p>' . __( 'From this screen you can review, compare, and restore revisions:' ) . '</p>';
-$revisions_overview .= '<ul><li>' . __( 'To navigate between revisions, <strong>drag the slider handle left or right</strong> or <strong>use the Previous or Next buttons</strong>.' ) . '</li>';
-$revisions_overview .= '<li>' . __( 'Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.' ) . '</li>';
-$revisions_overview .= '<li>' . __( 'To restore a revision, <strong>click Restore This Revision</strong>.' ) . '</li></ul>';
+$revisions_overview  = '<p>'.__('This screen is used for managing your content revisions.').'</p>';
+$revisions_overview .= '<p>'.__('Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.').'</p>';
+$revisions_overview .= '<p>'.__('From this screen you can review, compare, and restore revisions:').'</p>';
+$revisions_overview .= '<ul><li>'.__('To navigate between revisions, <strong>drag the slider handle left or right</strong> or <strong>use the Previous or Next buttons</strong>.').'</li>';
+$revisions_overview .= '<li>'.__('Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.').'</li>';
+$revisions_overview .= '<li>'.__('To restore a revision, <strong>click Restore This Revision</strong>.').'</li></ul>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'revisions-overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $revisions_overview
-) );
+));
 
-$revisions_sidebar  = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://codex.wordpress.org/Revision_Management" target="_blank">Revisions Management</a>' ) . '</p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>';
+$revisions_sidebar  = '<p><strong>'.__('For more information:').'</strong></p>';
+$revisions_sidebar .= '<p>'.__('<a href="https://codex.wordpress.org/Revision_Management" target="_blank">Revisions Management</a>').'</p>';
+$revisions_sidebar .= '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>';
 
-get_current_screen()->set_help_sidebar( $revisions_sidebar );
+get_current_screen()->set_help_sidebar($revisions_sidebar);
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
@@ -132,4 +132,4 @@ 
 <?php
 wp_print_revision_templates();
 
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once(ABSPATH.'wp-admin/admin-footer.php');

Braces +28 added lines, -18 removed lines

@@ -25,20 +25,24 @@ 
 $revision_id = absint( $revision );
 
 $from = is_numeric( $from ) ? absint( $from ) : null;
-if ( ! $revision_id )
+if ( ! $revision_id ) {
 	$revision_id = absint( $to );
+}
 $redirect = 'edit.php';
 
 switch ( $action ) {
 case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
+	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+			break;
+	}
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+	if ( ! current_user_can( 'edit_post', $revision->post_parent ) ) {
+			break;
+	}
 
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+	if ( ! $post = get_post( $revision->post_parent ) ) {
+			break;
+	}
 
 	// Revisions disabled (previously checked autosaves && ! wp_is_post_autosave( $revision ))
 	if ( ! wp_revisions_enabled( $post ) ) {
@@ -47,8 +51,9 @@ 
 	}
 
 	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
+	if ( wp_check_post_lock( $post->ID ) ) {
+			break;
+	}
 
 	check_admin_referer( "restore-post_{$revision->ID}" );
 
@@ -58,13 +63,16 @@ 
 case 'view' :
 case 'edit' :
 default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+			break;
+	}
+	if ( ! $post = get_post( $revision->post_parent ) ) {
+			break;
+	}
 
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) )
-		break;
+	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'read_post', $post->ID ) ) {
+			break;
+	}
 
 	// Revisions disabled and we're not looking at an autosave
 	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
@@ -83,8 +91,9 @@ 
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) )
+if ( ! $redirect && empty( $post->post_type ) ) {
 	$redirect = 'edit.php';
+}
 
 if ( ! empty( $redirect ) ) {
 	wp_redirect( $redirect );
@@ -92,10 +101,11 @@ 
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
+if ( ! empty( $post->post_type ) && 'post' != $post->post_type ) {
 	$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
-else
+} else {
 	$parent_file = $submenu_file = 'edit.php';
+}
 
 wp_enqueue_script( 'revisions' );
 wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );

src/wp-admin/admin-post.php

Spacing +15 added lines, -15 removed lines

@@ -9,35 +9,35 @@ 
  */
 
 /** We are located in WordPress Administration Screens */
-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');
 
 /** Allow for cross-domain requests (from the frontend). */
 send_origin_headers();
 
-require_once(ABSPATH . 'wp-admin/includes/admin.php');
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 nocache_headers();
 
 /** This action is documented in wp-admin/admin.php */
-do_action( 'admin_init' );
+do_action('admin_init');
 
-$action = empty( $_REQUEST['action'] ) ? '' : $_REQUEST['action'];
+$action = empty($_REQUEST['action']) ? '' : $_REQUEST['action'];
 
-if ( ! wp_validate_auth_cookie() ) {
-	if ( empty( $action ) ) {
+if ( ! wp_validate_auth_cookie()) {
+	if (empty($action)) {
 		/**
 		 * Fires on a non-authenticated admin post request where no action was supplied.
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( 'admin_post_nopriv' );
+		do_action('admin_post_nopriv');
 	} else {
 		/**
 		 * Fires on a non-authenticated admin post request for the given action.
@@ -47,16 +47,16 @@ 
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( "admin_post_nopriv_{$action}" );
+		do_action("admin_post_nopriv_{$action}");
 	}
 } else {
-	if ( empty( $action ) ) {
+	if (empty($action)) {
 		/**
 		 * Fires on an authenticated admin post request where no action was supplied.
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( 'admin_post' );
+		do_action('admin_post');
 	} else {
 		/**
 		 * Fires on an authenticated admin post request for the given action.
@@ -66,6 +66,6 @@ 
 		 *
 		 * @since 2.6.0
 		 */
-		do_action( "admin_post_{$action}" );
+		do_action("admin_post_{$action}");
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -13,10 +13,11 @@
 	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' );
+}
 
 /** Allow for cross-domain requests (from the frontend). */
 send_origin_headers();

src/wp-admin/options-reading.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Reading settings administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Reading settings administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +61 added lines, -61 removed lines

@@ -7,12 +7,12 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
-$title = __( 'Reading Settings' );
+$title = __('Reading Settings');
 $parent_file = 'options-general.php';
 
 /**
@@ -44,109 +44,109 @@ 
  * @since 3.5.0
  */
 function options_reading_blog_charset() {
-	echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
-	echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
+	echo '<input name="blog_charset" type="text" id="blog_charset" value="'.esc_attr(get_option('blog_charset')).'" class="regular-text" />';
+	echo '<p class="description">'.__('The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)').'</p>';
 }
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
-		'<p>' . sprintf(__('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="%s">Pages</a>. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page') . '</p>' .
-		'<p>' . __('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen contains the settings that affect the display of your content.').'</p>'.
+		'<p>'.sprintf(__('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="%s">Pages</a>. One will become the front page, and the other will be where your posts are displayed.'), 'post-new.php?post_type=page').'</p>'.
+		'<p>'.__('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display and whether to show full text or a summary.').'</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'      => 'site-visibility',
-	'title'   => has_action( 'blog_privacy_selector' ) ? __( 'Site Visibility' ) : __( 'Search Engine Visibility' ),
-	'content' => '<p>' . __( 'You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.' ) . '</p>' .
-		'<p>' . __( 'When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
-) );
+	'title'   => has_action('blog_privacy_selector') ? __('Site Visibility') : __('Search Engine Visibility'),
+	'content' => '<p>'.__('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the checkbox next to &#8220;Discourage search engines from indexing this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.').'</p>'.
+		'<p>'.__('When this setting is in effect, a reminder is shown in the At a Glance box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Reading_Screen" target="_blank">Documentation on Reading Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Reading_Screen" target="_blank">Documentation on Reading Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php
-settings_fields( 'reading' );
+settings_fields('reading');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
-	add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
+if ( ! in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8')))
+	add_settings_field('blog_charset', __('Encoding for pages and feeds'), 'options_reading_blog_charset', 'reading', 'default', array('label_for' => 'blog_charset'));
 ?>
 
-<?php if ( ! get_pages() ) : ?>
+<?php if ( ! get_pages()) : ?>
 <input name="show_on_front" type="hidden" value="posts" />
 <table class="form-table">
 <?php
-	if ( 'posts' != get_option( 'show_on_front' ) ) :
-		update_option( 'show_on_front', 'posts' );
+	if ('posts' != get_option('show_on_front')) :
+		update_option('show_on_front', 'posts');
 	endif;
 
 else :
-	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
-		update_option( 'show_on_front', 'posts' );
+	if ('page' == get_option('show_on_front') && ! get_option('page_on_front') && ! get_option('page_for_posts'))
+		update_option('show_on_front', 'posts');
 ?>
 <table class="form-table">
 <tr>
-<th scope="row"><?php _e( 'Front page displays' ); ?></th>
-<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Front page displays' ); ?></span></legend>
+<th scope="row"><?php _e('Front page displays'); ?></th>
+<td id="front-static-pages"><fieldset><legend class="screen-reader-text"><span><?php _e('Front page displays'); ?></span></legend>
 	<p><label>
-		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked( 'posts', get_option( 'show_on_front' ) ); ?> />
-		<?php _e( 'Your latest posts' ); ?>
+		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
+		<?php _e('Your latest posts'); ?>
 	</label>
 	</p>
 	<p><label>
-		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked( 'page', get_option( 'show_on_front' ) ); ?> />
-		<?php printf( __( 'A <a href="%s">static page</a> (select below)' ), 'edit.php?post_type=page' ); ?>
+		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> />
+		<?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit.php?post_type=page'); ?>
 	</label>
 	</p>
 <ul>
-	<li><label for="page_on_front"><?php printf( __( 'Front page: %s' ), wp_dropdown_pages( array( 'name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_on_front' ) ) ) ); ?></label></li>
-	<li><label for="page_for_posts"><?php printf( __( 'Posts page: %s' ), wp_dropdown_pages( array( 'name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __( '&mdash; Select &mdash;' ), 'option_none_value' => '0', 'selected' => get_option( 'page_for_posts' ) ) ) ); ?></label></li>
+	<li><label for="page_on_front"><?php printf(__('Front page: %s'), wp_dropdown_pages(array('name' => 'page_on_front', 'echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'option_none_value' => '0', 'selected' => get_option('page_on_front')))); ?></label></li>
+	<li><label for="page_for_posts"><?php printf(__('Posts page: %s'), wp_dropdown_pages(array('name' => 'page_for_posts', 'echo' => 0, 'show_option_none' => __('&mdash; Select &mdash;'), 'option_none_value' => '0', 'selected' => get_option('page_for_posts')))); ?></label></li>
 </ul>
-<?php if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == get_option( 'page_on_front' ) ) : ?>
-<div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
+<?php if ('page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front')) : ?>
+<div id="front-page-warning" class="error inline"><p><?php _e('<strong>Warning:</strong> these pages should not be the same!'); ?></p></div>
 <?php endif; ?>
 </fieldset></td>
 </tr>
 <?php endif; ?>
 <tr>
-<th scope="row"><label for="posts_per_page"><?php _e( 'Blog pages show at most' ); ?></label></th>
+<th scope="row"><label for="posts_per_page"><?php _e('Blog pages show at most'); ?></label></th>
 <td>
-<input name="posts_per_page" type="number" step="1" min="1" id="posts_per_page" value="<?php form_option( 'posts_per_page' ); ?>" class="small-text" /> <?php _e( 'posts' ); ?>
+<input name="posts_per_page" type="number" step="1" min="1" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" class="small-text" /> <?php _e('posts'); ?>
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="posts_per_rss"><?php _e( 'Syndication feeds show the most recent' ); ?></label></th>
-<td><input name="posts_per_rss" type="number" step="1" min="1" id="posts_per_rss" value="<?php form_option( 'posts_per_rss' ); ?>" class="small-text" /> <?php _e( 'items' ); ?></td>
+<th scope="row"><label for="posts_per_rss"><?php _e('Syndication feeds show the most recent'); ?></label></th>
+<td><input name="posts_per_rss" type="number" step="1" min="1" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" class="small-text" /> <?php _e('items'); ?></td>
 </tr>
 <tr>
-<th scope="row"><?php _e( 'For each article in a feed, show' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'For each article in a feed, show' ); ?> </span></legend>
-<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked( 0, get_option( 'rss_use_excerpt' ) ); ?>	/> <?php _e( 'Full text' ); ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked( 1, get_option( 'rss_use_excerpt' ) ); ?> /> <?php _e( 'Summary' ); ?></label></p>
+<th scope="row"><?php _e('For each article in a feed, show'); ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('For each article in a feed, show'); ?> </span></legend>
+<p><label><input name="rss_use_excerpt" type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>	/> <?php _e('Full text'); ?></label><br />
+<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary'); ?></label></p>
 </fieldset></td>
 </tr>
 
 <tr class="option-site-visibility">
-<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
-<?php if ( has_action( 'blog_privacy_selector' ) ) : ?>
+<th scope="row"><?php has_action('blog_privacy_selector') ? _e('Site Visibility') : _e('Search Engine Visibility'); ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php has_action('blog_privacy_selector') ? _e('Site Visibility') : _e('Search Engine Visibility'); ?> </span></legend>
+<?php if (has_action('blog_privacy_selector')) : ?>
 	<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
-	<label for="blog-public"><?php _e( 'Allow search engines to index this site' );?></label><br/>
+	<label for="blog-public"><?php _e('Allow search engines to index this site'); ?></label><br/>
 	<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
-	<label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
-	<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
+	<label for="blog-norobots"><?php _e('Discourage search engines from indexing this site'); ?></label>
+	<p class="description"><?php _e('Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.'); ?></p>
 	<?php
 	/**
 	 * Enable the legacy 'Site Visibility' privacy options.
@@ -161,22 +161,22 @@ 
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'blog_privacy_selector' );
+	do_action('blog_privacy_selector');
 	?>
 <?php else : ?>
-	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) ); ?> />
-	<?php _e( 'Discourage search engines from indexing this site' ); ?></label>
-	<p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
+	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
+	<?php _e('Discourage search engines from indexing this site'); ?></label>
+	<p class="description"><?php _e('It is up to search engines to honor this request.'); ?></p>
 <?php endif; ?>
 </fieldset></td>
 </tr>
 
-<?php do_settings_fields( 'reading', 'default' ); ?>
+<?php do_settings_fields('reading', 'default'); ?>
 </table>
 
-<?php do_settings_sections( 'reading' ); ?>
+<?php do_settings_sections('reading'); ?>
 
 <?php submit_button(); ?>
 </form>
 </div>
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +12 added lines, -5 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( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __( 'Reading Settings' );
 $parent_file = 'options-general.php';
@@ -80,8 +81,9 @@ 
 <?php
 settings_fields( 'reading' );
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
+}
 ?>
 
 <?php if ( ! get_pages() ) : ?>
@@ -92,9 +94,11 @@ 
 		update_option( 'show_on_front', 'posts' );
 	endif;
 
-else :
+else {
+	:
 	if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_on_front' ) && ! get_option( 'page_for_posts' ) )
 		update_option( 'show_on_front', 'posts' );
+}
 ?>
 <table class="form-table">
 <tr>
@@ -163,8 +167,11 @@ 
 	 */
 	do_action( 'blog_privacy_selector' );
 	?>
-<?php else : ?>
-	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) ); ?> />
+<?php else {
+	: ?>
+	<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( '0', get_option( 'blog_public' ) );
+}
+?> />
 	<?php _e( 'Discourage search engines from indexing this site' ); ?></label>
 	<p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
 <?php endif; ?>

src/wp-admin/link.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Manage link administration actions.
- *
- * This page is accessed by the link management pages and handles the forms and
- * AJAX processes for link actions.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Manage link administration actions.
+	 *
+	 * This page is accessed by the link management pages and handles the forms and
+	 * AJAX processes for link actions.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +17 added lines, -17 removed lines

@@ -10,18 +10,18 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
+wp_reset_vars(array('action', 'cat_id', 'link_id'));
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links'))
 	wp_link_manager_disabled_message();
 
-if ( !empty($_POST['deletebookmarks']) )
+if ( ! empty($_POST['deletebookmarks']))
 	$action = 'deletebookmarks';
-if ( !empty($_POST['move']) )
+if ( ! empty($_POST['move']))
 	$action = 'move';
-if ( !empty($_POST['linkcheck']) )
+if ( ! empty($_POST['linkcheck']))
 	$linkcheck = $_POST['linkcheck'];
 
 $this_file = admin_url('link-manager.php');
@@ -40,7 +40,7 @@ 
 		foreach ($linkcheck as $link_id) {
 			$link_id = (int) $link_id;
 
-			if ( wp_delete_link($link_id) )
+			if (wp_delete_link($link_id))
 				$deleted++;
 		}
 
@@ -68,15 +68,15 @@ 
 		check_admin_referer('add-bookmark');
 
 		$redir = wp_get_referer();
-		if ( add_link() )
-			$redir = add_query_arg( 'added', 'true', $redir );
+		if (add_link())
+			$redir = add_query_arg('added', 'true', $redir);
 
-		wp_redirect( $redir );
+		wp_redirect($redir);
 		exit;
 
 	case 'save' :
 		$link_id = (int) $_POST['link_id'];
-		check_admin_referer('update-bookmark_' . $link_id);
+		check_admin_referer('update-bookmark_'.$link_id);
 
 		edit_link($link_id);
 
@@ -85,7 +85,7 @@ 
 
 	case 'delete' :
 		$link_id = (int) $_GET['link_id'];
-		check_admin_referer('delete-bookmark_' . $link_id);
+		check_admin_referer('delete-bookmark_'.$link_id);
 
 		wp_delete_link($link_id);
 
@@ -96,8 +96,8 @@ 
 		wp_enqueue_script('link');
 		wp_enqueue_script('xfn');
 
-		if ( wp_is_mobile() )
-			wp_enqueue_script( 'jquery-touch-punch' );
+		if (wp_is_mobile())
+			wp_enqueue_script('jquery-touch-punch');
 
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
@@ -105,11 +105,11 @@ 
 
 		$link_id = (int) $_GET['link_id'];
 
-		if (!$link = get_link_to_edit($link_id))
+		if ( ! $link = get_link_to_edit($link_id))
 			wp_die(__('Link not found.'));
 
-		include( ABSPATH . 'wp-admin/edit-link-form.php' );
-		include( ABSPATH . 'wp-admin/admin-footer.php' );
+		include(ABSPATH.'wp-admin/edit-link-form.php');
+		include(ABSPATH.'wp-admin/admin-footer.php');
 		break;
 
 	default :

Braces +20 added lines, -12 removed lines

@@ -14,15 +14,19 @@ 
 
 wp_reset_vars( array( 'action', 'cat_id', 'link_id' ) );
 
-if ( ! current_user_can('manage_links') )
+if ( ! current_user_can('manage_links') ) {
 	wp_link_manager_disabled_message();
+}
 
-if ( !empty($_POST['deletebookmarks']) )
+if ( !empty($_POST['deletebookmarks']) ) {
 	$action = 'deletebookmarks';
-if ( !empty($_POST['move']) )
+}
+if ( !empty($_POST['move']) ) {
 	$action = 'move';
-if ( !empty($_POST['linkcheck']) )
+}
+if ( !empty($_POST['linkcheck']) ) {
 	$linkcheck = $_POST['linkcheck'];
+}
 
 $this_file = admin_url('link-manager.php');
 
@@ -40,8 +44,9 @@ 
 		foreach ($linkcheck as $link_id) {
 			$link_id = (int) $link_id;
 
-			if ( wp_delete_link($link_id) )
-				$deleted++;
+			if ( wp_delete_link($link_id) ) {
+							$deleted++;
+			}
 		}
 
 		wp_redirect("$this_file?deleted=$deleted");
@@ -68,8 +73,9 @@ 
 		check_admin_referer('add-bookmark');
 
 		$redir = wp_get_referer();
-		if ( add_link() )
-			$redir = add_query_arg( 'added', 'true', $redir );
+		if ( add_link() ) {
+					$redir = add_query_arg( 'added', 'true', $redir );
+		}
 
 		wp_redirect( $redir );
 		exit;
@@ -96,8 +102,9 @@ 
 		wp_enqueue_script('link');
 		wp_enqueue_script('xfn');
 
-		if ( wp_is_mobile() )
-			wp_enqueue_script( 'jquery-touch-punch' );
+		if ( wp_is_mobile() ) {
+					wp_enqueue_script( 'jquery-touch-punch' );
+		}
 
 		$parent_file = 'link-manager.php';
 		$submenu_file = 'link-manager.php';
@@ -105,8 +112,9 @@ 
 
 		$link_id = (int) $_GET['link_id'];
 
-		if (!$link = get_link_to_edit($link_id))
-			wp_die(__('Link not found.'));
+		if (!$link = get_link_to_edit($link_id)) {
+					wp_die(__('Link not found.'));
+		}
 
 		include( ABSPATH . 'wp-admin/edit-link-form.php' );
 		include( ABSPATH . 'wp-admin/admin-footer.php' );

src/wp-admin/options-discussion.php

Indentation +14 added lines, -14 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Discussion settings administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+		 * Discussion settings administration panel.
+		 *
+		 * @package WordPress
+		 * @subpackage Administration
+		 */
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
@@ -248,15 +248,15 @@ 
 	'retro' => __('Retro (Generated)')
 );
 /**
- * Filter the default avatars.
- *
- * Avatars are stored in key/value pairs, where the key is option value,
- * and the name is the displayed avatar name.
- *
- * @since 2.6.0
- *
- * @param array $avatar_defaults Array of default avatars.
- */
+	 * Filter the default avatars.
+	 *
+	 * Avatars are stored in key/value pairs, where the key is option value,
+	 * and the name is the displayed avatar name.
+	 *
+	 * @since 2.6.0
+	 *
+	 * @param array $avatar_defaults Array of default avatars.
+	 */
 $avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
 $default = get_option( 'avatar_default', 'mystery' );
 $size = 32;

Spacing +52 added lines, -52 removed lines

@@ -6,10 +6,10 @@ 
  * @subpackage Administration
  */
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('You do not have sufficient permissions to manage options for this site.'));
 
 $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
@@ -32,26 +32,26 @@ 
 	</script>
 <?php
 }
-add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
+add_action('admin_print_footer_scripts', 'options_discussion_add_js');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.').'</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_Discussion_Screen" target="_blank">Documentation on Discussion Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Settings_Discussion_Screen" target="_blank">Documentation on Discussion Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form method="post" action="options.php">
 <?php settings_fields('discussion'); ?>
@@ -72,7 +72,7 @@ 
 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
 <?php _e('Allow people to post comments on new articles'); ?></label>
 <br />
-<p class="description"><?php echo '(' . __( 'These settings may be overridden for individual articles.' ) . ')'; ?></p>
+<p class="description"><?php echo '('.__('These settings may be overridden for individual articles.').')'; ?></p>
 </fieldset></td>
 </tr>
 <tr>
@@ -83,13 +83,13 @@ 
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<?php if ( ! get_option('users_can_register') && is_multisite()) echo ' '.__('(Signup has been disabled. Only members of this site can comment.)'); ?>
 </label>
 <br />
 
 <label for="close_comments_for_old_posts">
 <input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
-<?php printf( __('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr(get_option('close_comments_days_old')) . '" class="small-text" />'); ?>
+<?php printf(__('Automatically close comments on articles older than %s days'), '</label><label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="'.esc_attr(get_option('close_comments_days_old')).'" class="small-text" />'); ?>
 </label>
 <br />
 <label for="thread_comments">
@@ -102,17 +102,17 @@ 
  *
  * @param int $max_depth The maximum depth of threaded comments. Default 10.
  */
-$maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
+$maxdeep = (int) apply_filters('thread_comments_depth_max', 10);
 
 $thread_comments_depth = '</label><label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
-for ( $i = 2; $i <= $maxdeep; $i++ ) {
-	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+for ($i = 2; $i <= $maxdeep; $i++) {
+	$thread_comments_depth .= "<option value='".esc_attr($i)."'";
+	if (get_option('thread_comments_depth') == $i) $thread_comments_depth .= " selected='selected'";
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
 
-printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth );
+printf(__('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth);
 
 ?></label>
 <br />
@@ -121,24 +121,24 @@ 
 <?php
 
 $default_comments_page = '</label><label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('first') . '</option></select>';
+if ('newest' == get_option('default_comments_page')) $default_comments_page .= ' selected="selected"';
+$default_comments_page .= '>'.__('last').'</option><option value="oldest"';
+if ('oldest' == get_option('default_comments_page')) $default_comments_page .= ' selected="selected"';
+$default_comments_page .= '>'.__('first').'</option></select>';
 
-printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
+printf(__('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="'.esc_attr(get_option('comments_per_page')).'" class="small-text" />', $default_comments_page);
 
 ?></label>
 <br />
 <label for="comment_order"><?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('newer') . '</option></select>';
+if ('asc' == get_option('comment_order')) $comment_order .= ' selected="selected"';
+$comment_order .= '>'.__('older').'</option><option value="desc"';
+if ('desc' == get_option('comment_order')) $comment_order .= ' selected="selected"';
+$comment_order .= '>'.__('newer').'</option></select>';
 
-printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
+printf(__('Comments should be displayed with the %s comments at the top of each page'), $comment_order);
 
 ?></label>
 </fieldset></td>
@@ -168,11 +168,11 @@ 
 <tr>
 <th scope="row"><?php _e('Comment Moderation'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
-<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
+<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="'.esc_attr(get_option('comment_max_links')).'" class="small-text" />'); ?></label></p>
 
 <p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
-<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
+<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea(get_option('moderation_keys')); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
@@ -181,7 +181,7 @@ 
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
 <p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
-<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
+<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea(get_option('blacklist_keys')); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
@@ -195,7 +195,7 @@ 
 <?php
 // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
 
-$show_avatars = get_option( 'show_avatars' );
+$show_avatars = get_option('show_avatars');
 ?>
 
 <table class="form-table">
@@ -203,12 +203,12 @@ 
 <th scope="row"><?php _e('Avatar Display'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
 	<label for="show_avatars">
-		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( $show_avatars, 1 ); ?> />
-		<?php _e( 'Show Avatars' ); ?>
+		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked($show_avatars, 1); ?> />
+		<?php _e('Show Avatars'); ?>
 	</label>
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Maximum Rating'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
 
@@ -225,13 +225,13 @@ 
 );
 foreach ($ratings as $key => $rating) :
 	$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
-	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr($key) . "' $selected/> $rating</label><br />";
+	echo "\n\t<label><input type='radio' name='avatar_rating' value='".esc_attr($key)."' $selected/> $rating</label><br />";
 endforeach;
 ?>
 
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars) echo ' hide-if-js'; ?>">
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 
@@ -257,28 +257,28 @@ 
  *
  * @param array $avatar_defaults Array of default avatars.
  */
-$avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
-$default = get_option( 'avatar_default', 'mystery' );
+$avatar_defaults = apply_filters('avatar_defaults', $avatar_defaults);
+$default = get_option('avatar_default', 'mystery');
 $size = 32;
 $avatar_list = '';
 
 // Force avatars on to display these choices
-add_filter( 'pre_option_show_avatars', '__return_true', 100 );
+add_filter('pre_option_show_avatars', '__return_true', 100);
 
-foreach ( $avatar_defaults as $default_key => $default_name ) {
+foreach ($avatar_defaults as $default_key => $default_name) {
 	$selected = ($default == $default_key) ? 'checked="checked" ' : '';
-	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
+	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='".esc_attr($default_key)."' {$selected}/> ";
 
-	$avatar = get_avatar( $user_email, $size, $default_key );
-	$avatar = preg_replace( "/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar );
-	$avatar = preg_replace( "/srcset='(.+?) 2x'/", "srcset='\$1&amp;forcedefault=1 2x'", $avatar );
+	$avatar = get_avatar($user_email, $size, $default_key);
+	$avatar = preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar);
+	$avatar = preg_replace("/srcset='(.+?) 2x'/", "srcset='\$1&amp;forcedefault=1 2x'", $avatar);
 	$avatar_list .= $avatar;
 
-	$avatar_list .= ' ' . $default_name . '</label>';
+	$avatar_list .= ' '.$default_name.'</label>';
 	$avatar_list .= '<br />';
 }
 
-remove_filter( 'pre_option_show_avatars', '__return_true', 100 );
+remove_filter('pre_option_show_avatars', '__return_true', 100);
 
 /**
  * Filter the HTML output of the default avatar list.
@@ -287,7 +287,7 @@ 
  *
  * @param string $avatar_list HTML markup of the avatar list.
  */
-echo apply_filters( 'default_avatar_select', $avatar_list );
+echo apply_filters('default_avatar_select', $avatar_list);
 ?>
 
 </fieldset></td>
@@ -301,4 +301,4 @@ 
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Braces +29 added lines, -9 removed lines

@@ -8,8 +8,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
+}
 
 $title = __('Discussion Settings');
 $parent_file = 'options-general.php';
@@ -83,7 +84,10 @@ 
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) {
+	echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' );
+}
+?>
 </label>
 <br />
 
@@ -107,7 +111,9 @@ 
 $thread_comments_depth = '</label><label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
 for ( $i = 2; $i <= $maxdeep; $i++ ) {
 	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+	if ( get_option('thread_comments_depth') == $i ) {
+		$thread_comments_depth .= " selected='selected'";
+	}
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
@@ -121,9 +127,13 @@ 
 <?php
 
 $default_comments_page = '</label><label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
+if ( 'newest' == get_option('default_comments_page') ) {
+	$default_comments_page .= ' selected="selected"';
+}
 $default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
+if ( 'oldest' == get_option('default_comments_page') ) {
+	$default_comments_page .= ' selected="selected"';
+}
 $default_comments_page .= '>' . __('first') . '</option></select>';
 
 printf( __('Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default'), '</label><label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr(get_option('comments_per_page')) . '" class="small-text" />', $default_comments_page );
@@ -133,9 +143,13 @@ 
 <label for="comment_order"><?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
+if ( 'asc' == get_option('comment_order') ) {
+	$comment_order .= ' selected="selected"';
+}
 $comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
+if ( 'desc' == get_option('comment_order') ) {
+	$comment_order .= ' selected="selected"';
+}
 $comment_order .= '>' . __('newer') . '</option></select>';
 
 printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
@@ -208,7 +222,10 @@ 
 	</label>
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars ) {
+	echo ' hide-if-js';
+}
+?>">
 <th scope="row"><?php _e('Maximum Rating'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
 
@@ -231,7 +248,10 @@ 
 
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
+<tr class="avatar-settings<?php if ( ! $show_avatars ) {
+	echo ' hide-if-js';
+}
+?>">
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 

src/wp-admin/post-new.php

Spacing +25 added lines, -25 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /**
  * @global string  $post_type
@@ -16,28 +16,28 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( ! isset( $_GET['post_type'] ) ) {
+if ( ! isset($_GET['post_type'])) {
 	$post_type = 'post';
-} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) {
+} elseif (in_array($_GET['post_type'], get_post_types(array('show_ui' => true)))) {
 	$post_type = $_GET['post_type'];
 } else {
-	wp_die( __('Invalid post type') );
+	wp_die(__('Invalid post type'));
 }
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( 'post' == $post_type ) {
+if ('post' == $post_type) {
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
-} elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+} elseif ('attachment' == $post_type) {
+	if (wp_redirect(admin_url('media-new.php')))
 		exit;
 } else {
 	$submenu_file = "post-new.php?post_type=$post_type";
-	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
+	if (isset($post_type_object) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true) {
 		$parent_file = $post_type_object->show_in_menu;
 		// What if there isn't a post-new.php item for this post type?
-		if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
-			if (	isset( $_registered_pages[ get_plugin_page_hookname( "edit.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
+		if ( ! isset($_registered_pages[get_plugin_page_hookname("post-new.php?post_type=$post_type", $post_type_object->show_in_menu)])) {
+			if (isset($_registered_pages[get_plugin_page_hookname("edit.php?post_type=$post_type", $post_type_object->show_in_menu)])) {
 				// Fall back to edit.php for that post type, if it exists
 				$submenu_file = "edit.php?post_type=$post_type";
 			} else {
@@ -54,28 +54,28 @@ 
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can($post_type_object->cap->edit_posts) || ! current_user_can($post_type_object->cap->create_posts))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
-	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+if ( ! wp_next_scheduled('wp_scheduled_auto_draft_delete'))
+	wp_schedule_event(time(), 'daily', 'wp_scheduled_auto_draft_delete');
 
-wp_enqueue_script( 'autosave' );
+wp_enqueue_script('autosave');
 
-if ( is_multisite() ) {
-	add_action( 'admin_footer', '_admin_notice_post_locked' );
+if (is_multisite()) {
+	add_action('admin_footer', '_admin_notice_post_locked');
 } else {
-	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
+	$check_users = get_users(array('fields' => 'ID', 'number' => 2));
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (count($check_users) > 1)
+		add_action('admin_footer', '_admin_notice_post_locked');
 
-	unset( $check_users );
+	unset($check_users);
 }
 
 // Show post form.
-$post = get_default_post_to_edit( $post_type, true );
+$post = get_default_post_to_edit($post_type, true);
 $post_ID = $post->ID;
-include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/edit-form-advanced.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +11 added lines, -7 removed lines

@@ -29,9 +29,10 @@ 
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
-		exit;
-} else {
+	if ( wp_redirect( admin_url( 'media-new.php' ) ) ) {
+			exit;
+	}
+	} else {
 	$submenu_file = "post-new.php?post_type=$post_type";
 	if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
 		$parent_file = $post_type_object->show_in_menu;
@@ -54,12 +55,14 @@ 
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) )
+if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+}
 
 wp_enqueue_script( 'autosave' );
 
@@ -68,8 +71,9 @@ 
 } else {
 	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if ( count( $check_users ) > 1 ) {
+			add_action( 'admin_footer', '_admin_notice_post_locked' );
+	}
 
 	unset( $check_users );
 }

src/wp-admin/options-head.php

Spacing +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
  * @subpackage Administration
  */
 
-wp_reset_vars( array( 'action' ) );
+wp_reset_vars(array('action'));
 
-if ( isset( $_GET['updated'] ) && isset( $_GET['page'] ) ) {
+if (isset($_GET['updated']) && isset($_GET['page'])) {
 	// For backwards compat with plugins that don't use the Settings API and just set updated=1 in the redirect
 	add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 }

src/wp-admin/moderation.php

Spacing +2 added lines, -2 removed lines

@@ -7,6 +7,6 @@
  * @package WordPress
  * @subpackage Administration
  */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
-wp_redirect( admin_url('edit-comments.php?comment_status=moderated') );
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
+wp_redirect(admin_url('edit-comments.php?comment_status=moderated'));
 exit;

src/wp-admin/setup-config.php

Switch Indentation +102 added lines, -102 removed lines

@@ -99,35 +99,35 @@ 
 }
 
 switch($step) {
-	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			setup_config_display_header( 'language-chooser' );
-			echo '<form id="setup" method="post" action="?step=0">';
-			wp_install_language_form( $languages );
-			echo '</form>';
-			break;
-		}
+		case -1:
+			if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+				setup_config_display_header( 'language-chooser' );
+				echo '<form id="setup" method="post" action="?step=0">';
+				wp_install_language_form( $languages );
+				echo '</form>';
+				break;
+			}
 
-		// Deliberately fall through if we can't reach the translations API.
+			// Deliberately fall through if we can't reach the translations API.
 
-	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
-				$GLOBALS['wp_locale'] = new WP_Locale();
+		case 0:
+			if ( ! empty( $language ) ) {
+				$loaded_language = wp_download_language_pack( $language );
+				if ( $loaded_language ) {
+					load_default_textdomain( $loaded_language );
+					$GLOBALS['wp_locale'] = new WP_Locale();
+				}
 			}
-		}
 
-		setup_config_display_header();
-		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
-			$step_1 .= '&amp;noapi';
-		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
-		}
-?>
+			setup_config_display_header();
+			$step_1 = 'setup-config.php?step=1';
+			if ( isset( $_REQUEST['noapi'] ) ) {
+				$step_1 .= '&amp;noapi';
+			}
+			if ( ! empty( $loaded_language ) ) {
+				$step_1 .= '&amp;language=' . $loaded_language;
+			}
+	?>
 
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
 <ol>
@@ -139,21 +139,21 @@ 
 </ol>
 <p>
 	<?php _e( 'We&#8217;re going to use this information to create a <code>wp-config.php</code> file.' ); ?>
-	<strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong>
+		<strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong>
 	<?php _e( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?>
 </p>
 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
 
 <p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
-<?php
-	break;
+	<?php
+		break;
 
-	case 1:
-		load_default_textdomain( $language );
-		$GLOBALS['wp_locale'] = new WP_Locale();
+		case 1:
+			load_default_textdomain( $language );
+			$GLOBALS['wp_locale'] = new WP_Locale();
 
-		setup_config_display_header();
-	?>
+			setup_config_display_header();
+		?>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
 	<table class="form-table">
@@ -184,100 +184,100 @@ 
 		</tr>
 	</table>
 	<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
+		<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
 	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
 </form>
 <?php
-	break;
+		break;
 
-	case 2:
-	load_default_textdomain( $language );
-	$GLOBALS['wp_locale'] = new WP_Locale();
+		case 2:
+		load_default_textdomain( $language );
+		$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+		$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
+		$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
+		$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
+		$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
+		$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
 
-	$step_1 = 'setup-config.php?step=1';
-	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
-		$step_1 .= '&amp;noapi';
-	}
+		$step_1 = 'setup-config.php?step=1';
+		$install = 'install.php';
+		if ( isset( $_REQUEST['noapi'] ) ) {
+			$step_1 .= '&amp;noapi';
+		}
 
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
-	} else {
-		$install .= '?language=en_US';
-	}
+		if ( ! empty( $language ) ) {
+			$step_1 .= '&amp;language=' . $language;
+			$install .= '?language=' . $language;
+		} else {
+			$install .= '?language=en_US';
+		}
 
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+		$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+		if ( empty( $prefix ) )
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
 
-	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+		// Validate $prefix: it can only contain letters, numbers and underscores.
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
 
-	// Test the db connection.
-	/**#@+
+		// Test the db connection.
+		/**#@+
 	 * @ignore
 	 */
-	define('DB_NAME', $dbname);
-	define('DB_USER', $uname);
-	define('DB_PASSWORD', $pwd);
-	define('DB_HOST', $dbhost);
-	/**#@-*/
+		define('DB_NAME', $dbname);
+		define('DB_USER', $uname);
+		define('DB_PASSWORD', $pwd);
+		define('DB_HOST', $dbhost);
+		/**#@-*/
 
-	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
-	require_wp_db();
+		// Re-construct $wpdb with these new values.
+		unset( $wpdb );
+		require_wp_db();
 
-	/*
+		/*
 	 * The wpdb constructor bails when WP_SETUP_CONFIG is set, so we must
 	 * fire this manually. We'll fail here if the values are no good.
 	 */
-	$wpdb->db_connect();
-
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+		$wpdb->db_connect();
 
-	// Fetch or generate keys and salts.
-	$no_api = isset( $_POST['noapi'] );
-	if ( ! $no_api ) {
-		$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
-	}
+		if ( ! empty( $wpdb->error ) )
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
 
-	if ( $no_api || is_wp_error( $secret_keys ) ) {
-		$secret_keys = array();
-		for ( $i = 0; $i < 8; $i++ ) {
-			$secret_keys[] = wp_generate_password( 64, true, true );
+		// Fetch or generate keys and salts.
+		$no_api = isset( $_POST['noapi'] );
+		if ( ! $no_api ) {
+			$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
 		}
-	} else {
-		$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-		foreach ( $secret_keys as $k => $v ) {
-			$secret_keys[$k] = substr( $v, 28, 64 );
-		}
-	}
 
-	$key = 0;
-	// Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
-			continue;
+		if ( $no_api || is_wp_error( $secret_keys ) ) {
+			$secret_keys = array();
+			for ( $i = 0; $i < 8; $i++ ) {
+				$secret_keys[] = wp_generate_password( 64, true, true );
+			}
+		} else {
+			$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
+			foreach ( $secret_keys as $k => $v ) {
+				$secret_keys[$k] = substr( $v, 28, 64 );
+			}
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
+		$key = 0;
+		// Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
+		foreach ( $config_file as $line_num => $line ) {
+			if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
+				$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+				continue;
+			}
+
+			if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+				continue;
 
-		$constant = $match[1];
-		$padding  = $match[2];
+			$constant = $match[1];
+			$padding  = $match[2];
 
-		switch ( $constant ) {
+			switch ( $constant ) {
 			case 'DB_NAME'     :
 			case 'DB_USER'     :
 			case 'DB_PASSWORD' :
@@ -299,7 +299,7 @@ 
 			case 'NONCE_SALT'       :
 				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
 				break;
-		}
+			}
 	}
 	unset( $line );
 

Spacing +118 added lines, -118 removed lines

@@ -28,35 +28,35 @@ 
  */
 error_reporting(0);
 
-define( 'ABSPATH', dirname( dirname( __FILE__ ) ) . '/' );
+define('ABSPATH', dirname(dirname(__FILE__)).'/');
 
-require( ABSPATH . 'wp-settings.php' );
+require(ABSPATH.'wp-settings.php');
 
 /** Load WordPress Administration Upgrade API */
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 /** Load WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
 nocache_headers();
 
 // Support wp-config-sample.php one level up, for the develop repo.
-if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
-	$config_file = file( ABSPATH . 'wp-config-sample.php' );
-elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
-	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
+if (file_exists(ABSPATH.'wp-config-sample.php'))
+	$config_file = file(ABSPATH.'wp-config-sample.php');
+elseif (file_exists(dirname(ABSPATH).'/wp-config-sample.php'))
+	$config_file = file(dirname(ABSPATH).'/wp-config-sample.php');
 else
-	wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
+	wp_die(__('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'));
 
 // Check if wp-config.php has been created
-if ( file_exists( ABSPATH . 'wp-config.php' ) )
-	wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ), 'install.php' ) . '</p>' );
+if (file_exists(ABSPATH.'wp-config.php'))
+	wp_die('<p>'.sprintf(__("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>."), 'install.php').'</p>');
 
 // Check if wp-config.php exists above the root directory but is not part of another install
-if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) )
-	wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php' ) . '</p>' );
+if (file_exists(ABSPATH.'../wp-config.php') && ! file_exists(ABSPATH.'../wp-settings.php'))
+	wp_die('<p>'.sprintf(__("The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php').'</p>');
 
-$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
+$step = isset($_GET['step']) ? (int) $_GET['step'] : -1;
 
 /**
  * Display setup wp-config.php file header.
@@ -69,41 +69,41 @@ 
  *
  * @param string|array $body_classes
  */
-function setup_config_display_header( $body_classes = array() ) {
+function setup_config_display_header($body_classes = array()) {
 	$body_classes = (array) $body_classes;
 	$body_classes[] = 'wp-core-ui';
-	if ( is_rtl() ) {
+	if (is_rtl()) {
 		$body_classes[] = 'rtl';
 	}
 
-	header( 'Content-Type: text/html; charset=utf-8' );
+	header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
-	<?php wp_admin_css( 'install', true ); ?>
+	<title><?php _e('WordPress &rsaquo; Setup Configuration File'); ?></title>
+	<?php wp_admin_css('install', true); ?>
 </head>
-<body class="<?php echo implode( ' ', $body_classes ); ?>">
-<h1 id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<body class="<?php echo implode(' ', $body_classes); ?>">
+<h1 id="logo"><a href="<?php esc_attr_e('https://wordpress.org/'); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></h1>
 <?php
 } // end function setup_config_display_header();
 
 $language = '';
-if ( ! empty( $_REQUEST['language'] ) ) {
-	$language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
-} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
+if ( ! empty($_REQUEST['language'])) {
+	$language = preg_replace('/[^a-zA-Z_]/', '', $_REQUEST['language']);
+} elseif (isset($GLOBALS['wp_local_package'])) {
 	$language = $GLOBALS['wp_local_package'];
 }
 
-switch($step) {
+switch ($step) {
 	case -1:
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
-			setup_config_display_header( 'language-chooser' );
+		if (wp_can_install_language_pack() && empty($language) && ($languages = wp_get_available_translations())) {
+			setup_config_display_header('language-chooser');
 			echo '<form id="setup" method="post" action="?step=0">';
-			wp_install_language_form( $languages );
+			wp_install_language_form($languages);
 			echo '</form>';
 			break;
 		}
@@ -111,116 +111,116 @@ 
 		// Deliberately fall through if we can't reach the translations API.
 
 	case 0:
-		if ( ! empty( $language ) ) {
-			$loaded_language = wp_download_language_pack( $language );
-			if ( $loaded_language ) {
-				load_default_textdomain( $loaded_language );
+		if ( ! empty($language)) {
+			$loaded_language = wp_download_language_pack($language);
+			if ($loaded_language) {
+				load_default_textdomain($loaded_language);
 				$GLOBALS['wp_locale'] = new WP_Locale();
 			}
 		}
 
 		setup_config_display_header();
 		$step_1 = 'setup-config.php?step=1';
-		if ( isset( $_REQUEST['noapi'] ) ) {
+		if (isset($_REQUEST['noapi'])) {
 			$step_1 .= '&amp;noapi';
 		}
-		if ( ! empty( $loaded_language ) ) {
-			$step_1 .= '&amp;language=' . $loaded_language;
+		if ( ! empty($loaded_language)) {
+			$step_1 .= '&amp;language='.$loaded_language;
 		}
 ?>
 
-<p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
+<p><?php _e('Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.') ?></p>
 <ol>
-	<li><?php _e( 'Database name' ); ?></li>
-	<li><?php _e( 'Database username' ); ?></li>
-	<li><?php _e( 'Database password' ); ?></li>
-	<li><?php _e( 'Database host' ); ?></li>
-	<li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
+	<li><?php _e('Database name'); ?></li>
+	<li><?php _e('Database username'); ?></li>
+	<li><?php _e('Database password'); ?></li>
+	<li><?php _e('Database host'); ?></li>
+	<li><?php _e('Table prefix (if you want to run more than one WordPress in a single database)'); ?></li>
 </ol>
 <p>
-	<?php _e( 'We&#8217;re going to use this information to create a <code>wp-config.php</code> file.' ); ?>
-	<strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong>
-	<?php _e( "Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?>
+	<?php _e('We&#8217;re going to use this information to create a <code>wp-config.php</code> file.'); ?>
+	<strong><?php _e("If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>."); ?></strong>
+	<?php _e("Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>."); ?>
 </p>
-<p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
+<p><?php _e("In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;"); ?></p>
 
-<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
+<p class="step"><a href="<?php echo $step_1; ?>" class="button button-large"><?php _e('Let&#8217;s go!'); ?></a></p>
 <?php
 	break;
 
 	case 1:
-		load_default_textdomain( $language );
+		load_default_textdomain($language);
 		$GLOBALS['wp_locale'] = new WP_Locale();
 
 		setup_config_display_header();
 	?>
 <form method="post" action="setup-config.php?step=2">
-	<p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
+	<p><?php _e("Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host."); ?></p>
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
+			<th scope="row"><label for="dbname"><?php _e('Database Name'); ?></label></th>
 			<td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
-			<td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
+			<td><?php _e('The name of the database you want to run WP in.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
-			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
-			<td><?php _e( 'Your MySQL username' ); ?></td>
+			<th scope="row"><label for="uname"><?php _e('User Name'); ?></label></th>
+			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars(_x('username', 'example username'), ENT_QUOTES); ?>" /></td>
+			<td><?php _e('Your MySQL username'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
-			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" autocomplete="off" /></td>
-			<td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
+			<th scope="row"><label for="pwd"><?php _e('Password'); ?></label></th>
+			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars(_x('password', 'example password'), ENT_QUOTES); ?>" autocomplete="off" /></td>
+			<td><?php _e('&hellip;and your MySQL password.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
+			<th scope="row"><label for="dbhost"><?php _e('Database Host'); ?></label></th>
 			<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
-			<td><?php _e( 'You should be able to get this info from your web host, if <code>localhost</code> does not work.' ); ?></td>
+			<td><?php _e('You should be able to get this info from your web host, if <code>localhost</code> does not work.'); ?></td>
 		</tr>
 		<tr>
-			<th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
+			<th scope="row"><label for="prefix"><?php _e('Table Prefix'); ?></label></th>
 			<td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td>
-			<td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
+			<td><?php _e('If you want to run multiple WordPress installations in a single database, change this.'); ?></td>
 		</tr>
 	</table>
-	<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
-	<input type="hidden" name="language" value="<?php echo esc_attr( $language ); ?>" />
-	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button button-large" /></p>
+	<?php if (isset($_GET['noapi'])) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
+	<input type="hidden" name="language" value="<?php echo esc_attr($language); ?>" />
+	<p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars(__('Submit'), ENT_QUOTES); ?>" class="button button-large" /></p>
 </form>
 <?php
 	break;
 
 	case 2:
-	load_default_textdomain( $language );
+	load_default_textdomain($language);
 	$GLOBALS['wp_locale'] = new WP_Locale();
 
-	$dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
-	$uname = trim( wp_unslash( $_POST[ 'uname' ] ) );
-	$pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) );
-	$dbhost = trim( wp_unslash( $_POST[ 'dbhost' ] ) );
-	$prefix = trim( wp_unslash( $_POST[ 'prefix' ] ) );
+	$dbname = trim(wp_unslash($_POST['dbname']));
+	$uname = trim(wp_unslash($_POST['uname']));
+	$pwd = trim(wp_unslash($_POST['pwd']));
+	$dbhost = trim(wp_unslash($_POST['dbhost']));
+	$prefix = trim(wp_unslash($_POST['prefix']));
 
 	$step_1 = 'setup-config.php?step=1';
 	$install = 'install.php';
-	if ( isset( $_REQUEST['noapi'] ) ) {
+	if (isset($_REQUEST['noapi'])) {
 		$step_1 .= '&amp;noapi';
 	}
 
-	if ( ! empty( $language ) ) {
-		$step_1 .= '&amp;language=' . $language;
-		$install .= '?language=' . $language;
+	if ( ! empty($language)) {
+		$step_1 .= '&amp;language='.$language;
+		$install .= '?language='.$language;
 	} else {
 		$install .= '?language=en_US';
 	}
 
-	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
+	$tryagain_link = '</p><p class="step"><a href="'.$step_1.'" onclick="javascript:history.go(-1);return false;" class="button button-large">'.__('Try again').'</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	if (empty($prefix))
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" must not be empty.'.$tryagain_link));
 
 	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	if (preg_match('|[^a-z0-9_]|i', $prefix))
+		wp_die(__('<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.'.$tryagain_link));
 
 	// Test the db connection.
 	/**#@+
@@ -233,7 +233,7 @@ 
 	/**#@-*/
 
 	// Re-construct $wpdb with these new values.
-	unset( $wpdb );
+	unset($wpdb);
 	require_wp_db();
 
 	/*
@@ -242,51 +242,51 @@ 
 	 */
 	$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	if ( ! empty($wpdb->error))
+		wp_die($wpdb->error->get_error_message().$tryagain_link);
 
 	// Fetch or generate keys and salts.
-	$no_api = isset( $_POST['noapi'] );
-	if ( ! $no_api ) {
-		$secret_keys = wp_remote_get( 'https://api.wordpress.org/secret-key/1.1/salt/' );
+	$no_api = isset($_POST['noapi']);
+	if ( ! $no_api) {
+		$secret_keys = wp_remote_get('https://api.wordpress.org/secret-key/1.1/salt/');
 	}
 
-	if ( $no_api || is_wp_error( $secret_keys ) ) {
+	if ($no_api || is_wp_error($secret_keys)) {
 		$secret_keys = array();
-		for ( $i = 0; $i < 8; $i++ ) {
-			$secret_keys[] = wp_generate_password( 64, true, true );
+		for ($i = 0; $i < 8; $i++) {
+			$secret_keys[] = wp_generate_password(64, true, true);
 		}
 	} else {
-		$secret_keys = explode( "\n", wp_remote_retrieve_body( $secret_keys ) );
-		foreach ( $secret_keys as $k => $v ) {
-			$secret_keys[$k] = substr( $v, 28, 64 );
+		$secret_keys = explode("\n", wp_remote_retrieve_body($secret_keys));
+		foreach ($secret_keys as $k => $v) {
+			$secret_keys[$k] = substr($v, 28, 64);
 		}
 	}
 
 	$key = 0;
 	// Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
-	foreach ( $config_file as $line_num => $line ) {
-		if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-			$config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+	foreach ($config_file as $line_num => $line) {
+		if ('$table_prefix  =' == substr($line, 0, 16)) {
+			$config_file[$line_num] = '$table_prefix  = \''.addcslashes($prefix, "\\'")."';\r\n";
 			continue;
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+		if ( ! preg_match('/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match))
 			continue;
 
 		$constant = $match[1];
 		$padding  = $match[2];
 
-		switch ( $constant ) {
+		switch ($constant) {
 			case 'DB_NAME'     :
 			case 'DB_USER'     :
 			case 'DB_PASSWORD' :
 			case 'DB_HOST'     :
-				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
+				$config_file[$line_num] = "define('".$constant."',".$padding."'".addcslashes(constant($constant), "\\'")."');\r\n";
 				break;
 			case 'DB_CHARSET'  :
-				if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
-					$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'utf8mb4');\r\n";
+				if ('utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap('utf8mb4'))) {
+					$config_file[$line_num] = "define('".$constant."',".$padding."'utf8mb4');\r\n";
 				}
 				break;
 			case 'AUTH_KEY'         :
@@ -297,24 +297,24 @@ 
 			case 'SECURE_AUTH_SALT' :
 			case 'LOGGED_IN_SALT'   :
 			case 'NONCE_SALT'       :
-				$config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
+				$config_file[$line_num] = "define('".$constant."',".$padding."'".$secret_keys[$key++]."');\r\n";
 				break;
 		}
 	}
-	unset( $line );
+	unset($line);
 
-	if ( ! is_writable(ABSPATH) ) :
+	if ( ! is_writable(ABSPATH)) :
 		setup_config_display_header();
 ?>
-<p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
-<p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
+<p><?php _e("Sorry, but I can&#8217;t write the <code>wp-config.php</code> file."); ?></p>
+<p><?php _e('You can create the <code>wp-config.php</code> manually and paste the following text into it.'); ?></p>
 <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
-		foreach( $config_file as $line ) {
+		foreach ($config_file as $line) {
 			echo htmlentities($line, ENT_COMPAT, 'UTF-8');
 		}
 ?></textarea>
-<p><?php _e( 'After you&#8217;ve done that, click &#8220;Run the install.&#8221;' ); ?></p>
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p><?php _e('After you&#8217;ve done that, click &#8220;Run the install.&#8221;'); ?></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e('Run the install'); ?></a></p>
 <script>
 (function(){
 if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
@@ -330,27 +330,27 @@ 
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
-		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
-			$path_to_wp_config = ABSPATH . 'wp-config.php';
+		if (file_exists(ABSPATH.'wp-config-sample.php'))
+			$path_to_wp_config = ABSPATH.'wp-config.php';
 		else
-			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+			$path_to_wp_config = dirname(ABSPATH).'/wp-config.php';
 
-		$handle = fopen( $path_to_wp_config, 'w' );
-		foreach( $config_file as $line ) {
-			fwrite( $handle, $line );
+		$handle = fopen($path_to_wp_config, 'w');
+		foreach ($config_file as $line) {
+			fwrite($handle, $line);
 		}
-		fclose( $handle );
-		chmod( $path_to_wp_config, 0666 );
+		fclose($handle);
+		chmod($path_to_wp_config, 0666);
 		setup_config_display_header();
 ?>
-<p><?php _e( "All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
+<p><?php _e("All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;"); ?></p>
 
-<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>
+<p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e('Run the install'); ?></a></p>
 <?php
 	endif;
 	break;
 }
 ?>
-<?php wp_print_scripts( 'language-chooser' ); ?>
+<?php wp_print_scripts('language-chooser'); ?>
 </body>
 </html>

Braces +30 added lines, -17 removed lines

@@ -41,20 +41,23 @@ 
 nocache_headers();
 
 // Support wp-config-sample.php one level up, for the develop repo.
-if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
+if ( file_exists( ABSPATH . 'wp-config-sample.php' ) ) {
 	$config_file = file( ABSPATH . 'wp-config-sample.php' );
-elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) )
+} elseif ( file_exists( dirname( ABSPATH ) . '/wp-config-sample.php' ) ) {
 	$config_file = file( dirname( ABSPATH ) . '/wp-config-sample.php' );
-else
+} else {
 	wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
+}
 
 // Check if wp-config.php has been created
-if ( file_exists( ABSPATH . 'wp-config.php' ) )
+if ( file_exists( ABSPATH . 'wp-config.php' ) ) {
 	wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ), 'install.php' ) . '</p>' );
+}
 
 // Check if wp-config.php exists above the root directory but is not part of another install
-if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) )
+if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) ) {
 	wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php' ) . '</p>' );
+}
 
 $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;
 
@@ -79,7 +82,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -215,12 +221,14 @@ 
 
 	$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
 
-	if ( empty( $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	if ( empty( $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
+	}
 
 	// Validate $prefix: it can only contain letters, numbers and underscores.
-	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-		wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+			wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
+	}
 
 	// Test the db connection.
 	/**#@+
@@ -242,8 +250,9 @@ 
 	 */
 	$wpdb->db_connect();
 
-	if ( ! empty( $wpdb->error ) )
-		wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	if ( ! empty( $wpdb->error ) ) {
+			wp_die( $wpdb->error->get_error_message() . $tryagain_link );
+	}
 
 	// Fetch or generate keys and salts.
 	$no_api = isset( $_POST['noapi'] );
@@ -271,8 +280,9 @@ 
 			continue;
 		}
 
-		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
-			continue;
+		if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) ) {
+					continue;
+		}
 
 		$constant = $match[1];
 		$padding  = $match[2];
@@ -325,15 +335,18 @@ 
 })();
 </script>
 <?php
-	else :
+	else {
+		:
 		/*
 		 * If this file doesn't exist, then we are using the wp-config-sample.php
 		 * file one level up, which is for the develop repo.
 		 */
 		if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
 			$path_to_wp_config = ABSPATH . 'wp-config.php';
-		else
-			$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+	}
+		else {
+					$path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
+		}
 
 		$handle = fopen( $path_to_wp_config, 'w' );
 		foreach( $config_file as $line ) {