ntwb / wordpress

src/wp-admin/edit-tags.php

Switch Indentation +100 added lines, -100 removed lines

@@ -64,137 +64,137 @@
 
 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(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to add this item.' ) . '</p>',
-			403
-		);
-	}
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to add this item.' ) . '</p>',
+				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 && false !== strpos( $referer, 'edit-tags.php' ) ) {
-		$location = $referer;
-	}
+		if ( $referer && 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;
+	case 'delete':
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
 
-	if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
-		$location = $referer;
-	}
+		if ( $referer && 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(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
-			403
-		);
-	}
+		if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+				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(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
-			403
-		);
-	}
+		if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+				403
+			);
+		}
 
-	$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 && false !== strpos( $referer, 'edit-tags.php' ) ) {
-		$location = $referer;
-	}
+		$tags = (array) $_REQUEST['delete_tags'];
+		foreach ( $tags as $tag_ID ) {
+			wp_delete_term( $tag_ID, $taxonomy );
+		}
 
-	$location = add_query_arg( 'message', 6, $location );
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
+		if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+			$location = $referer;
+		}
 
-	break;
+		$location = add_query_arg( 'message', 6, $location );
 
-case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	case 'edit':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
-	}
+		$term_id = (int) $_REQUEST['tag_ID'];
+		$term    = get_term( $term_id );
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
-	exit;
+		if ( ! $term instanceof WP_Term ) {
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
 
-case 'editedtag':
-	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+		wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+		exit;
 
-	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
-			403
-		);
-	}
+	case 'editedtag':
+		$tag_ID = (int) $_POST['tag_ID'];
+		check_admin_referer( 'update-tag_' . $tag_ID );
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+				403
+			);
+		}
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+		$tag = get_term( $tag_ID, $taxonomy );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
 
-	$location = 'edit-tags.php?taxonomy=' . $taxonomy;
-	if ( 'post' != $post_type )
-		$location .= '&post_type=' . $post_type;
+		$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
-	if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
-		$location = $referer;
-	}
+		$location = 'edit-tags.php?taxonomy=' . $taxonomy;
+		if ( 'post' != $post_type )
+			$location .= '&post_type=' . $post_type;
 
-	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 ( $referer && 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 ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {

Spacing +181 added lines, -181 removed lines

@@ -7,24 +7,24 @@ 
  */
 
 /** 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 ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
-   wp_die( __( 'Sorry, you are not allowed to manage these items.' ) );
+if ( ! in_array($tax->name, get_taxonomies(array('show_ui' => true)))) {
+   wp_die(__('Sorry, you are not allowed to manage these items.'));
 }
 
-if ( ! current_user_can( $tax->cap->manage_terms ) ) {
+if ( ! current_user_can($tax->cap->manage_terms)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to manage these items.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to manage these items.').'</p>',
 		403
 	);
 }
@@ -41,10 +41,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&amp;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 {
@@ -52,158 +52,158 @@ 
 	$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'));
 
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(array(
 	'heading_pagination' => $tax->labels->items_list_navigation,
 	'heading_list'       => $tax->labels->items_list,
-) );
+));
 
 $location = false;
 $referer = wp_get_referer();
 
-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 ) ) {
+	if ( ! current_user_can($tax->cap->edit_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to add this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to add this item.').'</p>',
 			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 && false !== strpos( $referer, 'edit-tags.php' ) ) {
+	if ($referer && 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;
+	$location = 'edit-tags.php?taxonomy='.$taxonomy;
+	if ('post' != $post_type)
+		$location .= '&post_type='.$post_type;
 
-	if ( $referer && false !== strpos( $referer, 'edit-tags.php' ) ) {
+	if ($referer && 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 ) ) {
+	if ( ! current_user_can($tax->cap->delete_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to delete this item.').'</p>',
 			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 ) ) {
+	if ( ! current_user_can($tax->cap->delete_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to delete these items.').'</p>',
 			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 && false !== strpos( $referer, 'edit-tags.php' ) ) {
+	$location = 'edit-tags.php?taxonomy='.$taxonomy;
+	if ('post' != $post_type)
+		$location .= '&post_type='.$post_type;
+	if ($referer && false !== strpos($referer, 'edit-tags.php')) {
 		$location = $referer;
 	}
 
-	$location = add_query_arg( 'message', 6, $location );
+	$location = add_query_arg('message', 6, $location);
 
 	break;
 
 case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+	if ( ! isset($_REQUEST['tag_ID'])) {
 		break;
 	}
 
 	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	$term    = get_term($term_id);
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	if ( ! $term instanceof WP_Term) {
+		wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 	}
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+	wp_redirect(esc_url_raw(get_edit_term_link($term_id, $taxonomy, $post_type)));
 	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 ) ) {
+	if ( ! current_user_can($tax->cap->edit_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 			403
 		);
 	}
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	$tag = get_term($tag_ID, $taxonomy);
+	if ( ! $tag)
+		wp_die(__('You attempted to edit an item that doesn&#8217;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 && false !== strpos( $referer, 'edit-tags.php' ) ) {
+	if ($referer && 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);
 	}
 
 	/**
@@ -214,119 +214,119 @@ 
 	 * @param string $location The destination URL.
 	 * @param object $tax      The taxonomy object.
 	 */
-	wp_redirect( apply_filters( 'redirect_term_location', $location, $tax ) );
+	wp_redirect(apply_filters('redirect_term_location', $location, $tax));
 	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 ) ) {
+if ( ! current_user_can($tax->cap->edit_terms)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 		403
 	);
 }
 
 /** Also used by the Edit Tag  form */
-require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+require_once(ABSPATH.'wp-admin/includes/edit-tag-messages.php');
 
-$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 ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+<h1><?php echo esc_html($title);
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( wp_unslash( $_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>
 
@@ -334,7 +334,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>
 
@@ -345,8 +345,8 @@ 
 
 <?php
 
-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.
 		 *
@@ -355,8 +355,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.
 		 *
@@ -365,7 +365,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.
@@ -375,7 +375,7 @@ 
 		 *
 		 * @param string $taxonomy The taxonomy slug.
 		 */
-		do_action( 'add_tag_form_pre', $taxonomy );
+		do_action('add_tag_form_pre', $taxonomy);
 	}
 
 	/**
@@ -387,7 +387,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">
@@ -401,7 +401,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); ?>" />
@@ -410,20 +410,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,
@@ -432,7 +432,7 @@ 
 		'name'             => 'parent',
 		'orderby'          => 'name',
 		'hierarchical'     => true,
-		'show_option_none' => __( 'None' ),
+		'show_option_none' => __('None'),
 	);
 
 	/**
@@ -456,23 +456,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.
 	 *
@@ -480,7 +480,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form_fields', $taxonomy );
+	do_action('add_tag_form_fields', $taxonomy);
 }
 
 /**
@@ -492,11 +492,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.
 	 *
@@ -505,8 +505,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.
 	 *
@@ -515,7 +515,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.
@@ -525,7 +525,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form', $taxonomy );
+	do_action('add_tag_form', $taxonomy);
 }
 
 /**
@@ -537,23 +537,23 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form", $taxonomy );
+do_action("{$taxonomy}_add_form", $taxonomy);
 ?>
 </form></div>
 <?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">
 <h2><?php echo $tax->labels->popular_items; ?></h2>
-<?php echo $tag_cloud; unset( $tag_cloud ); ?>
+<?php echo $tag_cloud; unset($tag_cloud); ?>
 </div>
 <?php
 	endif;
@@ -567,33 +567,33 @@ 
 <div id="col-right">
 <div class="col-wrap">
 <form id="posts-filter" method="post">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
+<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->display(); ?>
 
 </form>
 
-<?php if ( 'category' == $taxonomy ) : ?>
+<?php if ('category' == $taxonomy) : ?>
 <div class="form-wrap edit-term-notes">
 <p>
 	<?php
-	echo '<strong>' . __( 'Note:' ) . '</strong><br />';
+	echo '<strong>'.__('Note:').'</strong><br />';
 	printf(
 		/* translators: %s: default category */
-		__( '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 %s.' ),
+		__('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 %s.'),
 		/** This filter is documented in wp-includes/category-template.php */
-		'<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
+		'<strong>'.apply_filters('the_category', get_cat_name(get_option('default_category'))).'</strong>'
 	);
 	?>
 </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 edit-term-notes">
-<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;
 
@@ -606,7 +606,7 @@ 
  *
  * @param string $taxonomy The taxonomy name.
  */
-do_action( "after-{$taxonomy}-table", $taxonomy );
+do_action("after-{$taxonomy}-table", $taxonomy);
 ?>
 
 </div>
@@ -615,7 +615,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>
@@ -624,4 +624,4 @@ 
 
 $wp_list_table->inline_edit();
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/media.php

Switch Indentation +76 added lines, -76 removed lines

@@ -15,87 +15,87 @@ 
 wp_reset_vars(array('action'));
 
 switch ( $action ) {
-case 'editattachment' :
-	$attachment_id = (int) $_POST['attachment_id'];
-	check_admin_referer('media-form');
-
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-	$errors = media_upload_form_handler();
-
-	if ( empty($errors) ) {
-		$location = 'media.php';
-		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-				$location = $referer;
-		}
-		if ( false !== strpos($location, 'upload.php') ) {
-			$location = remove_query_arg('message', $location);
-			$location = add_query_arg('posted',	$attachment_id, $location);
-		} elseif ( false !== strpos($location, 'media.php') ) {
-			$location = add_query_arg('message', 'updated', $location);
+	case 'editattachment' :
+		$attachment_id = (int) $_POST['attachment_id'];
+		check_admin_referer('media-form');
+
+		if ( !current_user_can('edit_post', $attachment_id) )
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+
+		$errors = media_upload_form_handler();
+
+		if ( empty($errors) ) {
+			$location = 'media.php';
+			if ( $referer = wp_get_original_referer() ) {
+				if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
+					$location = $referer;
+			}
+			if ( false !== strpos($location, 'upload.php') ) {
+				$location = remove_query_arg('message', $location);
+				$location = add_query_arg('posted',	$attachment_id, $location);
+			} elseif ( false !== strpos($location, 'media.php') ) {
+				$location = add_query_arg('message', 'updated', $location);
+			}
+			wp_redirect($location);
+			exit;
 		}
-		wp_redirect($location);
-		exit;
-	}
 
-	// No break.
-case 'edit' :
-	$title = __('Edit Media');
+		// No break.
+	case 'edit' :
+		$title = __('Edit Media');
 
-	if ( empty($errors) )
-		$errors = null;
+		if ( empty($errors) )
+			$errors = null;
 
-	if ( empty( $_GET['attachment_id'] ) ) {
-		wp_redirect( admin_url('upload.php') );
-		exit();
-	}
-	$att_id = (int) $_GET['attachment_id'];
-
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
-
-	$att = get_post($att_id);
-
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
-
-	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-
-	wp_enqueue_script( 'wp-ajax-response' );
-	wp_enqueue_script('image-edit');
-	wp_enqueue_style('imgareaselect');
-
-	get_current_screen()->add_help_tab( array(
-		'id'      => 'overview',
-		'title'   => __('Overview'),
-		'content' =>
-			'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
-
-	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-	);
-
-	require( ABSPATH . 'wp-admin/admin-header.php' );
-
-	$parent_file = 'upload.php';
-	$message = '';
-	$class = '';
-	if ( isset($_GET['message']) ) {
-		switch ( $_GET['message'] ) {
+		if ( empty( $_GET['attachment_id'] ) ) {
+			wp_redirect( admin_url('upload.php') );
+			exit();
+		}
+		$att_id = (int) $_GET['attachment_id'];
+
+		if ( !current_user_can('edit_post', $att_id) )
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+
+		$att = get_post($att_id);
+
+		if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn&#8217;t exist. Perhaps it was deleted?') );
+		if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn&#8217;t an attachment. Please go back and try again.') );
+		if ( $att->post_status == 'trash' ) wp_die( __('You can&#8217;t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+
+		add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
+
+		wp_enqueue_script( 'wp-ajax-response' );
+		wp_enqueue_script('image-edit');
+		wp_enqueue_style('imgareaselect');
+
+		get_current_screen()->add_help_tab( array(
+			'id'      => 'overview',
+			'title'   => __('Overview'),
+			'content' =>
+				'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
+				'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
+				'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
+				'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
+		) );
+
+		get_current_screen()->set_help_sidebar(
+		'<p><strong>' . __('For more information:') . '</strong></p>' .
+		'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
+		'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+		);
+
+		require( ABSPATH . 'wp-admin/admin-header.php' );
+
+		$parent_file = 'upload.php';
+		$message = '';
+		$class = '';
+		if ( isset($_GET['message']) ) {
+			switch ( $_GET['message'] ) {
 			case 'updated' :
 				$message = __('Media file updated.');
 				$class = 'updated';
 				break;
-		}
+			}
 	}
 	if ( $message )
 		echo "<div id='message' class='$class'><p>$message</p></div>\n";
@@ -139,8 +139,8 @@ 
 
 	exit;
 
-default:
-	wp_redirect( admin_url('upload.php') );
-	exit;
+	default:
+		wp_redirect( admin_url('upload.php') );
+		exit;
 
 }

Spacing +39 added lines, -39 removed lines

@@ -7,33 +7,33 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $parent_file = 'upload.php';
 $submenu_file = 'upload.php';
 
 wp_reset_vars(array('action'));
 
-switch ( $action ) {
+switch ($action) {
 case 'editattachment' :
 	$attachment_id = (int) $_POST['attachment_id'];
 	check_admin_referer('media-form');
 
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( ! current_user_can('edit_post', $attachment_id))
+		wp_die(__('Sorry, you are not allowed to edit this attachment.'));
 
 	$errors = media_upload_form_handler();
 
-	if ( empty($errors) ) {
+	if (empty($errors)) {
 		$location = 'media.php';
-		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
+		if ($referer = wp_get_original_referer()) {
+			if (false !== strpos($referer, 'upload.php') || (url_to_postid($referer) == $attachment_id))
 				$location = $referer;
 		}
-		if ( false !== strpos($location, 'upload.php') ) {
+		if (false !== strpos($location, 'upload.php')) {
 			$location = remove_query_arg('message', $location);
-			$location = add_query_arg('posted',	$attachment_id, $location);
-		} elseif ( false !== strpos($location, 'media.php') ) {
+			$location = add_query_arg('posted', $attachment_id, $location);
+		} elseif (false !== strpos($location, 'media.php')) {
 			$location = add_query_arg('message', 'updated', $location);
 		}
 		wp_redirect($location);
@@ -44,60 +44,60 @@ 
 case 'edit' :
 	$title = __('Edit Media');
 
-	if ( empty($errors) )
+	if (empty($errors))
 		$errors = null;
 
-	if ( empty( $_GET['attachment_id'] ) ) {
-		wp_redirect( admin_url('upload.php') );
+	if (empty($_GET['attachment_id'])) {
+		wp_redirect(admin_url('upload.php'));
 		exit();
 	}
 	$att_id = (int) $_GET['attachment_id'];
 
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( ! current_user_can('edit_post', $att_id))
+		wp_die(__('Sorry, you are not allowed to edit this attachment.'));
 
 	$att = get_post($att_id);
 
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	if (empty($att->ID)) wp_die(__('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?'));
+	if ('attachment' !== $att->post_type) wp_die(__('You attempted to edit an item that isn’t an attachment. Please go back and try again.'));
+	if ($att->post_status == 'trash') wp_die(__('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.'));
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 
-	wp_enqueue_script( 'wp-ajax-response' );
+	wp_enqueue_script('wp-ajax-response');
 	wp_enqueue_script('image-edit');
 	wp_enqueue_style('imgareaselect');
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' =>
-			'<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .
-			'<p>' . __('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.') . '</p>' .
-			'<p>' . __('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.') . '</p>' .
-			'<p>' . __('Remember to click Update Media to save metadata entered or changed.') . '</p>'
-	) );
+			'<p>'.__('This screen allows you to edit five fields for metadata in a file within the media library.').'</p>'.
+			'<p>'.__('For images only, you can click on Edit Image under the thumbnail to expand out an inline image editor with icons for cropping, rotating, or flipping the image as well as for undoing and redoing. The boxes on the right give you more options for scaling the image, for cropping it, and for cropping the thumbnail in a different way than you crop the original image. You can click on Help in those boxes to get more information.').'</p>'.
+			'<p>'.__('Note that you crop the image by clicking on it (the Crop icon is already selected) and dragging the cropping frame to select the desired part. Then click Save to retain the cropping.').'</p>'.
+			'<p>'.__('Remember to click Update Media to save metadata entered or changed.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
-	require( ABSPATH . 'wp-admin/admin-header.php' );
+	require(ABSPATH.'wp-admin/admin-header.php');
 
 	$parent_file = 'upload.php';
 	$message = '';
 	$class = '';
-	if ( isset($_GET['message']) ) {
-		switch ( $_GET['message'] ) {
+	if (isset($_GET['message'])) {
+		switch ($_GET['message']) {
 			case 'updated' :
 				$message = __('Media file updated.');
 				$class = 'updated';
 				break;
 		}
 	}
-	if ( $message )
+	if ($message)
 		echo "<div id='message' class='$class'><p>$message</p></div>\n";
 
 ?>
@@ -105,24 +105,24 @@ 
 <div class="wrap">
 <h1>
 <?php
-echo esc_html( $title );
-if ( current_user_can( 'upload_files' ) ) { ?>
+echo esc_html($title);
+if (current_user_can('upload_files')) { ?>
 	<a href="media-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a>
 <?php } ?>
 </h1>
 
 <form method="post" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
-<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
+<?php submit_button(__('Update Media'), 'primary', 'save', false); ?>
 </p>
 
 <div class="media-single">
 <div id="media-item-<?php echo $att_id; ?>" class="media-item">
-<?php echo get_media_item( $att_id, array( 'toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => !empty($errors[$att_id]) ? $errors[$att_id] : null ) ); ?>
+<?php echo get_media_item($att_id, array('toggle' => false, 'send' => false, 'delete' => false, 'show_title' => false, 'errors' => ! empty($errors[$att_id]) ? $errors[$att_id] : null)); ?>
 </div>
 </div>
 
-<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
+<?php submit_button(__('Update Media'), 'primary', 'save'); ?>
 <input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? esc_attr($post_id) : ''; ?>" />
 <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($att_id); ?>" />
 <input type="hidden" name="action" value="editattachment" />
@@ -135,12 +135,12 @@ 
 
 <?php
 
-	require( ABSPATH . 'wp-admin/admin-footer.php' );
+	require(ABSPATH.'wp-admin/admin-footer.php');
 
 	exit;
 
 default:
-	wp_redirect( admin_url('upload.php') );
+	wp_redirect(admin_url('upload.php'));
 	exit;
 
 }

Braces +24 added lines, -13 removed lines

@@ -19,16 +19,18 @@ 
 	$attachment_id = (int) $_POST['attachment_id'];
 	check_admin_referer('media-form');
 
-	if ( !current_user_can('edit_post', $attachment_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( !current_user_can('edit_post', $attachment_id) ) {
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	}
 
 	$errors = media_upload_form_handler();
 
 	if ( empty($errors) ) {
 		$location = 'media.php';
 		if ( $referer = wp_get_original_referer() ) {
-			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  )
-				$location = $referer;
+			if ( false !== strpos($referer, 'upload.php') || ( url_to_postid($referer) == $attachment_id )  ) {
+							$location = $referer;
+			}
 		}
 		if ( false !== strpos($location, 'upload.php') ) {
 			$location = remove_query_arg('message', $location);
@@ -44,8 +46,9 @@ 
 case 'edit' :
 	$title = __('Edit Media');
 
-	if ( empty($errors) )
-		$errors = null;
+	if ( empty($errors) ) {
+			$errors = null;
+	}
 
 	if ( empty( $_GET['attachment_id'] ) ) {
 		wp_redirect( admin_url('upload.php') );
@@ -53,14 +56,21 @@ 
 	}
 	$att_id = (int) $_GET['attachment_id'];
 
-	if ( !current_user_can('edit_post', $att_id) )
-		wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	if ( !current_user_can('edit_post', $att_id) ) {
+			wp_die ( __('Sorry, you are not allowed to edit this attachment.') );
+	}
 
 	$att = get_post($att_id);
 
-	if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
-	if ( 'attachment' !== $att->post_type ) wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
-	if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	if ( empty($att->ID) ) {
+		wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
+	}
+	if ( 'attachment' !== $att->post_type ) {
+		wp_die( __('You attempted to edit an item that isn’t an attachment. Please go back and try again.') );
+	}
+	if ( $att->post_status == 'trash' ) {
+		wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
+	}
 
 	add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 
@@ -97,8 +107,9 @@ 
 				break;
 		}
 	}
-	if ( $message )
-		echo "<div id='message' class='$class'><p>$message</p></div>\n";
+	if ( $message ) {
+			echo "<div id='message' class='$class'><p>$message</p></div>\n";
+	}
 
 ?>
 

src/wp-admin/edit-comments.php

Spacing +137 added lines, -137 removed lines

@@ -7,11 +7,11 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! current_user_can( 'edit_posts' ) ) {
+require_once(dirname(__FILE__).'/admin.php');
+if ( ! current_user_can('edit_posts')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit comments.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit comments.').'</p>',
 		403
 	);
 }
@@ -21,90 +21,90 @@ 
 
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
-	check_admin_referer( 'bulk-comments' );
+if ($doaction) {
+	check_admin_referer('bulk-comments');
 
-	if ( 'delete_all' == $doaction && !empty( $_REQUEST['pagegen_timestamp'] ) ) {
-		$comment_status = wp_unslash( $_REQUEST['comment_status'] );
-		$delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
-		$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
+	if ('delete_all' == $doaction && ! empty($_REQUEST['pagegen_timestamp'])) {
+		$comment_status = wp_unslash($_REQUEST['comment_status']);
+		$delete_time = wp_unslash($_REQUEST['pagegen_timestamp']);
+		$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time));
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['delete_comments'] ) ) {
+	} elseif (isset($_REQUEST['delete_comments'])) {
 		$comment_ids = $_REQUEST['delete_comments'];
-		$doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
-	} elseif ( wp_get_referer() ) {
-		wp_safe_redirect( wp_get_referer() );
+		$doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
+	} elseif (isset($_REQUEST['ids'])) {
+		$comment_ids = array_map('absint', explode(',', $_REQUEST['ids']));
+	} elseif (wp_get_referer()) {
+		wp_safe_redirect(wp_get_referer());
 		exit;
 	}
 
 	$approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
 
-	$redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
-	$redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
+	$redirect_to = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids'), wp_get_referer());
+	$redirect_to = add_query_arg('paged', $pagenum, $redirect_to);
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	foreach ( $comment_ids as $comment_id ) { // Check the permissions on each
-		if ( !current_user_can( 'edit_comment', $comment_id ) )
+	foreach ($comment_ids as $comment_id) { // Check the permissions on each
+		if ( ! current_user_can('edit_comment', $comment_id))
 			continue;
 
-		switch ( $doaction ) {
+		switch ($doaction) {
 			case 'approve' :
-				wp_set_comment_status( $comment_id, 'approve' );
+				wp_set_comment_status($comment_id, 'approve');
 				$approved++;
 				break;
 			case 'unapprove' :
-				wp_set_comment_status( $comment_id, 'hold' );
+				wp_set_comment_status($comment_id, 'hold');
 				$unapproved++;
 				break;
 			case 'spam' :
-				wp_spam_comment( $comment_id );
+				wp_spam_comment($comment_id);
 				$spammed++;
 				break;
 			case 'unspam' :
-				wp_unspam_comment( $comment_id );
+				wp_unspam_comment($comment_id);
 				$unspammed++;
 				break;
 			case 'trash' :
-				wp_trash_comment( $comment_id );
+				wp_trash_comment($comment_id);
 				$trashed++;
 				break;
 			case 'untrash' :
-				wp_untrash_comment( $comment_id );
+				wp_untrash_comment($comment_id);
 				$untrashed++;
 				break;
 			case 'delete' :
-				wp_delete_comment( $comment_id );
+				wp_delete_comment($comment_id);
 				$deleted++;
 				break;
 		}
 	}
 
-	wp_defer_comment_counting( false );
-
-	if ( $approved )
-		$redirect_to = add_query_arg( 'approved', $approved, $redirect_to );
-	if ( $unapproved )
-		$redirect_to = add_query_arg( 'unapproved', $unapproved, $redirect_to );
-	if ( $spammed )
-		$redirect_to = add_query_arg( 'spammed', $spammed, $redirect_to );
-	if ( $unspammed )
-		$redirect_to = add_query_arg( 'unspammed', $unspammed, $redirect_to );
-	if ( $trashed )
-		$redirect_to = add_query_arg( 'trashed', $trashed, $redirect_to );
-	if ( $untrashed )
-		$redirect_to = add_query_arg( 'untrashed', $untrashed, $redirect_to );
-	if ( $deleted )
-		$redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
-	if ( $trashed || $spammed )
-		$redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
-
-	wp_safe_redirect( $redirect_to );
+	wp_defer_comment_counting(false);
+
+	if ($approved)
+		$redirect_to = add_query_arg('approved', $approved, $redirect_to);
+	if ($unapproved)
+		$redirect_to = add_query_arg('unapproved', $unapproved, $redirect_to);
+	if ($spammed)
+		$redirect_to = add_query_arg('spammed', $spammed, $redirect_to);
+	if ($unspammed)
+		$redirect_to = add_query_arg('unspammed', $unspammed, $redirect_to);
+	if ($trashed)
+		$redirect_to = add_query_arg('trashed', $trashed, $redirect_to);
+	if ($untrashed)
+		$redirect_to = add_query_arg('untrashed', $untrashed, $redirect_to);
+	if ($deleted)
+		$redirect_to = add_query_arg('deleted', $deleted, $redirect_to);
+	if ($trashed || $spammed)
+		$redirect_to = add_query_arg('ids', join(',', $comment_ids), $redirect_to);
+
+	wp_safe_redirect($redirect_to);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -113,167 +113,167 @@ 
 wp_enqueue_script('admin-comments');
 enqueue_comment_hotkeys_js();
 
-if ( $post_id ) {
-	$comments_count = wp_count_comments( $post_id );
-	$draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' );
-	if ( $comments_count->moderated > 0 ) {
+if ($post_id) {
+	$comments_count = wp_count_comments($post_id);
+	$draft_or_post_title = wp_html_excerpt(_draft_or_post_title($post_id), 50, '&hellip;');
+	if ($comments_count->moderated > 0) {
 		/* translators: 1: comments count 2: post title */
-		$title = sprintf( __( 'Comments (%1$s) on &#8220;%2$s&#8221;' ),
-			number_format_i18n( $comments_count->moderated ),
+		$title = sprintf(__('Comments (%1$s) on &#8220;%2$s&#8221;'),
+			number_format_i18n($comments_count->moderated),
 			$draft_or_post_title
 		);
 	} else {
 		/* translators: %s: post title */
-		$title = sprintf( __( 'Comments on &#8220;%s&#8221;' ),
+		$title = sprintf(__('Comments on &#8220;%s&#8221;'),
 			$draft_or_post_title
 		);
 	}
 } else {
 	$comments_count = wp_count_comments();
-	if ( $comments_count->moderated > 0 ) {
+	if ($comments_count->moderated > 0) {
 		/* translators: %s: comments count */
-		$title = sprintf( __( 'Comments (%s)' ),
-			number_format_i18n( $comments_count->moderated )
+		$title = sprintf(__('Comments (%s)'),
+			number_format_i18n($comments_count->moderated)
 		);
 	} else {
-		$title = __( 'Comments' );
+		$title = __('Comments');
 	}
 }
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'moderating-comments',
 'title'		=> __('Moderating Comments'),
 'content'	=>
-		'<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
-		'<p>' . __( 'In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
-		'<p>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</p>'
-) );
+		'<p>'.__('A red bar on the left means the comment is waiting for you to moderate it.').'</p>'.
+		'<p>'.__('In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.').'</p>'.
+		'<p>'.__('In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.').'</p>'.
+		'<p>'.__('In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.').'</p>'.
+		'<p>'.__('In the <strong>Submitted On</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.').'</p>'.
+		'<p>'.__('Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Comment_Spam" target="_blank">Documentation on Comment Spam</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Documentation on Keyboard Shortcuts</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/Administration_Screens#Comments" target="_blank">Documentation on Comments</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Comment_Spam" target="_blank">Documentation on Comment Spam</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">Documentation on Keyboard Shortcuts</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-get_current_screen()->set_screen_reader_content( array(
-	'heading_views'      => __( 'Filter comments list' ),
-	'heading_pagination' => __( 'Comments list navigation' ),
-	'heading_list'       => __( 'Comments list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter comments list'),
+	'heading_pagination' => __('Comments list navigation'),
+	'heading_list'       => __('Comments list'),
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1><?php
-if ( $post_id ) {
+if ($post_id) {
 	/* translators: %s: link to post */
-	printf( __( 'Comments on &#8220;%s&#8221;' ),
-		sprintf( '<a href="%1$s">%2$s</a>',
-			get_edit_post_link( $post_id ),
-			wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '&hellip;' )
+	printf(__('Comments on &#8220;%s&#8221;'),
+		sprintf('<a href="%1$s">%2$s</a>',
+			get_edit_post_link($post_id),
+			wp_html_excerpt(_draft_or_post_title($post_id), 50, '&hellip;')
 		)
 	);
 } else {
-	_e( 'Comments' );
+	_e('Comments');
 }
 
-if ( isset($_REQUEST['s']) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	echo '<span class="subtitle">';
 	/* translators: %s: search keywords */
-	printf( __( 'Search results for &#8220;%s&#8221;' ),
-		wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '&hellip;' )
+	printf(__('Search results for &#8220;%s&#8221;'),
+		wp_html_excerpt(esc_html(wp_unslash($_REQUEST['s'])), 50, '&hellip;')
 	);
 	echo '</span>';
 }
 ?></h1>
 
 <?php
-if ( isset( $_REQUEST['error'] ) ) {
+if (isset($_REQUEST['error'])) {
 	$error = (int) $_REQUEST['error'];
 	$error_msg = '';
-	switch ( $error ) {
+	switch ($error) {
 		case 1 :
-			$error_msg = __( 'Invalid comment ID.' );
+			$error_msg = __('Invalid comment ID.');
 			break;
 		case 2 :
-			$error_msg = __( 'Sorry, you are not allowed to edit comments on this post.' );
+			$error_msg = __('Sorry, you are not allowed to edit comments on this post.');
 			break;
 	}
-	if ( $error_msg )
-		echo '<div id="moderated" class="error"><p>' . $error_msg . '</p></div>';
+	if ($error_msg)
+		echo '<div id="moderated" class="error"><p>'.$error_msg.'</p></div>';
 }
 
-if ( isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same']) ) {
-	$approved  = isset( $_REQUEST['approved']  ) ? (int) $_REQUEST['approved']  : 0;
-	$deleted   = isset( $_REQUEST['deleted']   ) ? (int) $_REQUEST['deleted']   : 0;
-	$trashed   = isset( $_REQUEST['trashed']   ) ? (int) $_REQUEST['trashed']   : 0;
-	$untrashed = isset( $_REQUEST['untrashed'] ) ? (int) $_REQUEST['untrashed'] : 0;
-	$spammed   = isset( $_REQUEST['spammed']   ) ? (int) $_REQUEST['spammed']   : 0;
-	$unspammed = isset( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
-	$same      = isset( $_REQUEST['same'] )      ? (int) $_REQUEST['same']      : 0;
-
-	if ( $approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0 ) {
-		if ( $approved > 0 ) {
+if (isset($_REQUEST['approved']) || isset($_REQUEST['deleted']) || isset($_REQUEST['trashed']) || isset($_REQUEST['untrashed']) || isset($_REQUEST['spammed']) || isset($_REQUEST['unspammed']) || isset($_REQUEST['same'])) {
+	$approved  = isset($_REQUEST['approved']) ? (int) $_REQUEST['approved'] : 0;
+	$deleted   = isset($_REQUEST['deleted']) ? (int) $_REQUEST['deleted'] : 0;
+	$trashed   = isset($_REQUEST['trashed']) ? (int) $_REQUEST['trashed'] : 0;
+	$untrashed = isset($_REQUEST['untrashed']) ? (int) $_REQUEST['untrashed'] : 0;
+	$spammed   = isset($_REQUEST['spammed']) ? (int) $_REQUEST['spammed'] : 0;
+	$unspammed = isset($_REQUEST['unspammed']) ? (int) $_REQUEST['unspammed'] : 0;
+	$same      = isset($_REQUEST['same']) ? (int) $_REQUEST['same'] : 0;
+
+	if ($approved > 0 || $deleted > 0 || $trashed > 0 || $untrashed > 0 || $spammed > 0 || $unspammed > 0 || $same > 0) {
+		if ($approved > 0) {
 			/* translators: %s: number of comments approved */
-			$messages[] = sprintf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
+			$messages[] = sprintf(_n('%s comment approved', '%s comments approved', $approved), $approved);
 		}
 
-		if ( $spammed > 0 ) {
+		if ($spammed > 0) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
 			/* translators: %s: number of comments marked as spam */
-			$messages[] = sprintf( _n( '%s comment marked as spam.', '%s comments marked as spam.', $spammed ), $spammed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf(_n('%s comment marked as spam.', '%s comments marked as spam.', $spammed), $spammed).' <a href="'.esc_url(wp_nonce_url("edit-comments.php?doaction=undo&action=unspam&ids=$ids", "bulk-comments")).'">'.__('Undo').'</a><br />';
 		}
 
-		if ( $unspammed > 0 ) {
+		if ($unspammed > 0) {
 			/* translators: %s: number of comments restored from the spam */
-			$messages[] = sprintf( _n( '%s comment restored from the spam', '%s comments restored from the spam', $unspammed ), $unspammed );
+			$messages[] = sprintf(_n('%s comment restored from the spam', '%s comments restored from the spam', $unspammed), $unspammed);
 		}
 
-		if ( $trashed > 0 ) {
+		if ($trashed > 0) {
 			$ids = isset($_REQUEST['ids']) ? $_REQUEST['ids'] : 0;
 			/* translators: %s: number of comments moved to the Trash */
-			$messages[] = sprintf( _n( '%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed ), $trashed ) . ' <a href="' . esc_url( wp_nonce_url( "edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments" ) ) . '">' . __('Undo') . '</a><br />';
+			$messages[] = sprintf(_n('%s comment moved to the Trash.', '%s comments moved to the Trash.', $trashed), $trashed).' <a href="'.esc_url(wp_nonce_url("edit-comments.php?doaction=undo&action=untrash&ids=$ids", "bulk-comments")).'">'.__('Undo').'</a><br />';
 		}
 
-		if ( $untrashed > 0 ) {
+		if ($untrashed > 0) {
 			/* translators: %s: number of comments restored from the Trash */
-			$messages[] = sprintf( _n( '%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed ), $untrashed );
+			$messages[] = sprintf(_n('%s comment restored from the Trash', '%s comments restored from the Trash', $untrashed), $untrashed);
 		}
 
-		if ( $deleted > 0 ) {
+		if ($deleted > 0) {
 			/* translators: %s: number of comments permanently deleted */
-			$messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
+			$messages[] = sprintf(_n('%s comment permanently deleted', '%s comments permanently deleted', $deleted), $deleted);
 		}
 
-		if ( $same > 0 && $comment = get_comment( $same ) ) {
-			switch ( $comment->comment_approved ) {
+		if ($same > 0 && $comment = get_comment($same)) {
+			switch ($comment->comment_approved) {
 				case '1' :
-					$messages[] = __('This comment is already approved.') . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					$messages[] = __('This comment is already approved.').' <a href="'.esc_url(admin_url("comment.php?action=editcomment&c=$same")).'">'.__('Edit comment').'</a>';
 					break;
 				case 'trash' :
-					$messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+					$messages[] = __('This comment is already in the Trash.').' <a href="'.esc_url(admin_url('edit-comments.php?comment_status=trash')).'"> '.__('View Trash').'</a>';
 					break;
 				case 'spam' :
-					$messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+					$messages[] = __('This comment is already marked as spam.').' <a href="'.esc_url(admin_url("comment.php?action=editcomment&c=$same")).'">'.__('Edit comment').'</a>';
 					break;
 			}
 		}
 
-		echo '<div id="moderated" class="updated notice is-dismissible"><p>' . implode( "<br/>\n", $messages ) . '</p></div>';
+		echo '<div id="moderated" class="updated notice is-dismissible"><p>'.implode("<br/>\n", $messages).'</p></div>';
 	}
 }
 ?>
@@ -282,20 +282,20 @@ 
 
 <form id="comments-form" method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Comments' ), 'comment' ); ?>
+<?php $wp_list_table->search_box(__('Search Comments'), 'comment'); ?>
 
-<?php if ( $post_id ) : ?>
-<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
+<?php if ($post_id) : ?>
+<input type="hidden" name="p" value="<?php echo esc_attr(intval($post_id)); ?>" />
 <?php endif; ?>
 <input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
 <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
 
-<input type="hidden" name="_total" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('total_items') ); ?>" />
-<input type="hidden" name="_per_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('per_page') ); ?>" />
-<input type="hidden" name="_page" value="<?php echo esc_attr( $wp_list_table->get_pagination_arg('page') ); ?>" />
+<input type="hidden" name="_total" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('total_items')); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('per_page')); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr($wp_list_table->get_pagination_arg('page')); ?>" />
 
-<?php if ( isset($_REQUEST['paged']) ) { ?>
-	<input type="hidden" name="paged" value="<?php echo esc_attr( absint( $_REQUEST['paged'] ) ); ?>" />
+<?php if (isset($_REQUEST['paged'])) { ?>
+	<input type="hidden" name="paged" value="<?php echo esc_attr(absint($_REQUEST['paged'])); ?>" />
 <?php } ?>
 
 <?php $wp_list_table->display(); ?>
@@ -307,4 +307,4 @@ 
 <?php
 wp_comment_reply('-1', true, 'detail');
 wp_comment_trashnotice();
-include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/freedoms.php

Spacing +21 added lines, -21 removed lines

@@ -7,47 +7,47 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-$title = __( 'Freedoms' );
+$title = __('Freedoms');
 
-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>
 
-<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version. WordPress %s changes a lot behind the scenes to make your WordPress experience even better!' ), $display_version ); ?></p>
+<p class="about-text"><?php printf(__('Thank you for updating to the latest version. WordPress %s changes a lot behind the scenes to make your WordPress experience even better!'), $display_version); ?></p>
 
-<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 wp-clearfix">
-	<a href="about.php" class="nav-tab"><?php _e( 'What&#8217;s New' ); ?></a>
-	<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-	<a href="freedoms.php" class="nav-tab nav-tab-active"><?php _e( 'Freedoms' ); ?></a>
+	<a href="about.php" class="nav-tab"><?php _e('What&#8217;s New'); ?></a>
+	<a href="credits.php" class="nav-tab"><?php _e('Credits'); ?></a>
+	<a href="freedoms.php" class="nav-tab nav-tab-active"><?php _e('Freedoms'); ?></a>
 </h2>
 
-<p class="about-description"><?php printf( __( 'WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.' ), 'https://wordpress.org/about/license/' ); ?></p>
+<p class="about-description"><?php printf(__('WordPress is Free and open source software, built by a distributed community of mostly volunteer developers from around the world. WordPress comes with some awesome, worldview-changing rights courtesy of its <a href="%s">license</a>, the GPL.'), 'https://wordpress.org/about/license/'); ?></p>
 
 <ol start="0">
-	<li><p><?php _e( 'You have the freedom to run the program, for any purpose.' ); ?></p></li>
-	<li><p><?php _e( 'You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.' ); ?></p></li>
-	<li><p><?php _e( 'You have the freedom to redistribute copies of the original program so you can help your neighbor.' ); ?></p></li>
-	<li><p><?php _e( 'You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.' ); ?></p></li>
+	<li><p><?php _e('You have the freedom to run the program, for any purpose.'); ?></p></li>
+	<li><p><?php _e('You have access to the source code, the freedom to study how the program works, and the freedom to change it to make it do what you wish.'); ?></p></li>
+	<li><p><?php _e('You have the freedom to redistribute copies of the original program so you can help your neighbor.'); ?></p></li>
+	<li><p><?php _e('You have the freedom to distribute copies of your modified versions to others. By doing this you can give the whole community a chance to benefit from your changes.'); ?></p></li>
 </ol>
 
-<p><?php printf( __( 'WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.' ), 'http://wordpressfoundation.org/trademark-policy/' ); ?></p>
+<p><?php printf(__('WordPress grows when people like you tell their friends about it, and the thousands of businesses and services that are built on and around WordPress share that fact with their users. We&#8217;re flattered every time someone spreads the good word, just make sure to <a href="%s">check out our trademark guidelines</a> first.'), 'http://wordpressfoundation.org/trademark-policy/'); ?></p>
 
 <p><?php
 
-$plugins_url = current_user_can( 'activate_plugins' ) ? admin_url( 'plugins.php' ) : 'https://wordpress.org/plugins/';
-$themes_url = current_user_can( 'switch_themes' ) ? admin_url( 'themes.php' ) : 'https://wordpress.org/themes/';
+$plugins_url = current_user_can('activate_plugins') ? admin_url('plugins.php') : 'https://wordpress.org/plugins/';
+$themes_url = current_user_can('switch_themes') ? admin_url('themes.php') : 'https://wordpress.org/themes/';
 
-printf( __( 'Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); ?></p>
+printf(__('Every plugin and theme in WordPress.org&#8217;s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding <a href="%1$s">plugins</a> and <a href="%2$s">themes</a> there. If you get a plugin or theme from another source, make sure to <a href="%3$s">ask them if it&#8217;s GPL</a> first. If they don&#8217;t respect the WordPress license, we don&#8217;t recommend them.'), $plugins_url, $themes_url, 'https://wordpress.org/about/license/'); ?></p>
 
-<p><?php _e( 'Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.' ); ?></p>
+<p><?php _e('Don&#8217;t you wish all software came with these freedoms? So do we! For more information, check out the <a href="https://www.fsf.org/">Free Software Foundation</a>.'); ?></p>
 
 </div>
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/themes.php

Spacing +165 added lines, -165 removed lines

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

src/wp-admin/my-sites.php

Spacing +41 added lines, -41 removed lines

@@ -7,69 +7,69 @@ 
  * @since 3.0.0
  */
 
-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.'));
 
-if ( ! current_user_can('read') )
-	wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
+if ( ! current_user_can('read'))
+	wp_die(__('Sorry, you are not allowed to access this page.'));
 
-$action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
+$action = isset($_POST['action']) ? $_POST['action'] : 'splash';
 
-$blogs = get_blogs_of_user( $current_user->ID );
+$blogs = get_blogs_of_user($current_user->ID);
 
 $updated = false;
-if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
-	check_admin_referer( 'update-my-sites' );
+if ('updateblogsettings' == $action && isset($_POST['primary_blog'])) {
+	check_admin_referer('update-my-sites');
 
-	$blog = get_blog_details( (int) $_POST['primary_blog'] );
-	if ( $blog && isset( $blog->domain ) ) {
-		update_user_option( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true );
+	$blog = get_blog_details((int) $_POST['primary_blog']);
+	if ($blog && isset($blog->domain)) {
+		update_user_option($current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true);
 		$updated = true;
 	} else {
-		wp_die( __( 'The primary site you chose does not exist.' ) );
+		wp_die(__('The primary site you chose does not exist.'));
 	}
 }
 
-$title = __( 'My Sites' );
+$title = __('My Sites');
 $parent_file = 'index.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.') . '</p>' .
-		'<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
-) );
+		'<p>'.__('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.').'</p>'.
+		'<p>'.__('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen" target="_blank">Documentation on My Sites</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/Dashboard_My_Sites_Screen" target="_blank">Documentation on My Sites</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');
 
-if ( $updated ) { ?>
-	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e( 'Settings saved.' ); ?></strong></p></div>
+if ($updated) { ?>
+	<div id="message" class="updated notice is-dismissible"><p><strong><?php _e('Settings saved.'); ?></strong></p></div>
 <?php } ?>
 
 <div class="wrap">
 <h1><?php
-echo esc_html( $title );
+echo esc_html($title);
 
-if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) {
+if (in_array(get_site_option('registration'), array('all', 'blog'))) {
 	/** This filter is documented in wp-login.php */
-	$sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
-	printf( ' <a href="%s" class="page-title-action">%s</a>', esc_url( $sign_up_url ), esc_html_x( 'Add New', 'site' ) );
+	$sign_up_url = apply_filters('wp_signup_location', network_site_url('wp-signup.php'));
+	printf(' <a href="%s" class="page-title-action">%s</a>', esc_url($sign_up_url), esc_html_x('Add New', 'site'));
 }
 ?></h1>
 
 <?php
-if ( empty( $blogs ) ) :
+if (empty($blogs)) :
 	echo '<p>';
-	_e( 'You must be a member of at least one site to use this page.' );
+	_e('You must be a member of at least one site to use this page.');
 	echo '</p>';
 else :
 ?>
@@ -81,7 +81,7 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'myblogs_allblogs_options' );
+	do_action('myblogs_allblogs_options');
 	?>
 	<br clear="all" />
 	<ul class="my-sites striped">
@@ -98,14 +98,14 @@ 
 	 * @param string $settings_html The settings HTML markup. Default empty.
 	 * @param object $context       Context of the setting (global or site-specific). Default 'global'.
 	 */
-	$settings_html = apply_filters( 'myblogs_options', '', 'global' );
-	if ( $settings_html != '' ) {
-		echo '<h3>' . __( 'Global Settings' ) . '</h3>';
+	$settings_html = apply_filters('myblogs_options', '', 'global');
+	if ($settings_html != '') {
+		echo '<h3>'.__('Global Settings').'</h3>';
 		echo $settings_html;
 	}
-	reset( $blogs );
+	reset($blogs);
 
-	foreach ( $blogs as $user_blog ) {
+	foreach ($blogs as $user_blog) {
 		echo "<li>";
 		echo "<h3>{$user_blog->blogname}</h3>";
 		/**
@@ -116,16 +116,16 @@ 
 		 * @param string $string    The HTML site link markup.
 		 * @param object $user_blog An object containing the site data.
 		 */
-		echo "<p class='my-sites-actions'>" . apply_filters( 'myblogs_blog_actions', "<a href='" . esc_url( get_home_url( $user_blog->userblog_id ) ). "'>" . __( 'Visit' ) . "</a> | <a href='" . esc_url( get_admin_url( $user_blog->userblog_id ) ) . "'>" . __( 'Dashboard' ) . "</a>", $user_blog ) . "</p>";
+		echo "<p class='my-sites-actions'>".apply_filters('myblogs_blog_actions', "<a href='".esc_url(get_home_url($user_blog->userblog_id))."'>".__('Visit')."</a> | <a href='".esc_url(get_admin_url($user_blog->userblog_id))."'>".__('Dashboard')."</a>", $user_blog)."</p>";
 		/** This filter is documented in wp-admin/my-sites.php */
-		echo apply_filters( 'myblogs_options', '', $user_blog );
+		echo apply_filters('myblogs_options', '', $user_blog);
 		echo "</li>";
 	}?>
 	</ul>
 	<?php
-	if ( count( $blogs ) > 1 || has_action( 'myblogs_allblogs_options' ) || has_filter( 'myblogs_options' ) ) {
+	if (count($blogs) > 1 || has_action('myblogs_allblogs_options') || has_filter('myblogs_options')) {
 		?><input type="hidden" name="action" value="updateblogsettings" /><?php
-		wp_nonce_field( 'update-my-sites' );
+		wp_nonce_field('update-my-sites');
 		submit_button();
 	}
 	?>
@@ -133,4 +133,4 @@ 
 <?php endif; ?>
 	</div>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/custom-header.php

Braces +121 added lines, -91 removed lines

@@ -137,15 +137,17 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
+		if ( ! isset( $_GET['step'] ) ) {
+					return 1;
+		}
 
 		$step = (int) $_GET['step'];
 		if ( $step < 1 || 3 < $step ||
 			( 2 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce-custom-header-upload'], 'custom-header-upload' ) ) ||
 			( 3 == $step && ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'custom-header-crop-image' ) )
-		)
-			return 1;
+		) {
+					return 1;
+		}
 
 		return $step;
 	}
@@ -161,8 +163,9 @@ 
 		if ( ( 1 == $step || 3 == $step ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
+			if ( current_theme_supports( 'custom-header', 'header-text' ) ) {
+							wp_enqueue_script( 'wp-color-picker' );
+			}
 		} elseif ( 2 == $step ) {
 			wp_enqueue_script('imgareaselect');
 		}
@@ -176,10 +179,11 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
-			wp_enqueue_style('imgareaselect');
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					wp_enqueue_style( 'wp-color-picker' );
+		} elseif ( 2 == $step ) {
+					wp_enqueue_style('imgareaselect');
+		}
 	}
 
 	/**
@@ -188,11 +192,13 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
-			return;
+		if ( ! current_user_can('edit_theme_options') ) {
+					return;
+		}
 
-		if ( empty( $_POST ) )
-			return;
+		if ( empty( $_POST ) ) {
+					return;
+		}
 
 		$this->updated = true;
 
@@ -215,10 +221,11 @@ 
 			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
 			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
 			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['text-color']);
-			if ( strlen($color) == 6 || strlen($color) == 3 )
-				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			if ( strlen($color) == 6 || strlen($color) == 3 ) {
+							set_theme_mod('header_textcolor', $color);
+			} elseif ( ! $color ) {
+							set_theme_mod( 'header_textcolor', 'blank' );
+			}
 		}
 
 		if ( isset( $_POST['default-header'] ) ) {
@@ -238,8 +245,9 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
-			return;
+		if ( !isset($_wp_default_headers) ) {
+					return;
+		}
 
 		if ( ! empty( $this->default_headers ) ) {
 			return;
@@ -289,8 +297,9 @@ 
 			echo '<div class="default-header">';
 			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
 			$width = '';
-			if ( !empty( $header['attachment_id'] ) )
-				$width = ' width="230"';
+			if ( !empty( $header['attachment_id'] ) ) {
+							$width = ' width="230"';
+			}
 			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) .'"' . $width . ' /></label>';
 			echo '</div>';
 		}
@@ -304,10 +313,11 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			$this->js_1();
-		elseif ( 2 == $step )
-			$this->js_2();
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					$this->js_1();
+		} elseif ( 2 == $step ) {
+					$this->js_2();
+		}
 	}
 
 	/**
@@ -492,21 +502,24 @@ 
 
 		if ( $header_image ) {
 			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ( $custom_header->width ) {
+					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+		}
+		if ( $custom_header->height ) {
+					$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		}
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		else
-			$style = ' style="display:none;"';
+		if ( display_header_text() ) {
+					$style = ' style="color:#' . get_header_textcolor() . ';"';
+		} else {
+					$style = ' style="display:none;"';
+		}
 		?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
@@ -525,8 +538,8 @@ 
 	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
 		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
 	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s wide.' ) . ' ',
 				sprintf(
@@ -535,9 +548,10 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
+		}
 	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s tall.' ) . ' ',
 				sprintf(
@@ -546,10 +560,11 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
-			printf(
+		if ( current_theme_supports( 'custom-header', 'width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested width is %s.' ) . ' ',
 				sprintf(
@@ -558,8 +573,9 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
-		if ( current_theme_supports( 'custom-header', 'height' ) )
-			printf(
+		}
+		if ( current_theme_supports( 'custom-header', 'height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested height is %s.' ) . ' ',
 				sprintf(
@@ -568,6 +584,7 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	?></p>
 	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
@@ -620,9 +637,12 @@ 
 <td>
 <?php if ( current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
 	<p><?php _e( 'If you don&lsquo;t want to upload your own image, you can use one of these cool headers, or show a random one.' ) ?></p>
-<?php else: ?>
+<?php else {
+	: ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 		$this->show_header_selector( 'default' );
 	?>
@@ -752,11 +772,13 @@ 
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
-			$max_width = 1500;
+		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					$max_width = 1500;
+		}
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
+					$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		}
 		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
 
 		// If flexible height isn't supported and the image is the exact right size
@@ -764,8 +786,9 @@ 
 			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			if ( file_exists( $file ) ) {
+							wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
+			}
 
 			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
@@ -783,8 +806,9 @@ 
 		} elseif ( $width > $max_width ) {
 			$oitar = $width / $max_width;
 			$image = wp_crop_image($attachment_id, 0, 0, $width, $height, $max_width, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
-			if ( ! $image || is_wp_error( $image ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			if ( ! $image || is_wp_error( $image ) ) {
+							wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			}
 
 			/** This filter is documented in wp-admin/custom-header.php */
 			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
@@ -822,8 +846,9 @@ 
 	<p class="submit">
 	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+			submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	}
 	?>
 	</p>
 </form>
@@ -842,13 +867,15 @@ 
 
 		$uploaded_file = $_FILES['import'];
 		$wp_filetype = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) )
-			wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
+					wp_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		}
 
 		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset($file['error']) )
-			wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		if ( isset($file['error']) ) {
+					wp_die( $file['error'],  __( 'Image Upload Error' ) );
+		}
 
 		$url = $file['url'];
 		$type = $file['type'];
@@ -912,23 +939,26 @@ 
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) )
-			$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
-		elseif ( ! empty( $_POST['create-new-attachment'] ) )
-			$cropped = _copy_image_file( $attachment_id );
-		else
-			$cropped = get_attached_file( $attachment_id );
+		if ( empty( $_POST['skip-cropping'] ) ) {
+					$cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], $width, $height );
+		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
+					$cropped = _copy_image_file( $attachment_id );
+		} else {
+					$cropped = get_attached_file( $attachment_id );
+		}
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		if ( ! $cropped || is_wp_error( $cropped ) ) {
+					wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
 		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
 
 		$object = $this->create_attachment_object( $cropped, $attachment_id );
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty( $_POST['create-new-attachment'] ) ) {
+					unset( $object['ID'] );
+		}
 
 		// Update the attachment
 		$attachment_id = $this->insert_attachment( $object, $cropped );
@@ -965,15 +995,17 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('Sorry, you are not allowed to customize headers.'));
+		if ( ! current_user_can('edit_theme_options') ) {
+					wp_die(__('Sorry, you are not allowed to customize headers.'));
+		}
 		$step = $this->step();
-		if ( 2 == $step )
-			$this->step_2();
-		elseif ( 3 == $step )
-			$this->step_3();
-		else
-			$this->step_1();
+		if ( 2 == $step ) {
+					$this->step_2();
+		} elseif ( 3 == $step ) {
+					$this->step_3();
+		} else {
+					$this->step_1();
+		}
 	}
 
 	/**
@@ -1015,8 +1047,9 @@ 
 	final public function set_header_image( $choice ) {
 		if ( is_array( $choice ) || is_object( $choice ) ) {
 			$choice = (array) $choice;
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) )
-				return;
+			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
+							return;
+			}
 
 			$choice['url'] = esc_url_raw( $choice['url'] );
 
@@ -1046,10 +1079,11 @@ 
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
-			else
-				return;
+			if ( isset( $this->default_headers[ $choice ] ) ) {
+							$header_image_data = $this->default_headers[ $choice ];
+			} else {
+							return;
+			}
 		}
 
 		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
@@ -1123,21 +1157,17 @@ 
 
 		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
 			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_height && $has_flex_width ) {
+		} elseif ( $has_flex_height && $has_flex_width ) {
 			$dst['dst_height'] = $height;
-		}
-		else {
+		} else {
 			$dst['dst_height'] = $theme_height;
 		}
 
 		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
 			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
-		}
-		elseif ( $has_flex_width && $has_flex_height ) {
+		} elseif ( $has_flex_width && $has_flex_height ) {
 			$dst['dst_width'] = $width;
-		}
-		else {
+		} else {
 			$dst['dst_width'] = $theme_width;
 		}
 

src/wp-admin/customize.php

Spacing +49 added lines, -49 removed lines

@@ -7,28 +7,28 @@ 
  * @since 3.4.0
  */
 
-define( 'IFRAME_REQUEST', true );
+define('IFRAME_REQUEST', true);
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'customize' ) ) {
+if ( ! current_user_can('customize')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to customize this site.').'</p>',
 		403
 	);
 }
 
-wp_reset_vars( array( 'url', 'return', 'autofocus' ) );
-if ( ! empty( $url ) ) {
-	$wp_customize->set_preview_url( wp_unslash( $url ) );
+wp_reset_vars(array('url', 'return', 'autofocus'));
+if ( ! empty($url)) {
+	$wp_customize->set_preview_url(wp_unslash($url));
 }
-if ( ! empty( $return ) ) {
-	$wp_customize->set_return_url( wp_unslash( $return ) );
+if ( ! empty($return)) {
+	$wp_customize->set_return_url(wp_unslash($return));
 }
-if ( ! empty( $autofocus ) && is_array( $autofocus ) ) {
-	$wp_customize->set_autofocus( wp_unslash( $autofocus ) );
+if ( ! empty($autofocus) && is_array($autofocus)) {
+	$wp_customize->set_autofocus(wp_unslash($autofocus));
 }
 
 /**
@@ -41,56 +41,56 @@ 
 $wp_scripts = new WP_Scripts;
 $wp_scripts->registered = $registered;
 
-add_action( 'customize_controls_print_scripts',        'print_head_scripts', 20 );
-add_action( 'customize_controls_print_footer_scripts', '_wp_footer_scripts'     );
-add_action( 'customize_controls_print_styles',         'print_admin_styles', 20 );
+add_action('customize_controls_print_scripts', 'print_head_scripts', 20);
+add_action('customize_controls_print_footer_scripts', '_wp_footer_scripts');
+add_action('customize_controls_print_styles', 'print_admin_styles', 20);
 
 /**
  * Fires when Customizer controls are initialized, before scripts are enqueued.
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_init' );
+do_action('customize_controls_init');
 
-wp_enqueue_script( 'customize-controls' );
-wp_enqueue_style( 'customize-controls' );
+wp_enqueue_script('customize-controls');
+wp_enqueue_style('customize-controls');
 
 /**
  * Enqueue Customizer control scripts.
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_enqueue_scripts' );
+do_action('customize_controls_enqueue_scripts');
 
 // Let's roll.
-@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
+@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 wp_user_settings();
 _wp_admin_html_begin();
 
 $body_class = 'wp-core-ui wp-customizer js';
 
-if ( wp_is_mobile() ) :
+if (wp_is_mobile()) :
 	$body_class .= ' mobile';
 
 	?><meta name="viewport" id="viewport-meta" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.2" /><?php
 endif;
 
-if ( $wp_customize->is_ios() ) {
+if ($wp_customize->is_ios()) {
 	$body_class .= ' ios';
 }
 
-if ( is_rtl() ) {
+if (is_rtl()) {
 	$body_class .= ' rtl';
 }
-$body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+$body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
-$admin_title = sprintf( $wp_customize->get_document_title_template(), __( 'Loading&hellip;' ) );
+$admin_title = sprintf($wp_customize->get_document_title_template(), __('Loading&hellip;'));
 
 ?><title><?php echo $admin_title; ?></title>
 
 <script type="text/javascript">
-var ajaxurl = <?php echo wp_json_encode( admin_url( 'admin-ajax.php', 'relative' ) ); ?>;
+var ajaxurl = <?php echo wp_json_encode(admin_url('admin-ajax.php', 'relative')); ?>;
 </script>
 
 <?php
@@ -99,31 +99,31 @@ 
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_print_styles' );
+do_action('customize_controls_print_styles');
 
 /**
  * Fires when Customizer control scripts are printed.
  *
  * @since 3.4.0
  */
-do_action( 'customize_controls_print_scripts' );
+do_action('customize_controls_print_scripts');
 ?>
 </head>
-<body class="<?php echo esc_attr( $body_class ); ?>">
+<body class="<?php echo esc_attr($body_class); ?>">
 <div class="wp-full-overlay expanded">
 	<form id="customize-controls" class="wrap wp-full-overlay-sidebar">
 		<div id="customize-header-actions" class="wp-full-overlay-header">
 			<?php
-			$save_text = $wp_customize->is_theme_active() ? __( 'Save &amp; Publish' ) : __( 'Save &amp; Activate' );
-			submit_button( $save_text, 'primary save', 'save', false );
+			$save_text = $wp_customize->is_theme_active() ? __('Save &amp; Publish') : __('Save &amp; Activate');
+			submit_button($save_text, 'primary save', 'save', false);
 			?>
 			<span class="spinner"></span>
 			<button type="button" class="customize-controls-preview-toggle">
-				<span class="controls"><?php _e( 'Customize' ); ?></span>
-				<span class="preview"><?php _e( 'Preview' ); ?></span>
+				<span class="controls"><?php _e('Customize'); ?></span>
+				<span class="preview"><?php _e('Preview'); ?></span>
 			</button>
-			<a class="customize-controls-close" href="<?php echo esc_url( $wp_customize->get_return_url() ); ?>">
-				<span class="screen-reader-text"><?php _e( 'Close the Customizer and go back to the previous page' ); ?></span>
+			<a class="customize-controls-close" href="<?php echo esc_url($wp_customize->get_return_url()); ?>">
+				<span class="screen-reader-text"><?php _e('Close the Customizer and go back to the previous page'); ?></span>
 			</a>
 		</div>
 
@@ -132,12 +132,12 @@ 
 			<div id="customize-info" class="accordion-section customize-info">
 				<div class="accordion-section-title">
 					<span class="preview-notice"><?php
-						echo sprintf( __( 'You are customizing %s' ), '<strong class="panel-title site-title">' . get_bloginfo( 'name' ) . '</strong>' );
+						echo sprintf(__('You are customizing %s'), '<strong class="panel-title site-title">'.get_bloginfo('name').'</strong>');
 					?></span>
-					<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e( 'Help' ); ?></span></button>
+					<button type="button" class="customize-help-toggle dashicons dashicons-editor-help" aria-expanded="false"><span class="screen-reader-text"><?php _e('Help'); ?></span></button>
 				</div>
 				<div class="customize-panel-description"><?php
-					_e( 'The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.' );
+					_e('The Customizer allows you to preview changes to your site before publishing them. You can also navigate to different pages on your site to preview them.');
 				?></div>
 			</div>
 
@@ -149,28 +149,28 @@ 
 
 		<div id="customize-footer-actions" class="wp-full-overlay-footer">
 			<?php $previewable_devices = $wp_customize->get_previewable_devices(); ?>
-			<?php if ( ! empty( $previewable_devices ) ) : ?>
+			<?php if ( ! empty($previewable_devices)) : ?>
 			<div class="devices">
-				<?php foreach ( (array) $previewable_devices as $device => $settings ) : ?>
+				<?php foreach ((array) $previewable_devices as $device => $settings) : ?>
 					<?php
-					if ( empty( $settings['label'] ) ) {
+					if (empty($settings['label'])) {
 						continue;
 					}
-					$active = ! empty( $settings['default'] );
-					$class = 'preview-' . $device;
-					if ( $active ) {
+					$active = ! empty($settings['default']);
+					$class = 'preview-'.$device;
+					if ($active) {
 						$class .= ' active';
 					}
 					?>
-					<button type="button" class="<?php echo esc_attr( $class ); ?>" aria-pressed="<?php echo esc_attr( $active ) ?>" data-device="<?php echo esc_attr( $device ); ?>">
-						<span class="screen-reader-text"><?php echo esc_html( $settings['label'] ); ?></span>
+					<button type="button" class="<?php echo esc_attr($class); ?>" aria-pressed="<?php echo esc_attr($active) ?>" data-device="<?php echo esc_attr($device); ?>">
+						<span class="screen-reader-text"><?php echo esc_html($settings['label']); ?></span>
 					</button>
 				<?php endforeach; ?>
 			</div>
 			<?php endif; ?>
-			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e( 'Collapse Sidebar' ); ?>">
+			<button type="button" class="collapse-sidebar button-secondary" aria-expanded="true" aria-label="<?php esc_attr_e('Collapse Sidebar'); ?>">
 				<span class="collapse-sidebar-arrow"></span>
-				<span class="collapse-sidebar-label"><?php _e( 'Collapse' ); ?></span>
+				<span class="collapse-sidebar-label"><?php _e('Collapse'); ?></span>
 			</button>
 		</div>
 	</form>
@@ -182,7 +182,7 @@ 
 	 *
 	 * @since 3.4.0
 	 */
-	do_action( 'customize_controls_print_footer_scripts' );
+	do_action('customize_controls_print_footer_scripts');
 	?>
 </div>
 </body>

src/wp-admin/plugin-install.php

Spacing +52 added lines, -52 removed lines

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