ntwb / wordpress

src/wp-admin/network/profile.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * User profile network administration panel.
- *
- * @package WordPress
- * @subpackage Multisite
- * @since 3.1.0
- */
+	 * User profile network administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Multisite
+	 * @since 3.1.0
+	 */
 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/profile.php' );
+require(ABSPATH.'wp-admin/profile.php');

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/profile.php' );

src/wp-admin/network/update-core.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/update-core.php' );
+require(ABSPATH.'wp-admin/update-core.php');

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/update-core.php' );

src/wp-admin/network/plugins.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/plugins.php' );
+require(ABSPATH.'wp-admin/plugins.php');

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/plugins.php' );

src/wp-admin/network/freedoms.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/freedoms.php' );
+require(ABSPATH.'wp-admin/freedoms.php');

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/freedoms.php' );

src/wp-admin/network/about.php

Spacing +4 added lines, -4 removed lines

@@ -8,9 +8,9 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_multisite() )
-	wp_die( __( 'Multisite support is not enabled.' ) );
+if ( ! is_multisite())
+	wp_die(__('Multisite support is not enabled.'));
 
-require( ABSPATH . 'wp-admin/about.php' );
+require(ABSPATH.'wp-admin/about.php');

Braces +2 added lines, -1 removed lines

@@ -10,7 +10,8 @@
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! is_multisite() )
+if ( ! is_multisite() ) {
 	wp_die( __( 'Multisite support is not enabled.' ) );
+}
 
 require( ABSPATH . 'wp-admin/about.php' );

src/wp-admin/credits.php

Spacing +76 added lines, -76 removed lines

@@ -7,9 +7,9 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-$title = __( 'Credits' );
+$title = __('Credits');
 
 /**
  * Retrieve the contributor credits.
@@ -24,23 +24,23 @@ 
 	global $wp_version;
 	$locale = get_locale();
 
-	$results = get_site_transient( 'wordpress_credits_' . $locale );
+	$results = get_site_transient('wordpress_credits_'.$locale);
 
-	if ( ! is_array( $results )
-		|| false !== strpos( $wp_version, '-' )
-		|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
+	if ( ! is_array($results)
+		|| false !== strpos($wp_version, '-')
+		|| (isset($results['data']['version']) && strpos($wp_version, $results['data']['version']) !== 0)
 	) {
-		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
+		$response = wp_remote_get("http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale");
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 			return false;
 
-		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+		$results = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $results ) )
+		if ( ! is_array($results))
 			return false;
 
-		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+		set_site_transient('wordpress_credits_'.$locale, $results, DAY_IN_SECONDS);
 	}
 
 	return $results;
@@ -56,8 +56,8 @@ 
  * @param string $username      The contributor's username.
  * @param string $profiles      URL to the contributor's WordPress.org profile page.
  */
-function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
-	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+function _wp_credits_add_profile_link(&$display_name, $username, $profiles) {
+	$display_name = '<a href="'.esc_url(sprintf($profiles, $username)).'">'.esc_html($display_name).'</a>';
 }
 
 /**
@@ -68,29 +68,29 @@ 
  *
  * @param string &$data External library data, passed by reference.
  */
-function _wp_credits_build_object_link( &$data ) {
-	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+function _wp_credits_build_object_link(&$data) {
+	$data = '<a href="'.esc_url($data[1]).'">'.esc_html($data[0]).'</a>';
 }
 
-list( $display_version ) = explode( '-', $wp_version );
+list($display_version) = explode('-', $wp_version);
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap about-wrap">
 
-<h1><?php printf( __( 'Welcome to WordPress %s' ), $display_version ); ?></h1>
+<h1><?php printf(__('Welcome to WordPress %s'), $display_version); ?></h1>
 
-<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes it even easier to format your content and customize your site.' ), $display_version ); ?></div>
+<div class="about-text"><?php printf(__('Thank you for updating! WordPress %s makes it even easier to format your content and customize your site.'), $display_version); ?></div>
 
-<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 <h2 class="nav-tab-wrapper">
 	<a href="about.php" class="nav-tab">
-		<?php _e( 'What&#8217;s New' ); ?>
+		<?php _e('What&#8217;s New'); ?>
 	</a><a href="credits.php" class="nav-tab nav-tab-active">
-		<?php _e( 'Credits' ); ?>
+		<?php _e('Credits'); ?>
 	</a><a href="freedoms.php" class="nav-tab">
-		<?php _e( 'Freedoms' ); ?>
+		<?php _e('Freedoms'); ?>
 	</a>
 </h2>
 
@@ -98,58 +98,58 @@ 
 
 $credits = wp_credits();
 
-if ( ! $credits ) {
-	echo '<p class="about-description">' . sprintf( __( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
+if ( ! $credits) {
+	echo '<p class="about-description">'.sprintf(__('WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.'),
 		'https://wordpress.org/about/',
 		/* translators: Url to the codex documentation on contributing to WordPress used on the credits page */
-		__( 'https://codex.wordpress.org/Contributing_to_WordPress' ) ) . '</p>';
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+		__('https://codex.wordpress.org/Contributing_to_WordPress')).'</p>';
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
-echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
+echo '<p class="about-description">'.__('WordPress is created by a worldwide team of passionate individuals.')."</p>\n";
 
-foreach ( $credits['groups'] as $group_slug => $group_data ) {
-	if ( $group_data['name'] ) {
-		if ( 'Translators' == $group_data['name'] ) {
+foreach ($credits['groups'] as $group_slug => $group_data) {
+	if ($group_data['name']) {
+		if ('Translators' == $group_data['name']) {
 			// Considered a special slug in the API response. (Also, will never be returned for en_US.)
-			$title = _x( 'Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section' );
-		} elseif ( isset( $group_data['placeholders'] ) ) {
-			$title = vsprintf( translate( $group_data['name'] ), $group_data['placeholders'] );
+			$title = _x('Translators', 'Translate this to be the equivalent of English Translators in your language for the credits page Translators section');
+		} elseif (isset($group_data['placeholders'])) {
+			$title = vsprintf(translate($group_data['name']), $group_data['placeholders']);
 		} else {
-			$title = translate( $group_data['name'] );
+			$title = translate($group_data['name']);
 		}
 
-		echo '<h4 class="wp-people-group">' . esc_html( $title ) . "</h4>\n";
+		echo '<h4 class="wp-people-group">'.esc_html($title)."</h4>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty($group_data['shuffle']))
+		shuffle($group_data['data']); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
-	switch ( $group_data['type'] ) {
+	switch ($group_data['type']) {
 		case 'list' :
-			array_walk( $group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles'] );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_add_profile_link', $credits['data']['profiles']);
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		case 'libraries' :
-			array_walk( $group_data['data'], '_wp_credits_build_object_link' );
-			echo '<p class="wp-credits-list">' . wp_sprintf( '%l.', $group_data['data'] ) . "</p>\n\n";
+			array_walk($group_data['data'], '_wp_credits_build_object_link');
+			echo '<p class="wp-credits-list">'.wp_sprintf('%l.', $group_data['data'])."</p>\n\n";
 			break;
 		default:
 			$compact = 'compact' == $group_data['type'];
-			$classes = 'wp-people-group ' . ( $compact ? 'compact' : '' );
-			echo '<ul class="' . $classes . '" id="wp-people-group-' . $group_slug . '">' . "\n";
-			foreach ( $group_data['data'] as $person_data ) {
-				echo '<li class="wp-person" id="wp-person-' . esc_attr( $person_data[2] ) . '">' . "\n\t";
-				echo '<a href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">';
+			$classes = 'wp-people-group '.($compact ? 'compact' : '');
+			echo '<ul class="'.$classes.'" id="wp-people-group-'.$group_slug.'">'."\n";
+			foreach ($group_data['data'] as $person_data) {
+				echo '<li class="wp-person" id="wp-person-'.esc_attr($person_data[2]).'">'."\n\t";
+				echo '<a href="'.esc_url(sprintf($credits['data']['profiles'], $person_data[2])).'">';
 				$size = 'compact' == $group_data['type'] ? 30 : 60;
-				$data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+				$data = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
 				$size *= 2;
-				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
-				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
-				echo '<a class="web" href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">' . esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				$data2x = get_avatar_data($person_data[1].'@md5.gravatar.com', array('size' => $size));
+				echo '<img src="'.esc_url($data['url']).'" srcset="'.esc_url($data2x['url']).' 2x" class="gravatar" alt="'.esc_attr($person_data[0]).'" /></a>'."\n\t";
+				echo '<a class="web" href="'.esc_url(sprintf($credits['data']['profiles'], $person_data[2])).'">'.esc_html($person_data[0])."</a>\n\t";
+				if ( ! $compact)
+					echo '<span class="title">'.translate($person_data[3])."</span>\n";
 				echo "</li>\n";
 			}
 			echo "</ul>\n";
@@ -158,34 +158,34 @@ 
 }
 
 ?>
-<p class="clear"><?php printf( __( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
+<p class="clear"><?php printf(__('Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.'),
 	/* translators: URL to the Make WordPress 'Get Involved' landing page used on the credits page */
-	__( 'https://make.wordpress.org/' ) ); ?></p>
+	__('https://make.wordpress.org/')); ?></p>
 
 </div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 return;
 
 // These are strings returned by the API that we want to be translatable
-__( 'Project Leaders' );
-__( 'Extended Core Team' );
-__( 'Core Developers' );
-__( 'Recent Rockstars' );
-__( 'Core Contributors to WordPress %s' );
-__( 'Contributing Developers' );
-__( 'Cofounder, Project Lead' );
-__( 'Lead Developer' );
-__( 'Release Lead' );
-__( 'User Experience Lead' );
-__( 'Core Developer' );
-__( 'Core Committer' );
-__( 'Guest Committer' );
-__( 'Developer' );
-__( 'Designer' );
-__( 'XML-RPC' );
-__( 'Internationalization' );
-__( 'External Libraries' );
-__( 'Icon Design' );
+__('Project Leaders');
+__('Extended Core Team');
+__('Core Developers');
+__('Recent Rockstars');
+__('Core Contributors to WordPress %s');
+__('Contributing Developers');
+__('Cofounder, Project Lead');
+__('Lead Developer');
+__('Release Lead');
+__('User Experience Lead');
+__('Core Developer');
+__('Core Committer');
+__('Guest Committer');
+__('Developer');
+__('Designer');
+__('XML-RPC');
+__('Internationalization');
+__('External Libraries');
+__('Icon Design');

Braces +13 added lines, -8 removed lines

@@ -32,13 +32,15 @@ 
 	) {
 		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+					return false;
+		}
 
 		$results = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $results ) )
-			return false;
+		if ( ! is_array( $results ) ) {
+					return false;
+		}
 
 		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
 	}
@@ -123,8 +125,10 @@ 
 		echo '<h4 class="wp-people-group">' . esc_html( $title ) . "</h4>\n";
 	}
 
-	if ( ! empty( $group_data['shuffle'] ) )
-		shuffle( $group_data['data'] ); // We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
+	if ( ! empty( $group_data['shuffle'] ) ) {
+			shuffle( $group_data['data'] );
+	}
+	// We were going to sort by ability to pronounce "hierarchical," but that wouldn't be fair to Matt.
 
 	switch ( $group_data['type'] ) {
 		case 'list' :
@@ -148,8 +152,9 @@ 
 				$data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
 				echo '<img src="' . esc_url( $data['url'] ) . '" srcset="' . esc_url( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
 				echo '<a class="web" href="' . esc_url( sprintf( $credits['data']['profiles'], $person_data[2] ) ) . '">' . esc_html( $person_data[0] ) . "</a>\n\t";
-				if ( ! $compact )
-					echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				if ( ! $compact ) {
+									echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";
+				}
 				echo "</li>\n";
 			}
 			echo "</ul>\n";

src/wp-admin/edit-tags.php

Indentation +7 added lines, -7 removed lines

@@ -402,7 +402,7 @@ 
 if ( current_user_can($tax->cap->edit_terms) ) {
 	if ( 'category' == $taxonomy ) {
 		/**
- 		 * Fires before the Add Category form.
+		 * Fires before the Add Category form.
 		 *
 		 * @since 2.1.0
 		 * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.
@@ -449,12 +449,12 @@ 
 <form id="addtag" method="post" action="edit-tags.php" class="validate"
 <?php
 /**
- * Fires at the beginning of the Add Tag form.
- *
- * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
- *
- * @since 3.7.0
- */
+	 * Fires at the beginning of the Add Tag form.
+	 *
+	 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
+	 *
+	 * @since 3.7.0
+	 */
 do_action( "{$taxonomy}_term_new_form_tag" );
 ?>>
 <input type="hidden" name="action" value="add-tag" />

Switch Indentation +83 added lines, -83 removed lines

@@ -49,119 +49,119 @@
 
 switch ( $wp_list_table->current_action() ) {
 
-case 'add-tag':
+	case 'add-tag':
 
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+		check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->edit_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+		$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
 
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+		if ( $referer = wp_get_original_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $location );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
+		if ( $ret && !is_wp_error( $ret ) )
+			$location = add_query_arg( 'message', 1, $location );
+		else
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
 
-	break;
+		break;
 
-case 'delete':
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+	case 'delete':
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
+		if ( $referer = wp_get_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
-		break;
-	}
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+		$tag_ID = (int) $_REQUEST['tag_ID'];
+		check_admin_referer( 'delete-tag_' . $tag_ID );
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->delete_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	wp_delete_term( $tag_ID, $taxonomy );
+		wp_delete_term( $tag_ID, $taxonomy );
 
-	$location = add_query_arg( 'message', 2, $location );
+		$location = add_query_arg( 'message', 2, $location );
 
-	break;
+		break;
 
-case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+	case 'bulk-delete':
+		check_admin_referer( 'bulk-tags' );
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->delete_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
-	}
+		$tags = (array) $_REQUEST['delete_tags'];
+		foreach ( $tags as $tag_ID ) {
+			wp_delete_term( $tag_ID, $taxonomy );
+		}
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
+		if ( $referer = wp_get_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	$location = add_query_arg( 'message', 6, $location );
+		$location = add_query_arg( 'message', 6, $location );
 
-	break;
+		break;
 
-case 'edit':
-	$title = $tax->labels->edit_item;
+	case 'edit':
+		$title = $tax->labels->edit_item;
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
+		$tag_ID = (int) $_REQUEST['tag_ID'];
 
-	$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-	include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+		$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		include( ABSPATH . 'wp-admin/edit-tag-form.php' );
+		include( ABSPATH . 'wp-admin/admin-footer.php' );
 
-	exit;
+		exit;
 
-case 'editedtag':
-	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+	case 'editedtag':
+		$tag_ID = (int) $_POST['tag_ID'];
+		check_admin_referer( 'update-tag_' . $tag_ID );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+		if ( !current_user_can( $tax->cap->edit_terms ) )
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+		$tag = get_term( $tag_ID, $taxonomy );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+		$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
 
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
-	}
+		if ( $referer = wp_get_original_referer() ) {
+			if ( false !== strpos( $referer, 'edit-tags.php' ) )
+				$location = $referer;
+		}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 3, $location );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
-	break;
+		if ( $ret && !is_wp_error( $ret ) )
+			$location = add_query_arg( 'message', 3, $location );
+		else
+			$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
+		break;
 }
 
 if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {

Spacing +195 added lines, -195 removed lines

@@ -7,18 +7,18 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! $taxnow )
-	wp_die( __( 'Invalid taxonomy' ) );
+if ( ! $taxnow)
+	wp_die(__('Invalid taxonomy'));
 
-$tax = get_taxonomy( $taxnow );
+$tax = get_taxonomy($taxnow);
 
-if ( ! $tax )
-	wp_die( __( 'Invalid taxonomy' ) );
+if ( ! $tax)
+	wp_die(__('Invalid taxonomy'));
 
-if ( ! current_user_can( $tax->cap->manage_terms ) )
-	wp_die( __( 'Cheatin’ uh?' ), 403 );
+if ( ! current_user_can($tax->cap->manage_terms))
+	wp_die(__('Cheatin’ uh?'), 403);
 
 /**
  * $post_type is set when the WP_Terms_List_Table instance is created
@@ -32,10 +32,10 @@ 
 
 $title = $tax->labels->name;
 
-if ( 'post' != $post_type ) {
-	$parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
+if ('post' != $post_type) {
+	$parent_file = ('attachment' == $post_type) ? 'upload.php' : "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type";
-} elseif ( 'link_category' == $tax->name ) {
+} elseif ('link_category' == $tax->name) {
 	$parent_file = 'link-manager.php';
 	$submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
@@ -43,81 +43,81 @@ 
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
+add_screen_option('per_page', array('default' => 20, 'option' => 'edit_'.$tax->name.'_per_page'));
 
 $location = false;
 
-switch ( $wp_list_table->current_action() ) {
+switch ($wp_list_table->current_action()) {
 
 case 'add-tag':
 
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+	check_admin_referer('add-tag', '_wpnonce_add-tag');
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can($tax->cap->edit_terms))
+		wp_die(__('Cheatin’ uh?'), 403);
 
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	$ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
+	$location = 'edit-tags.php?taxonomy='.$taxonomy;
+	if ('post' != $post_type)
+		$location .= '&post_type='.$post_type;
 
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
+	if ($referer = wp_get_original_referer()) {
+		if (false !== strpos($referer, 'edit-tags.php'))
 			$location = $referer;
 	}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $location );
+	if ($ret && ! is_wp_error($ret))
+		$location = add_query_arg('message', 1, $location);
 	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
+		$location = add_query_arg(array('error' => true, 'message' => 4), $location);
 
 	break;
 
 case 'delete':
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
+	$location = 'edit-tags.php?taxonomy='.$taxonomy;
+	if ('post' != $post_type)
+		$location .= '&post_type='.$post_type;
+	if ($referer = wp_get_referer()) {
+		if (false !== strpos($referer, 'edit-tags.php'))
 			$location = $referer;
 	}
 
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+	if ( ! isset($_REQUEST['tag_ID'])) {
 		break;
 	}
 
 	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+	check_admin_referer('delete-tag_'.$tag_ID);
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can($tax->cap->delete_terms))
+		wp_die(__('Cheatin’ uh?'), 403);
 
-	wp_delete_term( $tag_ID, $taxonomy );
+	wp_delete_term($tag_ID, $taxonomy);
 
-	$location = add_query_arg( 'message', 2, $location );
+	$location = add_query_arg('message', 2, $location);
 
 	break;
 
 case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+	check_admin_referer('bulk-tags');
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can($tax->cap->delete_terms))
+		wp_die(__('Cheatin’ uh?'), 403);
 
 	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
+	foreach ($tags as $tag_ID) {
+		wp_delete_term($tag_ID, $taxonomy);
 	}
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
+	$location = 'edit-tags.php?taxonomy='.$taxonomy;
+	if ('post' != $post_type)
+		$location .= '&post_type='.$post_type;
+	if ($referer = wp_get_referer()) {
+		if (false !== strpos($referer, 'edit-tags.php'))
 			$location = $referer;
 	}
 
-	$location = add_query_arg( 'message', 6, $location );
+	$location = add_query_arg('message', 6, $location);
 
 	break;
 
@@ -126,162 +126,162 @@ 
 
 	$tag_ID = (int) $_REQUEST['tag_ID'];
 
-	$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-	include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	$tag = get_term($tag_ID, $taxonomy, OBJECT, 'edit');
+	if ( ! $tag)
+		wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
+	require_once(ABSPATH.'wp-admin/admin-header.php');
+	include(ABSPATH.'wp-admin/edit-tag-form.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
 	exit;
 
 case 'editedtag':
 	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+	check_admin_referer('update-tag_'.$tag_ID);
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( ! current_user_can($tax->cap->edit_terms))
+		wp_die(__('Cheatin’ uh?'), 403);
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	$tag = get_term($tag_ID, $taxonomy);
+	if ( ! $tag)
+		wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+	$ret = wp_update_term($tag_ID, $taxonomy, $_POST);
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	$location = 'edit-tags.php?taxonomy='.$taxonomy;
+	if ('post' != $post_type)
+		$location .= '&post_type='.$post_type;
 
-	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
+	if ($referer = wp_get_original_referer()) {
+		if (false !== strpos($referer, 'edit-tags.php'))
 			$location = $referer;
 	}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 3, $location );
+	if ($ret && ! is_wp_error($ret))
+		$location = add_query_arg('message', 3, $location);
 	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
+		$location = add_query_arg(array('error' => true, 'message' => 5), $location);
 	break;
 }
 
-if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-	$location = remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) );
+if ( ! $location && ! empty($_REQUEST['_wp_http_referer'])) {
+	$location = remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']));
 }
 
-if ( $location ) {
-	if ( ! empty( $_REQUEST['paged'] ) ) {
-		$location = add_query_arg( 'paged', (int) $_REQUEST['paged'], $location );
+if ($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;
 }
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
+if (current_user_can($tax->cap->edit_terms))
 	wp_enqueue_script('inline-edit-tax');
 
-if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
-	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+if ('category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy) {
+	$help = '';
+	if ('category' == $taxonomy)
+		$help = '<p>'.sprintf(__('You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.'), 'options-writing.php').'</p>';
+	elseif ('link_category' == $taxonomy)
+		$help = '<p>'.__('You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.').'</p>';
 	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+		$help = '<p>'.__('You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.').'</p>';
 
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+	if ('link_category' == $taxonomy)
+		$help .= '<p>'.__('You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.').'</p>';
 	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+		$help .= '<p>'.__('What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' => $help,
-	) );
+	));
 
-	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
-			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+	if ('category' == $taxonomy || 'post_tag' == $taxonomy) {
+		if ('category' == $taxonomy)
+			$help = '<p>'.__('When adding a new category on this screen, you&#8217;ll fill in the following fields:').'</p>';
 		else
-			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+			$help = '<p>'.__('When adding a new tag on this screen, you&#8217;ll fill in the following fields:').'</p>';
 
-		$help .= '<ul>' .
-		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
+		$help .= '<ul>'.
+		'<li>'.__('<strong>Name</strong> &mdash; The name is how it appears on your site.').'</li>';
 
-		if ( ! global_terms_enabled() )
-			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		if ( ! global_terms_enabled())
+			$help .= '<li>'.__('<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.').'</li>';
 
-		if ( 'category' == $taxonomy )
-			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		if ('category' == $taxonomy)
+			$help .= '<li>'.__('<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.').'</li>';
 
-		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
-		'</ul>' .
-		'<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
+		$help .= '<li>'.__('<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.').'</li>'.
+		'</ul>'.
+		'<p>'.__('You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.').'</p>';
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'adding-terms',
-			'title'   => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
+			'title'   => 'category' == $taxonomy ? __('Adding Categories') : __('Adding Tags'),
 			'content' => $help,
-		) );
+		));
 	}
 
-	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
+	$help = '<p><strong>'.__('For more information:').'</strong></p>';
 
-	if ( 'category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
+	if ('category' == $taxonomy)
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>').'</p>';
+	elseif ('link_category' == $taxonomy)
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>').'</p>';
 	else
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>').'</p>';
 
-	$help .= '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
+	$help .= '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>';
 
-	get_current_screen()->set_help_sidebar( $help );
+	get_current_screen()->set_help_sidebar($help);
 
-	unset( $help );
+	unset($help);
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( !current_user_can($tax->cap->edit_terms) )
-	wp_die( __('You are not allowed to edit this item.') );
+if ( ! current_user_can($tax->cap->edit_terms))
+	wp_die(__('You are not allowed to edit this item.'));
 
 $messages = array();
 $messages['_item'] = array(
 	0 => '', // Unused. Messages start at index 1.
-	1 => __( 'Item added.' ),
-	2 => __( 'Item deleted.' ),
-	3 => __( 'Item updated.' ),
-	4 => __( 'Item not added.' ),
-	5 => __( 'Item not updated.' ),
-	6 => __( 'Items deleted.' )
+	1 => __('Item added.'),
+	2 => __('Item deleted.'),
+	3 => __('Item updated.'),
+	4 => __('Item not added.'),
+	5 => __('Item not updated.'),
+	6 => __('Items deleted.')
 );
 $messages['category'] = array(
 	0 => '', // Unused. Messages start at index 1.
-	1 => __( 'Category added.' ),
-	2 => __( 'Category deleted.' ),
-	3 => __( 'Category updated.' ),
-	4 => __( 'Category not added.' ),
-	5 => __( 'Category not updated.' ),
-	6 => __( 'Categories deleted.' )
+	1 => __('Category added.'),
+	2 => __('Category deleted.'),
+	3 => __('Category updated.'),
+	4 => __('Category not added.'),
+	5 => __('Category not updated.'),
+	6 => __('Categories deleted.')
 );
 $messages['post_tag'] = array(
 	0 => '', // Unused. Messages start at index 1.
-	1 => __( 'Tag added.' ),
-	2 => __( 'Tag deleted.' ),
-	3 => __( 'Tag updated.' ),
-	4 => __( 'Tag not added.' ),
-	5 => __( 'Tag not updated.' ),
-	6 => __( 'Tags deleted.' )
+	1 => __('Tag added.'),
+	2 => __('Tag deleted.'),
+	3 => __('Tag updated.'),
+	4 => __('Tag not added.'),
+	5 => __('Tag not updated.'),
+	6 => __('Tags deleted.')
 );
 
 /**
@@ -291,35 +291,35 @@ 
  *
  * @param array $messages The messages to be displayed.
  */
-$messages = apply_filters( 'term_updated_messages', $messages );
+$messages = apply_filters('term_updated_messages', $messages);
 
 $message = false;
-if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
-	if ( isset( $messages[ $taxonomy ][ $msg ] ) )
-		$message = $messages[ $taxonomy ][ $msg ];
-	elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) )
-		$message = $messages['_item'][ $msg ];
+if (isset($_REQUEST['message']) && ($msg = (int) $_REQUEST['message'])) {
+	if (isset($messages[$taxonomy][$msg]))
+		$message = $messages[$taxonomy][$msg];
+	elseif ( ! isset($messages[$taxonomy]) && isset($messages['_item'][$msg]))
+		$message = $messages['_item'][$msg];
 }
 
-$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';
+$class = (isset($_REQUEST['error'])) ? 'error' : 'updated';
 
-if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
-	$import_link = admin_url( 'admin.php?import=wpcat2tag' );
+if (is_plugin_active('wpcat2tag-importer/wpcat2tag-importer.php')) {
+	$import_link = admin_url('admin.php?import=wpcat2tag');
 } else {
-	$import_link = admin_url( 'import.php' );
+	$import_link = admin_url('import.php');
 }
 
 ?>
 
 <div class="wrap nosubsub">
-<h1><?php echo esc_html( $title );
-if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+<h1><?php echo esc_html($title);
+if ( ! empty($_REQUEST['s']))
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(wp_unslash($_REQUEST['s']))); ?>
 </h1>
 
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message', 'error'), $_SERVER['REQUEST_URI']);
 endif; ?>
 <div id="ajax-response"></div>
 
@@ -327,7 +327,7 @@ 
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 
-<?php $wp_list_table->search_box( $tax->labels->search_items, 'tag' ); ?>
+<?php $wp_list_table->search_box($tax->labels->search_items, 'tag'); ?>
 
 </form>
 <br class="clear" />
@@ -345,21 +345,21 @@ 
 <br class="clear" />
 </form>
 
-<?php if ( 'category' == $taxonomy ) : ?>
+<?php if ('category' == $taxonomy) : ?>
 <div class="form-wrap">
 <p>
 	<?php
 	/** This filter is documented in wp-includes/category-template.php */
-	printf( __( '<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.' ), apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) );
+	printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_cat_name(get_option('default_category'))));
 	?>
 </p>
-<?php if ( current_user_can( 'import' ) ) : ?>
-<p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ) ?></p>
+<?php if (current_user_can('import')) : ?>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), esc_url($import_link)) ?></p>
 <?php endif; ?>
 </div>
-<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
+<?php elseif ('post_tag' == $taxonomy && current_user_can('import')) : ?>
 <div class="form-wrap">
-<p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ) ;?></p>
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.'), esc_url($import_link)); ?></p>
 </div>
 <?php endif;
 
@@ -372,7 +372,7 @@ 
  *
  * @param string $taxonomy The taxonomy name.
  */
-do_action( "after-{$taxonomy}-table", $taxonomy );
+do_action("after-{$taxonomy}-table", $taxonomy);
 ?>
 
 </div>
@@ -383,24 +383,24 @@ 
 
 <?php
 
-if ( !is_null( $tax->labels->popular_items ) ) {
-	if ( current_user_can( $tax->cap->edit_terms ) )
-		$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) );
+if ( ! is_null($tax->labels->popular_items)) {
+	if (current_user_can($tax->cap->edit_terms))
+		$tag_cloud = wp_tag_cloud(array('taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit'));
 	else
-		$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
+		$tag_cloud = wp_tag_cloud(array('taxonomy' => $taxonomy, 'echo' => false));
 
-	if ( $tag_cloud ) :
+	if ($tag_cloud) :
 	?>
 <div class="tagcloud">
 <h3><?php echo $tax->labels->popular_items; ?></h3>
-<?php echo $tag_cloud; unset( $tag_cloud ); ?>
+<?php echo $tag_cloud; unset($tag_cloud); ?>
 </div>
 <?php
 endif;
 }
 
-if ( current_user_can($tax->cap->edit_terms) ) {
-	if ( 'category' == $taxonomy ) {
+if (current_user_can($tax->cap->edit_terms)) {
+	if ('category' == $taxonomy) {
 		/**
  		 * Fires before the Add Category form.
 		 *
@@ -409,8 +409,8 @@ 
 		 *
 		 * @param object $arg Optional arguments cast to an object.
 		 */
-		do_action( 'add_category_form_pre', (object) array( 'parent' => 0 ) );
-	} elseif ( 'link_category' == $taxonomy ) {
+		do_action('add_category_form_pre', (object) array('parent' => 0));
+	} elseif ('link_category' == $taxonomy) {
 		/**
 		 * Fires before the link category form.
 		 *
@@ -419,7 +419,7 @@ 
 		 *
 		 * @param object $arg Optional arguments cast to an object.
 		 */
-		do_action( 'add_link_category_form_pre', (object) array( 'parent' => 0 ) );
+		do_action('add_link_category_form_pre', (object) array('parent' => 0));
 	} else {
 		/**
 		 * Fires before the Add Tag form.
@@ -429,7 +429,7 @@ 
 		 *
 		 * @param string $taxonomy The taxonomy slug.
 		 */
-		do_action( 'add_tag_form_pre', $taxonomy );
+		do_action('add_tag_form_pre', $taxonomy);
 	}
 
 	/**
@@ -441,7 +441,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( "{$taxonomy}_pre_add_form", $taxonomy );
+	do_action("{$taxonomy}_pre_add_form", $taxonomy);
 ?>
 
 <div class="form-wrap">
@@ -455,7 +455,7 @@ 
  *
  * @since 3.7.0
  */
-do_action( "{$taxonomy}_term_new_form_tag" );
+do_action("{$taxonomy}_term_new_form_tag");
 ?>>
 <input type="hidden" name="action" value="add-tag" />
 <input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
@@ -464,20 +464,20 @@ 
 <?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>
 
 <div class="form-field form-required term-name-wrap">
-	<label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>
+	<label for="tag-name"><?php _ex('Name', 'term name'); ?></label>
 	<input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
 	<p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
-<?php if ( ! global_terms_enabled() ) : ?>
+<?php if ( ! global_terms_enabled()) : ?>
 <div class="form-field term-slug-wrap">
-	<label for="tag-slug"><?php _e( 'Slug' ); ?></label>
+	<label for="tag-slug"><?php _e('Slug'); ?></label>
 	<input name="slug" id="tag-slug" type="text" value="" size="40" />
 	<p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
 <?php endif; // global_terms_enabled() ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if (is_taxonomy_hierarchical($taxonomy)) : ?>
 <div class="form-field term-parent-wrap">
-	<label for="parent"><?php _ex( 'Parent', 'term parent' ); ?></label>
+	<label for="parent"><?php _ex('Parent', 'term parent'); ?></label>
 	<?php
 	$dropdown_args = array(
 		'hide_empty'       => 0,
@@ -486,7 +486,7 @@ 
 		'name'             => 'parent',
 		'orderby'          => 'name',
 		'hierarchical'     => true,
-		'show_option_none' => __( 'None' ),
+		'show_option_none' => __('None'),
 	);
 
 	/**
@@ -510,23 +510,23 @@ 
 	 * @param string $taxonomy The taxonomy slug.
 	 * @param string $context  Filter context. Accepts 'new' or 'edit'.
 	 */
-	$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
+	$dropdown_args = apply_filters('taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new');
 
-	wp_dropdown_categories( $dropdown_args );
+	wp_dropdown_categories($dropdown_args);
 	?>
-	<?php if ( 'category' == $taxonomy ) : // @todo: Generic text for hierarchical taxonomies ?>
+	<?php if ('category' == $taxonomy) : // @todo: Generic text for hierarchical taxonomies ?>
 		<p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
 	<?php endif; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>
 <div class="form-field term-description-wrap">
-	<label for="tag-description"><?php _e( 'Description' ); ?></label>
+	<label for="tag-description"><?php _e('Description'); ?></label>
 	<textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
 	<p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>
 
 <?php
-if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+if ( ! is_taxonomy_hierarchical($taxonomy)) {
 	/**
 	 * Fires after the Add Tag form fields for non-hierarchical taxonomies.
 	 *
@@ -534,7 +534,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form_fields', $taxonomy );
+	do_action('add_tag_form_fields', $taxonomy);
 }
 
 /**
@@ -546,11 +546,11 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form_fields", $taxonomy );
+do_action("{$taxonomy}_add_form_fields", $taxonomy);
 
-submit_button( $tax->labels->add_new_item );
+submit_button($tax->labels->add_new_item);
 
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/**
 	 * Fires at the end of the Edit Category form.
 	 *
@@ -559,8 +559,8 @@ 
 	 *
 	 * @param object $arg Optional arguments cast to an object.
 	 */
-	do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form', (object) array('parent' => 0));
+} elseif ('link_category' == $taxonomy) {
 	/**
 	 * Fires at the end of the Edit Link form.
 	 *
@@ -569,7 +569,7 @@ 
 	 *
 	 * @param object $arg Optional arguments cast to an object.
 	 */
-	do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+	do_action('edit_link_category_form', (object) array('parent' => 0));
 } else {
 	/**
 	 * Fires at the end of the Add Tag form.
@@ -579,7 +579,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form', $taxonomy );
+	do_action('add_tag_form', $taxonomy);
 }
 
 /**
@@ -591,7 +591,7 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form", $taxonomy );
+do_action("{$taxonomy}_add_form", $taxonomy);
 ?>
 </form></div>
 <?php } ?>
@@ -602,7 +602,7 @@ 
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.forms.addtag['tag-name'].focus();}catch(e){}
 </script>
@@ -611,4 +611,4 @@ 
 
 $wp_list_table->inline_edit();
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +108 added lines, -77 removed lines

@@ -9,16 +9,19 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $taxnow )
+if ( ! $taxnow ) {
 	wp_die( __( 'Invalid taxonomy' ) );
+}
 
 $tax = get_taxonomy( $taxnow );
 
-if ( ! $tax )
+if ( ! $tax ) {
 	wp_die( __( 'Invalid taxonomy' ) );
+}
 
-if ( ! current_user_can( $tax->cap->manage_terms ) )
+if ( ! current_user_can( $tax->cap->manage_terms ) ) {
 	wp_die( __( 'Cheatin’ uh?' ), 403 );
+}
 
 /**
  * $post_type is set when the WP_Terms_List_Table instance is created
@@ -53,33 +56,39 @@ 
 
 	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( !current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
 
 	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
 	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	if ( 'post' != $post_type ) {
+			$location .= '&post_type=' . $post_type;
+	}
 
 	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
+		if ( false !== strpos( $referer, 'edit-tags.php' ) ) {
+					$location = $referer;
+		}
 	}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $location );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
+	if ( $ret && !is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 1, $location );
+	} else {
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $location );
+	}
 
 	break;
 
 case 'delete':
 	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	if ( 'post' != $post_type ) {
+			$location .= '&post_type=' . $post_type;
+	}
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
+		if ( false !== strpos( $referer, 'edit-tags.php' ) ) {
+					$location = $referer;
+		}
 	}
 
 	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
@@ -89,8 +98,9 @@ 
 	$tag_ID = (int) $_REQUEST['tag_ID'];
 	check_admin_referer( 'delete-tag_' . $tag_ID );
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( !current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
 
 	wp_delete_term( $tag_ID, $taxonomy );
 
@@ -101,8 +111,9 @@ 
 case 'bulk-delete':
 	check_admin_referer( 'bulk-tags' );
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( !current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
 
 	$tags = (array) $_REQUEST['delete_tags'];
 	foreach ( $tags as $tag_ID ) {
@@ -110,11 +121,13 @@ 
 	}
 
 	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	if ( 'post' != $post_type ) {
+			$location .= '&post_type=' . $post_type;
+	}
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
+		if ( false !== strpos( $referer, 'edit-tags.php' ) ) {
+					$location = $referer;
+		}
 	}
 
 	$location = add_query_arg( 'message', 6, $location );
@@ -127,8 +140,9 @@ 
 	$tag_ID = (int) $_REQUEST['tag_ID'];
 
 	$tag = get_term( $tag_ID, $taxonomy, OBJECT, 'edit' );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $tag ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	include( ABSPATH . 'wp-admin/edit-tag-form.php' );
 	include( ABSPATH . 'wp-admin/admin-footer.php' );
@@ -139,28 +153,33 @@ 
 	$tag_ID = (int) $_POST['tag_ID'];
 	check_admin_referer( 'update-tag_' . $tag_ID );
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( __( 'Cheatin’ uh?' ), 403 );
+	if ( !current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die( __( 'Cheatin’ uh?' ), 403 );
+	}
 
 	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $tag ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 
 	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
 	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+	if ( 'post' != $post_type ) {
+			$location .= '&post_type=' . $post_type;
+	}
 
 	if ( $referer = wp_get_original_referer() ) {
-		if ( false !== strpos( $referer, 'edit-tags.php' ) )
-			$location = $referer;
+		if ( false !== strpos( $referer, 'edit-tags.php' ) ) {
+					$location = $referer;
+		}
 	}
 
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 3, $location );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
+	if ( $ret && !is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 3, $location );
+	} else {
+			$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $location );
+	}
 	break;
 }
 
@@ -185,22 +204,25 @@ 
 }
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
+if ( current_user_can($tax->cap->edit_terms) ) {
 	wp_enqueue_script('inline-edit-tax');
+}
 
 if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
 	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
-	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
-
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
-	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	if ( 'category' == $taxonomy ) {
+			$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
+			$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+	} else {
+			$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+	}
+
+	if ( 'link_category' == $taxonomy ) {
+			$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+	} else {
+			$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	}
 
 	get_current_screen()->add_help_tab( array(
 		'id'      => 'overview',
@@ -209,19 +231,22 @@ 
 	) );
 
 	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
-			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
-		else
-			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		if ( 'category' == $taxonomy ) {
+					$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		} else {
+					$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		}
 
 		$help .= '<ul>' .
 		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
 
-		if ( ! global_terms_enabled() )
-			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		if ( ! global_terms_enabled() ) {
+					$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		}
 
-		if ( 'category' == $taxonomy )
-			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		if ( 'category' == $taxonomy ) {
+					$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		}
 
 		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
 		'</ul>' .
@@ -236,12 +261,13 @@ 
 
 	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
-	if ( 'category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
-	else
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';
+	if ( 'category' == $taxonomy ) {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen" target="_blank">Documentation on Categories</a>' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen" target="_blank">Documentation on Link Categories</a>' ) . '</p>';
+	} else {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen" target="_blank">Documentation on Tags</a>' ) . '</p>';
+	}
 
 	$help .= '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>';
 
@@ -252,8 +278,9 @@ 
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-if ( !current_user_can($tax->cap->edit_terms) )
+if ( !current_user_can($tax->cap->edit_terms) ) {
 	wp_die( __('You are not allowed to edit this item.') );
+}
 
 $messages = array();
 $messages['_item'] = array(
@@ -295,11 +322,12 @@ 
 
 $message = false;
 if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
-	if ( isset( $messages[ $taxonomy ][ $msg ] ) )
-		$message = $messages[ $taxonomy ][ $msg ];
-	elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) )
-		$message = $messages['_item'][ $msg ];
-}
+	if ( isset( $messages[ $taxonomy ][ $msg ] ) ) {
+			$message = $messages[ $taxonomy ][ $msg ];
+	} elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) {
+			$message = $messages['_item'][ $msg ];
+	}
+	}
 
 $class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';
 
@@ -313,8 +341,10 @@ 
 
 <div class="wrap nosubsub">
 <h1><?php echo esc_html( $title );
-if ( !empty($_REQUEST['s']) )
-	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
+if ( !empty($_REQUEST['s']) ) {
+	printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) );
+}
+?>
 </h1>
 
 <?php if ( $message ) : ?>
@@ -384,10 +414,11 @@ 
 <?php
 
 if ( !is_null( $tax->labels->popular_items ) ) {
-	if ( current_user_can( $tax->cap->edit_terms ) )
-		$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) );
-	else
-		$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
+	if ( current_user_can( $tax->cap->edit_terms ) ) {
+			$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) );
+	} else {
+			$tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
+	}
 
 	if ( $tag_cloud ) :
 	?>

src/wp-admin/ms-admin.php

Spacing +2 added lines, -2 removed lines

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

src/wp-admin/plugin-editor.php

Switch Indentation +147 added lines, -147 removed lines

@@ -54,161 +54,161 @@ 
 
 switch ( $action ) {
 
-case 'update':
+	case 'update':
 
-	check_admin_referer('edit-plugin_' . $file);
+		check_admin_referer('edit-plugin_' . $file);
 
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	if ( is_writeable($real_file) ) {
-		$f = fopen($real_file, 'w+');
-		fwrite($f, $newcontent);
-		fclose($f);
+		$newcontent = wp_unslash( $_POST['newcontent'] );
+		if ( is_writeable($real_file) ) {
+			$f = fopen($real_file, 'w+');
+			fwrite($f, $newcontent);
+			fclose($f);
 
-		$network_wide = is_plugin_active_for_network( $file );
+			$network_wide = is_plugin_active_for_network( $file );
 
-		// Deactivate so we can test it.
-		if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
-			if ( is_plugin_active($file) )
-				deactivate_plugins($file, true);
+			// Deactivate so we can test it.
+			if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
+				if ( is_plugin_active($file) )
+					deactivate_plugins($file, true);
 
-			if ( ! is_network_admin() )
-				update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+				if ( ! is_network_admin() )
+					update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
 
-			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
-			exit;
+				wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
+				exit;
+			}
+			wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+		} else {
+			wp_redirect( self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
 		}
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
-	} else {
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
-	}
-	exit;
+		exit;
 
-default:
+	default:
 
-	if ( isset($_GET['liveupdate']) ) {
-		check_admin_referer('edit-plugin-test_' . $file);
+		if ( isset($_GET['liveupdate']) ) {
+			check_admin_referer('edit-plugin-test_' . $file);
 
-		$error = validate_plugin($file);
-		if ( is_wp_error($error) )
-			wp_die( $error );
+			$error = validate_plugin($file);
+			if ( is_wp_error($error) )
+				wp_die( $error );
 
-		if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
-			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
+			if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
+				activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
 
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
-		exit;
-	}
+			wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+			exit;
+		}
 
-	// List of allowable extensions
-	$editable_extensions = array('php', 'txt', 'text', 'js', 'css', 'html', 'htm', 'xml', 'inc', 'include');
+		// List of allowable extensions
+		$editable_extensions = array('php', 'txt', 'text', 'js', 'css', 'html', 'htm', 'xml', 'inc', 'include');
 
-	/**
+		/**
 	 * Filter file type extensions editable in the plugin editor.
 	 *
 	 * @since 2.8.0
 	 *
 	 * @param array $editable_extensions An array of editable plugin file extensions.
 	 */
-	$editable_extensions = (array) apply_filters( 'editable_extensions', $editable_extensions );
+		$editable_extensions = (array) apply_filters( 'editable_extensions', $editable_extensions );
 
-	if ( ! is_file($real_file) ) {
-		wp_die(sprintf('<p>%s</p>', __('No such file exists! Double check the name and try again.')));
-	} else {
-		// Get the extension of the file
-		if ( preg_match('/\.([^.]+)$/', $real_file, $matches) ) {
-			$ext = strtolower($matches[1]);
-			// If extension is not in the acceptable list, skip it
-			if ( !in_array( $ext, $editable_extensions) )
-				wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
+		if ( ! is_file($real_file) ) {
+			wp_die(sprintf('<p>%s</p>', __('No such file exists! Double check the name and try again.')));
+		} else {
+			// Get the extension of the file
+			if ( preg_match('/\.([^.]+)$/', $real_file, $matches) ) {
+				$ext = strtolower($matches[1]);
+				// If extension is not in the acceptable list, skip it
+				if ( !in_array( $ext, $editable_extensions) )
+					wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
+			}
 		}
-	}
-
-	get_current_screen()->add_help_tab( array(
-	'id'		=> 'overview',
-	'title'		=> __('Overview'),
-	'content'	=>
-		'<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
-		'<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
-		'<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.') . '</p>' .
-		'<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>' .
-		'<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
-		( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
-	) );
-
-	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Editor_Screen" target="_blank">Documentation on Editing Plugins</a>') . '</p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing Plugins</a>') . '</p>' .
-		'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-	);
-
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
-
-	update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
-
-	$content = file_get_contents( $real_file );
-
-	if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
-		$functions = wp_doc_link_parse( $content );
-
-		if ( !empty($functions) ) {
-			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function) {
-				$docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';
+
+		get_current_screen()->add_help_tab( array(
+		'id'		=> 'overview',
+		'title'		=> __('Overview'),
+		'content'	=>
+			'<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
+			'<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
+			'<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.') . '</p>' .
+			'<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>' .
+			'<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
+			( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
+		) );
+
+		get_current_screen()->set_help_sidebar(
+			'<p><strong>' . __('For more information:') . '</strong></p>' .
+			'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Editor_Screen" target="_blank">Documentation on Editing Plugins</a>') . '</p>' .
+			'<p>' . __('<a href="https://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing Plugins</a>') . '</p>' .
+			'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+		);
+
+		require_once(ABSPATH . 'wp-admin/admin-header.php');
+
+		update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
+
+		$content = file_get_contents( $real_file );
+
+		if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
+			$functions = wp_doc_link_parse( $content );
+
+			if ( !empty($functions) ) {
+				$docs_select = '<select name="docs-list" id="docs-list">';
+				$docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';
+				foreach ( $functions as $function) {
+					$docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';
+				}
+				$docs_select .= '</select>';
 			}
-			$docs_select .= '</select>';
 		}
-	}
 
-	$content = esc_textarea( $content );
-	?>
-<?php if (isset($_GET['a'])) : ?>
- <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
-<?php elseif (isset($_GET['phperror'])) : ?>
- <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
+		$content = esc_textarea( $content );
+		?>
+	<?php if (isset($_GET['a'])) : ?>
+	 <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
+	<?php elseif (isset($_GET['phperror'])) : ?>
+	 <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
 	<?php
-		if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
-	<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo esc_attr($file); ?>&amp;_wpnonce=<?php echo esc_attr($_GET['_error_nonce']); ?>"></iframe>
+			if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
+		<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo esc_attr($file); ?>&amp;_wpnonce=<?php echo esc_attr($_GET['_error_nonce']); ?>"></iframe>
 	<?php } ?>
-</div>
-<?php endif; ?>
+	</div>
+	<?php endif; ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
 <big><?php
-	if ( is_plugin_active($plugin) ) {
-		if ( is_writeable($real_file) )
-			echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
-		else
-			echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
-	} else {
-		if ( is_writeable($real_file) )
-			echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
-		else
-			echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
-	}
-	?></big>
+		if ( is_plugin_active($plugin) ) {
+			if ( is_writeable($real_file) )
+				echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
+			else
+				echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
+		} else {
+			if ( is_writeable($real_file) )
+				echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
+			else
+				echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
+		}
+		?></big>
 </div>
 <div class="alignright">
 	<form action="plugin-editor.php" method="post">
 		<strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong>
 		<select name="plugin" id="plugin">
 <?php
-	foreach ( $plugins as $plugin_key => $a_plugin ) {
-		$plugin_name = $a_plugin['Name'];
-		if ( $plugin_key == $plugin )
-			$selected = " selected='selected'";
-		else
-			$selected = '';
-		$plugin_name = esc_attr($plugin_name);
-		$plugin_key = esc_attr($plugin_key);
-		echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
-	}
-?>
-		</select>
+		foreach ( $plugins as $plugin_key => $a_plugin ) {
+			$plugin_name = $a_plugin['Name'];
+			if ( $plugin_key == $plugin )
+				$selected = " selected='selected'";
+			else
+				$selected = '';
+			$plugin_name = esc_attr($plugin_name);
+			$plugin_key = esc_attr($plugin_key);
+			echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
+		}
+	?>
+			</select>
 		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
 	</form>
 </div>
@@ -220,50 +220,50 @@ 
 
 	<ul>
 <?php
-foreach ( $plugin_files as $plugin_file ) :
-	// Get the extension of the file
-	if ( preg_match('/\.([^.]+)$/', $plugin_file, $matches) ) {
-		$ext = strtolower($matches[1]);
-		// If extension is not in the acceptable list, skip it
-		if ( !in_array( $ext, $editable_extensions ) )
+	foreach ( $plugin_files as $plugin_file ) :
+		// Get the extension of the file
+		if ( preg_match('/\.([^.]+)$/', $plugin_file, $matches) ) {
+			$ext = strtolower($matches[1]);
+			// If extension is not in the acceptable list, skip it
+			if ( !in_array( $ext, $editable_extensions ) )
+				continue;
+		} else {
+			// No extension found
 			continue;
-	} else {
-		// No extension found
-		continue;
-	}
-?>
-		<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo $plugin_file ?></a></li>
-<?php endforeach; ?>
+		}
+	?>
+			<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo $plugin_file ?></a></li>
+	<?php endforeach; ?>
 	</ul>
 </div>
 <form name="template" id="template" action="plugin-editor.php" method="post">
 	<?php wp_nonce_field('edit-plugin_' . $file) ?>
-		<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
+			<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
 		<input type="hidden" name="plugin" value="<?php echo esc_attr($plugin) ?>" />
 		<input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
 		</div>
 		<?php if ( !empty( $docs_select ) ) : ?>
-		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
+			<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
 		<?php endif; ?>
-<?php if ( is_writeable($real_file) ) : ?>
-	<?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
-		<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
+	<?php if ( is_writeable($real_file) ) : ?>
+		<?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
+			<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
 	<?php } ?>
-	<p class="submit">
+		<p class="submit">
 	<?php
-		if ( isset($_GET['phperror']) ) {
-			echo "<input type='hidden' name='phperror' value='1' />";
-			submit_button( __( 'Update File and Attempt to Reactivate' ), 'primary', 'submit', false );
-		} else {
-			submit_button( __( 'Update File' ), 'primary', 'submit', false );
-		}
-	?>
-	</p>
-<?php else : ?>
-	<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
-<?php endif; ?>
+			if ( isset($_GET['phperror']) ) {
+				echo "<input type='hidden' name='phperror' value='1' />";
+				submit_button( __( 'Update File and Attempt to Reactivate' ), 'primary', 'submit', false );
+			} else {
+				submit_button( __( 'Update File' ), 'primary', 'submit', false );
+			}
+		?>
+		</p>
+	<?php else : ?>
+		<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
+	<?php endif; ?>
 </form>
 <br class="clear" />
 </div>
@@ -274,6 +274,6 @@ 
 });
 </script>
 <?php
-	break;
+		break;
 }
 include(ABSPATH . "wp-admin/admin-footer.php");

Spacing +81 added lines, -81 removed lines

@@ -7,95 +7,95 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'plugin-editor.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('plugin-editor.php'));
 	exit();
 }
 
-if ( !current_user_can('edit_plugins') )
-	wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
+if ( ! current_user_can('edit_plugins'))
+	wp_die(__('You do not have sufficient permissions to edit plugins for this site.'));
 
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
 
-wp_reset_vars( array( 'action', 'error', 'file', 'plugin' ) );
+wp_reset_vars(array('action', 'error', 'file', 'plugin'));
 
 $plugins = get_plugins();
 
-if ( empty( $plugins ) ) {
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+if (empty($plugins)) {
+	include(ABSPATH.'wp-admin/admin-header.php');
 	?>
 	<div class="wrap">
-		<h1><?php echo esc_html( $title ); ?></h1>
-		<div id="message" class="error"><p><?php _e( 'You do not appear to have any plugins available at this time.' ); ?></p></div>
+		<h1><?php echo esc_html($title); ?></h1>
+		<div id="message" class="error"><p><?php _e('You do not appear to have any plugins available at this time.'); ?></p></div>
 	</div>
 	<?php
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
-if ( $file ) {
+if ($file) {
 	$plugin = $file;
-} elseif ( empty( $plugin ) ) {
+} elseif (empty($plugin)) {
 	$plugin = array_keys($plugins);
 	$plugin = $plugin[0];
 }
 
 $plugin_files = get_plugin_files($plugin);
 
-if ( empty($file) )
+if (empty($file))
 	$file = $plugin_files[0];
 
 $file = validate_file_to_edit($file, $plugin_files);
-$real_file = WP_PLUGIN_DIR . '/' . $file;
+$real_file = WP_PLUGIN_DIR.'/'.$file;
 $scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
-switch ( $action ) {
+switch ($action) {
 
 case 'update':
 
-	check_admin_referer('edit-plugin_' . $file);
+	check_admin_referer('edit-plugin_'.$file);
 
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	if ( is_writeable($real_file) ) {
+	$newcontent = wp_unslash($_POST['newcontent']);
+	if (is_writeable($real_file)) {
 		$f = fopen($real_file, 'w+');
 		fwrite($f, $newcontent);
 		fclose($f);
 
-		$network_wide = is_plugin_active_for_network( $file );
+		$network_wide = is_plugin_active_for_network($file);
 
 		// Deactivate so we can test it.
-		if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
-			if ( is_plugin_active($file) )
+		if (is_plugin_active($file) || isset($_POST['phperror'])) {
+			if (is_plugin_active($file))
 				deactivate_plugins($file, true);
 
-			if ( ! is_network_admin() )
-				update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin())
+				update_option('recently_activated', array($file => time()) + (array) get_option('recently_activated'));
 
-			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
+			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_'.$file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=".$network_wide));
 			exit;
 		}
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+		wp_redirect(self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto"));
 	} else {
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto") );
+		wp_redirect(self_admin_url("plugin-editor.php?file=$file&scrollto=$scrollto"));
 	}
 	exit;
 
 default:
 
-	if ( isset($_GET['liveupdate']) ) {
-		check_admin_referer('edit-plugin-test_' . $file);
+	if (isset($_GET['liveupdate'])) {
+		check_admin_referer('edit-plugin-test_'.$file);
 
 		$error = validate_plugin($file);
-		if ( is_wp_error($error) )
-			wp_die( $error );
+		if (is_wp_error($error))
+			wp_die($error);
 
-		if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
-			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
+		if (( ! empty($_GET['networkwide']) && ! is_plugin_active_for_network($file)) || ! is_plugin_active($file))
+			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty($_GET['networkwide'])); // we'll override this later if the plugin can be included without fatal error
 
-		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
+		wp_redirect(self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto"));
 		exit;
 	}
 
@@ -109,83 +109,83 @@ 
 	 *
 	 * @param array $editable_extensions An array of editable plugin file extensions.
 	 */
-	$editable_extensions = (array) apply_filters( 'editable_extensions', $editable_extensions );
+	$editable_extensions = (array) apply_filters('editable_extensions', $editable_extensions);
 
-	if ( ! is_file($real_file) ) {
+	if ( ! is_file($real_file)) {
 		wp_die(sprintf('<p>%s</p>', __('No such file exists! Double check the name and try again.')));
 	} else {
 		// Get the extension of the file
-		if ( preg_match('/\.([^.]+)$/', $real_file, $matches) ) {
+		if (preg_match('/\.([^.]+)$/', $real_file, $matches)) {
 			$ext = strtolower($matches[1]);
 			// If extension is not in the acceptable list, skip it
-			if ( !in_array( $ext, $editable_extensions) )
+			if ( ! in_array($ext, $editable_extensions))
 				wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
 		}
 	}
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 	'id'		=> 'overview',
 	'title'		=> __('Overview'),
 	'content'	=>
-		'<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
-		'<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
-		'<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.') . '</p>' .
-		'<p id="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>' .
-		'<p>' . __('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.') . '</p>' .
-		( is_network_admin() ? '<p>' . __('Any edits to files from this screen will be reflected on all sites in the network.') . '</p>' : '' )
-	) );
+		'<p>'.__('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.').'</p>'.
+		'<p>'.__('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.').'</p>'.
+		'<p>'.__('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Look Up takes you to a web page about that particular function.').'</p>'.
+		'<p id="newcontent-description">'.__('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.').'</p>'.
+		'<p>'.__('If you want to make changes but don&#8217;t want them to be overwritten when the plugin is updated, you may be ready to think about writing your own plugin. For information on how to edit plugins, write your own from scratch, or just better understand their anatomy, check out the links below.').'</p>'.
+		(is_network_admin() ? '<p>'.__('Any edits to files from this screen will be reflected on all sites in the network.').'</p>' : '')
+	));
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __('For more information:') . '</strong></p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Plugins_Editor_Screen" target="_blank">Documentation on Editing Plugins</a>') . '</p>' .
-		'<p>' . __('<a href="https://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing 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_Editor_Screen" target="_blank">Documentation on Editing Plugins</a>').'</p>'.
+		'<p>'.__('<a href="https://codex.wordpress.org/Writing_a_Plugin" target="_blank">Documentation on Writing Plugins</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
-	require_once(ABSPATH . 'wp-admin/admin-header.php');
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
+	update_recently_edited(WP_PLUGIN_DIR.'/'.$file);
 
-	$content = file_get_contents( $real_file );
+	$content = file_get_contents($real_file);
 
-	if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
-		$functions = wp_doc_link_parse( $content );
+	if ('.php' == substr($real_file, strrpos($real_file, '.'))) {
+		$functions = wp_doc_link_parse($content);
 
-		if ( !empty($functions) ) {
+		if ( ! empty($functions)) {
 			$docs_select = '<select name="docs-list" id="docs-list">';
-			$docs_select .= '<option value="">' . __( 'Function Name&hellip;' ) . '</option>';
-			foreach ( $functions as $function) {
-				$docs_select .= '<option value="' . esc_attr( $function ) . '">' . esc_html( $function ) . '()</option>';
+			$docs_select .= '<option value="">'.__('Function Name&hellip;').'</option>';
+			foreach ($functions as $function) {
+				$docs_select .= '<option value="'.esc_attr($function).'">'.esc_html($function).'()</option>';
 			}
 			$docs_select .= '</select>';
 		}
 	}
 
-	$content = esc_textarea( $content );
+	$content = esc_textarea($content);
 	?>
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
 <?php elseif (isset($_GET['phperror'])) : ?>
  <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
 	<?php
-		if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
+		if (wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_'.$file)) { ?>
 	<iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo esc_attr($file); ?>&amp;_wpnonce=<?php echo esc_attr($_GET['_error_nonce']); ?>"></iframe>
 	<?php } ?>
 </div>
 <?php endif; ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <div class="fileedit-sub">
 <div class="alignleft">
 <big><?php
-	if ( is_plugin_active($plugin) ) {
-		if ( is_writeable($real_file) )
+	if (is_plugin_active($plugin)) {
+		if (is_writeable($real_file))
 			echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
 		else
 			echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
 	} else {
-		if ( is_writeable($real_file) )
+		if (is_writeable($real_file))
 			echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
 		else
 			echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
@@ -197,9 +197,9 @@ 
 		<strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong>
 		<select name="plugin" id="plugin">
 <?php
-	foreach ( $plugins as $plugin_key => $a_plugin ) {
+	foreach ($plugins as $plugin_key => $a_plugin) {
 		$plugin_name = $a_plugin['Name'];
-		if ( $plugin_key == $plugin )
+		if ($plugin_key == $plugin)
 			$selected = " selected='selected'";
 		else
 			$selected = '';
@@ -209,7 +209,7 @@ 
 	}
 ?>
 		</select>
-		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
+		<?php submit_button(__('Select'), 'button', 'Submit', false); ?>
 	</form>
 </div>
 <br class="clear" />
@@ -220,44 +220,44 @@ 
 
 	<ul>
 <?php
-foreach ( $plugin_files as $plugin_file ) :
+foreach ($plugin_files as $plugin_file) :
 	// Get the extension of the file
-	if ( preg_match('/\.([^.]+)$/', $plugin_file, $matches) ) {
+	if (preg_match('/\.([^.]+)$/', $plugin_file, $matches)) {
 		$ext = strtolower($matches[1]);
 		// If extension is not in the acceptable list, skip it
-		if ( !in_array( $ext, $editable_extensions ) )
+		if ( ! in_array($ext, $editable_extensions))
 			continue;
 	} else {
 		// No extension found
 		continue;
 	}
 ?>
-		<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo $plugin_file ?></a></li>
+		<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode($plugin_file) ?>&amp;plugin=<?php echo urlencode($plugin) ?>"><?php echo $plugin_file ?></a></li>
 <?php endforeach; ?>
 	</ul>
 </div>
 <form name="template" id="template" action="plugin-editor.php" method="post">
-	<?php wp_nonce_field('edit-plugin_' . $file) ?>
+	<?php wp_nonce_field('edit-plugin_'.$file) ?>
 		<div><textarea cols="70" rows="25" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="file" value="<?php echo esc_attr($file) ?>" />
 		<input type="hidden" name="plugin" value="<?php echo esc_attr($plugin) ?>" />
 		<input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
 		</div>
-		<?php if ( !empty( $docs_select ) ) : ?>
-		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Look Up' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
+		<?php if ( ! empty($docs_select)) : ?>
+		<div id="documentation" class="hide-if-no-js"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e('Look Up') ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode(get_locale()) ?>&amp;version=<?php echo urlencode($wp_version) ?>&amp;redirect=true'); }" /></div>
 		<?php endif; ?>
-<?php if ( is_writeable($real_file) ) : ?>
-	<?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
+<?php if (is_writeable($real_file)) : ?>
+	<?php if (in_array($file, (array) get_option('active_plugins', array()))) { ?>
 		<p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
 	<?php } ?>
 	<p class="submit">
 	<?php
-		if ( isset($_GET['phperror']) ) {
+		if (isset($_GET['phperror'])) {
 			echo "<input type='hidden' name='phperror' value='1' />";
-			submit_button( __( 'Update File and Attempt to Reactivate' ), 'primary', 'submit', false );
+			submit_button(__('Update File and Attempt to Reactivate'), 'primary', 'submit', false);
 		} else {
-			submit_button( __( 'Update File' ), 'primary', 'submit', false );
+			submit_button(__('Update File'), 'primary', 'submit', false);
 		}
 	?>
 	</p>
@@ -276,4 +276,4 @@ 
 <?php
 	break;
 }
-include(ABSPATH . "wp-admin/admin-footer.php");
+include(ABSPATH."wp-admin/admin-footer.php");

Braces +43 added lines, -28 removed lines

@@ -14,8 +14,9 @@ 
 	exit();
 }
 
-if ( !current_user_can('edit_plugins') )
+if ( !current_user_can('edit_plugins') ) {
 	wp_die( __('You do not have sufficient permissions to edit plugins for this site.') );
+}
 
 $title = __("Edit Plugins");
 $parent_file = 'plugins.php';
@@ -45,8 +46,9 @@ 
 
 $plugin_files = get_plugin_files($plugin);
 
-if ( empty($file) )
+if ( empty($file) ) {
 	$file = $plugin_files[0];
+}
 
 $file = validate_file_to_edit($file, $plugin_files);
 $real_file = WP_PLUGIN_DIR . '/' . $file;
@@ -68,11 +70,13 @@ 
 
 		// Deactivate so we can test it.
 		if ( is_plugin_active($file) || isset($_POST['phperror']) ) {
-			if ( is_plugin_active($file) )
-				deactivate_plugins($file, true);
+			if ( is_plugin_active($file) ) {
+							deactivate_plugins($file, true);
+			}
 
-			if ( ! is_network_admin() )
-				update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+			if ( ! is_network_admin() ) {
+							update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+			}
 
 			wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));
 			exit;
@@ -89,11 +93,14 @@ 
 		check_admin_referer('edit-plugin-test_' . $file);
 
 		$error = validate_plugin($file);
-		if ( is_wp_error($error) )
-			wp_die( $error );
+		if ( is_wp_error($error) ) {
+					wp_die( $error );
+		}
 
-		if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) )
-			activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error
+		if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) ) {
+					activate_plugin($file, "plugin-editor.php?file=$file&phperror=1", ! empty( $_GET['networkwide'] ) );
+		}
+		// we'll override this later if the plugin can be included without fatal error
 
 		wp_redirect( self_admin_url("plugin-editor.php?file=$file&a=te&scrollto=$scrollto") );
 		exit;
@@ -118,8 +125,9 @@ 
 		if ( preg_match('/\.([^.]+)$/', $real_file, $matches) ) {
 			$ext = strtolower($matches[1]);
 			// If extension is not in the acceptable list, skip it
-			if ( !in_array( $ext, $editable_extensions) )
-				wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
+			if ( !in_array( $ext, $editable_extensions) ) {
+							wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
+			}
 		}
 	}
 
@@ -180,15 +188,17 @@ 
 <div class="alignleft">
 <big><?php
 	if ( is_plugin_active($plugin) ) {
-		if ( is_writeable($real_file) )
-			echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
-		else
-			echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
+		if ( is_writeable($real_file) ) {
+					echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);
+		} else {
+					echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);
+		}
 	} else {
-		if ( is_writeable($real_file) )
-			echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
-		else
-			echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
+		if ( is_writeable($real_file) ) {
+					echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);
+		} else {
+					echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);
+		}
 	}
 	?></big>
 </div>
@@ -199,10 +209,11 @@ 
 <?php
 	foreach ( $plugins as $plugin_key => $a_plugin ) {
 		$plugin_name = $a_plugin['Name'];
-		if ( $plugin_key == $plugin )
-			$selected = " selected='selected'";
-		else
-			$selected = '';
+		if ( $plugin_key == $plugin ) {
+					$selected = " selected='selected'";
+		} else {
+					$selected = '';
+		}
 		$plugin_name = esc_attr($plugin_name);
 		$plugin_key = esc_attr($plugin_key);
 		echo "\n\t<option value=\"$plugin_key\" $selected>$plugin_name</option>";
@@ -225,8 +236,9 @@ 
 	if ( preg_match('/\.([^.]+)$/', $plugin_file, $matches) ) {
 		$ext = strtolower($matches[1]);
 		// If extension is not in the acceptable list, skip it
-		if ( !in_array( $ext, $editable_extensions ) )
-			continue;
+		if ( !in_array( $ext, $editable_extensions ) ) {
+					continue;
+		}
 	} else {
 		// No extension found
 		continue;
@@ -261,8 +273,11 @@ 
 		}
 	?>
 	</p>
-<?php else : ?>
-	<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
+<?php else {
+	: ?>
+	<p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="https://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.');
+}
+?></em></p>
 <?php endif; ?>
 </form>
 <br class="clear" />