Inspection of "Merge branch 'master' of git://develop.git.wordpre..." - ntwb/wordpress - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a7cd2a...eabd6c )

by Stephen

created 2016-03-16 21:52 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -8,5 +8,5 @@
 block discarded – undo
  * @subpackage Administration
  */
 
-_deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/upgrade.php' );
-require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+_deprecated_file(basename(__FILE__), '2.5', 'wp-admin/includes/upgrade.php');
+require_once(ABSPATH.'wp-admin/includes/upgrade.php');

Please login to merge, or discard this patch.

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@
 block discarded – undo
 <?php
 /**
- * WordPress Upgrade Functions. Old file, must not be used. Include
- * wp-admin/includes/upgrade.php instead.
- *
- * @deprecated 2.5.0
- * @package WordPress
- * @subpackage Administration
- */
+		 * WordPress Upgrade Functions. Old file, must not be used. Include
+		 * wp-admin/includes/upgrade.php instead.
+		 *
+		 * @deprecated 2.5.0
+		 * @package WordPress
+		 * @subpackage Administration
+		 */
 
 _deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/upgrade.php' );
 require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

Please login to merge, or discard this patch.

src/wp-admin/install.php 2 patches

Braces +7 added lines, -5 removed lines patch added patch discarded remove patch

@@ -206,12 +206,13 @@  discard block
 block discarded – undo
 $php_compat     = version_compare( $php_version, $required_php_version, '>=' );
 $mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
 
-if ( !$mysql_compat && !$php_compat )
+if ( !$mysql_compat && !$php_compat ) {
 	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-elseif ( !$php_compat )
+} elseif ( !$php_compat ) {
 	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
-elseif ( !$mysql_compat )
+} elseif ( !$mysql_compat ) {
 	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+}
 
 if ( !$mysql_compat || !$php_compat ) {
 	display_header();
@@ -281,8 +282,9 @@  discard block
 block discarded – undo
 			$loaded_language = 'en_US';
 		}
 
-		if ( ! empty( $wpdb->error ) )
-			wp_die( $wpdb->error->get_error_message() );
+		if ( ! empty( $wpdb->error ) ) {
+					wp_die( $wpdb->error->get_error_message() );
+		}
 
 		display_header();
 		// Fill in the data we gathered

Please login to merge, or discard this patch.

Spacing +131 added lines, -131 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@  discard block
 block discarded – undo
  */
 
 // Sanity check.
-if ( false ) {
+if (false) {
 ?>
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -30,23 +30,23 @@  discard block
 block discarded – undo
  * @since 1.5.1
  * @var bool
  */
-define( 'WP_INSTALLING', true );
+define('WP_INSTALLING', true);
 
 /** Load WordPress Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once(dirname(dirname(__FILE__)).'/wp-load.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');
 
 /** Load wpdb */
-require_once( ABSPATH . WPINC . '/wp-db.php' );
+require_once(ABSPATH.WPINC.'/wp-db.php');
 
 nocache_headers();
 
-$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
+$step = isset($_GET['step']) ? (int) $_GET['step'] : 0;
 
 /**
  * Display install header.
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
  *
  * @param string $body_classes
  */
-function display_header( $body_classes = '' ) {
-	header( 'Content-Type: text/html; charset=utf-8' );
-	if ( is_rtl() ) {
+function display_header($body_classes = '') {
+	header('Content-Type: text/html; charset=utf-8');
+	if (is_rtl()) {
 		$body_classes .= 'rtl';
 	}
-	if ( $body_classes ) {
-		$body_classes = ' ' . $body_classes;
+	if ($body_classes) {
+		$body_classes = ' '.$body_classes;
 	}
 ?>
 <!DOCTYPE html>
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
 	<meta name="viewport" content="width=device-width" />
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex,nofollow" />
-	<title><?php _e( 'WordPress &rsaquo; Installation' ); ?></title>
+	<title><?php _e('WordPress &rsaquo; Installation'); ?></title>
 	<?php
-		wp_admin_css( 'install', true );
-		wp_admin_css( 'dashicons', true );
+		wp_admin_css('install', true);
+		wp_admin_css('dashicons', true);
 	?>
 </head>
 <body class="wp-core-ui<?php echo $body_classes ?>">
-<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
+<p id="logo"><a href="<?php echo esc_url(__('https://wordpress.org/')); ?>" tabindex="-1"><?php _e('WordPress'); ?></a></p>
 
 <?php
 } // end display_header()
@@ -89,74 +89,74 @@  discard block
 block discarded – undo
  *
  * @param string|null $error
  */
-function display_setup_form( $error = null ) {
+function display_setup_form($error = null) {
 	global $wpdb;
 
-	$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) );
-	$user_table = ( $wpdb->get_var( $sql ) != null );
+	$sql = $wpdb->prepare("SHOW TABLES LIKE %s", $wpdb->esc_like($wpdb->users));
+	$user_table = ($wpdb->get_var($sql) != null);
 
 	// Ensure that Blogs appear in search engines by default.
 	$blog_public = 1;
-	if ( isset( $_POST['weblog_title'] ) ) {
-		$blog_public = isset( $_POST['blog_public'] );
+	if (isset($_POST['weblog_title'])) {
+		$blog_public = isset($_POST['blog_public']);
 	}
 
-	$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-	$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-	$admin_email  = isset( $_POST['admin_email']  ) ? trim( wp_unslash( $_POST['admin_email'] ) ) : '';
+	$weblog_title = isset($_POST['weblog_title']) ? trim(wp_unslash($_POST['weblog_title'])) : '';
+	$user_name = isset($_POST['user_name']) ? trim(wp_unslash($_POST['user_name'])) : '';
+	$admin_email  = isset($_POST['admin_email']) ? trim(wp_unslash($_POST['admin_email'])) : '';
 
-	if ( ! is_null( $error ) ) {
+	if ( ! is_null($error)) {
 ?>
-<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
+<h1><?php _ex('Welcome', 'Howdy'); ?></h1>
 <p class="message"><?php echo $error; ?></p>
 <?php } ?>
 <form id="setup" method="post" action="install.php?step=2" novalidate="novalidate">
 	<table class="form-table">
 		<tr>
-			<th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
-			<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
+			<th scope="row"><label for="weblog_title"><?php _e('Site Title'); ?></label></th>
+			<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr($weblog_title); ?>" /></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="user_login"><?php _e('Username'); ?></label></th>
 			<td>
 			<?php
-			if ( $user_table ) {
+			if ($user_table) {
 				_e('User(s) already exists.');
 				echo '<input name="user_name" type="hidden" value="admin" />';
 			} else {
-				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
-				<p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>
+				?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr(sanitize_user($user_name, true)); ?>" />
+				<p><?php _e('Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.'); ?></p>
 			<?php
 			} ?>
 			</td>
 		</tr>
-		<?php if ( ! $user_table ) : ?>
+		<?php if ( ! $user_table) : ?>
 		<tr class="form-field form-required user-pass1-wrap">
 			<th scope="row">
 				<label for="pass1">
-					<?php _e( 'Password' ); ?>
+					<?php _e('Password'); ?>
 				</label>
 			</th>
 			<td>
 				<div class="">
-					<?php $initial_password = isset( $_POST['admin_password'] ) ? stripslashes( $_POST['admin_password'] ) : wp_generate_password( 18 ); ?>
-					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
-					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset( $_POST['admin_password'] ); ?>" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+					<?php $initial_password = isset($_POST['admin_password']) ? stripslashes($_POST['admin_password']) : wp_generate_password(18); ?>
+					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr($initial_password); ?>" aria-describedby="pass-strength-result" />
+					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-start-masked="<?php echo (int) isset($_POST['admin_password']); ?>" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 						<span class="dashicons dashicons-hidden"></span>
-						<span class="text"><?php _e( 'Hide' ); ?></span>
+						<span class="text"><?php _e('Hide'); ?></span>
 					</button>
 					<div id="pass-strength-result" aria-live="polite"></div>
 				</div>
 				<p><span class="description important hide-if-no-js">
-				<strong><?php _e( 'Important:' ); ?></strong>
+				<strong><?php _e('Important:'); ?></strong>
 				<?php /* translators: The non-breaking space prevents 1Password from thinking the text "log in" should trigger a password save prompt. */ ?>
-				<?php _e( 'You will need this password to log&nbsp;in. Please store it in a secure location.' ); ?></span></p>
+				<?php _e('You will need this password to log&nbsp;in. Please store it in a secure location.'); ?></span></p>
 			</td>
 		</tr>
 		<tr class="form-field form-required user-pass2-wrap hide-if-js">
 			<th scope="row">
-				<label for="pass2"><?php _e( 'Repeat Password' ); ?>
-					<span class="description"><?php _e( '(required)' ); ?></span>
+				<label for="pass2"><?php _e('Repeat Password'); ?>
+					<span class="description"><?php _e('(required)'); ?></span>
 				</label>
 			</th>
 			<td>
@@ -164,57 +164,57 @@  discard block
 block discarded – undo
 			</td>
 		</tr>
 		<tr class="pw-weak">
-			<th scope="row"><?php _e( 'Confirm Password' ); ?></th>
+			<th scope="row"><?php _e('Confirm Password'); ?></th>
 			<td>
 				<label>
 					<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-					<?php _e( 'Confirm use of weak password' ); ?>
+					<?php _e('Confirm use of weak password'); ?>
 				</label>
 			</td>
 		</tr>
 		<?php endif; ?>
 		<tr>
-			<th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
-			<td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
-			<p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
+			<th scope="row"><label for="admin_email"><?php _e('Your Email'); ?></label></th>
+			<td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr($admin_email); ?>" />
+			<p><?php _e('Double-check your email address before continuing.'); ?></p></td>
 		</tr>
 		<tr>
-			<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?></th>
+			<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>
+					<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, $blog_public ); ?> />
-						<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, $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>
+					if (has_action('blog_privacy_selector')) { ?>
+						<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked(1, $blog_public); ?> />
+						<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, $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>
 						<?php
 						/** This action is documented in wp-admin/options-reading.php */
-						do_action( 'blog_privacy_selector' );
+						do_action('blog_privacy_selector');
 					 } else { ?>
-						<label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( 0, $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, $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 } ?>
 				</fieldset>
 			</td>
 		</tr>
 	</table>
-	<p class="step"><?php submit_button( __( 'Install WordPress' ), 'large', 'Submit', false, array( 'id' => 'submit' ) ); ?></p>
-	<input type="hidden" name="language" value="<?php echo isset( $_REQUEST['language'] ) ? esc_attr( $_REQUEST['language'] ) : ''; ?>" />
+	<p class="step"><?php submit_button(__('Install WordPress'), 'large', 'Submit', false, array('id' => 'submit')); ?></p>
+	<input type="hidden" name="language" value="<?php echo isset($_REQUEST['language']) ? esc_attr($_REQUEST['language']) : ''; ?>" />
 </form>
 <?php
 } // end display_setup_form()
 
 // Let's check to make sure WP isn't already installed.
-if ( is_blog_installed() ) {
+if (is_blog_installed()) {
 	display_header();
 	die(
-		'<h1>' . __( 'Already Installed' ) . '</h1>' .
-		'<p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p>' .
-		'<p class="step"><a href="' . esc_url( wp_login_url() ) . '" class="button button-large">' . __( 'Log In' ) . '</a></p>' .
+		'<h1>'.__('Already Installed').'</h1>'.
+		'<p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p>'.
+		'<p class="step"><a href="'.esc_url(wp_login_url()).'" class="button button-large">'.__('Log In').'</a></p>'.
 		'</body></html>'
 	);
 }
@@ -229,43 +229,43 @@  discard block
 block discarded – undo
 
 $php_version    = phpversion();
 $mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-$mysql_compat   = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
+$php_compat     = version_compare($php_version, $required_php_version, '>=');
+$mysql_compat   = version_compare($mysql_version, $required_mysql_version, '>=') || file_exists(WP_CONTENT_DIR.'/db.php');
 
-if ( !$mysql_compat && !$php_compat )
-	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-elseif ( !$php_compat )
-	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
-elseif ( !$mysql_compat )
-	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+if ( ! $mysql_compat && ! $php_compat)
+	$compat = sprintf(__('You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version);
+elseif ( ! $php_compat)
+	$compat = sprintf(__('You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version);
+elseif ( ! $mysql_compat)
+	$compat = sprintf(__('You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version);
 
-if ( !$mysql_compat || !$php_compat ) {
+if ( ! $mysql_compat || ! $php_compat) {
 	display_header();
-	die( '<h1>' . __( 'Insufficient Requirements' ) . '</h1><p>' . $compat . '</p></body></html>' );
+	die('<h1>'.__('Insufficient Requirements').'</h1><p>'.$compat.'</p></body></html>');
 }
 
-if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
+if ( ! is_string($wpdb->base_prefix) || '' === $wpdb->base_prefix) {
 	display_header();
 	die(
-		'<h1>' . __( 'Configuration Error' ) . '</h1>' .
-		'<p>' . sprintf(
+		'<h1>'.__('Configuration Error').'</h1>'.
+		'<p>'.sprintf(
 			/* translators: %s: wp-config.php */
-			__( 'Your %s file has an empty database table prefix, which is not supported.' ),
+			__('Your %s file has an empty database table prefix, which is not supported.'),
 			'<code>wp-config.php</code>'
-		) . '</p></body></html>'
+		).'</p></body></html>'
 	);
 }
 
 // Set error message if DO_NOT_UPGRADE_GLOBAL_TABLES isn't set as it will break install.
-if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
+if (defined('DO_NOT_UPGRADE_GLOBAL_TABLES')) {
 	display_header();
 	die(
-		'<h1>' . __( 'Configuration Error' ) . '</h1>' .
-		'<p>' . sprintf(
+		'<h1>'.__('Configuration Error').'</h1>'.
+		'<p>'.sprintf(
 			/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
-			__( 'The constant %s cannot be defined when installing WordPress.' ),
+			__('The constant %s cannot be defined when installing WordPress.'),
 			'<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
-		) . '</p></body></html>'
+		).'</p></body></html>'
 	);
 }
 
@@ -274,21 +274,21 @@  discard block
 block discarded – undo
  * @global WP_Locale $wp_locale
  */
 $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'];
 }
 
-$scripts_to_print = array( 'jquery' );
+$scripts_to_print = array('jquery');
 
-switch($step) {
+switch ($step) {
 	case 0: // Step 0
-		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
+		if (wp_can_install_language_pack() && empty($language) && ($languages = wp_get_available_translations())) {
 			$scripts_to_print[] = 'language-chooser';
-			display_header( 'language-chooser' );
+			display_header('language-chooser');
 			echo '<form id="setup" method="post" action="?step=1">';
-			wp_install_language_form( $languages );
+			wp_install_language_form($languages);
 			echo '</form>';
 			break;
 		}
@@ -296,10 +296,10 @@  discard block
 block discarded – undo
 		// Deliberately fall through if we can't reach the translations API.
 
 	case 1: // Step 1, direct link or from language chooser.
-		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();
 			}
 		}
@@ -308,99 +308,99 @@  discard block
 block discarded – undo
 
 		display_header();
 ?>
-<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
-<p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
+<h1><?php _ex('Welcome', 'Howdy'); ?></h1>
+<p><?php _e('Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.'); ?></p>
 
-<h2><?php _e( 'Information needed' ); ?></h2>
-<p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
+<h2><?php _e('Information needed'); ?></h2>
+<p><?php _e('Please provide the following information. Don&#8217;t worry, you can always change these settings later.'); ?></p>
 
 <?php
 		display_setup_form();
 		break;
 	case 2:
-		if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
+		if ( ! empty($language) && load_default_textdomain($language)) {
 			$loaded_language = $language;
 			$GLOBALS['wp_locale'] = new WP_Locale();
 		} else {
 			$loaded_language = 'en_US';
 		}
 
-		if ( ! empty( $wpdb->error ) )
-			wp_die( $wpdb->error->get_error_message() );
+		if ( ! empty($wpdb->error))
+			wp_die($wpdb->error->get_error_message());
 
 		$scripts_to_print[] = 'user-profile';
 
 		display_header();
 		// Fill in the data we gathered
-		$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
-		$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
-		$admin_password = isset($_POST['admin_password']) ? wp_unslash( $_POST['admin_password'] ) : '';
-		$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
-		$admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
-		$public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 1;
+		$weblog_title = isset($_POST['weblog_title']) ? trim(wp_unslash($_POST['weblog_title'])) : '';
+		$user_name = isset($_POST['user_name']) ? trim(wp_unslash($_POST['user_name'])) : '';
+		$admin_password = isset($_POST['admin_password']) ? wp_unslash($_POST['admin_password']) : '';
+		$admin_password_check = isset($_POST['admin_password2']) ? wp_unslash($_POST['admin_password2']) : '';
+		$admin_email  = isset($_POST['admin_email']) ? trim(wp_unslash($_POST['admin_email'])) : '';
+		$public       = isset($_POST['blog_public']) ? (int) $_POST['blog_public'] : 1;
 
 		// Check email address.
 		$error = false;
-		if ( empty( $user_name ) ) {
+		if (empty($user_name)) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'Please provide a valid username.' ) );
+			display_setup_form(__('Please provide a valid username.'));
 			$error = true;
-		} elseif ( $user_name != sanitize_user( $user_name, true ) ) {
-			display_setup_form( __( 'The username you provided has invalid characters.' ) );
+		} elseif ($user_name != sanitize_user($user_name, true)) {
+			display_setup_form(__('The username you provided has invalid characters.'));
 			$error = true;
-		} elseif ( $admin_password != $admin_password_check ) {
+		} elseif ($admin_password != $admin_password_check) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
+			display_setup_form(__('Your passwords do not match. Please try again.'));
 			$error = true;
-		} elseif ( empty( $admin_email ) ) {
+		} elseif (empty($admin_email)) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'You must provide an email address.' ) );
+			display_setup_form(__('You must provide an email address.'));
 			$error = true;
-		} elseif ( ! is_email( $admin_email ) ) {
+		} elseif ( ! is_email($admin_email)) {
 			// TODO: poka-yoke
-			display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>[email protected]</code>.' ) );
+			display_setup_form(__('Sorry, that isn&#8217;t a valid email address. Email addresses look like <code>[email protected]</code>.'));
 			$error = true;
 		}
 
-		if ( $error === false ) {
+		if ($error === false) {
 			$wpdb->show_errors();
-			$result = wp_install( $weblog_title, $user_name, $admin_email, $public, '', wp_slash( $admin_password ), $loaded_language );
+			$result = wp_install($weblog_title, $user_name, $admin_email, $public, '', wp_slash($admin_password), $loaded_language);
 ?>
 
-<h1><?php _e( 'Success!' ); ?></h1>
+<h1><?php _e('Success!'); ?></h1>
 
-<p><?php _e( 'WordPress has been installed. Thank you, and enjoy!' ); ?></p>
+<p><?php _e('WordPress has been installed. Thank you, and enjoy!'); ?></p>
 
 <table class="form-table install-success">
 	<tr>
-		<th><?php _e( 'Username' ); ?></th>
-		<td><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></td>
+		<th><?php _e('Username'); ?></th>
+		<td><?php echo esc_html(sanitize_user($user_name, true)); ?></td>
 	</tr>
 	<tr>
-		<th><?php _e( 'Password' ); ?></th>
+		<th><?php _e('Password'); ?></th>
 		<td><?php
-		if ( ! empty( $result['password'] ) && empty( $admin_password_check ) ): ?>
-			<code><?php echo esc_html( $result['password'] ) ?></code><br />
+		if ( ! empty($result['password']) && empty($admin_password_check)): ?>
+			<code><?php echo esc_html($result['password']) ?></code><br />
 		<?php endif ?>
 			<p><?php echo $result['password_message'] ?></p>
 		</td>
 	</tr>
 </table>
 
-<p class="step"><a href="<?php echo esc_url( wp_login_url() ); ?>" class="button button-large"><?php _e( 'Log In' ); ?></a></p>
+<p class="step"><a href="<?php echo esc_url(wp_login_url()); ?>" class="button button-large"><?php _e('Log In'); ?></a></p>
 
 <?php
 		}
 		break;
 }
 
-if ( ! wp_is_mobile() ) {
+if ( ! wp_is_mobile()) {
 	?>
 <script type="text/javascript">var t = document.getElementById('weblog_title'); if (t){ t.focus(); }</script>
 	<?php
 }
 
-wp_print_scripts( $scripts_to_print );
+wp_print_scripts($scripts_to_print);
 ?>
 <script type="text/javascript">
 jQuery( function( $ ) {

Please login to merge, or discard this patch.

src/wp-admin/ms-themes.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
  * @since 3.0.0
  */
 
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_redirect( network_admin_url('themes.php') );
+wp_redirect(network_admin_url('themes.php'));
 exit;

Please login to merge, or discard this patch.

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,11 +1,11 @@
 block discarded – undo
 <?php
 /**
- * Multisite themes administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.0.0
- */
+		 * Multisite themes administration panel.
+		 *
+		 * @package WordPress
+		 * @subpackage Multisite
+		 * @since 3.0.0
+		 */
 
 require_once( dirname( __FILE__ ) . '/admin.php' );
 

Please login to merge, or discard this patch.

src/wp-admin/plugin-install.php 3 patches

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

@@ -6,16 +6,18 @@  discard block
 block discarded – undo
  * @subpackage Administration
  */
 // TODO route this pages via a specific iframe handler instead of the do_action below
-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
 	define( 'IFRAME_REQUEST', true );
+}
 
 /**
  * WordPress Administration Bootstrap.
  */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('install_plugins') )
+if ( ! current_user_can('install_plugins') ) {
 	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
+}
 
 if ( is_multisite() && ! is_network_admin() ) {
 	wp_redirect( network_admin_url( 'plugin-install.php' ) );
@@ -49,8 +51,9 @@  discard block
 block discarded – undo
 $parent_file = 'plugins.php';
 
 wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
+if ( 'plugin-information' != $tab ) {
 	add_thickbox();
+}
 
 $body_id = $tab;
 

Please login to merge, or discard this patch.

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,10 +1,10 @@
 block discarded – undo
 <?php
 /**
- * Install plugin administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Install plugin administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 // TODO route this pages via a specific iframe handler instead of the do_action below
 if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
 	define( 'IFRAME_REQUEST', true );

Please login to merge, or discard this patch.

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -6,55 +6,55 @@  discard block
 block discarded – undo
  * @subpackage Administration
  */
 // TODO route this pages via a specific iframe handler instead of the do_action below
-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
-	define( 'IFRAME_REQUEST', true );
+if ( ! defined('IFRAME_REQUEST') && isset($_GET['tab']) && ('plugin-information' == $_GET['tab']))
+	define('IFRAME_REQUEST', true);
 
 /**
  * WordPress Administration Bootstrap.
  */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can('install_plugins') )
+if ( ! current_user_can('install_plugins'))
 	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'plugin-install.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('plugin-install.php'));
 	exit();
 }
 
 $wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
 $pagenum = $wp_list_table->get_pagenum();
 
-if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-	$location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+if ( ! empty($_REQUEST['_wp_http_referer'])) {
+	$location = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
 
-	if ( ! empty( $_REQUEST['paged'] ) ) {
-		$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+	if ( ! empty($_REQUEST['paged'])) {
+		$location = add_query_arg('paged', (int) $_REQUEST['paged'], $location);
 	}
 
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
 }
 
 $wp_list_table->prepare_items();
 
-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
+$total_pages = $wp_list_table->get_pagination_arg('total_pages');
 
-if ( $pagenum > $total_pages && $total_pages > 0 ) {
-	wp_redirect( add_query_arg( 'paged', $total_pages ) );
+if ($pagenum > $total_pages && $total_pages > 0) {
+	wp_redirect(add_query_arg('paged', $total_pages));
 	exit;
 }
 
-$title = __( 'Add Plugins' );
+$title = __('Add Plugins');
 $parent_file = 'plugins.php';
 
-wp_enqueue_script( 'plugin-install' );
-if ( 'plugin-information' != $tab )
+wp_enqueue_script('plugin-install');
+if ('plugin-information' != $tab)
 	add_thickbox();
 
 $body_id = $tab;
 
-wp_enqueue_script( 'updates' );
+wp_enqueue_script('updates');
 
 /**
  * Fires before each tab on the Install Plugins screen is loaded.
@@ -64,60 +64,60 @@  discard block
 block discarded – undo
  *
  * @since 2.7.0
  */
-do_action( "install_plugins_pre_$tab" );
+do_action("install_plugins_pre_$tab");
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'adding-plugins',
 'title'		=> __('Adding Plugins'),
 'content'	=>
-	'<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
-	'<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
-	'<p>' . __('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
-	'<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
-) );
+	'<p>'.__('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.').'</p>'.
+	'<p>'.__('If you just want to get an idea of what&#8217;s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.').'</p>'.
+	'<p>'.__('You can also browse a user&#8217;s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.').'</p>'.
+	'<p>'.__('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</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/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter plugins list' ),
-	'heading_pagination' => __( 'Plugins list navigation' ),
-	'heading_list'       => __( 'Plugins list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter plugins list'),
+	'heading_pagination' => __('Plugins list navigation'),
+	'heading_list'       => __('Plugins list'),
+));
 
 /**
  * WordPress Administration Template Header.
  */
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
 <h1>
 	<?php
-	echo esc_html( $title );
-	if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
-		if ( $tab === 'upload' ) {
-			$href = self_admin_url( 'plugin-install.php' );
-			$text = _x( 'Browse', 'plugins' );
+	echo esc_html($title);
+	if ( ! empty($tabs['upload']) && current_user_can('upload_plugins')) {
+		if ($tab === 'upload') {
+			$href = self_admin_url('plugin-install.php');
+			$text = _x('Browse', 'plugins');
 		} else {
-			$href = self_admin_url( 'plugin-install.php?tab=upload' );
-			$text = __( 'Upload Plugin' );
+			$href = self_admin_url('plugin-install.php?tab=upload');
+			$text = __('Upload Plugin');
 		}
-		echo ' <a href="' . $href . '" class="upload page-title-action">' . $text . '</a>';
+		echo ' <a href="'.$href.'" class="upload page-title-action">'.$text.'</a>';
 	}
 	?>
 </h1>
 
 <?php
-if ( $tab !== 'upload' ) {
+if ($tab !== 'upload') {
 	$wp_list_table->views();
 	echo '<br class="clear" />';
 }
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
  *
  * @param int $paged The current page number of the plugins list table.
  */
-do_action( "install_plugins_$tab", $paged ); ?>
+do_action("install_plugins_$tab", $paged); ?>
 </div>
 
 <?php
@@ -141,4 +141,4 @@  discard block
 block discarded – undo
 /**
  * WordPress Administration Template Footer.
  */
-include(ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Please login to merge, or discard this patch.

src/wp-admin/admin-ajax.php 3 patches

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -13,35 +13,35 @@  discard block
 block discarded – undo
  *
  * @since 2.1.0
  */
-define( 'DOING_AJAX', true );
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+define('DOING_AJAX', true);
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
 /** Load WordPress Bootstrap */
-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 an action parameter
-if ( empty( $_REQUEST['action'] ) )
-	die( '0' );
+if (empty($_REQUEST['action']))
+	die('0');
 
 /** Load WordPress Administration APIs */
-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+require_once(ABSPATH.'wp-admin/includes/admin.php');
 
 /** Load Ajax Handlers for WordPress Core */
-require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+require_once(ABSPATH.'wp-admin/includes/ajax-actions.php');
 
-@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
-@header( 'X-Robots-Tag: noindex' );
+@header('Content-Type: text/html; charset='.get_option('blog_charset'));
+@header('X-Robots-Tag: noindex');
 
 send_nosniff_header();
 nocache_headers();
 
 /** This action is documented in wp-admin/admin.php */
-do_action( 'admin_init' );
+do_action('admin_init');
 
 $core_actions_get = array(
 	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
@@ -69,15 +69,15 @@  discard block
 block discarded – undo
 $core_actions_post[] = 'wp-fullscreen-save-post';
 
 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
-	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+if ( ! empty($_GET['action']) && in_array($_GET['action'], $core_actions_get))
+	add_action('wp_ajax_'.$_GET['action'], 'wp_ajax_'.str_replace('-', '_', $_GET['action']), 1);
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
-	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+if ( ! empty($_POST['action']) && in_array($_POST['action'], $core_actions_post))
+	add_action('wp_ajax_'.$_POST['action'], 'wp_ajax_'.str_replace('-', '_', $_POST['action']), 1);
 
-add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
+add_action('wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1);
 
-if ( is_user_logged_in() ) {
+if (is_user_logged_in()) {
 	/**
 	 * Fires authenticated AJAX actions for logged-in users.
 	 *
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_ajax_' . $_REQUEST['action'] );
+	do_action('wp_ajax_'.$_REQUEST['action']);
 } else {
 	/**
 	 * Fires non-authenticated AJAX actions for logged-out users.
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
+	do_action('wp_ajax_nopriv_'.$_REQUEST['action']);
 }
 // Default status
-die( '0' );
+die('0');

Please login to merge, or discard this patch.

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

@@ -25,8 +25,9 @@  discard block
 block discarded – undo
 send_origin_headers();
 
 // Require an action parameter
-if ( empty( $_REQUEST['action'] ) )
+if ( empty( $_REQUEST['action'] ) ) {
 	die( '0' );
+}
 
 /** Load WordPress Administration APIs */
 require_once( ABSPATH . 'wp-admin/includes/admin.php' );
@@ -69,11 +70,13 @@  discard block
 block discarded – undo
 $core_actions_post[] = 'wp-fullscreen-save-post';
 
 // Register core Ajax calls.
-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
 	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
+}
 
-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
 	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
+}
 
 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 

Please login to merge, or discard this patch.

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,12 +1,12 @@
 block discarded – undo
 <?php
 /**
- * WordPress AJAX Process Execution.
- *
- * @package WordPress
- * @subpackage Administration
- *
- * @link https://codex.wordpress.org/AJAX_in_Plugins
- */
+	 * WordPress AJAX Process Execution.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 *
+	 * @link https://codex.wordpress.org/AJAX_in_Plugins
+	 */
 
 /**
  * Executing AJAX process.

Please login to merge, or discard this patch.

src/wp-admin/options-writing.php 2 patches

Braces +7 added lines, -3 removed lines patch added patch discarded remove patch

@@ -9,8 +9,9 @@  discard block
 block discarded – undo
 /** 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 = __('Writing Settings');
 $parent_file = 'options-general.php';
@@ -164,9 +165,12 @@  discard block
 block discarded – undo
 
 <textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
 
-<?php else : ?>
+<?php else {
+	: ?>
 
-	<p><?php printf(__('WordPress is not notifying any <a href="https://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">visibility settings</a>.'), 'options-reading.php'); ?></p>
+	<p><?php printf(__('WordPress is not notifying any <a href="https://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">visibility settings</a>.'), 'options-reading.php');
+}
+?></p>
 
 <?php endif; ?>
 <?php } // multisite ?>

Please login to merge, or discard this patch.

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -7,56 +7,56 @@  discard block
 block discarded – undo
  */
 
 /** 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 = __('Writing Settings');
 $parent_file = 'options-general.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+	'content' => '<p>'.__('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.').'</p>'.
+		'<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
+));
 
 /** This filter is documented in wp-admin/options.php */
-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
+if (apply_filters('enable_post_by_email_configuration', true)) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'options-postemail',
-		'title'   => __( 'Post Via Email' ),
-		'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
-	) );
+		'title'   => __('Post Via Email'),
+		'content' => '<p>'.__('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.').'</p>',
+	));
 }
 
 /** This filter is documented in wp-admin/options-writing.php */
-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
-	get_current_screen()->add_help_tab( array(
+if (apply_filters('enable_update_services_configuration', true)) {
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'options-services',
-		'title'   => __( 'Update Services' ),
-		'content' => '<p>' . __( 'If desired, WordPress will automatically alert various services of your new posts.' ) . '</p>',
-	) );
+		'title'   => __('Update Services'),
+		'content' => '<p>'.__('If desired, WordPress will automatically alert various services of your new posts.').'</p>',
+	));
 }
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Writing_Screen" target="_blank">Documentation on Writing 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_Writing_Screen" target="_blank">Documentation on Writing 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('writing'); ?>
 
 <table class="form-table">
-<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
+<?php if (get_site_option('initial_db_version') < 32453) : ?>
 <tr>
 <th scope="row"><?php _e('Formatting') ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
@@ -77,21 +77,21 @@  discard block
 block discarded – undo
 </tr>
 <?php
 $post_formats = get_post_format_strings();
-unset( $post_formats['standard'] );
+unset($post_formats['standard']);
 ?>
 <tr>
 <th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
 <td>
 	<select name="default_post_format" id="default_post_format">
-		<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
-<?php foreach ( $post_formats as $format_slug => $format_name ): ?>
-		<option<?php selected( get_option( 'default_post_format' ), $format_slug ); ?> value="<?php echo esc_attr( $format_slug ); ?>"><?php echo esc_html( $format_name ); ?></option>
+		<option value="0"><?php echo get_post_format_string('standard'); ?></option>
+<?php foreach ($post_formats as $format_slug => $format_name): ?>
+		<option<?php selected(get_option('default_post_format'), $format_slug); ?> value="<?php echo esc_attr($format_slug); ?>"><?php echo esc_html($format_name); ?></option>
 <?php endforeach; ?>
 	</select>
 </td>
 </tr>
 <?php
-if ( get_option( 'link_manager_enabled' ) ) :
+if (get_option('link_manager_enabled')) :
 ?>
 <tr>
 <th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
@@ -111,9 +111,9 @@  discard block
 block discarded – undo
 
 <?php
 /** This filter is documented in wp-admin/options.php */
-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+if (apply_filters('enable_post_by_email_configuration', true)) {
 ?>
-<h2 class="title"><?php _e( 'Post via email' ) ?></h2>
+<h2 class="title"><?php _e('Post via email') ?></h2>
 <p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
 
 <table class="form-table">
@@ -154,15 +154,15 @@  discard block
 block discarded – undo
  *
  * @param bool $enable Whether to enable the Update Services settings area. Default true.
  */
-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
+if (apply_filters('enable_update_services_configuration', true)) {
 ?>
-<h2 class="title"><?php _e( 'Update Services' ) ?></h2>
+<h2 class="title"><?php _e('Update Services') ?></h2>
 
-<?php if ( 1 == get_option('blog_public') ) : ?>
+<?php if (1 == get_option('blog_public')) : ?>
 
-<p><label for="ping_sites"><?php _e( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.' ) ?></label></p>
+<p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.') ?></label></p>
 
-<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
+<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea(get_option('ping_sites')); ?></textarea>
 
 <?php else : ?>
 
@@ -177,4 +177,4 @@  discard block
 block discarded – undo
 </form>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

Please login to merge, or discard this patch.

src/wp-admin/admin-header.php 3 patches

Spacing +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -6,9 +6,9 @@  discard block
 block discarded – undo
  * @subpackage Administration
  */
 
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if ( ! defined( 'WP_ADMIN' ) )
-	require_once( dirname( __FILE__ ) . '/admin.php' );
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
+if ( ! defined('WP_ADMIN'))
+	require_once(dirname(__FILE__).'/admin.php');
 
 /**
  * In case admin-header.php is included in a function.
@@ -27,23 +27,23 @@  discard block
 block discarded – undo
 	$update_title, $total_update_count, $parent_file;
 
 // Catch plugins that include admin-header.php before admin.php completes.
-if ( empty( $current_screen ) )
+if (empty($current_screen))
 	set_current_screen();
 
 get_admin_page_title();
-$title = esc_html( strip_tags( $title ) );
+$title = esc_html(strip_tags($title));
 
-if ( is_network_admin() )
-	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
-elseif ( is_user_admin() )
-	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
+if (is_network_admin())
+	$admin_title = sprintf(__('Network Admin: %s'), esc_html(get_current_site()->site_name));
+elseif (is_user_admin())
+	$admin_title = sprintf(__('User Dashboard: %s'), esc_html(get_current_site()->site_name));
 else
-	$admin_title = get_bloginfo( 'name' );
+	$admin_title = get_bloginfo('name');
 
-if ( $admin_title == $title )
-	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
+if ($admin_title == $title)
+	$admin_title = sprintf(__('%1$s &#8212; WordPress'), $title);
 else
-	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
+	$admin_title = sprintf(__('%1$s &lsaquo; %2$s &#8212; WordPress'), $title, $admin_title);
 
 /**
  * Filter the title tag content for an admin page.
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
  * @param string $admin_title The page title, with extra context added.
  * @param string $title       The original page title.
  */
-$admin_title = apply_filters( 'admin_title', $admin_title, $title );
+$admin_title = apply_filters('admin_title', $admin_title, $title);
 
 wp_user_settings();
 
@@ -62,21 +62,21 @@  discard block
 block discarded – undo
 <title><?php echo $admin_title; ?></title>
 <?php
 
-wp_enqueue_style( 'colors' );
-wp_enqueue_style( 'ie' );
+wp_enqueue_style('colors');
+wp_enqueue_style('ie');
 wp_enqueue_script('utils');
-wp_enqueue_script( 'svg-painter' );
+wp_enqueue_script('svg-painter');
 
 $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>',
 	pagenow = '<?php echo $current_screen->id; ?>',
 	typenow = '<?php echo $current_screen->post_type; ?>',
 	adminpage = '<?php echo $admin_body_class; ?>',
-	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+	decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 	isRtl = <?php echo (int) is_rtl(); ?>;
 </script>
 <meta name="viewport" content="width=device-width,initial-scale=1.0">
@@ -89,35 +89,35 @@  discard block
 block discarded – undo
  *
  * @param string $hook_suffix The current admin page.
  */
-do_action( 'admin_enqueue_scripts', $hook_suffix );
+do_action('admin_enqueue_scripts', $hook_suffix);
 
 /**
  * Fires when styles are printed for a specific admin page based on $hook_suffix.
  *
  * @since 2.6.0
  */
-do_action( "admin_print_styles-$hook_suffix" );
+do_action("admin_print_styles-$hook_suffix");
 
 /**
  * Fires when styles are printed for all admin pages.
  *
  * @since 2.6.0
  */
-do_action( 'admin_print_styles' );
+do_action('admin_print_styles');
 
 /**
  * Fires when scripts are printed for a specific admin page based on $hook_suffix.
  *
  * @since 2.1.0
  */
-do_action( "admin_print_scripts-$hook_suffix" );
+do_action("admin_print_scripts-$hook_suffix");
 
 /**
  * Fires when scripts are printed for all admin pages.
  *
  * @since 2.1.0
  */
-do_action( 'admin_print_scripts' );
+do_action('admin_print_scripts');
 
 /**
  * Fires in head section for a specific admin page.
@@ -127,45 +127,45 @@  discard block
 block discarded – undo
  *
  * @since 2.1.0
  */
-do_action( "admin_head-$hook_suffix" );
+do_action("admin_head-$hook_suffix");
 
 /**
  * Fires in head section for all admin pages.
  *
  * @since 2.1.0
  */
-do_action( 'admin_head' );
+do_action('admin_head');
 
-if ( get_user_setting('mfold') == 'f' )
+if (get_user_setting('mfold') == 'f')
 	$admin_body_class .= ' folded';
 
-if ( !get_user_setting('unfold') )
+if ( ! get_user_setting('unfold'))
 	$admin_body_class .= ' auto-fold';
 
-if ( is_admin_bar_showing() )
+if (is_admin_bar_showing())
 	$admin_body_class .= ' admin-bar';
 
-if ( is_rtl() )
+if (is_rtl())
 	$admin_body_class .= ' rtl';
 
-if ( $current_screen->post_type )
-	$admin_body_class .= ' post-type-' . $current_screen->post_type;
+if ($current_screen->post_type)
+	$admin_body_class .= ' post-type-'.$current_screen->post_type;
 
-if ( $current_screen->taxonomy )
-	$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
+if ($current_screen->taxonomy)
+	$admin_body_class .= ' taxonomy-'.$current_screen->taxonomy;
 
-$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
-$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
-$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$admin_body_class .= ' branch-'.str_replace(array('.', ','), '-', floatval($wp_version));
+$admin_body_class .= ' version-'.str_replace('.', '-', preg_replace('/^([.0-9]+).*/', '$1', $wp_version));
+$admin_body_class .= ' admin-color-'.sanitize_html_class(get_user_option('admin_color'), 'fresh');
+$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
-if ( wp_is_mobile() )
+if (wp_is_mobile())
 	$admin_body_class .= ' mobile';
 
-if ( is_multisite() )
+if (is_multisite())
 	$admin_body_class .= ' multisite';
 
-if ( is_network_admin() )
+if (is_network_admin())
 	$admin_body_class .= ' network-admin';
 
 $admin_body_class .= ' no-customize-support no-svg';
@@ -187,22 +187,22 @@  discard block
 block discarded – undo
  *
  * @param string $classes Space-separated list of CSS classes.
  */
-$admin_body_classes = apply_filters( 'admin_body_class', '' );
+$admin_body_classes = apply_filters('admin_body_class', '');
 ?>
-<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 <script type="text/javascript">
 	document.body.className = document.body.className.replace('no-js','js');
 </script>
 
 <?php
 // Make sure the customize body classes are correct as early as possible.
-if ( current_user_can( 'customize' ) ) {
+if (current_user_can('customize')) {
 	wp_customize_support_script();
 }
 ?>
 
 <div id="wpwrap">
-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
+<?php require(ABSPATH.'wp-admin/menu-header.php'); ?>
 <div id="wpcontent">
 
 <?php
@@ -211,14 +211,14 @@  discard block
 block discarded – undo
  *
  * @since 3.0.0
  */
-do_action( 'in_admin_header' );
+do_action('in_admin_header');
 ?>
 
 <div id="wpbody" role="main">
 <?php
 unset($title_class, $blog_name, $total_update_count, $update_title);
 
-$current_screen->set_parentage( $parent_file );
+$current_screen->set_parentage($parent_file);
 
 ?>
 
@@ -227,27 +227,27 @@  discard block
 block discarded – undo
 
 $current_screen->render_screen_meta();
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 	/**
 	 * Print network admin screen notices.
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'network_admin_notices' );
-} elseif ( is_user_admin() ) {
+	do_action('network_admin_notices');
+} elseif (is_user_admin()) {
 	/**
 	 * Print user admin screen notices.
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'user_admin_notices' );
+	do_action('user_admin_notices');
 } else {
 	/**
 	 * Print admin screen notices.
 	 *
 	 * @since 3.1.0
 	 */
-	do_action( 'admin_notices' );
+	do_action('admin_notices');
 }
 
 /**
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
  *
  * @since 3.1.0
  */
-do_action( 'all_admin_notices' );
+do_action('all_admin_notices');
 
-if ( $parent_file == 'options-general.php' )
-	require(ABSPATH . 'wp-admin/options-head.php');
+if ($parent_file == 'options-general.php')
+	require(ABSPATH.'wp-admin/options-head.php');

Please login to merge, or discard this patch.

Braces +31 added lines, -17 removed lines patch added patch discarded remove patch

@@ -7,8 +7,9 @@  discard block
 block discarded – undo
  */
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
-if ( ! defined( 'WP_ADMIN' ) )
+if ( ! defined( 'WP_ADMIN' ) ) {
 	require_once( dirname( __FILE__ ) . '/admin.php' );
+}
 
 /**
  * In case admin-header.php is included in a function.
@@ -27,23 +28,26 @@  discard block
 block discarded – undo
 	$update_title, $total_update_count, $parent_file;
 
 // Catch plugins that include admin-header.php before admin.php completes.
-if ( empty( $current_screen ) )
+if ( empty( $current_screen ) ) {
 	set_current_screen();
+}
 
 get_admin_page_title();
 $title = esc_html( strip_tags( $title ) );
 
-if ( is_network_admin() )
+if ( is_network_admin() ) {
 	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
-elseif ( is_user_admin() )
+} elseif ( is_user_admin() ) {
 	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
-else
+} else {
 	$admin_title = get_bloginfo( 'name' );
+}
 
-if ( $admin_title == $title )
+if ( $admin_title == $title ) {
 	$admin_title = sprintf( __( '%1$s &#8212; WordPress' ), $title );
-else
+} else {
 	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s &#8212; WordPress' ), $title, $admin_title );
+}
 
 /**
  * Filter the title tag content for an admin page.
@@ -136,37 +140,46 @@  discard block
 block discarded – undo
  */
 do_action( 'admin_head' );
 
-if ( get_user_setting('mfold') == 'f' )
+if ( get_user_setting('mfold') == 'f' ) {
 	$admin_body_class .= ' folded';
+}
 
-if ( !get_user_setting('unfold') )
+if ( !get_user_setting('unfold') ) {
 	$admin_body_class .= ' auto-fold';
+}
 
-if ( is_admin_bar_showing() )
+if ( is_admin_bar_showing() ) {
 	$admin_body_class .= ' admin-bar';
+}
 
-if ( is_rtl() )
+if ( is_rtl() ) {
 	$admin_body_class .= ' rtl';
+}
 
-if ( $current_screen->post_type )
+if ( $current_screen->post_type ) {
 	$admin_body_class .= ' post-type-' . $current_screen->post_type;
+}
 
-if ( $current_screen->taxonomy )
+if ( $current_screen->taxonomy ) {
 	$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
+}
 
 $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
 $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
 $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
 $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
 
-if ( wp_is_mobile() )
+if ( wp_is_mobile() ) {
 	$admin_body_class .= ' mobile';
+}
 
-if ( is_multisite() )
+if ( is_multisite() ) {
 	$admin_body_class .= ' multisite';
+}
 
-if ( is_network_admin() )
+if ( is_network_admin() ) {
 	$admin_body_class .= ' network-admin';
+}
 
 $admin_body_class .= ' no-customize-support no-svg';
 
@@ -257,5 +270,6 @@  discard block
 block discarded – undo
  */
 do_action( 'all_admin_notices' );
 
-if ( $parent_file == 'options-general.php' )
+if ( $parent_file == 'options-general.php' ) {
 	require(ABSPATH . 'wp-admin/options-head.php');
+}

Please login to merge, or discard this patch.

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -1,10 +1,10 @@  discard block
 block discarded – undo
 <?php
 /**
- * WordPress Administration Template Header
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Template Header
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 if ( ! defined( 'WP_ADMIN' ) )
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
 
 <?php
 /**
- * Fires at the beginning of the content section in an admin page.
- *
- * @since 3.0.0
- */
+	 * Fires at the beginning of the content section in an admin page.
+	 *
+	 * @since 3.0.0
+	 */
 do_action( 'in_admin_header' );
 ?>
 

Please login to merge, or discard this patch.

src/wp-admin/themes.php 3 patches

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -1,10 +1,10 @@
 block discarded – undo
 <?php
 /**
- * Themes administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Themes administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Please login to merge, or discard this patch.

Spacing +161 added lines, -161 removed lines patch added patch discarded remove patch

@@ -7,58 +7,58 @@  discard block
 block discarded – undo
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'switch_themes' ) && ! current_user_can( 'edit_theme_options' ) ) {
+if ( ! current_user_can('switch_themes') && ! current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to edit theme options on this site.').'</p>',
 		403
 	);
 }
 
-if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) {
-	if ( 'activate' == $_GET['action'] ) {
-		check_admin_referer('switch-theme_' . $_GET['stylesheet']);
-		$theme = wp_get_theme( $_GET['stylesheet'] );
+if (current_user_can('switch_themes') && isset($_GET['action'])) {
+	if ('activate' == $_GET['action']) {
+		check_admin_referer('switch-theme_'.$_GET['stylesheet']);
+		$theme = wp_get_theme($_GET['stylesheet']);
 
-		if ( ! $theme->exists() || ! $theme->is_allowed() ) {
+		if ( ! $theme->exists() || ! $theme->is_allowed()) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The requested theme does not exist.').'</p>',
 				403
 			);
 		}
 
-		switch_theme( $theme->get_stylesheet() );
-		wp_redirect( admin_url('themes.php?activated=true') );
+		switch_theme($theme->get_stylesheet());
+		wp_redirect(admin_url('themes.php?activated=true'));
 		exit;
-	} elseif ( 'delete' == $_GET['action'] ) {
-		check_admin_referer('delete-theme_' . $_GET['stylesheet']);
-		$theme = wp_get_theme( $_GET['stylesheet'] );
+	} elseif ('delete' == $_GET['action']) {
+		check_admin_referer('delete-theme_'.$_GET['stylesheet']);
+		$theme = wp_get_theme($_GET['stylesheet']);
 
-		if ( ! current_user_can( 'delete_themes' ) ) {
+		if ( ! current_user_can('delete_themes')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'You are not allowed to delete this item.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('You are not allowed to delete this item.').'</p>',
 				403
 			);
 		}
 
-		if ( ! $theme->exists() ) {
+		if ( ! $theme->exists()) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The requested theme does not exist.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The requested theme does not exist.').'</p>',
 				403
 			);
 		}
 
 		$active = wp_get_theme();
-		if ( $active->get( 'Template' ) == $_GET['stylesheet'] ) {
-			wp_redirect( admin_url( 'themes.php?delete-active-child=true' ) );
+		if ($active->get('Template') == $_GET['stylesheet']) {
+			wp_redirect(admin_url('themes.php?delete-active-child=true'));
 		} else {
-			delete_theme( $_GET['stylesheet'] );
-			wp_redirect( admin_url( 'themes.php?deleted=true' ) );
+			delete_theme($_GET['stylesheet']);
+			wp_redirect(admin_url('themes.php?deleted=true'));
 		}
 		exit;
 	}
@@ -68,115 +68,115 @@  discard block
 block discarded – undo
 $parent_file = 'themes.php';
 
 // Help tab: Overview
-if ( current_user_can( 'switch_themes' ) ) {
-	$help_overview  = '<p>' . __( 'This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.' ) . '</p>' .
-		'<p>' . __( 'From this screen you can:' ) . '</p>' .
-		'<ul><li>' . __( 'Hover or tap to see Activate and Live Preview buttons' ) . '</li>' .
-		'<li>' . __( 'Click on the theme to see the theme name, version, author, description, tags, and the Delete link' ) . '</li>' .
-		'<li>' . __( 'Click Customize for the current theme or Live Preview for any other theme to see a live preview' ) . '</li></ul>' .
-		'<p>' . __( 'The current theme is displayed highlighted as the first theme.' ) . '</p>' .
-		'<p>' . __( 'The search for installed themes will search for terms in their name, description, author, or tag.' ) . ' <span id="live-search-desc">' . __( 'The search results will be updated as you type.' ) . '</span></p>';
-
-	get_current_screen()->add_help_tab( array(
+if (current_user_can('switch_themes')) {
+	$help_overview = '<p>'.__('This screen is used for managing your installed themes. Aside from the default theme(s) included with your WordPress installation, themes are designed and developed by third parties.').'</p>'.
+		'<p>'.__('From this screen you can:').'</p>'.
+		'<ul><li>'.__('Hover or tap to see Activate and Live Preview buttons').'</li>'.
+		'<li>'.__('Click on the theme to see the theme name, version, author, description, tags, and the Delete link').'</li>'.
+		'<li>'.__('Click Customize for the current theme or Live Preview for any other theme to see a live preview').'</li></ul>'.
+		'<p>'.__('The current theme is displayed highlighted as the first theme.').'</p>'.
+		'<p>'.__('The search for installed themes will search for terms in their name, description, author, or tag.').' <span id="live-search-desc">'.__('The search results will be updated as you type.').'</span></p>';
+
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
-		'title'   => __( 'Overview' ),
+		'title'   => __('Overview'),
 		'content' => $help_overview
-	) );
+	));
 } // switch_themes
 
 // Help tab: Adding Themes
-if ( current_user_can( 'install_themes' ) ) {
-	if ( is_multisite() ) {
-		$help_install = '<p>' . __('Installing themes on Multisite can only be done from the Network Admin section.') . '</p>';
+if (current_user_can('install_themes')) {
+	if (is_multisite()) {
+		$help_install = '<p>'.__('Installing themes on Multisite can only be done from the Network Admin section.').'</p>';
 	} else {
-		$help_install = '<p>' . sprintf( __('If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'https://wordpress.org/themes/' ) . '</p>';
+		$help_install = '<p>'.sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional themes from the <a href="%s" target="_blank">WordPress.org Theme Directory</a>. Themes in the WordPress.org Theme Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!'), 'https://wordpress.org/themes/').'</p>';
 	}
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'adding-themes',
 		'title'   => __('Adding Themes'),
 		'content' => $help_install
-	) );
+	));
 } // install_themes
 
 // Help tab: Previewing and Customizing
-if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+if (current_user_can('edit_theme_options') && current_user_can('customize')) {
 	$help_customize =
-		'<p>' . __( 'Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.' ) . '</p>'.
-		'<p>' . __( 'The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button above the menu.' ) . '</p>' .
-		'<p>' . __( 'When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again.' ) . '</p>';
+		'<p>'.__('Tap or hover on any theme then click the Live Preview button to see a live preview of that theme and change theme options in a separate, full-screen view. You can also find a Live Preview button at the bottom of the theme details screen. Any installed theme can be previewed and customized in this way.').'</p>'.
+		'<p>'.__('The theme being previewed is fully interactive &mdash; navigate to different pages to see how the theme handles posts, archives, and other page templates. The settings may differ depending on what theme features the theme being previewed supports. To accept the new settings and activate the theme all in one step, click the Save &amp; Activate button above the menu.').'</p>'.
+		'<p>'.__('When previewing on smaller monitors, you can use the collapse icon at the bottom of the left-hand pane. This will hide the pane, giving you more room to preview your site in the new theme. To bring the pane back, click on the collapse icon again.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'customize-preview-themes',
-		'title'		=> __( 'Previewing and Customizing' ),
+		'title'		=> __('Previewing and Customizing'),
 		'content'	=> $help_customize
-	) );
+	));
 } // edit_theme_options && customize
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( current_user_can( 'switch_themes' ) ) {
+if (current_user_can('switch_themes')) {
 	$themes = wp_prepare_themes_for_js();
 } else {
-	$themes = wp_prepare_themes_for_js( array( wp_get_theme() ) );
+	$themes = wp_prepare_themes_for_js(array(wp_get_theme()));
 }
-wp_reset_vars( array( 'theme', 'search' ) );
+wp_reset_vars(array('theme', 'search'));
 
-wp_localize_script( 'theme', '_wpThemeSettings', array(
+wp_localize_script('theme', '_wpThemeSettings', array(
 	'themes'   => $themes,
 	'settings' => array(
-		'canInstall'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ),
-		'installURI'    => ( ! is_multisite() && current_user_can( 'install_themes' ) ) ? admin_url( 'theme-install.php' ) : null,
-		'confirmDelete' => __( "Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete." ),
-		'adminUrl'      => parse_url( admin_url(), PHP_URL_PATH ),
+		'canInstall'    => ( ! is_multisite() && current_user_can('install_themes')),
+		'installURI'    => ( ! is_multisite() && current_user_can('install_themes')) ? admin_url('theme-install.php') : null,
+		'confirmDelete' => __("Are you sure you want to delete this theme?\n\nClick 'Cancel' to go back, 'OK' to confirm the delete."),
+		'adminUrl'      => parse_url(admin_url(), PHP_URL_PATH),
 	),
  	'l10n' => array(
- 		'addNew'            => __( 'Add New Theme' ),
- 		'search'            => __( 'Search Installed Themes' ),
- 		'searchPlaceholder' => __( 'Search installed themes...' ), // placeholder (no ellipsis)
-		'themesFound'       => __( 'Number of Themes found: %d' ),
-		'noThemesFound'     => __( 'No themes found. Try a different search.' ),
+ 		'addNew'            => __('Add New Theme'),
+ 		'search'            => __('Search Installed Themes'),
+ 		'searchPlaceholder' => __('Search installed themes...'), // placeholder (no ellipsis)
+		'themesFound'       => __('Number of Themes found: %d'),
+		'noThemesFound'     => __('No themes found. Try a different search.'),
   	),
-) );
+));
 
 add_thickbox();
-wp_enqueue_script( 'theme' );
-wp_enqueue_script( 'customize-loader' );
+wp_enqueue_script('theme');
+wp_enqueue_script('customize-loader');
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
-	<h1><?php esc_html_e( 'Themes' ); ?>
-		<span class="title-count theme-count"><?php echo count( $themes ); ?></span>
-	<?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?>
-		<a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a>
+	<h1><?php esc_html_e('Themes'); ?>
+		<span class="title-count theme-count"><?php echo count($themes); ?></span>
+	<?php if ( ! is_multisite() && current_user_can('install_themes')) : ?>
+		<a href="<?php echo admin_url('theme-install.php'); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x('Add New', 'Add new theme'); ?></a>
 	<?php endif; ?>
 	</h1>
 <?php
-if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?>
+if ( ! validate_current_theme() || isset($_GET['broken'])) : ?>
 <div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
-<?php elseif ( isset($_GET['activated']) ) :
-		if ( isset( $_GET['previewed'] ) ) { ?>
-		<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
+<?php elseif (isset($_GET['activated'])) :
+		if (isset($_GET['previewed'])) { ?>
+		<div id="message2" class="updated notice is-dismissible"><p><?php _e('Settings saved and theme activated.'); ?> <a href="<?php echo home_url('/'); ?>"><?php _e('Visit site'); ?></a></p></div>
 		<?php } else { ?>
-<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php
+<div id="message2" class="updated notice is-dismissible"><p><?php _e('New theme activated.'); ?> <a href="<?php echo home_url('/'); ?>"><?php _e('Visit site'); ?></a></p></div><?php
 		}
-	elseif ( isset($_GET['deleted']) ) : ?>
+	elseif (isset($_GET['deleted'])) : ?>
 <div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
-<?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
-	<div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
+<?php elseif (isset($_GET['delete-active-child'])) : ?>
+	<div id="message4" class="error"><p><?php _e('You cannot delete a theme while it has an active child theme.'); ?></p></div>
 <?php
 endif;
 
 $ct = wp_get_theme();
 
-if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
-	echo '<div class="error"><p>' . sprintf( __( 'ERROR: %s' ), $ct->errors()->get_error_message() ) . '</p></div>';
+if ($ct->errors() && ( ! is_multisite() || current_user_can('manage_network_themes'))) {
+	echo '<div class="error"><p>'.sprintf(__('ERROR: %s'), $ct->errors()->get_error_message()).'</p></div>';
 }
 
 /*
@@ -187,37 +187,37 @@  discard block
 block discarded – undo
 
 	// Pretend you didn't see this.
 	$current_theme_actions = array();
-	if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
-		foreach ( (array) $submenu['themes.php'] as $item) {
+	if (is_array($submenu) && isset($submenu['themes.php'])) {
+		foreach ((array) $submenu['themes.php'] as $item) {
 			$class = '';
-			if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) )
+			if ('themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos($item[2], 'customize.php'))
 				continue;
 			// 0 = name, 1 = capability, 2 = file
-			if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
+			if ((strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)))
 				$class = ' current';
-			if ( !empty($submenu[$item[2]]) ) {
+			if ( ! empty($submenu[$item[2]])) {
 				$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
 				$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-				if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
+				if (file_exists(WP_PLUGIN_DIR."/{$submenu[$item[2]][0][2]}") || ! empty($menu_hook))
 					$current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
 				else
 					$current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
-			} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
+			} elseif ( ! empty($item[2]) && current_user_can($item[1])) {
 				$menu_file = $item[2];
 
-				if ( current_user_can( 'customize' ) ) {
-					if ( 'custom-header' === $menu_file ) {
+				if (current_user_can('customize')) {
+					if ('custom-header' === $menu_file) {
 						$current_theme_actions[] = "<a class='button button-secondary hide-if-no-customize$class' href='customize.php?autofocus[control]=header_image'>{$item[0]}</a>";
-					} elseif ( 'custom-background' === $menu_file ) {
+					} elseif ('custom-background' === $menu_file) {
 						$current_theme_actions[] = "<a class='button button-secondary hide-if-no-customize$class' href='customize.php?autofocus[control]=background_image'>{$item[0]}</a>";
 					}
 				}
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
-					$menu_file = substr( $menu_file, 0, $pos );
+				if (false !== ($pos = strpos($menu_file, '?'))) {
+					$menu_file = substr($menu_file, 0, $pos);
 				}
 
-				if ( file_exists( ABSPATH . "wp-admin/$menu_file" ) ) {
+				if (file_exists(ABSPATH."wp-admin/$menu_file")) {
 					$current_theme_actions[] = "<a class='button button-secondary$class' href='{$item[2]}'>{$item[0]}</a>";
 				} else {
 					$current_theme_actions[] = "<a class='button button-secondary$class' href='themes.php?page={$item[2]}'>{$item[0]}</a>";
@@ -236,26 +236,26 @@  discard block
 block discarded – undo
  * This PHP is synchronized with the tmpl-theme template below!
  */
 
-foreach ( $themes as $theme ) :
-	$aria_action = esc_attr( $theme['id'] . '-action' );
-	$aria_name   = esc_attr( $theme['id'] . '-name' );
+foreach ($themes as $theme) :
+	$aria_action = esc_attr($theme['id'].'-action');
+	$aria_name   = esc_attr($theme['id'].'-name');
 	?>
-<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
-	<?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
+<div class="theme<?php if ($theme['active']) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action.' '.$aria_name; ?>">
+	<?php if ( ! empty($theme['screenshot'][0])) { ?>
 		<div class="theme-screenshot">
 			<img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />
 		</div>
 	<?php } else { ?>
 		<div class="theme-screenshot blank"></div>
 	<?php } ?>
-	<span class="more-details" id="<?php echo $aria_action; ?>"><?php _e( 'Theme Details' ); ?></span>
-	<div class="theme-author"><?php printf( __( 'By %s' ), $theme['author'] ); ?></div>
+	<span class="more-details" id="<?php echo $aria_action; ?>"><?php _e('Theme Details'); ?></span>
+	<div class="theme-author"><?php printf(__('By %s'), $theme['author']); ?></div>
 
-	<?php if ( $theme['active'] ) { ?>
+	<?php if ($theme['active']) { ?>
 		<h2 class="theme-name" id="<?php echo $aria_name; ?>">
 			<?php
 			/* translators: %s: theme name */
-			printf( __( '<span>Active:</span> %s' ), $theme['name'] );
+			printf(__('<span>Active:</span> %s'), $theme['name']);
 			?>
 		</h2>
 	<?php } else { ?>
@@ -264,21 +264,21 @@  discard block
 block discarded – undo
 
 	<div class="theme-actions">
 
-	<?php if ( $theme['active'] ) { ?>
-		<?php if ( $theme['actions']['customize'] && current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
-			<a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Customize' ); ?></a>
+	<?php if ($theme['active']) { ?>
+		<?php if ($theme['actions']['customize'] && current_user_can('edit_theme_options') && current_user_can('customize')) { ?>
+			<a class="button button-primary customize load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e('Customize'); ?></a>
 		<?php } ?>
 	<?php } else { ?>
-		<a class="button button-secondary activate" href="<?php echo $theme['actions']['activate']; ?>"><?php _e( 'Activate' ); ?></a>
-		<?php if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { ?>
-			<a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e( 'Live Preview' ); ?></a>
+		<a class="button button-secondary activate" href="<?php echo $theme['actions']['activate']; ?>"><?php _e('Activate'); ?></a>
+		<?php if (current_user_can('edit_theme_options') && current_user_can('customize')) { ?>
+			<a class="button button-primary load-customize hide-if-no-customize" href="<?php echo $theme['actions']['customize']; ?>"><?php _e('Live Preview'); ?></a>
 		<?php } ?>
 	<?php } ?>
 
 	</div>
 
-	<?php if ( $theme['hasUpdate'] ) { ?>
-		<div class="theme-update"><?php _e( 'Update Available' ); ?></div>
+	<?php if ($theme['hasUpdate']) { ?>
+		<div class="theme-update"><?php _e('Update Available'); ?></div>
 	<?php } ?>
 </div>
 <?php endforeach; ?>
@@ -286,61 +286,61 @@  discard block
 block discarded – undo
 </div>
 <div class="theme-overlay"></div>
 
-<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+<p class="no-themes"><?php _e('No themes found. Try a different search.'); ?></p>
 
 <?php
 // List broken themes, if any.
-if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
+if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes(array('errors' => true))) {
 ?>
 
 <div class="broken-themes">
 <h3><?php _e('Broken Themes'); ?></h3>
-<p><?php _e( 'The following themes are installed but incomplete.' ); ?></p>
+<p><?php _e('The following themes are installed but incomplete.'); ?></p>
 
 <?php
-$can_delete = current_user_can( 'delete_themes' );
-$can_install = current_user_can( 'install_themes' );
+$can_delete = current_user_can('delete_themes');
+$can_install = current_user_can('install_themes');
 ?>
 <table>
 	<tr>
 		<th><?php _ex('Name', 'theme name'); ?></th>
 		<th><?php _e('Description'); ?></th>
-		<?php if ( $can_delete ) { ?>
+		<?php if ($can_delete) { ?>
 			<td></td>
 		<?php } ?>
-		<?php if ( $can_install ) { ?>
+		<?php if ($can_install) { ?>
 			<td></td>
 		<?php } ?>
 	</tr>
-	<?php foreach ( $broken_themes as $broken_theme ) : ?>
+	<?php foreach ($broken_themes as $broken_theme) : ?>
 		<tr>
-			<td><?php echo $broken_theme->get( 'Name' ) ? $broken_theme->display( 'Name' ) : $broken_theme->get_stylesheet(); ?></td>
+			<td><?php echo $broken_theme->get('Name') ? $broken_theme->display('Name') : $broken_theme->get_stylesheet(); ?></td>
 			<td><?php echo $broken_theme->errors()->get_error_message(); ?></td>
 			<?php
-			if ( $can_delete ) {
+			if ($can_delete) {
 				$stylesheet = $broken_theme->get_stylesheet();
-				$delete_url = add_query_arg( array(
+				$delete_url = add_query_arg(array(
 					'action'     => 'delete',
-					'stylesheet' => urlencode( $stylesheet ),
-				), admin_url( 'themes.php' ) );
-				$delete_url = wp_nonce_url( $delete_url, 'delete-theme_' . $stylesheet );
+					'stylesheet' => urlencode($stylesheet),
+				), admin_url('themes.php'));
+				$delete_url = wp_nonce_url($delete_url, 'delete-theme_'.$stylesheet);
 				?>
-				<td><a href="<?php echo esc_url( $delete_url ); ?>" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a></td>
+				<td><a href="<?php echo esc_url($delete_url); ?>" class="button button-secondary delete-theme"><?php _e('Delete'); ?></a></td>
 				<?php
 			}
 
-			if ( $can_install && 'theme_no_parent' === $broken_theme->errors()->get_error_code() ) {
-				$parent_theme_name = $broken_theme->get( 'Template' );
-				$parent_theme = themes_api( 'theme_information', array( 'slug' => urlencode( $parent_theme_name ) ) );
+			if ($can_install && 'theme_no_parent' === $broken_theme->errors()->get_error_code()) {
+				$parent_theme_name = $broken_theme->get('Template');
+				$parent_theme = themes_api('theme_information', array('slug' => urlencode($parent_theme_name)));
 
-				if ( ! is_wp_error( $parent_theme ) ) {
-					$install_url = add_query_arg( array(
+				if ( ! is_wp_error($parent_theme)) {
+					$install_url = add_query_arg(array(
 						'action' => 'install-theme',
-						'theme'  => urlencode( $parent_theme_name ),
-					), admin_url( 'update.php' ) );
-					$install_url = wp_nonce_url( $install_url, 'install-theme_' . $parent_theme_name );
+						'theme'  => urlencode($parent_theme_name),
+					), admin_url('update.php'));
+					$install_url = wp_nonce_url($install_url, 'install-theme_'.$parent_theme_name);
 					?>
-					<td><a href="<?php echo esc_url( $install_url ); ?>" class="button button-secondary install-theme"><?php _e( 'Install Parent Theme' ); ?></a></td>
+					<td><a href="<?php echo esc_url($install_url); ?>" class="button button-secondary install-theme"><?php _e('Install Parent Theme'); ?></a></td>
 					<?php
 				}
 			}
@@ -368,14 +368,14 @@  discard block
 block discarded – undo
 	<# } else { #>
 		<div class="theme-screenshot blank"></div>
 	<# } #>
-	<span class="more-details" id="{{ data.id }}-action"><?php _e( 'Theme Details' ); ?></span>
-	<div class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></div>
+	<span class="more-details" id="{{ data.id }}-action"><?php _e('Theme Details'); ?></span>
+	<div class="theme-author"><?php printf(__('By %s'), '{{{ data.author }}}'); ?></div>
 
 	<# if ( data.active ) { #>
 		<h2 class="theme-name" id="{{ data.id }}-name">
 			<?php
 			/* translators: %s: theme name */
-			printf( __( '<span>Active:</span> %s' ), '{{{ data.name }}}' );
+			printf(__('<span>Active:</span> %s'), '{{{ data.name }}}');
 			?>
 		</h2>
 	<# } else { #>
@@ -386,17 +386,17 @@  discard block
 block discarded – undo
 
 	<# if ( data.active ) { #>
 		<# if ( data.actions.customize ) { #>
-			<a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Customize' ); ?></a>
+			<a class="button button-primary customize load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e('Customize'); ?></a>
 		<# } #>
 	<# } else { #>
-		<a class="button button-secondary activate" href="{{{ data.actions.activate }}}"><?php _e( 'Activate' ); ?></a>
-		<a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e( 'Live Preview' ); ?></a>
+		<a class="button button-secondary activate" href="{{{ data.actions.activate }}}"><?php _e('Activate'); ?></a>
+		<a class="button button-primary load-customize hide-if-no-customize" href="{{{ data.actions.customize }}}"><?php _e('Live Preview'); ?></a>
 	<# } #>
 
 	</div>
 
 	<# if ( data.hasUpdate ) { #>
-		<div class="theme-update"><?php _e( 'Update Available' ); ?></div>
+		<div class="theme-update"><?php _e('Update Available'); ?></div>
 	<# } #>
 </script>
 
@@ -404,9 +404,9 @@  discard block
 block discarded – undo
 	<div class="theme-backdrop"></div>
 	<div class="theme-wrap wp-clearfix">
 		<div class="theme-header">
-			<button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
-			<button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
-			<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
+			<button class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show previous theme'); ?></span></button>
+			<button class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Show next theme'); ?></span></button>
+			<button class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e('Close details dialog'); ?></span></button>
 		</div>
 		<div class="theme-about wp-clearfix">
 			<div class="theme-screenshots">
@@ -419,46 +419,46 @@  discard block
 block discarded – undo
 
 			<div class="theme-info">
 				<# if ( data.active ) { #>
-					<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
+					<span class="current-label"><?php _e('Current Theme'); ?></span>
 				<# } #>
-				<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
-				<p class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></p>
+				<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf(__('Version: %s'), '{{ data.version }}'); ?></span></h2>
+				<p class="theme-author"><?php printf(__('By %s'), '{{{ data.authorAndUri }}}'); ?></p>
 
 				<# if ( data.hasUpdate ) { #>
 				<div class="notice notice-warning notice-alt notice-large">
-					<h3 class="notice-title"><?php _e( 'Update Available' ); ?></h3>
+					<h3 class="notice-title"><?php _e('Update Available'); ?></h3>
 					{{{ data.update }}}
 				</div>
 				<# } #>
 				<p class="theme-description">{{{ data.description }}}</p>
 
 				<# if ( data.parent ) { #>
-					<p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
+					<p class="parent-theme"><?php printf(__('This is a child theme of %s.'), '<strong>{{{ data.parent }}}</strong>'); ?></p>
 				<# } #>
 
 				<# if ( data.tags ) { #>
-					<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
+					<p class="theme-tags"><span><?php _e('Tags:'); ?></span> {{{ data.tags }}}</p>
 				<# } #>
 			</div>
 		</div>
 
 		<div class="theme-actions">
 			<div class="active-theme">
-				<a href="{{{ data.actions.customize }}}" class="button button-primary customize load-customize hide-if-no-customize"><?php _e( 'Customize' ); ?></a>
-				<?php echo implode( ' ', $current_theme_actions ); ?>
+				<a href="{{{ data.actions.customize }}}" class="button button-primary customize load-customize hide-if-no-customize"><?php _e('Customize'); ?></a>
+				<?php echo implode(' ', $current_theme_actions); ?>
 			</div>
 			<div class="inactive-theme">
 				<# if ( data.actions.activate ) { #>
-					<a href="{{{ data.actions.activate }}}" class="button button-secondary activate"><?php _e( 'Activate' ); ?></a>
+					<a href="{{{ data.actions.activate }}}" class="button button-secondary activate"><?php _e('Activate'); ?></a>
 				<# } #>
-				<a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e( 'Live Preview' ); ?></a>
+				<a href="{{{ data.actions.customize }}}" class="button button-primary load-customize hide-if-no-customize"><?php _e('Live Preview'); ?></a>
 			</div>
 
 			<# if ( ! data.active && data.actions['delete'] ) { #>
-				<a href="{{{ data.actions['delete'] }}}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
+				<a href="{{{ data.actions['delete'] }}}" class="button button-secondary delete-theme"><?php _e('Delete'); ?></a>
 			<# } #>
 		</div>
 	</div>
 </script>
 
-<?php require( ABSPATH . 'wp-admin/admin-footer.php' );
+<?php require(ABSPATH.'wp-admin/admin-footer.php');

Please login to merge, or discard this patch.

Braces +16 added lines, -11 removed lines patch added patch discarded remove patch

@@ -165,8 +165,7 @@  discard block
 block discarded – undo
 		<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
 		<?php } else { ?>
 <div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php
-		}
-	elseif ( isset($_GET['deleted']) ) : ?>
+		} elseif ( isset($_GET['deleted']) ) : ?>
 <div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
 <?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
 	<div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
@@ -190,18 +189,21 @@  discard block
 block discarded – undo
 	if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
 		foreach ( (array) $submenu['themes.php'] as $item) {
 			$class = '';
-			if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) )
-				continue;
+			if ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) {
+							continue;
+			}
 			// 0 = name, 1 = capability, 2 = file
-			if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) )
-				$class = ' current';
+			if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file)) ) {
+							$class = ' current';
+			}
 			if ( !empty($submenu[$item[2]]) ) {
 				$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
 				$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
-				if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook))
-					$current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
-				else
-					$current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+				if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") || !empty($menu_hook)) {
+									$current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+				} else {
+									$current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
+				}
 			} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
 				$menu_file = $item[2];
 
@@ -240,7 +242,10 @@  discard block
 block discarded – undo
 	$aria_action = esc_attr( $theme['id'] . '-action' );
 	$aria_name   = esc_attr( $theme['id'] . '-name' );
 	?>
-<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
+<div class="theme<?php if ( $theme['active'] ) {
+	echo ' active';
+}
+?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
 	<?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
 		<div class="theme-screenshot">
 			<img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />

Please login to merge, or discard this patch.

src/wp-admin/profile.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -15,4 +15,4 @@
		block discarded – undo
15	15	define('IS_PROFILE_PAGE', true);
16	16
17	17	/** Load User Editing Page */
18		-require_once( dirname( __FILE__ ) . '/user-edit.php' );
	18	+require_once(dirname(__FILE__).'/user-edit.php');

Please login to merge, or discard this patch.

		@@ -8,5 +8,5 @@
		block discarded – undo
8	8	* @subpackage Administration
9	9	*/
10	10
11		-_deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/upgrade.php' );
12		-require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
	11	+_deprecated_file(basename(__FILE__), '2.5', 'wp-admin/includes/upgrade.php');
	12	+require_once(ABSPATH.'wp-admin/includes/upgrade.php');

		@@ -1,12 +1,12 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * WordPress Upgrade Functions. Old file, must not be used. Include
4		- * wp-admin/includes/upgrade.php instead.
5		- *
6		- * @deprecated 2.5.0
7		- * @package WordPress
8		- * @subpackage Administration
9		- */
	3	+ * WordPress Upgrade Functions. Old file, must not be used. Include
	4	+ * wp-admin/includes/upgrade.php instead.
	5	+ *
	6	+ * @deprecated 2.5.0
	7	+ * @package WordPress
	8	+ * @subpackage Administration
	9	+ */
10	10
11	11	_deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/upgrade.php' );
12	12	require_once(ABSPATH . 'wp-admin/includes/upgrade.php');

		@@ -206,12 +206,13 @@ discard block
		block discarded – undo
206	206	$php_compat = version_compare( $php_version, $required_php_version, '>=' );
207	207	$mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) \|\| file_exists( WP_CONTENT_DIR . '/db.php' );
208	208
209		-if ( !$mysql_compat && !$php_compat )
	209	+if ( !$mysql_compat && !$php_compat ) {
210	210	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
211		-elseif ( !$php_compat )
	211	+} elseif ( !$php_compat ) {
212	212	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
213		-elseif ( !$mysql_compat )
	213	+} elseif ( !$mysql_compat ) {
214	214	$compat = sprintf( __( 'You cannot install because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
	215	+}
215	216
216	217	if ( !$mysql_compat \|\| !$php_compat ) {
217	218	display_header();
		@@ -281,8 +282,9 @@ discard block
		block discarded – undo
281	282	$loaded_language = 'en_US';
282	283	}
283	284
284		- if ( ! empty( $wpdb->error ) )
285		- wp_die( $wpdb->error->get_error_message() );
	285	+ if ( ! empty( $wpdb->error ) ) {
	286	+ wp_die( $wpdb->error->get_error_message() );
	287	+ }
286	288
287	289	display_header();
288	290	// Fill in the data we gathered

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7	* @since 3.0.0
8	8	*/
9	9
10		-require_once( dirname( __FILE__ ) . '/admin.php' );
	10	+require_once(dirname(__FILE__).'/admin.php');
11	11
12		-wp_redirect( network_admin_url('themes.php') );
	12	+wp_redirect(network_admin_url('themes.php'));
13	13	exit;

		@@ -1,11 +1,11 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * Multisite themes administration panel.
4		- *
5		- * @package WordPress
6		- * @subpackage Multisite
7		- * @since 3.0.0
8		- */
	3	+ * Multisite themes administration panel.
	4	+ *
	5	+ * @package WordPress
	6	+ * @subpackage Multisite
	7	+ * @since 3.0.0
	8	+ */
9	9
10	10	require_once( dirname( __FILE__ ) . '/admin.php' );
11	11

		@@ -6,16 +6,18 @@ discard block
		block discarded – undo
6	6	* @subpackage Administration
7	7	*/
8	8	// TODO route this pages via a specific iframe handler instead of the do_action below
9		-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
	9	+if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
10	10	define( 'IFRAME_REQUEST', true );
	11	+}
11	12
12	13	/**
13	14	* WordPress Administration Bootstrap.
14	15	*/
15	16	require_once( dirname( __FILE__ ) . '/admin.php' );
16	17
17		-if ( ! current_user_can('install_plugins') )
	18	+if ( ! current_user_can('install_plugins') ) {
18	19	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
	20	+}
19	21
20	22	if ( is_multisite() && ! is_network_admin() ) {
21	23	wp_redirect( network_admin_url( 'plugin-install.php' ) );
		@@ -49,8 +51,9 @@ discard block
		block discarded – undo
49	51	$parent_file = 'plugins.php';
50	52
51	53	wp_enqueue_script( 'plugin-install' );
52		-if ( 'plugin-information' != $tab )
	54	+if ( 'plugin-information' != $tab ) {
53	55	add_thickbox();
	56	+}
54	57
55	58	$body_id = $tab;
56	59

		@@ -1,10 +1,10 @@
		block discarded – undo
1	1	<?php
2	2	/**
3		- * Install plugin administration panel.
4		- *
5		- * @package WordPress
6		- * @subpackage Administration
7		- */
	3	+ * Install plugin administration panel.
	4	+ *
	5	+ * @package WordPress
	6	+ * @subpackage Administration
	7	+ */
8	8	// TODO route this pages via a specific iframe handler instead of the do_action below
9	9	if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
10	10	define( 'IFRAME_REQUEST', true );

		@@ -6,55 +6,55 @@ discard block
		block discarded – undo
6	6	* @subpackage Administration
7	7	*/
8	8	// TODO route this pages via a specific iframe handler instead of the do_action below
9		-if ( !defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
10		- define( 'IFRAME_REQUEST', true );
	9	+if ( ! defined('IFRAME_REQUEST') && isset($_GET['tab']) && ('plugin-information' == $_GET['tab']))
	10	+ define('IFRAME_REQUEST', true);
11	11
12	12	/**
13	13	* WordPress Administration Bootstrap.
14	14	*/
15		-require_once( dirname( __FILE__ ) . '/admin.php' );
	15	+require_once(dirname(__FILE__).'/admin.php');
16	16
17		-if ( ! current_user_can('install_plugins') )
	17	+if ( ! current_user_can('install_plugins'))
18	18	wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
19	19
20		-if ( is_multisite() && ! is_network_admin() ) {
21		- wp_redirect( network_admin_url( 'plugin-install.php' ) );
	20	+if (is_multisite() && ! is_network_admin()) {
	21	+ wp_redirect(network_admin_url('plugin-install.php'));
22	22	exit();
23	23	}
24	24
25	25	$wp_list_table = _get_list_table('WP_Plugin_Install_List_Table');
26	26	$pagenum = $wp_list_table->get_pagenum();
27	27
28		-if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
29		- $location = remove_query_arg( '_wp_http_referer', wp_unslash( $_SERVER['REQUEST_URI'] ) );
	28	+if ( ! empty($_REQUEST['_wp_http_referer'])) {
	29	+ $location = remove_query_arg('_wp_http_referer', wp_unslash($_SERVER['REQUEST_URI']));
30	30
31		- if ( ! empty( $_REQUEST['paged'] ) ) {
32		- $location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
	31	+ if ( ! empty($_REQUEST['paged'])) {
	32	+ $location = add_query_arg('paged', (int) $_REQUEST['paged'], $location);
33	33	}
34	34
35		- wp_redirect( $location );
	35	+ wp_redirect($location);
36	36	exit;
37	37	}
38	38
39	39	$wp_list_table->prepare_items();
40	40
41		-$total_pages = $wp_list_table->get_pagination_arg( 'total_pages' );
	41	+$total_pages = $wp_list_table->get_pagination_arg('total_pages');
42	42
43		-if ( $pagenum > $total_pages && $total_pages > 0 ) {
44		- wp_redirect( add_query_arg( 'paged', $total_pages ) );
	43	+if ($pagenum > $total_pages && $total_pages > 0) {
	44	+ wp_redirect(add_query_arg('paged', $total_pages));
45	45	exit;
46	46	}
47	47
48		-$title = __( 'Add Plugins' );
	48	+$title = __('Add Plugins');
49	49	$parent_file = 'plugins.php';
50	50
51		-wp_enqueue_script( 'plugin-install' );
52		-if ( 'plugin-information' != $tab )
	51	+wp_enqueue_script('plugin-install');
	52	+if ('plugin-information' != $tab)
53	53	add_thickbox();
54	54
55	55	$body_id = $tab;
56	56
57		-wp_enqueue_script( 'updates' );
	57	+wp_enqueue_script('updates');
58	58
59	59	/**
60	60	* Fires before each tab on the Install Plugins screen is loaded.
		@@ -64,60 +64,60 @@ discard block
		block discarded – undo
64	64	*
65	65	* @since 2.7.0
66	66	*/
67		-do_action( "install_plugins_pre_$tab" );
	67	+do_action("install_plugins_pre_$tab");
68	68
69		-get_current_screen()->add_help_tab( array(
	69	+get_current_screen()->add_help_tab(array(
70	70	'id' => 'overview',
71	71	'title' => __('Overview'),
72	72	'content' =>
73		- '<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/') . '</p>'
74		-) );
75		-get_current_screen()->add_help_tab( array(
	73	+ '<p>'.sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'https://wordpress.org/plugins/').'</p>'
	74	+));
	75	+get_current_screen()->add_help_tab(array(
76	76	'id' => 'adding-plugins',
77	77	'title' => __('Adding Plugins'),
78	78	'content' =>
79		- '<p>' . __('If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
80		- '<p>' . __('If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
81		- '<p>' . __('You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.') . '</p>' .
82		- '<p>' . __('If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
83		-) );
	79	+ '<p>'.__('If you know what you’re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting popular tags. Tags in larger type mean more plugins have been labeled with that tag.').'</p>'.
	80	+ '<p>'.__('If you just want to get an idea of what’s available, you can browse Featured and Popular plugins by using the links in the upper left of the screen. These sections rotate regularly.').'</p>'.
	81	+ '<p>'.__('You can also browse a user’s favorite plugins, by using the Favorites link in the upper left of the screen and entering their WordPress.org username.').'</p>'.
	82	+ '<p>'.__('If you want to install a plugin that you’ve downloaded elsewhere, click the Upload link in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.').'</p>'
	83	+));
84	84
85	85	get_current_screen()->set_help_sidebar(
86		- '<p><strong>' . __('For more information:') . '</strong></p>' .
87		- '<p>' . __('<a href="https://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>') . '</p>' .
88		- '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
	86	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	87	+ '<p>'.__('<a href="https://codex.wordpress.org/Plugins_Add_New_Screen" target="_blank">Documentation on Installing Plugins</a>').'</p>'.
	88	+ '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
89	89	);
90	90
91		-get_current_screen()->set_screen_reader_content( array(
92		- 'heading_views' => __( 'Filter plugins list' ),
93		- 'heading_pagination' => __( 'Plugins list navigation' ),
94		- 'heading_list' => __( 'Plugins list' ),
95		-) );
	91	+get_current_screen()->set_screen_reader_content(array(
	92	+ 'heading_views' => __('Filter plugins list'),
	93	+ 'heading_pagination' => __('Plugins list navigation'),
	94	+ 'heading_list' => __('Plugins list'),
	95	+));
96	96
97	97	/**
98	98	* WordPress Administration Template Header.
99	99	*/
100		-include(ABSPATH . 'wp-admin/admin-header.php');
	100	+include(ABSPATH.'wp-admin/admin-header.php');
101	101	?>
102	102	<div class="wrap">
103	103	<h1>
104	104	<?php
105		- echo esc_html( $title );
106		- if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
107		- if ( $tab === 'upload' ) {
108		- $href = self_admin_url( 'plugin-install.php' );
109		- $text = _x( 'Browse', 'plugins' );
	105	+ echo esc_html($title);
	106	+ if ( ! empty($tabs['upload']) && current_user_can('upload_plugins')) {
	107	+ if ($tab === 'upload') {
	108	+ $href = self_admin_url('plugin-install.php');
	109	+ $text = _x('Browse', 'plugins');
110	110	} else {
111		- $href = self_admin_url( 'plugin-install.php?tab=upload' );
112		- $text = __( 'Upload Plugin' );
	111	+ $href = self_admin_url('plugin-install.php?tab=upload');
	112	+ $text = __('Upload Plugin');
113	113	}
114		- echo ' <a href="' . $href . '" class="upload page-title-action">' . $text . '</a>';
	114	+ echo ' <a href="'.$href.'" class="upload page-title-action">'.$text.'</a>';
115	115	}
116	116	?>
117	117	</h1>
118	118
119	119	<?php
120		-if ( $tab !== 'upload' ) {
	120	+if ($tab !== 'upload') {
121	121	$wp_list_table->views();
122	122	echo '<br class="clear" />';
123	123	}
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	*
133	133	* @param int $paged The current page number of the plugins list table.
134	134	*/
135		-do_action( "install_plugins_$tab", $paged ); ?>
	135	+do_action("install_plugins_$tab", $paged); ?>
136	136	</div>
137	137
138	138	<?php
		@@ -141,4 +141,4 @@ discard block
		block discarded – undo
141	141	/**
142	142	* WordPress Administration Template Footer.
143	143	*/
144		-include(ABSPATH . 'wp-admin/admin-footer.php');
	144	+include(ABSPATH.'wp-admin/admin-footer.php');

		@@ -13,35 +13,35 @@ discard block
		block discarded – undo
13	13	*
14	14	* @since 2.1.0
15	15	*/
16		-define( 'DOING_AJAX', true );
17		-if ( ! defined( 'WP_ADMIN' ) ) {
18		- define( 'WP_ADMIN', true );
	16	+define('DOING_AJAX', true);
	17	+if ( ! defined('WP_ADMIN')) {
	18	+ define('WP_ADMIN', true);
19	19	}
20	20
21	21	/** Load WordPress Bootstrap */
22		-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
	22	+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
23	23
24	24	/** Allow for cross-domain requests (from the frontend). */
25	25	send_origin_headers();
26	26
27	27	// Require an action parameter
28		-if ( empty( $_REQUEST['action'] ) )
29		- die( '0' );
	28	+if (empty($_REQUEST['action']))
	29	+ die('0');
30	30
31	31	/** Load WordPress Administration APIs */
32		-require_once( ABSPATH . 'wp-admin/includes/admin.php' );
	32	+require_once(ABSPATH.'wp-admin/includes/admin.php');
33	33
34	34	/** Load Ajax Handlers for WordPress Core */
35		-require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
	35	+require_once(ABSPATH.'wp-admin/includes/ajax-actions.php');
36	36
37		-@header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
38		-@header( 'X-Robots-Tag: noindex' );
	37	+@header('Content-Type: text/html; charset='.get_option('blog_charset'));
	38	+@header('X-Robots-Tag: noindex');
39	39
40	40	send_nosniff_header();
41	41	nocache_headers();
42	42
43	43	/** This action is documented in wp-admin/admin.php */
44		-do_action( 'admin_init' );
	44	+do_action('admin_init');
45	45
46	46	$core_actions_get = array(
47	47	'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
		@@ -69,15 +69,15 @@ discard block
		block discarded – undo
69	69	$core_actions_post[] = 'wp-fullscreen-save-post';
70	70
71	71	// Register core Ajax calls.
72		-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
73		- add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
	72	+if ( ! empty($_GET['action']) && in_array($_GET['action'], $core_actions_get))
	73	+ add_action('wp_ajax_'.$_GET['action'], 'wp_ajax_'.str_replace('-', '_', $_GET['action']), 1);
74	74
75		-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
76		- add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
	75	+if ( ! empty($_POST['action']) && in_array($_POST['action'], $core_actions_post))
	76	+ add_action('wp_ajax_'.$_POST['action'], 'wp_ajax_'.str_replace('-', '_', $_POST['action']), 1);
77	77
78		-add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
	78	+add_action('wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1);
79	79
80		-if ( is_user_logged_in() ) {
	80	+if (is_user_logged_in()) {
81	81	/**
82	82	* Fires authenticated AJAX actions for logged-in users.
83	83	*
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	*
87	87	* @since 2.1.0
88	88	*/
89		- do_action( 'wp_ajax_' . $_REQUEST['action'] );
	89	+ do_action('wp_ajax_'.$_REQUEST['action']);
90	90	} else {
91	91	/**
92	92	* Fires non-authenticated AJAX actions for logged-out users.
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96	*
97	97	* @since 2.8.0
98	98	*/
99		- do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
	99	+ do_action('wp_ajax_nopriv_'.$_REQUEST['action']);
100	100	}
101	101	// Default status
102		-die( '0' );
	102	+die('0');

		@@ -25,8 +25,9 @@ discard block
		block discarded – undo
25	25	send_origin_headers();
26	26
27	27	// Require an action parameter
28		-if ( empty( $_REQUEST['action'] ) )
	28	+if ( empty( $_REQUEST['action'] ) ) {
29	29	die( '0' );
	30	+}
30	31
31	32	/** Load WordPress Administration APIs */
32	33	require_once( ABSPATH . 'wp-admin/includes/admin.php' );
		@@ -69,11 +70,13 @@ discard block
		block discarded – undo
69	70	$core_actions_post[] = 'wp-fullscreen-save-post';
70	71
71	72	// Register core Ajax calls.
72		-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) )
	73	+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
73	74	add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 1 );
	75	+}
74	76
75		-if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) )
	77	+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
76	78	add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
	79	+}
77	80
78	81	add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
79	82

		@@ -9,8 +9,9 @@ discard block
		block discarded – undo
9	9	/** WordPress Administration Bootstrap */
10	10	require_once( dirname( __FILE__ ) . '/admin.php' );
11	11
12		-if ( ! current_user_can( 'manage_options' ) )
	12	+if ( ! current_user_can( 'manage_options' ) ) {
13	13	wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
	14	+}
14	15
15	16	$title = __('Writing Settings');
16	17	$parent_file = 'options-general.php';
		@@ -164,9 +165,12 @@ discard block
		block discarded – undo
164	165
165	166	<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
166	167
167		-<?php else : ?>
	168	+<?php else {
	169	+ : ?>
168	170
169		- <p><?php printf(__('WordPress is not notifying any <a href="https://codex.wordpress.org/Update_Services">Update Services</a> because of your site’s <a href="%s">visibility settings</a>.'), 'options-reading.php'); ?></p>
	171	+ <p><?php printf(__('WordPress is not notifying any <a href="https://codex.wordpress.org/Update_Services">Update Services</a> because of your site’s <a href="%s">visibility settings</a>.'), 'options-reading.php');
	172	+}
	173	+?></p>
170	174
171	175	<?php endif; ?>
172	176	<?php } // multisite ?>

		@@ -7,56 +7,56 @@ discard block
		block discarded – undo
7	7	*/
8	8
9	9	/** WordPress Administration Bootstrap */
10		-require_once( dirname( __FILE__ ) . '/admin.php' );
	10	+require_once(dirname(__FILE__).'/admin.php');
11	11
12		-if ( ! current_user_can( 'manage_options' ) )
13		- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
	12	+if ( ! current_user_can('manage_options'))
	13	+ wp_die(__('You do not have sufficient permissions to manage options for this site.'));
14	14
15	15	$title = __('Writing Settings');
16	16	$parent_file = 'options-general.php';
17	17
18		-get_current_screen()->add_help_tab( array(
	18	+get_current_screen()->add_help_tab(array(
19	19	'id' => 'overview',
20	20	'title' => __('Overview'),
21		- 'content' => '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.') . '</p>' .
22		- '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
23		-) );
	21	+ 'content' => '<p>'.__('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within the dashboard, while the rest control external publishing methods. For more information on any of these methods, use the documentation links.').'</p>'.
	22	+ '<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>',
	23	+));
24	24
25	25	/** This filter is documented in wp-admin/options.php */
26		-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
27		- get_current_screen()->add_help_tab( array(
	26	+if (apply_filters('enable_post_by_email_configuration', true)) {
	27	+ get_current_screen()->add_help_tab(array(
28	28	'id' => 'options-postemail',
29		- 'title' => __( 'Post Via Email' ),
30		- 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
31		- ) );
	29	+ 'title' => __('Post Via Email'),
	30	+ 'content' => '<p>'.__('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.').'</p>',
	31	+ ));
32	32	}
33	33
34	34	/** This filter is documented in wp-admin/options-writing.php */
35		-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
36		- get_current_screen()->add_help_tab( array(
	35	+if (apply_filters('enable_update_services_configuration', true)) {
	36	+ get_current_screen()->add_help_tab(array(
37	37	'id' => 'options-services',
38		- 'title' => __( 'Update Services' ),
39		- 'content' => '<p>' . __( 'If desired, WordPress will automatically alert various services of your new posts.' ) . '</p>',
40		- ) );
	38	+ 'title' => __('Update Services'),
	39	+ 'content' => '<p>'.__('If desired, WordPress will automatically alert various services of your new posts.').'</p>',
	40	+ ));
41	41	}
42	42
43	43	get_current_screen()->set_help_sidebar(
44		- '<p><strong>' . __('For more information:') . '</strong></p>' .
45		- '<p>' . __('<a href="https://codex.wordpress.org/Settings_Writing_Screen" target="_blank">Documentation on Writing Settings</a>') . '</p>' .
46		- '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
	44	+ '<p><strong>'.__('For more information:').'</strong></p>'.
	45	+ '<p>'.__('<a href="https://codex.wordpress.org/Settings_Writing_Screen" target="_blank">Documentation on Writing Settings</a>').'</p>'.
	46	+ '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
47	47	);
48	48
49		-include( ABSPATH . 'wp-admin/admin-header.php' );
	49	+include(ABSPATH.'wp-admin/admin-header.php');
50	50	?>
51	51
52	52	<div class="wrap">
53		-<h1><?php echo esc_html( $title ); ?></h1>
	53	+<h1><?php echo esc_html($title); ?></h1>
54	54
55	55	<form method="post" action="options.php">
56	56	<?php settings_fields('writing'); ?>
57	57
58	58	<table class="form-table">
59		-<?php if ( get_site_option( 'initial_db_version' ) < 32453 ) : ?>
	59	+<?php if (get_site_option('initial_db_version') < 32453) : ?>
60	60	<tr>
61	61	<th scope="row"><?php _e('Formatting') ?></th>
62	62	<td><fieldset><legend class="screen-reader-text"><span><?php _e('Formatting') ?></span></legend>
		@@ -77,21 +77,21 @@ discard block
		block discarded – undo
77	77	</tr>
78	78	<?php
79	79	$post_formats = get_post_format_strings();
80		-unset( $post_formats['standard'] );
	80	+unset($post_formats['standard']);
81	81	?>
82	82	<tr>
83	83	<th scope="row"><label for="default_post_format"><?php _e('Default Post Format') ?></label></th>
84	84	<td>
85	85	<select name="default_post_format" id="default_post_format">
86		- <option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
87		-<?php foreach ( $post_formats as $format_slug => $format_name ): ?>
88		- <option<?php selected( get_option( 'default_post_format' ), $format_slug ); ?> value="<?php echo esc_attr( $format_slug ); ?>"><?php echo esc_html( $format_name ); ?></option>
	86	+ <option value="0"><?php echo get_post_format_string('standard'); ?></option>
	87	+<?php foreach ($post_formats as $format_slug => $format_name): ?>
	88	+ <option<?php selected(get_option('default_post_format'), $format_slug); ?> value="<?php echo esc_attr($format_slug); ?>"><?php echo esc_html($format_name); ?></option>
89	89	<?php endforeach; ?>
90	90	</select>
91	91	</td>
92	92	</tr>
93	93	<?php
94		-if ( get_option( 'link_manager_enabled' ) ) :
	94	+if (get_option('link_manager_enabled')) :
95	95	?>
96	96	<tr>
97	97	<th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
		@@ -111,9 +111,9 @@ discard block
		block discarded – undo
111	111
112	112	<?php
113	113	/** This filter is documented in wp-admin/options.php */
114		-if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
	114	+if (apply_filters('enable_post_by_email_configuration', true)) {
115	115	?>
116		-<h2 class="title"><?php _e( 'Post via email' ) ?></h2>
	116	+<h2 class="title"><?php _e('Post via email') ?></h2>
117	117	<p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
118	118
119	119	<table class="form-table">
		@@ -154,15 +154,15 @@ discard block
		block discarded – undo
154	154	*
155	155	* @param bool $enable Whether to enable the Update Services settings area. Default true.
156	156	*/
157		-if ( apply_filters( 'enable_update_services_configuration', true ) ) {
	157	+if (apply_filters('enable_update_services_configuration', true)) {
158	158	?>
159		-<h2 class="title"><?php _e( 'Update Services' ) ?></h2>
	159	+<h2 class="title"><?php _e('Update Services') ?></h2>
160	160
161		-<?php if ( 1 == get_option('blog_public') ) : ?>
	161	+<?php if (1 == get_option('blog_public')) : ?>
162	162
163		-<p><label for="ping_sites"><?php _e( 'When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.' ) ?></label></p>
	163	+<p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="https://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service URLs with line breaks.') ?></label></p>
164	164
165		-<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea( get_option('ping_sites') ); ?></textarea>
	165	+<textarea name="ping_sites" id="ping_sites" class="large-text code" rows="3"><?php echo esc_textarea(get_option('ping_sites')); ?></textarea>
166	166
167	167	<?php else : ?>
168	168
		@@ -177,4 +177,4 @@ discard block
		block discarded – undo
177	177	</form>
178	178	</div>
179	179
180		-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
	180	+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

		@@ -6,9 +6,9 @@ discard block
		block discarded – undo
6	6	* @subpackage Administration
7	7	*/
8	8
9		-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
10		-if ( ! defined( 'WP_ADMIN' ) )
11		- require_once( dirname( __FILE__ ) . '/admin.php' );
	9	+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
	10	+if ( ! defined('WP_ADMIN'))
	11	+ require_once(dirname(__FILE__).'/admin.php');
12	12
13	13	/**
14	14	* In case admin-header.php is included in a function.
		@@ -27,23 +27,23 @@ discard block
		block discarded – undo
27	27	$update_title, $total_update_count, $parent_file;
28	28
29	29	// Catch plugins that include admin-header.php before admin.php completes.
30		-if ( empty( $current_screen ) )
	30	+if (empty($current_screen))
31	31	set_current_screen();
32	32
33	33	get_admin_page_title();
34		-$title = esc_html( strip_tags( $title ) );
	34	+$title = esc_html(strip_tags($title));
35	35
36		-if ( is_network_admin() )
37		- $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
38		-elseif ( is_user_admin() )
39		- $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
	36	+if (is_network_admin())
	37	+ $admin_title = sprintf(__('Network Admin: %s'), esc_html(get_current_site()->site_name));
	38	+elseif (is_user_admin())
	39	+ $admin_title = sprintf(__('User Dashboard: %s'), esc_html(get_current_site()->site_name));
40	40	else
41		- $admin_title = get_bloginfo( 'name' );
	41	+ $admin_title = get_bloginfo('name');
42	42
43		-if ( $admin_title == $title )
44		- $admin_title = sprintf( __( '%1$s — WordPress' ), $title );
	43	+if ($admin_title == $title)
	44	+ $admin_title = sprintf(__('%1$s — WordPress'), $title);
45	45	else
46		- $admin_title = sprintf( __( '%1$s &lsaquo; %2$s — WordPress' ), $title, $admin_title );
	46	+ $admin_title = sprintf(__('%1$s &lsaquo; %2$s — WordPress'), $title, $admin_title);
47	47
48	48	/**
49	49	* Filter the title tag content for an admin page.
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	* @param string $admin_title The page title, with extra context added.
54	54	* @param string $title The original page title.
55	55	*/
56		-$admin_title = apply_filters( 'admin_title', $admin_title, $title );
	56	+$admin_title = apply_filters('admin_title', $admin_title, $title);
57	57
58	58	wp_user_settings();
59	59
		@@ -62,21 +62,21 @@ discard block
		block discarded – undo
62	62	<title><?php echo $admin_title; ?></title>
63	63	<?php
64	64
65		-wp_enqueue_style( 'colors' );
66		-wp_enqueue_style( 'ie' );
	65	+wp_enqueue_style('colors');
	66	+wp_enqueue_style('ie');
67	67	wp_enqueue_script('utils');
68		-wp_enqueue_script( 'svg-painter' );
	68	+wp_enqueue_script('svg-painter');
69	69
70	70	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
71	71	?>
72	72	<script type="text/javascript">
73	73	addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
74		-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
	74	+var ajaxurl = '<?php echo admin_url('admin-ajax.php', 'relative'); ?>',
75	75	pagenow = '<?php echo $current_screen->id; ?>',
76	76	typenow = '<?php echo $current_screen->post_type; ?>',
77	77	adminpage = '<?php echo $admin_body_class; ?>',
78		- thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
79		- decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
	78	+ thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
	79	+ decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
80	80	isRtl = <?php echo (int) is_rtl(); ?>;
81	81	</script>
82	82	<meta name="viewport" content="width=device-width,initial-scale=1.0">
		@@ -89,35 +89,35 @@ discard block
		block discarded – undo
89	89	*
90	90	* @param string $hook_suffix The current admin page.
91	91	*/
92		-do_action( 'admin_enqueue_scripts', $hook_suffix );
	92	+do_action('admin_enqueue_scripts', $hook_suffix);
93	93
94	94	/**
95	95	* Fires when styles are printed for a specific admin page based on $hook_suffix.
96	96	*
97	97	* @since 2.6.0
98	98	*/
99		-do_action( "admin_print_styles-$hook_suffix" );
	99	+do_action("admin_print_styles-$hook_suffix");
100	100
101	101	/**
102	102	* Fires when styles are printed for all admin pages.
103	103	*
104	104	* @since 2.6.0
105	105	*/
106		-do_action( 'admin_print_styles' );
	106	+do_action('admin_print_styles');
107	107
108	108	/**
109	109	* Fires when scripts are printed for a specific admin page based on $hook_suffix.
110	110	*
111	111	* @since 2.1.0
112	112	*/
113		-do_action( "admin_print_scripts-$hook_suffix" );
	113	+do_action("admin_print_scripts-$hook_suffix");
114	114
115	115	/**
116	116	* Fires when scripts are printed for all admin pages.
117	117	*
118	118	* @since 2.1.0
119	119	*/
120		-do_action( 'admin_print_scripts' );
	120	+do_action('admin_print_scripts');
121	121
122	122	/**
123	123	* Fires in head section for a specific admin page.
		@@ -127,45 +127,45 @@ discard block
		block discarded – undo
127	127	*
128	128	* @since 2.1.0
129	129	*/
130		-do_action( "admin_head-$hook_suffix" );
	130	+do_action("admin_head-$hook_suffix");
131	131
132	132	/**
133	133	* Fires in head section for all admin pages.
134	134	*
135	135	* @since 2.1.0
136	136	*/
137		-do_action( 'admin_head' );
	137	+do_action('admin_head');
138	138
139		-if ( get_user_setting('mfold') == 'f' )
	139	+if (get_user_setting('mfold') == 'f')
140	140	$admin_body_class .= ' folded';
141	141
142		-if ( !get_user_setting('unfold') )
	142	+if ( ! get_user_setting('unfold'))
143	143	$admin_body_class .= ' auto-fold';
144	144
145		-if ( is_admin_bar_showing() )
	145	+if (is_admin_bar_showing())
146	146	$admin_body_class .= ' admin-bar';
147	147
148		-if ( is_rtl() )
	148	+if (is_rtl())
149	149	$admin_body_class .= ' rtl';
150	150
151		-if ( $current_screen->post_type )
152		- $admin_body_class .= ' post-type-' . $current_screen->post_type;
	151	+if ($current_screen->post_type)
	152	+ $admin_body_class .= ' post-type-'.$current_screen->post_type;
153	153
154		-if ( $current_screen->taxonomy )
155		- $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
	154	+if ($current_screen->taxonomy)
	155	+ $admin_body_class .= ' taxonomy-'.$current_screen->taxonomy;
156	156
157		-$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
158		-$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
159		-$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
160		-$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
	157	+$admin_body_class .= ' branch-'.str_replace(array('.', ','), '-', floatval($wp_version));
	158	+$admin_body_class .= ' version-'.str_replace('.', '-', preg_replace('/^([.0-9]+).*/', '$1', $wp_version));
	159	+$admin_body_class .= ' admin-color-'.sanitize_html_class(get_user_option('admin_color'), 'fresh');
	160	+$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
161	161
162		-if ( wp_is_mobile() )
	162	+if (wp_is_mobile())
163	163	$admin_body_class .= ' mobile';
164	164
165		-if ( is_multisite() )
	165	+if (is_multisite())
166	166	$admin_body_class .= ' multisite';
167	167
168		-if ( is_network_admin() )
	168	+if (is_network_admin())
169	169	$admin_body_class .= ' network-admin';
170	170
171	171	$admin_body_class .= ' no-customize-support no-svg';
		@@ -187,22 +187,22 @@ discard block
		block discarded – undo
187	187	*
188	188	* @param string $classes Space-separated list of CSS classes.
189	189	*/
190		-$admin_body_classes = apply_filters( 'admin_body_class', '' );
	190	+$admin_body_classes = apply_filters('admin_body_class', '');
191	191	?>
192		-<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
	192	+<body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
193	193	<script type="text/javascript">
194	194	document.body.className = document.body.className.replace('no-js','js');
195	195	</script>
196	196
197	197	<?php
198	198	// Make sure the customize body classes are correct as early as possible.
199		-if ( current_user_can( 'customize' ) ) {
	199	+if (current_user_can('customize')) {
200	200	wp_customize_support_script();
201	201	}
202	202	?>
203	203
204	204	<div id="wpwrap">
205		-<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
	205	+<?php require(ABSPATH.'wp-admin/menu-header.php'); ?>
206	206	<div id="wpcontent">
207	207
208	208	<?php
		@@ -211,14 +211,14 @@ discard block
		block discarded – undo
211	211	*
212	212	* @since 3.0.0
213	213	*/
214		-do_action( 'in_admin_header' );
	214	+do_action('in_admin_header');
215	215	?>
216	216
217	217	<div id="wpbody" role="main">
218	218	<?php
219	219	unset($title_class, $blog_name, $total_update_count, $update_title);
220	220
221		-$current_screen->set_parentage( $parent_file );
	221	+$current_screen->set_parentage($parent_file);
222	222
223	223	?>
224	224
		@@ -227,27 +227,27 @@ discard block
		block discarded – undo
227	227
228	228	$current_screen->render_screen_meta();
229	229
230		-if ( is_network_admin() ) {
	230	+if (is_network_admin()) {
231	231	/**
232	232	* Print network admin screen notices.
233	233	*
234	234	* @since 3.1.0
235	235	*/
236		- do_action( 'network_admin_notices' );
237		-} elseif ( is_user_admin() ) {
	236	+ do_action('network_admin_notices');
	237	+} elseif (is_user_admin()) {
238	238	/**
239	239	* Print user admin screen notices.
240	240	*
241	241	* @since 3.1.0
242	242	*/
243		- do_action( 'user_admin_notices' );
	243	+ do_action('user_admin_notices');
244	244	} else {
245	245	/**
246	246	* Print admin screen notices.
247	247	*
248	248	* @since 3.1.0
249	249	*/
250		- do_action( 'admin_notices' );
	250	+ do_action('admin_notices');
251	251	}
252	252
253	253	/**
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	*
256	256	* @since 3.1.0
257	257	*/
258		-do_action( 'all_admin_notices' );
	258	+do_action('all_admin_notices');
259	259
260		-if ( $parent_file == 'options-general.php' )
261		- require(ABSPATH . 'wp-admin/options-head.php');
	260	+if ($parent_file == 'options-general.php')
	261	+ require(ABSPATH.'wp-admin/options-head.php');

		@@ -7,8 +7,9 @@ discard block
		block discarded – undo
7	7	*/
8	8
9	9	@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
10		-if ( ! defined( 'WP_ADMIN' ) )
	10	+if ( ! defined( 'WP_ADMIN' ) ) {
11	11	require_once( dirname( __FILE__ ) . '/admin.php' );
	12	+}
12	13
13	14	/**
14	15	* In case admin-header.php is included in a function.
		@@ -27,23 +28,26 @@ discard block
		block discarded – undo
27	28	$update_title, $total_update_count, $parent_file;
28	29
29	30	// Catch plugins that include admin-header.php before admin.php completes.
30		-if ( empty( $current_screen ) )
	31	+if ( empty( $current_screen ) ) {
31	32	set_current_screen();
	33	+}
32	34
33	35	get_admin_page_title();
34	36	$title = esc_html( strip_tags( $title ) );
35	37
36		-if ( is_network_admin() )
	38	+if ( is_network_admin() ) {
37	39	$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_current_site()->site_name ) );
38		-elseif ( is_user_admin() )
	40	+} elseif ( is_user_admin() ) {
39	41	$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_current_site()->site_name ) );
40		-else
	42	+} else {
41	43	$admin_title = get_bloginfo( 'name' );
	44	+}
42	45
43		-if ( $admin_title == $title )
	46	+if ( $admin_title == $title ) {
44	47	$admin_title = sprintf( __( '%1$s — WordPress' ), $title );
45		-else
	48	+} else {
46	49	$admin_title = sprintf( __( '%1$s &lsaquo; %2$s — WordPress' ), $title, $admin_title );
	50	+}
47	51
48	52	/**
49	53	* Filter the title tag content for an admin page.
		@@ -136,37 +140,46 @@ discard block
		block discarded – undo
136	140	*/
137	141	do_action( 'admin_head' );
138	142
139		-if ( get_user_setting('mfold') == 'f' )
	143	+if ( get_user_setting('mfold') == 'f' ) {
140	144	$admin_body_class .= ' folded';
	145	+}
141	146
142		-if ( !get_user_setting('unfold') )
	147	+if ( !get_user_setting('unfold') ) {
143	148	$admin_body_class .= ' auto-fold';
	149	+}
144	150
145		-if ( is_admin_bar_showing() )
	151	+if ( is_admin_bar_showing() ) {
146	152	$admin_body_class .= ' admin-bar';
	153	+}
147	154
148		-if ( is_rtl() )
	155	+if ( is_rtl() ) {
149	156	$admin_body_class .= ' rtl';
	157	+}
150	158
151		-if ( $current_screen->post_type )
	159	+if ( $current_screen->post_type ) {
152	160	$admin_body_class .= ' post-type-' . $current_screen->post_type;
	161	+}
153	162
154		-if ( $current_screen->taxonomy )
	163	+if ( $current_screen->taxonomy ) {
155	164	$admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
	165	+}
156	166
157	167	$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
158	168	$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
159	169	$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
160	170	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
161	171
162		-if ( wp_is_mobile() )
	172	+if ( wp_is_mobile() ) {
163	173	$admin_body_class .= ' mobile';
	174	+}
164	175
165		-if ( is_multisite() )
	176	+if ( is_multisite() ) {
166	177	$admin_body_class .= ' multisite';
	178	+}
167	179
168		-if ( is_network_admin() )
	180	+if ( is_network_admin() ) {
169	181	$admin_body_class .= ' network-admin';
	182	+}
170	183
171	184	$admin_body_class .= ' no-customize-support no-svg';
172	185
		@@ -257,5 +270,6 @@ discard block
		block discarded – undo
257	270	*/
258	271	do_action( 'all_admin_notices' );
259	272
260		-if ( $parent_file == 'options-general.php' )
	273	+if ( $parent_file == 'options-general.php' ) {
261	274	require(ABSPATH . 'wp-admin/options-head.php');
	275	+}

		@@ -1,10 +1,10 @@ discard block
		block discarded – undo
1	1	<?php
2	2	/**
3		- * WordPress Administration Template Header
4		- *
5		- * @package WordPress
6		- * @subpackage Administration
7		- */
	3	+ * WordPress Administration Template Header
	4	+ *
	5	+ * @package WordPress
	6	+ * @subpackage Administration
	7	+ */
8	8
9	9	@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
10	10	if ( ! defined( 'WP_ADMIN' ) )
		@@ -207,10 +207,10 @@ discard block
		block discarded – undo
207	207
208	208	<?php
209	209	/**
210		- * Fires at the beginning of the content section in an admin page.
211		- *
212		- * @since 3.0.0
213		- */
	210	+ * Fires at the beginning of the content section in an admin page.
	211	+ *
	212	+ * @since 3.0.0
	213	+ */
214	214	do_action( 'in_admin_header' );
215	215	?>
216	216

		@@ -165,8 +165,7 @@ discard block
		block discarded – undo
165	165	<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'Settings saved and theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div>
166	166	<?php } else { ?>
167	167	<div id="message2" class="updated notice is-dismissible"><p><?php _e( 'New theme activated.' ); ?> <a href="<?php echo home_url( '/' ); ?>"><?php _e( 'Visit site' ); ?></a></p></div><?php
168		- }
169		- elseif ( isset($_GET['deleted']) ) : ?>
	168	+ } elseif ( isset($_GET['deleted']) ) : ?>
170	169	<div id="message3" class="updated notice is-dismissible"><p><?php _e('Theme deleted.') ?></p></div>
171	170	<?php elseif ( isset( $_GET['delete-active-child'] ) ) : ?>
172	171	<div id="message4" class="error"><p><?php _e( 'You cannot delete a theme while it has an active child theme.' ); ?></p></div>
		@@ -190,18 +189,21 @@ discard block
		block discarded – undo
190	189	if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
191	190	foreach ( (array) $submenu['themes.php'] as $item) {
192	191	$class = '';
193		- if ( 'themes.php' == $item[2] \|\| 'theme-editor.php' == $item[2] \|\| 0 === strpos( $item[2], 'customize.php' ) )
194		- continue;
	192	+ if ( 'themes.php' == $item[2] \|\| 'theme-editor.php' == $item[2] \|\| 0 === strpos( $item[2], 'customize.php' ) ) {
	193	+ continue;
	194	+ }
195	195	// 0 = name, 1 = capability, 2 = file
196		- if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) \|\| ($parent_file && ($item[2] == $parent_file)) )
197		- $class = ' current';
	196	+ if ( ( strcmp($self, $item[2]) == 0 && empty($parent_file)) \|\| ($parent_file && ($item[2] == $parent_file)) ) {
	197	+ $class = ' current';
	198	+ }
198	199	if ( !empty($submenu[$item[2]]) ) {
199	200	$submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
200	201	$menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
201		- if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook))
202		- $current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
203		- else
204		- $current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
	202	+ if ( file_exists(WP_PLUGIN_DIR . "/{$submenu[$item[2]][0][2]}") \|\| !empty($menu_hook)) {
	203	+ $current_theme_actions[] = "<a class='button button-secondary$class' href='admin.php?page={$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
	204	+ } else {
	205	+ $current_theme_actions[] = "<a class='button button-secondary$class' href='{$submenu[$item[2]][0][2]}'>{$item[0]}</a>";
	206	+ }
205	207	} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
206	208	$menu_file = $item[2];
207	209
		@@ -240,7 +242,10 @@ discard block
		block discarded – undo
240	242	$aria_action = esc_attr( $theme['id'] . '-action' );
241	243	$aria_name = esc_attr( $theme['id'] . '-name' );
242	244	?>
243		-<div class="theme<?php if ( $theme['active'] ) echo ' active'; ?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
	245	+<div class="theme<?php if ( $theme['active'] ) {
	246	+ echo ' active';
	247	+}
	248	+?>" tabindex="0" aria-describedby="<?php echo $aria_action . ' ' . $aria_name; ?>">
244	249	<?php if ( ! empty( $theme['screenshot'][0] ) ) { ?>
245	250	<div class="theme-screenshot">
246	251	<img src="<?php echo $theme['screenshot'][0]; ?>" alt="" />

ntwb / wordpress

Push — master ( a7cd2a...eabd6c )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +7 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +131 added lines, -131 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +6 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +7 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +56 added lines, -56 removed lines patch added patch discarded remove patch

Braces +31 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +161 added lines, -161 removed lines patch added patch discarded remove patch

Braces +16 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch