iqltechnologies / brighty

brighty/wp-admin/includes/nav-menu.php

Spacing +299 added lines, -299 removed lines

@@ -20,45 +20,45 @@ 
  *
  * @param array $request The unsanitized request values.
  */
-function _wp_ajax_menu_quick_search( $request = array() ) {
+function _wp_ajax_menu_quick_search($request = array()) {
 	$args            = array();
-	$type            = isset( $request['type'] ) ? $request['type'] : '';
-	$object_type     = isset( $request['object_type'] ) ? $request['object_type'] : '';
-	$query           = isset( $request['q'] ) ? $request['q'] : '';
-	$response_format = isset( $request['response-format'] ) ? $request['response-format'] : '';
+	$type            = isset($request['type']) ? $request['type'] : '';
+	$object_type     = isset($request['object_type']) ? $request['object_type'] : '';
+	$query           = isset($request['q']) ? $request['q'] : '';
+	$response_format = isset($request['response-format']) ? $request['response-format'] : '';
 
-	if ( ! $response_format || ! in_array( $response_format, array( 'json', 'markup' ), true ) ) {
+	if (!$response_format || !in_array($response_format, array('json', 'markup'), true)) {
 		$response_format = 'json';
 	}
 
-	if ( 'markup' === $response_format ) {
+	if ('markup' === $response_format) {
 		$args['walker'] = new Walker_Nav_Menu_Checklist;
 	}
 
-	if ( 'get-post-item' === $type ) {
-		if ( post_type_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+	if ('get-post-item' === $type) {
+		if (post_type_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' === $response_format ) {
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
-				} elseif ( 'json' === $response_format ) {
+				if ('markup' === $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($object_id))), 0, (object) $args);
+				} elseif ('json' === $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID'         => $object_id,
-							'post_title' => get_the_title( $object_id ),
-							'post_type'  => get_post_type( $object_id ),
+							'post_title' => get_the_title($object_id),
+							'post_type'  => get_post_type($object_id),
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( taxonomy_exists( $object_type ) ) {
-			if ( isset( $request['ID'] ) ) {
+		} elseif (taxonomy_exists($object_type)) {
+			if (isset($request['ID'])) {
 				$object_id = (int) $request['ID'];
-				if ( 'markup' === $response_format ) {
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
-				} elseif ( 'json' === $response_format ) {
-					$post_obj = get_term( $object_id, $object_type );
+				if ('markup' === $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_term($object_id, $object_type))), 0, (object) $args);
+				} elseif ('json' === $response_format) {
+					$post_obj = get_term($object_id, $object_type);
 					echo wp_json_encode(
 						array(
 							'ID'         => $object_id,
@@ -70,9 +70,9 @@ 
 				}
 			}
 		}
-	} elseif ( preg_match( '/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches ) ) {
-		if ( 'posttype' === $matches[1] && get_post_type_object( $matches[2] ) ) {
-			$post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
+	} elseif (preg_match('/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches)) {
+		if ('posttype' === $matches[1] && get_post_type_object($matches[2])) {
+			$post_type_obj = _wp_nav_menu_meta_box_object(get_post_type_object($matches[2]));
 			$args          = array_merge(
 				$args,
 				array(
@@ -84,30 +84,30 @@ 
 					's'                      => $query,
 				)
 			);
-			if ( isset( $post_type_obj->_default_query ) ) {
-				$args = array_merge( $args, (array) $post_type_obj->_default_query );
+			if (isset($post_type_obj->_default_query)) {
+				$args = array_merge($args, (array) $post_type_obj->_default_query);
 			}
-			$search_results_query = new WP_Query( $args );
-			if ( ! $search_results_query->have_posts() ) {
+			$search_results_query = new WP_Query($args);
+			if (!$search_results_query->have_posts()) {
 				return;
 			}
-			while ( $search_results_query->have_posts() ) {
+			while ($search_results_query->have_posts()) {
 				$post = $search_results_query->next_post();
-				if ( 'markup' === $response_format ) {
+				if ('markup' === $response_format) {
 					$var_by_ref = $post->ID;
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
-				} elseif ( 'json' === $response_format ) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array(get_post($var_by_ref))), 0, (object) $args);
+				} elseif ('json' === $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID'         => $post->ID,
-							'post_title' => get_the_title( $post->ID ),
+							'post_title' => get_the_title($post->ID),
 							'post_type'  => $matches[2],
 						)
 					);
 					echo "\n";
 				}
 			}
-		} elseif ( 'taxonomy' === $matches[1] ) {
+		} elseif ('taxonomy' === $matches[1]) {
 			$terms = get_terms(
 				array(
 					'taxonomy'   => $matches[2],
@@ -116,13 +116,13 @@ 
 					'hide_empty' => false,
 				)
 			);
-			if ( empty( $terms ) || is_wp_error( $terms ) ) {
+			if (empty($terms) || is_wp_error($terms)) {
 				return;
 			}
-			foreach ( (array) $terms as $term ) {
-				if ( 'markup' === $response_format ) {
-					echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
-				} elseif ( 'json' === $response_format ) {
+			foreach ((array) $terms as $term) {
+				if ('markup' === $response_format) {
+					echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', array($term)), 0, (object) $args);
+				} elseif ('json' === $response_format) {
 					echo wp_json_encode(
 						array(
 							'ID'         => $term->term_id,
@@ -145,14 +145,14 @@ 
 function wp_nav_menu_setup() {
 	// Register meta boxes.
 	wp_nav_menu_post_type_meta_boxes();
-	add_meta_box( 'add-custom-links', __( 'Custom Links' ), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
+	add_meta_box('add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default');
 	wp_nav_menu_taxonomy_meta_boxes();
 
 	// Register advanced menu items (columns).
-	add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
+	add_filter('manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
 
 	// If first time editing, disable advanced items by default.
-	if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
+	if (false === get_user_option('managenav-menuscolumnshidden')) {
 		$user = wp_get_current_user();
 		update_user_meta(
 			$user->ID,
@@ -178,18 +178,18 @@ 
 function wp_initial_nav_menu_meta_boxes() {
 	global $wp_meta_boxes;
 
-	if ( get_user_option( 'metaboxhidden_nav-menus' ) !== false || ! is_array( $wp_meta_boxes ) ) {
+	if (get_user_option('metaboxhidden_nav-menus') !== false || !is_array($wp_meta_boxes)) {
 		return;
 	}
 
-	$initial_meta_boxes = array( 'add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category' );
+	$initial_meta_boxes = array('add-post-type-page', 'add-post-type-post', 'add-custom-links', 'add-category');
 	$hidden_meta_boxes  = array();
 
-	foreach ( array_keys( $wp_meta_boxes['nav-menus'] ) as $context ) {
-		foreach ( array_keys( $wp_meta_boxes['nav-menus'][ $context ] ) as $priority ) {
-			foreach ( $wp_meta_boxes['nav-menus'][ $context ][ $priority ] as $box ) {
-				if ( in_array( $box['id'], $initial_meta_boxes, true ) ) {
-					unset( $box['id'] );
+	foreach (array_keys($wp_meta_boxes['nav-menus']) as $context) {
+		foreach (array_keys($wp_meta_boxes['nav-menus'][$context]) as $priority) {
+			foreach ($wp_meta_boxes['nav-menus'][$context][$priority] as $box) {
+				if (in_array($box['id'], $initial_meta_boxes, true)) {
+					unset($box['id']);
 				} else {
 					$hidden_meta_boxes[] = $box['id'];
 				}
@@ -198,7 +198,7 @@ 
 	}
 
 	$user = wp_get_current_user();
-	update_user_meta( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes );
+	update_user_meta($user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes);
 }
 
 /**
@@ -207,13 +207,13 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_post_type_meta_boxes() {
-	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+	$post_types = get_post_types(array('show_in_nav_menus' => true), 'object');
 
-	if ( ! $post_types ) {
+	if (!$post_types) {
 		return;
 	}
 
-	foreach ( $post_types as $post_type ) {
+	foreach ($post_types as $post_type) {
 		/**
 		 * Filters whether a menu items meta box will be added for the current
 		 * object type.
@@ -226,12 +226,12 @@ 
 		 * @param WP_Post_Type|false $post_type The current object to add a menu items
 		 *                                      meta box for.
 		 */
-		$post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
-		if ( $post_type ) {
+		$post_type = apply_filters('nav_menu_meta_box_object', $post_type);
+		if ($post_type) {
 			$id = $post_type->name;
 			// Give pages a higher priority.
-			$priority = ( 'page' === $post_type->name ? 'core' : 'default' );
-			add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
+			$priority = ('page' === $post_type->name ? 'core' : 'default');
+			add_meta_box("add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type);
 		}
 	}
 }
@@ -242,18 +242,18 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
+	$taxonomies = get_taxonomies(array('show_in_nav_menus' => true), 'object');
 
-	if ( ! $taxonomies ) {
+	if (!$taxonomies) {
 		return;
 	}
 
-	foreach ( $taxonomies as $tax ) {
+	foreach ($taxonomies as $tax) {
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
-		$tax = apply_filters( 'nav_menu_meta_box_object', $tax );
-		if ( $tax ) {
+		$tax = apply_filters('nav_menu_meta_box_object', $tax);
+		if ($tax) {
 			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+			add_meta_box("add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax);
 		}
 	}
 }
@@ -270,14 +270,14 @@ 
  * @param bool       $display              Whether to display or just return the string.
  * @return string|false Disabled attribute if at least one menu exists, false if not.
  */
-function wp_nav_menu_disabled_check( $nav_menu_selected_id, $display = true ) {
+function wp_nav_menu_disabled_check($nav_menu_selected_id, $display = true) {
 	global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus ) {
+	if ($one_theme_location_no_menus) {
 		return false;
 	}
 
-	return disabled( $nav_menu_selected_id, 0, $display );
+	return disabled($nav_menu_selected_id, 0, $display);
 }
 
 /**
@@ -297,18 +297,18 @@ 
 	<div class="customlinkdiv" id="customlinkdiv">
 		<input type="hidden" value="custom" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-type]" />
 		<p id="menu-item-url-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
-			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="code menu-item-textbox form-required" placeholder="https://" />
+			<label class="howto" for="custom-menu-item-url"><?php _e('URL'); ?></label>
+			<input id="custom-menu-item-url" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-url]" type="text"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="code menu-item-textbox form-required" placeholder="https://" />
 		</p>
 
 		<p id="menu-item-name-wrap" class="wp-clearfix">
-			<label class="howto" for="custom-menu-item-name"><?php _e( 'Link Text' ); ?></label>
-			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="regular-text menu-item-textbox" />
+			<label class="howto" for="custom-menu-item-name"><?php _e('Link Text'); ?></label>
+			<input id="custom-menu-item-name" name="menu-item[<?php echo $_nav_menu_placeholder; ?>][menu-item-title]" type="text"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="regular-text menu-item-textbox" />
 		</p>
 
 		<p class="button-controls wp-clearfix">
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-custom-menu-item" id="submit-customlinkdiv" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -335,17 +335,17 @@ 
  *     @type WP_Post_Type $args     Extra meta box arguments (the post type object for this meta box).
  * }
  */
-function wp_nav_menu_item_post_type_meta_box( $data_object, $box ) {
+function wp_nav_menu_item_post_type_meta_box($data_object, $box) {
 	global $_nav_menu_placeholder, $nav_menu_selected_id;
 
 	$post_type_name = $box['args']->name;
-	$post_type      = get_post_type_object( $post_type_name );
+	$post_type      = get_post_type_object($post_type_name);
 	$tab_name       = $post_type_name . '-tab';
 
 	// Paginate browsing for large numbers of post objects.
 	$per_page = 50;
-	$pagenum  = isset( $_REQUEST[ $tab_name ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset   = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum  = isset($_REQUEST[$tab_name]) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset   = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'offset'                 => $offset,
@@ -358,8 +358,8 @@ 
 		'update_post_meta_cache' => false,
 	);
 
-	if ( isset( $box['args']->_default_query ) ) {
-		$args = array_merge( $args, (array) $box['args']->_default_query );
+	if (isset($box['args']->_default_query)) {
+		$args = array_merge($args, (array) $box['args']->_default_query);
 	}
 
 	/*
@@ -367,21 +367,21 @@ 
 	 * Posts Page and Privacy Policy Page at the top of the list.
 	 */
 	$important_pages = array();
-	if ( 'page' === $post_type_name ) {
+	if ('page' === $post_type_name) {
 		$suppress_page_ids = array();
 
 		// Insert Front Page or custom Home link.
-		$front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
+		$front_page = 'page' === get_option('show_on_front') ? (int) get_option('page_on_front') : 0;
 
 		$front_page_obj = null;
-		if ( ! empty( $front_page ) ) {
-			$front_page_obj                = get_post( $front_page );
+		if (!empty($front_page)) {
+			$front_page_obj                = get_post($front_page);
 			$front_page_obj->front_or_home = true;
 
 			$important_pages[]   = $front_page_obj;
 			$suppress_page_ids[] = $front_page_obj->ID;
 		} else {
-			$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
+			$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? (int) $_nav_menu_placeholder - 1 : -1;
 			$front_page_obj        = (object) array(
 				'front_or_home' => true,
 				'ID'            => 0,
@@ -389,20 +389,20 @@ 
 				'post_content'  => '',
 				'post_excerpt'  => '',
 				'post_parent'   => '',
-				'post_title'    => _x( 'Home', 'nav menu home label' ),
+				'post_title'    => _x('Home', 'nav menu home label'),
 				'post_type'     => 'nav_menu_item',
 				'type'          => 'custom',
-				'url'           => home_url( '/' ),
+				'url'           => home_url('/'),
 			);
 
 			$important_pages[] = $front_page_obj;
 		}
 
 		// Insert Posts Page.
-		$posts_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
+		$posts_page = 'page' === get_option('show_on_front') ? (int) get_option('page_for_posts') : 0;
 
-		if ( ! empty( $posts_page ) ) {
-			$posts_page_obj             = get_post( $posts_page );
+		if (!empty($posts_page)) {
+			$posts_page_obj             = get_post($posts_page);
 			$posts_page_obj->posts_page = true;
 
 			$important_pages[]   = $posts_page_obj;
@@ -410,11 +410,11 @@ 
 		}
 
 		// Insert Privacy Policy Page.
-		$privacy_policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+		$privacy_policy_page_id = (int) get_option('wp_page_for_privacy_policy');
 
-		if ( ! empty( $privacy_policy_page_id ) ) {
-			$privacy_policy_page = get_post( $privacy_policy_page_id );
-			if ( $privacy_policy_page instanceof WP_Post && 'publish' === $privacy_policy_page->post_status ) {
+		if (!empty($privacy_policy_page_id)) {
+			$privacy_policy_page = get_post($privacy_policy_page_id);
+			if ($privacy_policy_page instanceof WP_Post && 'publish' === $privacy_policy_page->post_status) {
 				$privacy_policy_page->privacy_policy_page = true;
 
 				$important_pages[]   = $privacy_policy_page;
@@ -423,27 +423,27 @@ 
 		}
 
 		// Add suppression array to arguments for WP_Query.
-		if ( ! empty( $suppress_page_ids ) ) {
+		if (!empty($suppress_page_ids)) {
 			$args['post__not_in'] = $suppress_page_ids;
 		}
 	}
 
 	// @todo Transient caching of these results with proper invalidation on updating of a post of this type.
 	$get_posts = new WP_Query;
-	$posts     = $get_posts->query( $args );
+	$posts     = $get_posts->query($args);
 
 	// Only suppress and insert when more than just suppression pages available.
-	if ( ! $get_posts->post_count ) {
-		if ( ! empty( $suppress_page_ids ) ) {
-			unset( $args['post__not_in'] );
+	if (!$get_posts->post_count) {
+		if (!empty($suppress_page_ids)) {
+			unset($args['post__not_in']);
 			$get_posts = new WP_Query;
-			$posts     = $get_posts->query( $args );
+			$posts     = $get_posts->query($args);
 		} else {
-			echo '<p>' . __( 'No items.' ) . '</p>';
+			echo '<p>' . __('No items.') . '</p>';
 			return;
 		}
-	} elseif ( ! empty( $important_pages ) ) {
-		$posts = array_merge( $important_pages, $posts );
+	} elseif (!empty($important_pages)) {
+		$posts = array_merge($important_pages, $posts);
 	}
 
 	$num_pages = $get_posts->max_num_pages;
@@ -459,31 +459,31 @@ 
 				)
 			),
 			'format'             => '',
-			'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
-			'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
-			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+			'prev_text'          => '<span aria-label="' . esc_attr__('Previous page') . '">' . __('&laquo;') . '</span>',
+			'next_text'          => '<span aria-label="' . esc_attr__('Next page') . '">' . __('&raquo;') . '</span>',
+			'before_page_number' => '<span class="screen-reader-text">' . __('Page') . '</span> ',
 			'total'              => $num_pages,
 			'current'            => $pagenum,
 		)
 	);
 
 	$db_fields = false;
-	if ( is_post_type_hierarchical( $post_type_name ) ) {
+	if (is_post_type_hierarchical($post_type_name)) {
 		$db_fields = array(
 			'parent' => 'post_parent',
 			'id'     => 'ID',
 		);
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-recent';
 
-	if ( isset( $_REQUEST[ $tab_name ] ) && in_array( $_REQUEST[ $tab_name ], array( 'all', 'search' ), true ) ) {
-		$current_tab = $_REQUEST[ $tab_name ];
+	if (isset($_REQUEST[$tab_name]) && in_array($_REQUEST[$tab_name], array('all', 'search'), true)) {
+		$current_tab = $_REQUEST[$tab_name];
 	}
 
-	if ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
+	if (!empty($_REQUEST['quick-search-posttype-' . $post_type_name])) {
 		$current_tab = 'search';
 	}
 
@@ -499,35 +499,35 @@ 
 	$most_recent_url = '';
 	$view_all_url    = '';
 	$search_url      = '';
-	if ( $nav_menu_selected_id ) {
-		$most_recent_url = esc_url( add_query_arg( $tab_name, 'most-recent', remove_query_arg( $removed_args ) ) );
-		$view_all_url    = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
-		$search_url      = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
+	if ($nav_menu_selected_id) {
+		$most_recent_url = esc_url(add_query_arg($tab_name, 'most-recent', remove_query_arg($removed_args)));
+		$view_all_url    = esc_url(add_query_arg($tab_name, 'all', remove_query_arg($removed_args)));
+		$search_url      = esc_url(add_query_arg($tab_name, 'search', remove_query_arg($removed_args)));
 	}
 	?>
 	<div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
 		<ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-recent' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
-					<?php _e( 'Most Recent' ); ?>
+			<li <?php echo ('most-recent' === $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
+					<?php _e('Most Recent'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' === $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="<?php echo esc_attr($post_type_name); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
-					<?php _e( 'Search' ); ?>
+			<li <?php echo ('search' === $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr($post_type_name); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .posttype-tabs -->
 
-		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php _e( 'Most Recent' ); ?>" tabindex="0">
+		<div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ('most-recent' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); ?>" role="region" aria-label="<?php _e('Most Recent'); ?>" tabindex="0">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args    = array_merge(
+				$recent_args = array_merge(
 					$args,
 					array(
 						'orderby'        => 'post_date',
@@ -535,7 +535,7 @@ 
 						'posts_per_page' => 15,
 					)
 				);
-				$most_recent    = $get_posts->query( $recent_args );
+				$most_recent    = $get_posts->query($recent_args);
 				$args['walker'] = $walker;
 
 				/**
@@ -557,17 +557,17 @@ 
 				 * @param array     $box         Arguments passed to `wp_nav_menu_item_post_type_meta_box()`.
 				 * @param array     $recent_args An array of `WP_Query` arguments for 'Most Recent' tab.
 				 */
-				$most_recent = apply_filters( "nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box, $recent_args );
+				$most_recent = apply_filters("nav_menu_items_{$post_type_name}_recent", $most_recent, $args, $box, $recent_args);
 
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $most_recent ), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search" role="region" aria-label="<?php echo $post_type->labels->search_items; ?>" tabindex="0">
+		<div class="tabs-panel <?php echo ('search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search" role="region" aria-label="<?php echo $post_type->labels->search_items; ?>" tabindex="0">
 			<?php
-			if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
-				$searched       = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
+			if (isset($_REQUEST['quick-search-posttype-' . $post_type_name])) {
+				$searched       = esc_attr($_REQUEST['quick-search-posttype-' . $post_type_name]);
 				$search_results = get_posts(
 					array(
 						's'         => $searched,
@@ -582,28 +582,28 @@ 
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
-				<input type="search"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
+				<label for="quick-search-posttype-<?php echo $post_type_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
+				<input type="search"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="quick-search" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" id="quick-search-posttype-<?php echo $post_type_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
+				<?php submit_button(__('Search'), 'small quick-search-submit hide-if-js', 'submit', false, array('id' => 'submit-quick-search-posttype-' . $post_type_name)); ?>
 			</p>
 
 			<ul id="<?php echo $post_type_name; ?>-search-checklist" data-wp-lists="list:<?php echo $post_type_name; ?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if (!empty($search_results) && !is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
-				<li><?php _e( 'No results found.' ); ?></li>
+			<?php elseif (!empty($searched)) : ?>
+				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $post_type->labels->all_items; ?>" tabindex="0">
-			<?php if ( ! empty( $page_links ) ) : ?>
+		<div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ('all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); ?>" role="region" aria-label="<?php echo $post_type->labels->all_items; ?>" tabindex="0">
+			<?php if (!empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -612,8 +612,8 @@ 
 				<?php
 				$args['walker'] = $walker;
 
-				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
+				if ($post_type->has_archive) {
+					$_nav_menu_placeholder = (0 > $_nav_menu_placeholder) ? (int) $_nav_menu_placeholder - 1 : -1;
 					array_unshift(
 						$posts,
 						(object) array(
@@ -625,7 +625,7 @@ 
 							'post_title'   => $post_type->labels->archives,
 							'post_type'    => 'nav_menu_item',
 							'type'         => 'post_type_archive',
-							'url'          => get_post_type_archive_link( $post_type_name ),
+							'url'          => get_post_type_archive_link($post_type_name),
 						)
 					);
 				}
@@ -652,28 +652,28 @@ 
 				 * @param array        $args      An array of `WP_Query` arguments.
 				 * @param WP_Post_Type $post_type The current post type object for this menu item meta box.
 				 */
-				$posts = apply_filters( "nav_menu_items_{$post_type_name}", $posts, $args, $post_type );
+				$posts = apply_filters("nav_menu_items_{$post_type_name}", $posts, $args, $post_type);
 
-				$checkbox_items = walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $posts ), 0, (object) $args );
+				$checkbox_items = walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $posts), 0, (object) $args);
 
 				echo $checkbox_items;
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if (!empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
 			<?php endif; ?>
 		</div><!-- /.tabs-panel -->
 
-		<p class="button-controls wp-clearfix" data-items-type="posttype-<?php echo esc_attr( $post_type_name ); ?>">
+		<p class="button-controls wp-clearfix" data-items-type="posttype-<?php echo esc_attr($post_type_name); ?>">
 			<span class="list-controls hide-if-no-js">
-				<input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
-				<label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
+				<input type="checkbox"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> id="<?php echo esc_attr($tab_name); ?>" class="select-all" />
+				<label for="<?php echo esc_attr($tab_name); ?>"><?php _e('Select All'); ?></label>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr( 'submit-posttype-' . $post_type_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-post-type-menu-item" id="<?php echo esc_attr('submit-posttype-' . $post_type_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -699,17 +699,17 @@ 
  *     @type object   $args     Extra meta box arguments (the taxonomy object for this meta box).
  * }
  */
-function wp_nav_menu_item_taxonomy_meta_box( $data_object, $box ) {
+function wp_nav_menu_item_taxonomy_meta_box($data_object, $box) {
 	global $nav_menu_selected_id;
 
 	$taxonomy_name = $box['args']->name;
-	$taxonomy      = get_taxonomy( $taxonomy_name );
+	$taxonomy      = get_taxonomy($taxonomy_name);
 	$tab_name      = $taxonomy_name . '-tab';
 
 	// Paginate browsing for large numbers of objects.
 	$per_page = 50;
-	$pagenum  = isset( $_REQUEST[ $tab_name ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
-	$offset   = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
+	$pagenum  = isset($_REQUEST[$tab_name]) && isset($_REQUEST['paged']) ? absint($_REQUEST['paged']) : 1;
+	$offset   = 0 < $pagenum ? $per_page * ($pagenum - 1) : 0;
 
 	$args = array(
 		'taxonomy'     => $taxonomy_name,
@@ -725,10 +725,10 @@ 
 		'pad_counts'   => false,
 	);
 
-	$terms = get_terms( $args );
+	$terms = get_terms($args);
 
-	if ( ! $terms || is_wp_error( $terms ) ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
+	if (!$terms || is_wp_error($terms)) {
+		echo '<p>' . __('No items.') . '</p>';
 		return;
 	}
 
@@ -755,31 +755,31 @@ 
 				)
 			),
 			'format'             => '',
-			'prev_text'          => '<span aria-label="' . esc_attr__( 'Previous page' ) . '">' . __( '&laquo;' ) . '</span>',
-			'next_text'          => '<span aria-label="' . esc_attr__( 'Next page' ) . '">' . __( '&raquo;' ) . '</span>',
-			'before_page_number' => '<span class="screen-reader-text">' . __( 'Page' ) . '</span> ',
+			'prev_text'          => '<span aria-label="' . esc_attr__('Previous page') . '">' . __('&laquo;') . '</span>',
+			'next_text'          => '<span aria-label="' . esc_attr__('Next page') . '">' . __('&raquo;') . '</span>',
+			'before_page_number' => '<span class="screen-reader-text">' . __('Page') . '</span> ',
 			'total'              => $num_pages,
 			'current'            => $pagenum,
 		)
 	);
 
 	$db_fields = false;
-	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
+	if (is_taxonomy_hierarchical($taxonomy_name)) {
 		$db_fields = array(
 			'parent' => 'parent',
 			'id'     => 'term_id',
 		);
 	}
 
-	$walker = new Walker_Nav_Menu_Checklist( $db_fields );
+	$walker = new Walker_Nav_Menu_Checklist($db_fields);
 
 	$current_tab = 'most-used';
 
-	if ( isset( $_REQUEST[ $tab_name ] ) && in_array( $_REQUEST[ $tab_name ], array( 'all', 'most-used', 'search' ), true ) ) {
-		$current_tab = $_REQUEST[ $tab_name ];
+	if (isset($_REQUEST[$tab_name]) && in_array($_REQUEST[$tab_name], array('all', 'most-used', 'search'), true)) {
+		$current_tab = $_REQUEST[$tab_name];
 	}
 
-	if ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
+	if (!empty($_REQUEST['quick-search-taxonomy-' . $taxonomy_name])) {
 		$current_tab = 'search';
 	}
 
@@ -795,35 +795,35 @@ 
 	$most_used_url = '';
 	$view_all_url  = '';
 	$search_url    = '';
-	if ( $nav_menu_selected_id ) {
-		$most_used_url = esc_url( add_query_arg( $tab_name, 'most-used', remove_query_arg( $removed_args ) ) );
-		$view_all_url  = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
-		$search_url    = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
+	if ($nav_menu_selected_id) {
+		$most_used_url = esc_url(add_query_arg($tab_name, 'most-used', remove_query_arg($removed_args)));
+		$view_all_url  = esc_url(add_query_arg($tab_name, 'all', remove_query_arg($removed_args)));
+		$search_url    = esc_url(add_query_arg($tab_name, 'search', remove_query_arg($removed_args)));
 	}
 	?>
 	<div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
 		<ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
-			<li <?php echo ( 'most-used' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
-					<?php echo esc_html( $taxonomy->labels->most_used ); ?>
+			<li <?php echo ('most-used' === $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
+					<?php echo esc_html($taxonomy->labels->most_used); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
-					<?php _e( 'View All' ); ?>
+			<li <?php echo ('all' === $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr($taxonomy_name); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
+					<?php _e('View All'); ?>
 				</a>
 			</li>
-			<li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
-				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
-					<?php _e( 'Search' ); ?>
+			<li <?php echo ('search' === $current_tab ? ' class="tabs"' : ''); ?>>
+				<a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr($taxonomy_name); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
+					<?php _e('Search'); ?>
 				</a>
 			</li>
 		</ul><!-- .taxonomy-tabs -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->most_used; ?>" tabindex="0">
+		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ('most-used' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); ?>" role="region" aria-label="<?php echo $taxonomy->labels->most_used; ?>" tabindex="0">
 			<ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
 				<?php
-				$popular_terms  = get_terms(
+				$popular_terms = get_terms(
 					array(
 						'taxonomy'     => $taxonomy_name,
 						'orderby'      => 'count',
@@ -833,13 +833,13 @@ 
 					)
 				);
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $popular_terms ), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args);
 				?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->all_items; ?>" tabindex="0">
-			<?php if ( ! empty( $page_links ) ) : ?>
+		<div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ('all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); ?>" role="region" aria-label="<?php echo $taxonomy->labels->all_items; ?>" tabindex="0">
+			<?php if (!empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
@@ -847,20 +847,20 @@ 
 			<ul id="<?php echo $taxonomy_name; ?>checklist" data-wp-lists="list:<?php echo $taxonomy_name; ?>" class="categorychecklist form-no-clear">
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $terms ), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $terms), 0, (object) $args);
 				?>
 			</ul>
-			<?php if ( ! empty( $page_links ) ) : ?>
+			<?php if (!empty($page_links)) : ?>
 				<div class="add-menu-item-pagelinks">
 					<?php echo $page_links; ?>
 				</div>
 			<?php endif; ?>
 		</div><!-- /.tabs-panel -->
 
-		<div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>" role="region" aria-label="<?php echo $taxonomy->labels->search_items; ?>" tabindex="0">
+		<div class="tabs-panel <?php echo ('search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive'); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>" role="region" aria-label="<?php echo $taxonomy->labels->search_items; ?>" tabindex="0">
 			<?php
-			if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
-				$searched       = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
+			if (isset($_REQUEST['quick-search-taxonomy-' . $taxonomy_name])) {
+				$searched       = esc_attr($_REQUEST['quick-search-taxonomy-' . $taxonomy_name]);
 				$search_results = get_terms(
 					array(
 						'taxonomy'     => $taxonomy_name,
@@ -877,34 +877,34 @@ 
 			}
 			?>
 			<p class="quick-search-wrap">
-				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e( 'Search' ); ?></label>
+				<label for="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" class="screen-reader-text"><?php _e('Search'); ?></label>
 				<input type="search" class="quick-search" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" id="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
 				<span class="spinner"></span>
-				<?php submit_button( __( 'Search' ), 'small quick-search-submit hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
+				<?php submit_button(__('Search'), 'small quick-search-submit hide-if-js', 'submit', false, array('id' => 'submit-quick-search-taxonomy-' . $taxonomy_name)); ?>
 			</p>
 
 			<ul id="<?php echo $taxonomy_name; ?>-search-checklist" data-wp-lists="list:<?php echo $taxonomy_name; ?>" class="categorychecklist form-no-clear">
-			<?php if ( ! empty( $search_results ) && ! is_wp_error( $search_results ) ) : ?>
+			<?php if (!empty($search_results) && !is_wp_error($search_results)) : ?>
 				<?php
 				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
+				echo walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $search_results), 0, (object) $args);
 				?>
-			<?php elseif ( is_wp_error( $search_results ) ) : ?>
+			<?php elseif (is_wp_error($search_results)) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
-			<?php elseif ( ! empty( $searched ) ) : ?>
-				<li><?php _e( 'No results found.' ); ?></li>
+			<?php elseif (!empty($searched)) : ?>
+				<li><?php _e('No results found.'); ?></li>
 			<?php endif; ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
-		<p class="button-controls wp-clearfix" data-items-type="taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>">
+		<p class="button-controls wp-clearfix" data-items-type="taxonomy-<?php echo esc_attr($taxonomy_name); ?>">
 			<span class="list-controls hide-if-no-js">
-				<input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
-				<label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
+				<input type="checkbox"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> id="<?php echo esc_attr($tab_name); ?>" class="select-all" />
+				<label for="<?php echo esc_attr($tab_name); ?>"><?php _e('Select All'); ?></label>
 			</span>
 
 			<span class="add-to-menu">
-				<input type="submit"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e( 'Add to Menu' ); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr( 'submit-taxonomy-' . $taxonomy_name ); ?>" />
+				<input type="submit"<?php wp_nav_menu_disabled_check($nav_menu_selected_id); ?> class="button submit-add-to-menu right" value="<?php esc_attr_e('Add to Menu'); ?>" name="add-taxonomy-menu-item" id="<?php echo esc_attr('submit-taxonomy-' . $taxonomy_name); ?>" />
 				<span class="spinner"></span>
 			</span>
 		</p>
@@ -922,26 +922,26 @@ 
  * @param array[] $menu_data The unsanitized POSTed menu item data.
  * @return int[] The database IDs of the items saved
  */
-function wp_save_nav_menu_items( $menu_id = 0, $menu_data = array() ) {
+function wp_save_nav_menu_items($menu_id = 0, $menu_data = array()) {
 	$menu_id     = (int) $menu_id;
 	$items_saved = array();
 
-	if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
+	if (0 == $menu_id || is_nav_menu($menu_id)) {
 
 		// Loop through all the menu items' POST values.
-		foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
+		foreach ((array) $menu_data as $_possible_db_id => $_item_object_data) {
 			if (
 				// Checkbox is not checked.
-				empty( $_item_object_data['menu-item-object-id'] ) &&
+				empty($_item_object_data['menu-item-object-id']) &&
 				(
 					// And item type either isn't set.
-					! isset( $_item_object_data['menu-item-type'] ) ||
+					!isset($_item_object_data['menu-item-type']) ||
 					// Or URL is the default.
-					in_array( $_item_object_data['menu-item-url'], array( 'https://', 'http://', '' ), true ) ||
+					in_array($_item_object_data['menu-item-url'], array('https://', 'http://', ''), true) ||
 					// Or it's not a custom menu item (but not the custom home page).
-					! ( 'custom' === $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||
+					!('custom' === $_item_object_data['menu-item-type'] && !isset($_item_object_data['menu-item-db-id'])) ||
 					// Or it *is* a custom menu item that already exists.
-					! empty( $_item_object_data['menu-item-db-id'] )
+					!empty($_item_object_data['menu-item-db-id'])
 				)
 			) {
 				// Then this potential menu item is not getting added to this menu.
@@ -950,8 +950,8 @@ 
 
 			// If this possible menu item doesn't actually have a menu database ID yet.
 			if (
-				empty( $_item_object_data['menu-item-db-id'] ) ||
-				( 0 > $_possible_db_id ) ||
+				empty($_item_object_data['menu-item-db-id']) ||
+				(0 > $_possible_db_id) ||
 				$_possible_db_id != $_item_object_data['menu-item-db-id']
 			) {
 				$_actual_db_id = 0;
@@ -960,22 +960,22 @@ 
 			}
 
 			$args = array(
-				'menu-item-db-id'       => ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
-				'menu-item-object-id'   => ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
-				'menu-item-object'      => ( isset( $_item_object_data['menu-item-object'] ) ? $_item_object_data['menu-item-object'] : '' ),
-				'menu-item-parent-id'   => ( isset( $_item_object_data['menu-item-parent-id'] ) ? $_item_object_data['menu-item-parent-id'] : '' ),
-				'menu-item-position'    => ( isset( $_item_object_data['menu-item-position'] ) ? $_item_object_data['menu-item-position'] : '' ),
-				'menu-item-type'        => ( isset( $_item_object_data['menu-item-type'] ) ? $_item_object_data['menu-item-type'] : '' ),
-				'menu-item-title'       => ( isset( $_item_object_data['menu-item-title'] ) ? $_item_object_data['menu-item-title'] : '' ),
-				'menu-item-url'         => ( isset( $_item_object_data['menu-item-url'] ) ? $_item_object_data['menu-item-url'] : '' ),
-				'menu-item-description' => ( isset( $_item_object_data['menu-item-description'] ) ? $_item_object_data['menu-item-description'] : '' ),
-				'menu-item-attr-title'  => ( isset( $_item_object_data['menu-item-attr-title'] ) ? $_item_object_data['menu-item-attr-title'] : '' ),
-				'menu-item-target'      => ( isset( $_item_object_data['menu-item-target'] ) ? $_item_object_data['menu-item-target'] : '' ),
-				'menu-item-classes'     => ( isset( $_item_object_data['menu-item-classes'] ) ? $_item_object_data['menu-item-classes'] : '' ),
-				'menu-item-xfn'         => ( isset( $_item_object_data['menu-item-xfn'] ) ? $_item_object_data['menu-item-xfn'] : '' ),
+				'menu-item-db-id'       => (isset($_item_object_data['menu-item-db-id']) ? $_item_object_data['menu-item-db-id'] : ''),
+				'menu-item-object-id'   => (isset($_item_object_data['menu-item-object-id']) ? $_item_object_data['menu-item-object-id'] : ''),
+				'menu-item-object'      => (isset($_item_object_data['menu-item-object']) ? $_item_object_data['menu-item-object'] : ''),
+				'menu-item-parent-id'   => (isset($_item_object_data['menu-item-parent-id']) ? $_item_object_data['menu-item-parent-id'] : ''),
+				'menu-item-position'    => (isset($_item_object_data['menu-item-position']) ? $_item_object_data['menu-item-position'] : ''),
+				'menu-item-type'        => (isset($_item_object_data['menu-item-type']) ? $_item_object_data['menu-item-type'] : ''),
+				'menu-item-title'       => (isset($_item_object_data['menu-item-title']) ? $_item_object_data['menu-item-title'] : ''),
+				'menu-item-url'         => (isset($_item_object_data['menu-item-url']) ? $_item_object_data['menu-item-url'] : ''),
+				'menu-item-description' => (isset($_item_object_data['menu-item-description']) ? $_item_object_data['menu-item-description'] : ''),
+				'menu-item-attr-title'  => (isset($_item_object_data['menu-item-attr-title']) ? $_item_object_data['menu-item-attr-title'] : ''),
+				'menu-item-target'      => (isset($_item_object_data['menu-item-target']) ? $_item_object_data['menu-item-target'] : ''),
+				'menu-item-classes'     => (isset($_item_object_data['menu-item-classes']) ? $_item_object_data['menu-item-classes'] : ''),
+				'menu-item-xfn'         => (isset($_item_object_data['menu-item-xfn']) ? $_item_object_data['menu-item-xfn'] : ''),
 			);
 
-			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
+			$items_saved[] = wp_update_nav_menu_item($menu_id, $_actual_db_id, $args);
 
 		}
 	}
@@ -992,23 +992,23 @@ 
  * @param object $data_object The post type or taxonomy meta-object.
  * @return object The post type or taxonomy object.
  */
-function _wp_nav_menu_meta_box_object( $data_object = null ) {
-	if ( isset( $data_object->name ) ) {
+function _wp_nav_menu_meta_box_object($data_object = null) {
+	if (isset($data_object->name)) {
 
-		if ( 'page' === $data_object->name ) {
+		if ('page' === $data_object->name) {
 			$data_object->_default_query = array(
 				'orderby'     => 'menu_order title',
 				'post_status' => 'publish',
 			);
 
 			// Posts should show only published items.
-		} elseif ( 'post' === $data_object->name ) {
+		} elseif ('post' === $data_object->name) {
 			$data_object->_default_query = array(
 				'post_status' => 'publish',
 			);
 
 			// Categories should be in reverse chronological order.
-		} elseif ( 'category' === $data_object->name ) {
+		} elseif ('category' === $data_object->name) {
 			$data_object->_default_query = array(
 				'orderby' => 'id',
 				'order'   => 'DESC',
@@ -1033,18 +1033,18 @@ 
  * @param int $menu_id Optional. The ID of the menu to format. Default 0.
  * @return string|WP_Error The menu formatted to edit or error object on failure.
  */
-function wp_get_nav_menu_to_edit( $menu_id = 0 ) {
-	$menu = wp_get_nav_menu_object( $menu_id );
+function wp_get_nav_menu_to_edit($menu_id = 0) {
+	$menu = wp_get_nav_menu_object($menu_id);
 
 	// If the menu exists, get its items.
-	if ( is_nav_menu( $menu ) ) {
-		$menu_items = wp_get_nav_menu_items( $menu->term_id, array( 'post_status' => 'any' ) );
+	if (is_nav_menu($menu)) {
+		$menu_items = wp_get_nav_menu_items($menu->term_id, array('post_status' => 'any'));
 		$result     = '<div id="menu-instructions" class="post-body-plain';
-		$result    .= ( ! empty( $menu_items ) ) ? ' menu-instructions-inactive">' : '">';
-		$result    .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
+		$result    .= (!empty($menu_items)) ? ' menu-instructions-inactive">' : '">';
+		$result    .= '<p>' . __('Add menu items from the column on the left.') . '</p>';
 		$result    .= '</div>';
 
-		if ( empty( $menu_items ) ) {
+		if (empty($menu_items)) {
 			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
 		}
 
@@ -1056,16 +1056,16 @@ 
 		 * @param string $class   The walker class to use. Default 'Walker_Nav_Menu_Edit'.
 		 * @param int    $menu_id ID of the menu being rendered.
 		 */
-		$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id );
+		$walker_class_name = apply_filters('wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $menu_id);
 
-		if ( class_exists( $walker_class_name ) ) {
+		if (class_exists($walker_class_name)) {
 			$walker = new $walker_class_name;
 		} else {
 			return new WP_Error(
 				'menu_walker_not_exist',
 				sprintf(
 					/* translators: %s: Walker class name. */
-					__( 'The Walker class named %s does not exist.' ),
+					__('The Walker class named %s does not exist.'),
 					'<strong>' . $walker_class_name . '</strong>'
 				)
 			);
@@ -1073,28 +1073,28 @@ 
 
 		$some_pending_menu_items = false;
 		$some_invalid_menu_items = false;
-		foreach ( (array) $menu_items as $menu_item ) {
-			if ( isset( $menu_item->post_status ) && 'draft' === $menu_item->post_status ) {
+		foreach ((array) $menu_items as $menu_item) {
+			if (isset($menu_item->post_status) && 'draft' === $menu_item->post_status) {
 				$some_pending_menu_items = true;
 			}
-			if ( ! empty( $menu_item->_invalid ) ) {
+			if (!empty($menu_item->_invalid)) {
 				$some_invalid_menu_items = true;
 			}
 		}
 
-		if ( $some_pending_menu_items ) {
-			$result .= '<div class="notice notice-info notice-alt inline"><p>' . __( 'Click Save Menu to make pending menu items public.' ) . '</p></div>';
+		if ($some_pending_menu_items) {
+			$result .= '<div class="notice notice-info notice-alt inline"><p>' . __('Click Save Menu to make pending menu items public.') . '</p></div>';
 		}
 
-		if ( $some_invalid_menu_items ) {
-			$result .= '<div class="notice notice-error notice-alt inline"><p>' . __( 'There are some invalid menu items. Please check or delete them.' ) . '</p></div>';
+		if ($some_invalid_menu_items) {
+			$result .= '<div class="notice notice-error notice-alt inline"><p>' . __('There are some invalid menu items. Please check or delete them.') . '</p></div>';
 		}
 
 		$result .= '<ul class="menu" id="menu-to-edit"> ';
-		$result .= walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $menu_items ), 0, (object) array( 'walker' => $walker ) );
+		$result .= walk_nav_menu_tree(array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' => $walker));
 		$result .= ' </ul> ';
 		return $result;
-	} elseif ( is_wp_error( $menu ) ) {
+	} elseif (is_wp_error($menu)) {
 		return $menu;
 	}
 
@@ -1109,13 +1109,13 @@ 
  */
 function wp_nav_menu_manage_columns() {
 	return array(
-		'_title'          => __( 'Show advanced menu properties' ),
+		'_title'          => __('Show advanced menu properties'),
 		'cb'              => '<input type="checkbox" />',
-		'link-target'     => __( 'Link Target' ),
-		'title-attribute' => __( 'Title Attribute' ),
-		'css-classes'     => __( 'CSS Classes' ),
-		'xfn'             => __( 'Link Relationship (XFN)' ),
-		'description'     => __( 'Description' ),
+		'link-target'     => __('Link Target'),
+		'title-attribute' => __('Title Attribute'),
+		'css-classes'     => __('CSS Classes'),
+		'xfn'             => __('Link Relationship (XFN)'),
+		'description'     => __('Description'),
 	);
 }
 
@@ -1129,13 +1129,13 @@ 
  */
 function _wp_delete_orphaned_draft_menu_items() {
 	global $wpdb;
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	// Delete orphaned draft menu items.
-	$menu_items_to_delete = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < %d", $delete_timestamp ) );
+	$menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < %d", $delete_timestamp));
 
-	foreach ( (array) $menu_items_to_delete as $menu_item_id ) {
-		wp_delete_post( $menu_item_id, true );
+	foreach ((array) $menu_items_to_delete as $menu_item_id) {
+		wp_delete_post($menu_item_id, true);
 	}
 }
 
@@ -1148,7 +1148,7 @@ 
  * @param string     $nav_menu_selected_title Title of the currently-selected menu.
  * @return array The menu updated message
  */
-function wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) {
+function wp_nav_menu_update_menu_items($nav_menu_selected_id, $nav_menu_selected_title) {
 	$unsorted_menu_items = wp_get_nav_menu_items(
 		$nav_menu_selected_id,
 		array(
@@ -1163,8 +1163,8 @@ 
 	$menu_items = array();
 
 	// Index menu items by DB ID.
-	foreach ( $unsorted_menu_items as $_item ) {
-		$menu_items[ $_item->db_id ] = $_item;
+	foreach ($unsorted_menu_items as $_item) {
+		$menu_items[$_item->db_id] = $_item;
 	}
 
 	$post_fields = array(
@@ -1183,77 +1183,77 @@ 
 		'menu-item-xfn',
 	);
 
-	wp_defer_term_counting( true );
+	wp_defer_term_counting(true);
 
 	// Loop through all the menu items' POST variables.
-	if ( ! empty( $_POST['menu-item-db-id'] ) ) {
-		foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
+	if (!empty($_POST['menu-item-db-id'])) {
+		foreach ((array) $_POST['menu-item-db-id'] as $_key => $k) {
 
 			// Menu item title can't be blank.
-			if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' === $_POST['menu-item-title'][ $_key ] ) {
+			if (!isset($_POST['menu-item-title'][$_key]) || '' === $_POST['menu-item-title'][$_key]) {
 				continue;
 			}
 
 			$args = array();
-			foreach ( $post_fields as $field ) {
-				$args[ $field ] = isset( $_POST[ $field ][ $_key ] ) ? $_POST[ $field ][ $_key ] : '';
+			foreach ($post_fields as $field) {
+				$args[$field] = isset($_POST[$field][$_key]) ? $_POST[$field][$_key] : '';
 			}
 
-			$menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][ $_key ] != $_key ? 0 : $_key ), $args );
+			$menu_item_db_id = wp_update_nav_menu_item($nav_menu_selected_id, ($_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key), $args);
 
-			if ( is_wp_error( $menu_item_db_id ) ) {
+			if (is_wp_error($menu_item_db_id)) {
 				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
 			} else {
-				unset( $menu_items[ $menu_item_db_id ] );
+				unset($menu_items[$menu_item_db_id]);
 			}
 		}
 	}
 
 	// Remove menu items from the menu that weren't in $_POST.
-	if ( ! empty( $menu_items ) ) {
-		foreach ( array_keys( $menu_items ) as $menu_item_id ) {
-			if ( is_nav_menu_item( $menu_item_id ) ) {
-				wp_delete_post( $menu_item_id );
+	if (!empty($menu_items)) {
+		foreach (array_keys($menu_items) as $menu_item_id) {
+			if (is_nav_menu_item($menu_item_id)) {
+				wp_delete_post($menu_item_id);
 			}
 		}
 	}
 
 	// Store 'auto-add' pages.
-	$auto_add        = ! empty( $_POST['auto-add-pages'] );
-	$nav_menu_option = (array) get_option( 'nav_menu_options' );
+	$auto_add        = !empty($_POST['auto-add-pages']);
+	$nav_menu_option = (array) get_option('nav_menu_options');
 
-	if ( ! isset( $nav_menu_option['auto_add'] ) ) {
+	if (!isset($nav_menu_option['auto_add'])) {
 		$nav_menu_option['auto_add'] = array();
 	}
 
-	if ( $auto_add ) {
-		if ( ! in_array( $nav_menu_selected_id, $nav_menu_option['auto_add'], true ) ) {
+	if ($auto_add) {
+		if (!in_array($nav_menu_selected_id, $nav_menu_option['auto_add'], true)) {
 			$nav_menu_option['auto_add'][] = $nav_menu_selected_id;
 		}
 	} else {
-		$key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'], true );
-		if ( false !== $key ) {
-			unset( $nav_menu_option['auto_add'][ $key ] );
+		$key = array_search($nav_menu_selected_id, $nav_menu_option['auto_add'], true);
+		if (false !== $key) {
+			unset($nav_menu_option['auto_add'][$key]);
 		}
 	}
 
 	// Remove non-existent/deleted menus.
-	$nav_menu_option['auto_add'] = array_intersect( $nav_menu_option['auto_add'], wp_get_nav_menus( array( 'fields' => 'ids' ) ) );
-	update_option( 'nav_menu_options', $nav_menu_option );
+	$nav_menu_option['auto_add'] = array_intersect($nav_menu_option['auto_add'], wp_get_nav_menus(array('fields' => 'ids')));
+	update_option('nav_menu_options', $nav_menu_option);
 
-	wp_defer_term_counting( false );
+	wp_defer_term_counting(false);
 
 	/** This action is documented in wp-includes/nav-menu.php */
-	do_action( 'wp_update_nav_menu', $nav_menu_selected_id );
+	do_action('wp_update_nav_menu', $nav_menu_selected_id);
 
 	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
 		sprintf(
 			/* translators: %s: Nav menu title. */
-			__( '%s has been updated.' ),
+			__('%s has been updated.'),
 			'<strong>' . $nav_menu_selected_title . '</strong>'
 		) . '</p></div>';
 
-	unset( $menu_items, $unsorted_menu_items );
+	unset($menu_items, $unsorted_menu_items);
 
 	return $messages;
 }
@@ -1267,36 +1267,36 @@ 
  * @access private
  */
 function _wp_expand_nav_menu_post_data() {
-	if ( ! isset( $_POST['nav-menu-data'] ) ) {
+	if (!isset($_POST['nav-menu-data'])) {
 		return;
 	}
 
-	$data = json_decode( stripslashes( $_POST['nav-menu-data'] ) );
+	$data = json_decode(stripslashes($_POST['nav-menu-data']));
 
-	if ( ! is_null( $data ) && $data ) {
-		foreach ( $data as $post_input_data ) {
+	if (!is_null($data) && $data) {
+		foreach ($data as $post_input_data) {
 			// For input names that are arrays (e.g. `menu-item-db-id[3][4][5]`),
 			// derive the array path keys via regex and set the value in $_POST.
-			preg_match( '#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches );
+			preg_match('#([^\[]*)(\[(.+)\])?#', $post_input_data->name, $matches);
 
-			$array_bits = array( $matches[1] );
+			$array_bits = array($matches[1]);
 
-			if ( isset( $matches[3] ) ) {
-				$array_bits = array_merge( $array_bits, explode( '][', $matches[3] ) );
+			if (isset($matches[3])) {
+				$array_bits = array_merge($array_bits, explode('][', $matches[3]));
 			}
 
 			$new_post_data = array();
 
 			// Build the new array value from leaf to trunk.
-			for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) {
-				if ( count( $array_bits ) - 1 == $i ) {
-					$new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
+			for ($i = count($array_bits) - 1; $i >= 0; $i--) {
+				if (count($array_bits) - 1 == $i) {
+					$new_post_data[$array_bits[$i]] = wp_slash($post_input_data->value);
 				} else {
-					$new_post_data = array( $array_bits[ $i ] => $new_post_data );
+					$new_post_data = array($array_bits[$i] => $new_post_data);
 				}
 			}
 
-			$_POST = array_replace_recursive( $_POST, $new_post_data );
+			$_POST = array_replace_recursive($_POST, $new_post_data);
 		}
 	}
 }

brighty/wp-admin/includes/class-wp-privacy-data-removal-requests-list-table.php

Spacing +37 added lines, -37 removed lines

@@ -7,7 +7,7 @@ 
  * @since 4.9.6
  */
 
-if ( ! class_exists( 'WP_Privacy_Requests_Table' ) ) {
+if (!class_exists('WP_Privacy_Requests_Table')) {
 	require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-requests-table.php';
 }
 
@@ -43,36 +43,36 @@ 
 	 * @param WP_User_Request $item Item being shown.
 	 * @return string Email column markup.
 	 */
-	public function column_email( $item ) {
+	public function column_email($item) {
 		$row_actions = array();
 
 		// Allow the administrator to "force remove" the personal data even if confirmation has not yet been received.
 		$status      = $item->status;
 		$request_id  = $item->ID;
 		$row_actions = array();
-		if ( 'request-confirmed' !== $status ) {
+		if ('request-confirmed' !== $status) {
 			/** This filter is documented in wp-admin/includes/ajax-actions.php */
-			$erasers       = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-			$erasers_count = count( $erasers );
-			$nonce         = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );
+			$erasers       = apply_filters('wp_privacy_personal_data_erasers', array());
+			$erasers_count = count($erasers);
+			$nonce         = wp_create_nonce('wp-privacy-erase-personal-data-' . $request_id);
 
 			$remove_data_markup = '<span class="remove-personal-data force-remove-personal-data" ' .
-				'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
-				'data-request-id="' . esc_attr( $request_id ) . '" ' .
-				'data-nonce="' . esc_attr( $nonce ) .
+				'data-erasers-count="' . esc_attr($erasers_count) . '" ' .
+				'data-request-id="' . esc_attr($request_id) . '" ' .
+				'data-nonce="' . esc_attr($nonce) .
 				'">';
 
-			$remove_data_markup .= '<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle">' . __( 'Force erase personal data' ) . '</button></span>' .
-				'<span class="remove-personal-data-processing hidden">' . __( 'Erasing data...' ) . ' <span class="erasure-progress"></span></span>' .
-				'<span class="remove-personal-data-success hidden">' . __( 'Erasure completed.' ) . '</span>' .
-				'<span class="remove-personal-data-failed hidden">' . __( 'Force erasure has failed.' ) . ' <button type="button" class="button-link remove-personal-data-handle">' . __( 'Retry' ) . '</button></span>';
+			$remove_data_markup .= '<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle">' . __('Force erase personal data') . '</button></span>' .
+				'<span class="remove-personal-data-processing hidden">' . __('Erasing data...') . ' <span class="erasure-progress"></span></span>' .
+				'<span class="remove-personal-data-success hidden">' . __('Erasure completed.') . '</span>' .
+				'<span class="remove-personal-data-failed hidden">' . __('Force erasure has failed.') . ' <button type="button" class="button-link remove-personal-data-handle">' . __('Retry') . '</button></span>';
 
 			$remove_data_markup .= '</span>';
 
 			$row_actions['remove-data'] = $remove_data_markup;
 		}
 
-		if ( 'request-completed' !== $status ) {
+		if ('request-completed' !== $status) {
 			$complete_request_markup  = '<span>';
 			$complete_request_markup .= sprintf(
 				'<a href="%s" class="complete-request" aria-label="%s">%s</a>',
@@ -81,9 +81,9 @@ 
 						add_query_arg(
 							array(
 								'action'     => 'complete',
-								'request_id' => array( $request_id ),
+								'request_id' => array($request_id),
 							),
-							admin_url( 'erase-personal-data.php' )
+							admin_url('erase-personal-data.php')
 						),
 						'bulk-privacy_requests'
 					)
@@ -91,20 +91,20 @@ 
 				esc_attr(
 					sprintf(
 						/* translators: %s: Request email. */
-						__( 'Mark export request for &#8220;%s&#8221; as completed.' ),
+						__('Mark export request for &#8220;%s&#8221; as completed.'),
 						$item->email
 					)
 				),
-				__( 'Complete request' )
+				__('Complete request')
 			);
 			$complete_request_markup .= '</span>';
 		}
 
-		if ( ! empty( $complete_request_markup ) ) {
+		if (!empty($complete_request_markup)) {
 			$row_actions['complete-request'] = $complete_request_markup;
 		}
 
-		return sprintf( '<a href="%1$s">%2$s</a> %3$s', esc_url( 'mailto:' . $item->email ), $item->email, $this->row_actions( $row_actions ) );
+		return sprintf('<a href="%1$s">%2$s</a> %3$s', esc_url('mailto:' . $item->email), $item->email, $this->row_actions($row_actions));
 	}
 
 	/**
@@ -114,39 +114,39 @@ 
 	 *
 	 * @param WP_User_Request $item Item being shown.
 	 */
-	public function column_next_steps( $item ) {
+	public function column_next_steps($item) {
 		$status = $item->status;
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'request-pending':
-				esc_html_e( 'Waiting for confirmation' );
+				esc_html_e('Waiting for confirmation');
 				break;
 			case 'request-confirmed':
 				/** This filter is documented in wp-admin/includes/ajax-actions.php */
-				$erasers       = apply_filters( 'wp_privacy_personal_data_erasers', array() );
-				$erasers_count = count( $erasers );
+				$erasers       = apply_filters('wp_privacy_personal_data_erasers', array());
+				$erasers_count = count($erasers);
 				$request_id    = $item->ID;
-				$nonce         = wp_create_nonce( 'wp-privacy-erase-personal-data-' . $request_id );
+				$nonce         = wp_create_nonce('wp-privacy-erase-personal-data-' . $request_id);
 
 				echo '<div class="remove-personal-data" ' .
 					'data-force-erase="1" ' .
-					'data-erasers-count="' . esc_attr( $erasers_count ) . '" ' .
-					'data-request-id="' . esc_attr( $request_id ) . '" ' .
-					'data-nonce="' . esc_attr( $nonce ) .
+					'data-erasers-count="' . esc_attr($erasers_count) . '" ' .
+					'data-request-id="' . esc_attr($request_id) . '" ' .
+					'data-nonce="' . esc_attr($nonce) .
 					'">';
 
 				?>
-				<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle"><?php _e( 'Erase personal data' ); ?></button></span>
-				<span class="remove-personal-data-processing hidden"><?php _e( 'Erasing data...' ); ?> <span class="erasure-progress"></span></span>
-				<span class="remove-personal-data-success success-message hidden" ><?php _e( 'Erasure completed.' ); ?></span>
-				<span class="remove-personal-data-failed hidden"><?php _e( 'Data erasure has failed.' ); ?> <button type="button" class="button-link remove-personal-data-handle"><?php _e( 'Retry' ); ?></button></span>
+				<span class="remove-personal-data-idle"><button type="button" class="button-link remove-personal-data-handle"><?php _e('Erase personal data'); ?></button></span>
+				<span class="remove-personal-data-processing hidden"><?php _e('Erasing data...'); ?> <span class="erasure-progress"></span></span>
+				<span class="remove-personal-data-success success-message hidden" ><?php _e('Erasure completed.'); ?></span>
+				<span class="remove-personal-data-failed hidden"><?php _e('Data erasure has failed.'); ?> <button type="button" class="button-link remove-personal-data-handle"><?php _e('Retry'); ?></button></span>
 				<?php
 
 				echo '</div>';
 
 				break;
 			case 'request-failed':
-				echo '<button type="submit" class="button-link" name="privacy_action_email_retry[' . $item->ID . ']" id="privacy_action_email_retry[' . $item->ID . ']">' . __( 'Retry' ) . '</button>';
+				echo '<button type="submit" class="button-link" name="privacy_action_email_retry[' . $item->ID . ']" id="privacy_action_email_retry[' . $item->ID . ']">' . __('Retry') . '</button>';
 				break;
 			case 'request-completed':
 				echo '<a href="' . esc_url(
@@ -154,13 +154,13 @@ 
 						add_query_arg(
 							array(
 								'action'     => 'delete',
-								'request_id' => array( $item->ID ),
+								'request_id' => array($item->ID),
 							),
-							admin_url( 'erase-personal-data.php' )
+							admin_url('erase-personal-data.php')
 						),
 						'bulk-privacy_requests'
 					)
-				) . '">' . esc_html__( 'Remove request' ) . '</a>';
+				) . '">' . esc_html__('Remove request') . '</a>';
 				break;
 		}
 	}

brighty/wp-admin/includes/class-custom-image-header.php

Spacing +389 added lines, -389 removed lines

@@ -52,16 +52,16 @@ 
 	 * @param callable $admin_header_callback
 	 * @param callable $admin_image_div_callback Optional custom image div output callback.
 	 */
-	public function __construct( $admin_header_callback, $admin_image_div_callback = '' ) {
+	public function __construct($admin_header_callback, $admin_image_div_callback = '') {
 		$this->admin_header_callback    = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
-		add_action( 'admin_menu', array( $this, 'init' ) );
+		add_action('admin_menu', array($this, 'init'));
 
-		add_action( 'customize_save_after', array( $this, 'customize_set_last_used' ) );
-		add_action( 'wp_ajax_custom-header-crop', array( $this, 'ajax_header_crop' ) );
-		add_action( 'wp_ajax_custom-header-add', array( $this, 'ajax_header_add' ) );
-		add_action( 'wp_ajax_custom-header-remove', array( $this, 'ajax_header_remove' ) );
+		add_action('customize_save_after', array($this, 'customize_set_last_used'));
+		add_action('wp_ajax_custom-header-crop', array($this, 'ajax_header_crop'));
+		add_action('wp_ajax_custom-header-add', array($this, 'ajax_header_add'));
+		add_action('wp_ajax_custom-header-remove', array($this, 'ajax_header_remove'));
 	}
 
 	/**
@@ -70,20 +70,20 @@ 
 	 * @since 2.1.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) );
+		$page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
 
-		if ( ! $page ) {
+		if (!$page) {
 			return;
 		}
 
-		add_action( "admin_print_scripts-{$page}", array( $this, 'js_includes' ) );
-		add_action( "admin_print_styles-{$page}", array( $this, 'css_includes' ) );
-		add_action( "admin_head-{$page}", array( $this, 'help' ) );
-		add_action( "admin_head-{$page}", array( $this, 'take_action' ), 50 );
-		add_action( "admin_head-{$page}", array( $this, 'js' ), 50 );
+		add_action("admin_print_scripts-{$page}", array($this, 'js_includes'));
+		add_action("admin_print_styles-{$page}", array($this, 'css_includes'));
+		add_action("admin_head-{$page}", array($this, 'help'));
+		add_action("admin_head-{$page}", array($this, 'take_action'), 50);
+		add_action("admin_head-{$page}", array($this, 'js'), 50);
 
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-{$page}", $this->admin_header_callback, 51 );
+		if ($this->admin_header_callback) {
+			add_action("admin_head-{$page}", $this->admin_header_callback, 51);
 		}
 	}
 
@@ -96,45 +96,45 @@ 
 		get_current_screen()->add_help_tab(
 			array(
 				'id'      => 'overview',
-				'title'   => __( 'Overview' ),
+				'title'   => __('Overview'),
 				'content' =>
-					'<p>' . __( 'This screen is used to customize the header section of your theme.' ) . '</p>' .
-					'<p>' . __( 'You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.' ) . '<p>',
+					'<p>' . __('This screen is used to customize the header section of your theme.') . '</p>' .
+					'<p>' . __('You can choose from the theme&#8217;s default header images, or use one of your own. You can also customize how your Site Title and Tagline are displayed.') . '<p>',
 			)
 		);
 
 		get_current_screen()->add_help_tab(
 			array(
 				'id'      => 'set-header-image',
-				'title'   => __( 'Header Image' ),
+				'title'   => __('Header Image'),
 				'content' =>
-					'<p>' . __( 'You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.' ) . '</p>' .
-					'<p>' . __( 'Some themes come with additional header images bundled. If you see multiple images displayed, select the one you would like and click the &#8220;Save Changes&#8221; button.' ) . '</p>' .
-					'<p>' . __( 'If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.' ) . '</p>' .
-					'<p>' . __( 'If you do not want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.' ) . '</p>',
+					'<p>' . __('You can set a custom image header for your site. Simply upload the image and crop it, and the new header will go live immediately. Alternatively, you can use an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button.') . '</p>' .
+					'<p>' . __('Some themes come with additional header images bundled. If you see multiple images displayed, select the one you would like and click the &#8220;Save Changes&#8221; button.') . '</p>' .
+					'<p>' . __('If your theme has more than one default header image, or you have uploaded more than one custom header image, you have the option of having WordPress display a randomly different image on each page of your site. Click the &#8220;Random&#8221; radio button next to the Uploaded Images or Default Images section to enable this feature.') . '</p>' .
+					'<p>' . __('If you do not want a header image to be displayed on your site at all, click the &#8220;Remove Header Image&#8221; button at the bottom of the Header Image section of this page. If you want to re-enable the header image later, you just have to select one of the other image options and click &#8220;Save Changes&#8221;.') . '</p>',
 			)
 		);
 
 		get_current_screen()->add_help_tab(
 			array(
 				'id'      => 'set-header-text',
-				'title'   => __( 'Header Text' ),
+				'title'   => __('Header Text'),
 				'content' =>
 					'<p>' . sprintf(
 						/* translators: %s: URL to General Settings screen. */
-						__( 'For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%s">General Settings</a> section.' ),
-						admin_url( 'options-general.php' )
+						__('For most themes, the header text is your Site Title and Tagline, as defined in the <a href="%s">General Settings</a> section.'),
+						admin_url('options-general.php')
 					) .
 					'</p>' .
-					'<p>' . __( 'In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-					'<p>' . __( 'Do not forget to click &#8220;Save Changes&#8221; when you are done!' ) . '</p>',
+					'<p>' . __('In the Header Text section of this page, you can choose whether to display this text or hide it. You can also choose a color for the text by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.') . '</p>' .
+					'<p>' . __('Do not forget to click &#8220;Save Changes&#8221; when you are done!') . '</p>',
 			)
 		);
 
 		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Header_Screen">Documentation on Custom Header</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p><strong>' . __('For more information:') . '</strong></p>' .
+			'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Header_Screen">Documentation on Custom Header</a>') . '</p>' .
+			'<p>' . __('<a href="https://wordpress.org/support/">Support</a>') . '</p>'
 		);
 	}
 
@@ -146,14 +146,14 @@ 
 	 * @return int Current step.
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) ) {
+		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' ) )
+		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;
 		}
@@ -169,14 +169,14 @@ 
 	public function js_includes() {
 		$step = $this->step();
 
-		if ( ( 1 === $step || 3 === $step ) ) {
+		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' );
+			wp_enqueue_script('custom-header');
+			if (current_theme_supports('custom-header', 'header-text')) {
+				wp_enqueue_script('wp-color-picker');
 			}
-		} elseif ( 2 === $step ) {
-			wp_enqueue_script( 'imgareaselect' );
+		} elseif (2 === $step) {
+			wp_enqueue_script('imgareaselect');
 		}
 	}
 
@@ -188,10 +188,10 @@ 
 	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');
 		}
 	}
 
@@ -201,54 +201,54 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if (!current_user_can('edit_theme_options')) {
 			return;
 		}
 
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			return;
 		}
 
 		$this->updated = true;
 
-		if ( isset( $_POST['resetheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['resetheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 
 			$this->reset_header_image();
 
 			return;
 		}
 
-		if ( isset( $_POST['removeheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['removeheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 
 			$this->remove_header_image();
 
 			return;
 		}
 
-		if ( isset( $_POST['text-color'] ) && ! isset( $_POST['display-header-text'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['text-color']) && !isset($_POST['display-header-text'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 
-			set_theme_mod( 'header_textcolor', 'blank' );
-		} elseif ( isset( $_POST['text-color'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+			set_theme_mod('header_textcolor', 'blank');
+		} elseif (isset($_POST['text-color'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 
-			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
+			$_POST['text-color'] = str_replace('#', '', $_POST['text-color']);
 
-			$color = preg_replace( '/[^0-9a-fA-F]/', '', $_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'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['default-header'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 
-			$this->set_header_image( $_POST['default-header'] );
+			$this->set_header_image($_POST['default-header']);
 
 			return;
 		}
@@ -264,11 +264,11 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( ! isset( $_wp_default_headers ) ) {
+		if (!isset($_wp_default_headers)) {
 			return;
 		}
 
-		if ( ! empty( $this->default_headers ) ) {
+		if (!empty($this->default_headers)) {
 			return;
 		}
 
@@ -276,15 +276,15 @@ 
 		$template_directory_uri   = get_template_directory_uri();
 		$stylesheet_directory_uri = get_stylesheet_directory_uri();
 
-		foreach ( array_keys( $this->default_headers ) as $header ) {
-			$this->default_headers[ $header ]['url'] = sprintf(
-				$this->default_headers[ $header ]['url'],
+		foreach (array_keys($this->default_headers) as $header) {
+			$this->default_headers[$header]['url'] = sprintf(
+				$this->default_headers[$header]['url'],
 				$template_directory_uri,
 				$stylesheet_directory_uri
 			);
 
-			$this->default_headers[ $header ]['thumbnail_url'] = sprintf(
-				$this->default_headers[ $header ]['thumbnail_url'],
+			$this->default_headers[$header]['thumbnail_url'] = sprintf(
+				$this->default_headers[$header]['thumbnail_url'],
 				$template_directory_uri,
 				$stylesheet_directory_uri
 			);
@@ -302,36 +302,36 @@ 
 	 * @param string $type The header type. One of 'default' (for the Uploaded Images control)
 	 *                     or 'uploaded' (for the Uploaded Images control).
 	 */
-	public function show_header_selector( $type = 'default' ) {
-		if ( 'default' === $type ) {
+	public function show_header_selector($type = 'default') {
+		if ('default' === $type) {
 			$headers = $this->default_headers;
 		} else {
 			$headers = get_uploaded_header_images();
 			$type    = 'uploaded';
 		}
 
-		if ( 1 < count( $headers ) ) {
+		if (1 < count($headers)) {
 			echo '<div class="random-header">';
-			echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
-			_e( '<strong>Random:</strong> Show a different image on each page.' );
+			echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked(is_random_header_image($type), true, false) . ' />';
+			_e('<strong>Random:</strong> Show a different image on each page.');
 			echo '</label>';
 			echo '</div>';
 		}
 
 		echo '<div class="available-headers">';
 
-		foreach ( $headers as $header_key => $header ) {
+		foreach ($headers as $header_key => $header) {
 			$header_thumbnail = $header['thumbnail_url'];
 			$header_url       = $header['url'];
-			$header_alt_text  = empty( $header['alt_text'] ) ? '' : $header['alt_text'];
+			$header_alt_text  = empty($header['alt_text']) ? '' : $header['alt_text'];
 
 			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 ) . ' />';
+			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'] ) ) {
+			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 '<img src="' . set_url_scheme($header_thumbnail) . '" alt="' . esc_attr($header_alt_text) . '"' . $width . ' /></label>';
 			echo '</div>';
 		}
 
@@ -346,9 +346,9 @@ 
 	public function js() {
 		$step = $this->step();
 
-		if ( ( 1 === $step || 3 === $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+		if ((1 === $step || 3 === $step) && current_theme_supports('custom-header', 'header-text')) {
 			$this->js_1();
-		} elseif ( 2 === $step ) {
+		} elseif (2 === $step) {
 			$this->js_2();
 		}
 	}
@@ -360,16 +360,16 @@ 
 	 */
 	public function js_1() {
 		$default_color = '';
-		if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-			$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $default_color && false === strpos( $default_color, '#' ) ) {
+		if (current_theme_supports('custom-header', 'default-text-color')) {
+			$default_color = get_theme_support('custom-header', 'default-text-color');
+			if ($default_color && false === strpos($default_color, '#')) {
 				$default_color = '#' . $default_color;
 			}
 		}
 		?>
 <script type="text/javascript">
 (function($){
-	var default_color = '<?php echo esc_js( $default_color ); ?>',
+	var default_color = '<?php echo esc_js($default_color); ?>',
 		header_text_fields;
 
 	function pickColor(color) {
@@ -405,7 +405,7 @@ 
 			}
 		});
 		$('#display-header-text').click( toggle_text );
-		<?php if ( ! display_header_text() ) : ?>
+		<?php if (!display_header_text()) : ?>
 		toggle_text();
 		<?php endif; ?>
 	} );
@@ -431,8 +431,8 @@ 
 	}
 
 	jQuery( function() {
-		var xinit = <?php echo absint( get_theme_support( 'custom-header', 'width' ) ); ?>;
-		var yinit = <?php echo absint( get_theme_support( 'custom-header', 'height' ) ); ?>;
+		var xinit = <?php echo absint(get_theme_support('custom-header', 'width')); ?>;
+		var yinit = <?php echo absint(get_theme_support('custom-header', 'height')); ?>;
 		var ratio = xinit / yinit;
 		var ximg = jQuery('img#upload').width();
 		var yimg = jQuery('img#upload').height();
@@ -456,21 +456,21 @@ 
 			x2: xinit,
 			y2: yinit,
 			<?php
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' )
-				&& ! current_theme_supports( 'custom-header', 'flex-width' )
+			if (!current_theme_supports('custom-header', 'flex-height')
+				&& !current_theme_supports('custom-header', 'flex-width')
 			) {
 				?>
 			aspectRatio: xinit + ':' + yinit,
 				<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+			if (!current_theme_supports('custom-header', 'flex-height')) {
 				?>
-			maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
+			maxHeight: <?php echo get_theme_support('custom-header', 'height'); ?>,
 				<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if (!current_theme_supports('custom-header', 'flex-width')) {
 				?>
-			maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
+			maxWidth: <?php echo get_theme_support('custom-header', 'width'); ?>,
 				<?php
 			}
 			?>
@@ -500,172 +500,172 @@ 
 		?>
 
 <div class="wrap">
-<h1><?php _e( 'Custom Header' ); ?></h1>
+<h1><?php _e('Custom Header'); ?></h1>
 
-		<?php if ( current_user_can( 'customize' ) ) { ?>
+		<?php if (current_user_can('customize')) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
 			<?php
 			printf(
 				/* translators: %s: URL to header image configuration in Customizer. */
-				__( 'You can now manage and live-preview Custom Header in the <a href="%s">Customizer</a>.' ),
-				admin_url( 'customize.php?autofocus[control]=header_image' )
+				__('You can now manage and live-preview Custom Header in the <a href="%s">Customizer</a>.'),
+				admin_url('customize.php?autofocus[control]=header_image')
 			);
 			?>
 	</p>
 </div>
 		<?php } ?>
 
-		<?php if ( ! empty( $this->updated ) ) { ?>
+		<?php if (!empty($this->updated)) { ?>
 <div id="message" class="updated">
 	<p>
 			<?php
 			/* translators: %s: Home URL. */
-			printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) );
+			printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url('/'));
 			?>
 	</p>
 </div>
 		<?php } ?>
 
-<h2><?php _e( 'Header Image' ); ?></h2>
+<h2><?php _e('Header Image'); ?></h2>
 
 <table class="form-table" role="presentation">
 <tbody>
 
-		<?php if ( get_custom_header() || display_header_text() ) : ?>
+		<?php if (get_custom_header() || display_header_text()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
+<th scope="row"><?php _e('Preview'); ?></th>
 <td>
 			<?php
-			if ( $this->admin_image_div_callback ) {
-				call_user_func( $this->admin_image_div_callback );
+			if ($this->admin_image_div_callback) {
+				call_user_func($this->admin_image_div_callback);
 			} else {
 				$custom_header = get_custom_header();
 				$header_image  = get_header_image();
 
-				if ( $header_image ) {
-					$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
+				if ($header_image) {
+					$header_image_style = 'background-image:url(' . esc_url($header_image) . ');';
 				} else {
 					$header_image_style = '';
 				}
 
-				if ( $custom_header->width ) {
+				if ($custom_header->width) {
 					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
 				}
-				if ( $custom_header->height ) {
+				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() ) {
+				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>
+		<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>
 	</div>
 			<?php } ?>
 </td>
 </tr>
 		<?php endif; ?>
 
-		<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+		<?php if (current_user_can('upload_files') && current_theme_supports('custom-header', 'uploads')) : ?>
 <tr>
-<th scope="row"><?php _e( 'Select Image' ); ?></th>
+<th scope="row"><?php _e('Select Image'); ?></th>
 <td>
-	<p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
+	<p><?php _e('You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.'); ?><br />
 			<?php
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' )
-				&& ! current_theme_supports( 'custom-header', 'flex-width' )
+			if (!current_theme_supports('custom-header', 'flex-height')
+				&& !current_theme_supports('custom-header', 'flex-width')
 			) {
 				printf(
 					/* translators: 1: Image width in pixels, 2: Image height in pixels. */
-					__( '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' )
+					__('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' ) ) {
+			} elseif (current_theme_supports('custom-header', 'flex-height')) {
+				if (!current_theme_supports('custom-header', 'flex-width')) {
 					printf(
 						/* translators: %s: Size in pixels. */
-						__( 'Images should be at least %s wide.' ) . ' ',
+						__('Images should be at least %s wide.') . ' ',
 						sprintf(
 							/* translators: %d: Custom header width. */
-							'<strong>' . __( '%d pixels' ) . '</strong>',
-							get_theme_support( 'custom-header', 'width' )
+							'<strong>' . __('%d pixels') . '</strong>',
+							get_theme_support('custom-header', 'width')
 						)
 					);
 				}
-			} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-				if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+			} elseif (current_theme_supports('custom-header', 'flex-width')) {
+				if (!current_theme_supports('custom-header', 'flex-height')) {
 					printf(
 						/* translators: %s: Size in pixels. */
-						__( 'Images should be at least %s tall.' ) . ' ',
+						__('Images should be at least %s tall.') . ' ',
 						sprintf(
 							/* translators: %d: Custom header height. */
-							'<strong>' . __( '%d pixels' ) . '</strong>',
-							get_theme_support( 'custom-header', 'height' )
+							'<strong>' . __('%d pixels') . '</strong>',
+							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', 'flex-height')
+				|| current_theme_supports('custom-header', 'flex-width')
 			) {
-				if ( current_theme_supports( 'custom-header', 'width' ) ) {
+				if (current_theme_supports('custom-header', 'width')) {
 					printf(
 						/* translators: %s: Size in pixels. */
-						__( 'Suggested width is %s.' ) . ' ',
+						__('Suggested width is %s.') . ' ',
 						sprintf(
 							/* translators: %d: Custom header width. */
-							'<strong>' . __( '%d pixels' ) . '</strong>',
-							get_theme_support( 'custom-header', 'width' )
+							'<strong>' . __('%d pixels') . '</strong>',
+							get_theme_support('custom-header', 'width')
 						)
 					);
 				}
 
-				if ( current_theme_supports( 'custom-header', 'height' ) ) {
+				if (current_theme_supports('custom-header', 'height')) {
 					printf(
 						/* translators: %s: Size in pixels. */
-						__( 'Suggested height is %s.' ) . ' ',
+						__('Suggested height is %s.') . ' ',
 						sprintf(
 							/* translators: %d: Custom header height. */
-							'<strong>' . __( '%d pixels' ) . '</strong>',
-							get_theme_support( 'custom-header', 'height' )
+							'<strong>' . __('%d pixels') . '</strong>',
+							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 ) ); ?>">
+	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url(add_query_arg('step', 2)); ?>">
 	<p>
-		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+		<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-			<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-			<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+			<?php wp_nonce_field('custom-header-upload', '_wpnonce-custom-header-upload'); ?>
+			<?php submit_button(__('Upload'), '', 'submit', false); ?>
 	</p>
 			<?php
 			$modal_update_href = add_query_arg(
 				array(
 					'page'                          => 'custom-header',
 					'step'                          => 2,
-					'_wpnonce-custom-header-upload' => wp_create_nonce( 'custom-header-upload' ),
+					'_wpnonce-custom-header-upload' => wp_create_nonce('custom-header-upload'),
 				),
-				admin_url( 'themes.php' )
+				admin_url('themes.php')
 			);
 			?>
 	<p>
-		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+		<label for="choose-from-library-link"><?php _e('Or choose an image from your media library:'); ?></label><br />
 		<button id="choose-from-library-link" class="button"
-			data-update-link="<?php echo esc_url( $modal_update_href ); ?>"
-			data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-update-link="<?php echo esc_url($modal_update_href); ?>"
+			data-choose="<?php esc_attr_e('Choose a Custom Header'); ?>"
+			data-update="<?php esc_attr_e('Set as header'); ?>"><?php _e('Choose Image'); ?></button>
 	</p>
 	</form>
 </td>
@@ -674,109 +674,109 @@ 
 </tbody>
 </table>
 
-<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ); ?>">
-		<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
+<form method="post" action="<?php echo esc_url(add_query_arg('step', 1)); ?>">
+		<?php submit_button(null, 'screen-reader-text', 'save-header-options', false); ?>
 <table class="form-table" role="presentation">
 <tbody>
-		<?php if ( get_uploaded_header_images() ) : ?>
+		<?php if (get_uploaded_header_images()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
+<th scope="row"><?php _e('Uploaded Images'); ?></th>
 <td>
-	<p><?php _e( 'You can choose one of your previously uploaded headers, or show a random one.' ); ?></p>
+	<p><?php _e('You can choose one of your previously uploaded headers, or show a random one.'); ?></p>
 			<?php
-			$this->show_header_selector( 'uploaded' );
+			$this->show_header_selector('uploaded');
 			?>
 </td>
 </tr>
 			<?php
 	endif;
-		if ( ! empty( $this->default_headers ) ) :
+		if (!empty($this->default_headers)) :
 			?>
 <tr>
-<th scope="row"><?php _e( 'Default Images' ); ?></th>
+<th scope="row"><?php _e('Default Images'); ?></th>
 <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 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 : ?>
-	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ); ?></p>
+	<p><?php _e('You can use one of these cool headers or show a random one on each page.'); ?></p>
 	<?php endif; ?>
 			<?php
-			$this->show_header_selector( 'default' );
+			$this->show_header_selector('default');
 			?>
 </td>
 </tr>
 			<?php
 	endif;
-		if ( get_header_image() ) :
+		if (get_header_image()) :
 			?>
 <tr>
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<th scope="row"><?php _e('Remove Image'); ?></th>
 <td>
-	<p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ); ?></p>
-			<?php submit_button( __( 'Remove Header Image' ), '', 'removeheader', false ); ?>
+	<p><?php _e('This will remove the header image. You will not be able to restore any customizations.'); ?></p>
+			<?php submit_button(__('Remove Header Image'), '', 'removeheader', false); ?>
 </td>
 </tr>
 			<?php
 	endif;
 
 		$default_image = sprintf(
-			get_theme_support( 'custom-header', 'default-image' ),
+			get_theme_support('custom-header', 'default-image'),
 			get_template_directory_uri(),
 			get_stylesheet_directory_uri()
 		);
 
-		if ( $default_image && get_header_image() !== $default_image ) :
+		if ($default_image && get_header_image() !== $default_image) :
 			?>
 <tr>
-<th scope="row"><?php _e( 'Reset Image' ); ?></th>
+<th scope="row"><?php _e('Reset Image'); ?></th>
 <td>
-	<p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ); ?></p>
-			<?php submit_button( __( 'Restore Original Header Image' ), '', 'resetheader', false ); ?>
+	<p><?php _e('This will restore the original header image. You will not be able to restore any customizations.'); ?></p>
+			<?php submit_button(__('Restore Original Header Image'), '', 'resetheader', false); ?>
 </td>
 </tr>
 	<?php endif; ?>
 </tbody>
 </table>
 
-		<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+		<?php if (current_theme_supports('custom-header', 'header-text')) : ?>
 
-<h2><?php _e( 'Header Text' ); ?></h2>
+<h2><?php _e('Header Text'); ?></h2>
 
 <table class="form-table" role="presentation">
 <tbody>
 <tr>
-<th scope="row"><?php _e( 'Header Text' ); ?></th>
+<th scope="row"><?php _e('Header Text'); ?></th>
 <td>
 	<p>
-	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked( display_header_text() ); ?> /> <?php _e( 'Show header text with your image.' ); ?></label>
+	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked(display_header_text()); ?> /> <?php _e('Show header text with your image.'); ?></label>
 	</p>
 </td>
 </tr>
 
 <tr class="displaying-header-text">
-<th scope="row"><?php _e( 'Text Color' ); ?></th>
+<th scope="row"><?php _e('Text Color'); ?></th>
 <td>
 	<p>
 			<?php
 			$default_color = '';
-			if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-				$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-				if ( $default_color && false === strpos( $default_color, '#' ) ) {
+			if (current_theme_supports('custom-header', 'default-text-color')) {
+				$default_color = get_theme_support('custom-header', 'default-text-color');
+				if ($default_color && false === strpos($default_color, '#')) {
 					$default_color = '#' . $default_color;
 				}
 			}
 
-			$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
+			$default_color_attr = $default_color ? ' data-default-color="' . esc_attr($default_color) . '"' : '';
 
-			$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
+			$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support('custom-header', 'default-text-color');
+			if ($header_textcolor && false === strpos($header_textcolor, '#')) {
 				$header_textcolor = '#' . $header_textcolor;
 			}
 
-			echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
-			if ( $default_color ) {
+			echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr($header_textcolor) . '"' . $default_color_attr . ' />';
+			if ($default_color) {
 				/* translators: %s: Default text color. */
-				echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+				echo ' <span class="description hide-if-js">' . sprintf(_x('Default: %s', 'color'), esc_html($default_color)) . '</span>';
 			}
 			?>
 	</p>
@@ -792,12 +792,12 @@ 
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'custom_header_options' );
+		do_action('custom_header_options');
 
-		wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' );
+		wp_nonce_field('custom-header-options', '_wpnonce-custom-header-options');
 		?>
 
-		<?php submit_button( null, 'primary', 'save-header-options' ); ?>
+		<?php submit_button(null, 'primary', 'save-header-options'); ?>
 </form>
 </div>
 
@@ -810,62 +810,62 @@ 
 	 * @since 2.1.0
 	 */
 	public function step_2() {
-		check_admin_referer( 'custom-header-upload', '_wpnonce-custom-header-upload' );
+		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if (!current_theme_supports('custom-header', 'uploads')) {
 			wp_die(
-				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
-				'<p>' . __( 'The active theme does not support uploading a custom header image.' ) . '</p>',
+				'<h1>' . __('Something went wrong.') . '</h1>' .
+				'<p>' . __('The active theme does not support uploading a custom header image.') . '</p>',
 				403
 			);
 		}
 
-		if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
-			$attachment_id = absint( $_GET['file'] );
-			$file          = get_attached_file( $attachment_id, true );
-			$url           = wp_get_attachment_image_src( $attachment_id, 'full' );
+		if (empty($_POST) && isset($_GET['file'])) {
+			$attachment_id = absint($_GET['file']);
+			$file          = get_attached_file($attachment_id, true);
+			$url           = wp_get_attachment_image_src($attachment_id, 'full');
 			$url           = $url[0];
-		} elseif ( isset( $_POST ) ) {
+		} elseif (isset($_POST)) {
 			$data          = $this->step_2_manage_upload();
 			$attachment_id = $data['attachment_id'];
 			$file          = $data['file'];
 			$url           = $data['url'];
 		}
 
-		if ( file_exists( $file ) ) {
-			list( $width, $height, $type, $attr ) = wp_getimagesize( $file );
+		if (file_exists($file)) {
+			list($width, $height, $type, $attr) = wp_getimagesize($file);
 		} else {
-			$data   = wp_get_attachment_metadata( $attachment_id );
-			$height = isset( $data['height'] ) ? (int) $data['height'] : 0;
-			$width  = isset( $data['width'] ) ? (int) $data['width'] : 0;
-			unset( $data );
+			$data   = wp_get_attachment_metadata($attachment_id);
+			$height = isset($data['height']) ? (int) $data['height'] : 0;
+			$width  = isset($data['width']) ? (int) $data['width'] : 0;
+			unset($data);
 		}
 
 		$max_width = 0;
 
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise.
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+		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' ) );
+		$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.
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' )
-			&& ! current_theme_supports( 'custom-header', 'flex-width' )
-			&& (int) get_theme_support( 'custom-header', 'width' ) === $width
-			&& (int) get_theme_support( 'custom-header', 'height' ) === $height
+		if (!current_theme_supports('custom-header', 'flex-height')
+			&& !current_theme_supports('custom-header', 'flex-width')
+			&& (int) get_theme_support('custom-header', 'width') === $width
+			&& (int) get_theme_support('custom-header', 'height') === $height
 		) {
 			// Add the metadata.
-			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' ) );
+			$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 			/**
 			 * Fires after the header image is set or an error is returned.
@@ -875,10 +875,10 @@ 
 			 * @param string $file          Path to the file.
 			 * @param int    $attachment_id Attachment ID.
 			 */
-			do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication.
+			do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication.
 
 			return $this->finished();
-		} elseif ( $width > $max_width ) {
+		} elseif ($width > $max_width) {
 			$oitar = $width / $max_width;
 
 			$image = wp_crop_image(
@@ -890,17 +890,17 @@ 
 				$max_width,
 				$height / $oitar,
 				false,
-				str_replace( wp_basename( $file ), 'midsize-' . wp_basename( $file ), $file )
+				str_replace(wp_basename($file), 'midsize-' . wp_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/includes/class-custom-image-header.php */
-			$image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication.
+			$image = apply_filters('wp_create_file_in_uploads', $image, $attachment_id); // For replication.
 
-			$url    = str_replace( wp_basename( $url ), wp_basename( $image ), $url );
+			$url    = str_replace(wp_basename($url), wp_basename($image), $url);
 			$width  = $width / $oitar;
 			$height = $height / $oitar;
 		} else {
@@ -909,35 +909,35 @@ 
 		?>
 
 <div class="wrap">
-<h1><?php _e( 'Crop Header Image' ); ?></h1>
+<h1><?php _e('Crop Header Image'); ?></h1>
 
-<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 3 ) ); ?>">
-	<p class="hide-if-no-js"><?php _e( 'Choose the part of the image you want to use as your header.' ); ?></p>
-	<p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.' ); ?></strong></p>
+<form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
+	<p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
+	<p class="hide-if-js"><strong><?php _e('You need JavaScript to choose a part of the image.'); ?></strong></p>
 
 	<div id="crop_image" style="position: relative">
-		<img src="<?php echo esc_url( $url ); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" />
+		<img src="<?php echo esc_url($url); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" />
 	</div>
 
 	<input type="hidden" name="x1" id="x1" value="0" />
 	<input type="hidden" name="y1" id="y1" value="0" />
-	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>" />
-	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>" />
-	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
-	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
-		<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+	<input type="hidden" name="width" id="width" value="<?php echo esc_attr($width); ?>" />
+	<input type="hidden" name="height" id="height" value="<?php echo esc_attr($height); ?>" />
+	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($attachment_id); ?>" />
+	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
+		<?php if (empty($_POST) && isset($_GET['file'])) { ?>
 	<input type="hidden" name="create-new-attachment" value="true" />
 	<?php } ?>
-		<?php wp_nonce_field( 'custom-header-crop-image' ); ?>
+		<?php wp_nonce_field('custom-header-crop-image'); ?>
 
 	<p class="submit">
-		<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
+		<?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' ) )
+		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' ), '', 'skip-cropping', false );
+			submit_button(__('Skip Cropping, Publish Image as Is'), '', 'skip-cropping', false);
 		}
 		?>
 	</p>
@@ -953,25 +953,25 @@ 
 	 * @since 3.4.0
 	 */
 	public function step_2_manage_upload() {
-		$overrides = array( 'test_form' => false );
+		$overrides = array('test_form' => false);
 
 		$uploaded_file = $_FILES['import'];
-		$wp_filetype   = wp_check_filetype_and_ext( $uploaded_file['tmp_name'], $uploaded_file['name'] );
+		$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 );
+		$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'];
 		$file     = $file['file'];
-		$filename = wp_basename( $file );
+		$filename = wp_basename($file);
 
 		// Construct the attachment array.
 		$attachment = array(
@@ -983,9 +983,9 @@ 
 		);
 
 		// Save the data.
-		$attachment_id = wp_insert_attachment( $attachment, $file );
+		$attachment_id = wp_insert_attachment($attachment, $file);
 
-		return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
+		return compact('attachment_id', 'file', 'filename', 'url', 'type');
 	}
 
 	/**
@@ -996,36 +996,36 @@ 
 	 *              for retrieving the header image URL.
 	 */
 	public function step_3() {
-		check_admin_referer( 'custom-header-crop-image' );
+		check_admin_referer('custom-header-crop-image');
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if (!current_theme_supports('custom-header', 'uploads')) {
 			wp_die(
-				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
-				'<p>' . __( 'The active theme does not support uploading a custom header image.' ) . '</p>',
+				'<h1>' . __('Something went wrong.') . '</h1>' .
+				'<p>' . __('The active theme does not support uploading a custom header image.') . '</p>',
 				403
 			);
 		}
 
-		if ( ! empty( $_POST['skip-cropping'] )
-			&& ! current_theme_supports( 'custom-header', 'flex-height' )
-			&& ! current_theme_supports( 'custom-header', 'flex-width' )
+		if (!empty($_POST['skip-cropping'])
+			&& !current_theme_supports('custom-header', 'flex-height')
+			&& !current_theme_supports('custom-header', 'flex-width')
 		) {
 			wp_die(
-				'<h1>' . __( 'Something went wrong.' ) . '</h1>' .
-				'<p>' . __( 'The active theme does not support a flexible sized header image.' ) . '</p>',
+				'<h1>' . __('Something went wrong.') . '</h1>' .
+				'<p>' . __('The active theme does not support a flexible sized header image.') . '</p>',
 				403
 			);
 		}
 
-		if ( $_POST['oitar'] > 1 ) {
+		if ($_POST['oitar'] > 1) {
 			$_POST['x1']     = $_POST['x1'] * $_POST['oitar'];
 			$_POST['y1']     = $_POST['y1'] * $_POST['oitar'];
 			$_POST['width']  = $_POST['width'] * $_POST['oitar'];
 			$_POST['height'] = $_POST['height'] * $_POST['oitar'];
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		$original      = get_attached_file( $attachment_id );
+		$attachment_id = absint($_POST['attachment_id']);
+		$original      = get_attached_file($attachment_id);
 
 		$dimensions = $this->get_header_dimensions(
 			array(
@@ -1036,7 +1036,7 @@ 
 		$height     = $dimensions['dst_height'];
 		$width      = $dimensions['dst_width'];
 
-		if ( empty( $_POST['skip-cropping'] ) ) {
+		if (empty($_POST['skip-cropping'])) {
 			$cropped = wp_crop_image(
 				$attachment_id,
 				(int) $_POST['x1'],
@@ -1046,39 +1046,39 @@ 
 				$width,
 				$height
 			);
-		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
-			$cropped = _copy_image_file( $attachment_id );
+		} elseif (!empty($_POST['create-new-attachment'])) {
+			$cropped = _copy_image_file($attachment_id);
 		} else {
-			$cropped = get_attached_file( $attachment_id );
+			$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/includes/class-custom-image-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication.
 
-		$attachment = $this->create_attachment_object( $cropped, $attachment_id );
+		$attachment = $this->create_attachment_object($cropped, $attachment_id);
 
-		if ( ! empty( $_POST['create-new-attachment'] ) ) {
-			unset( $attachment['ID'] );
+		if (!empty($_POST['create-new-attachment'])) {
+			unset($attachment['ID']);
 		}
 
 		// Update the attachment.
-		$attachment_id = $this->insert_attachment( $attachment, $cropped );
+		$attachment_id = $this->insert_attachment($attachment, $cropped);
 
-		$url = wp_get_attachment_url( $attachment_id );
-		$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+		$url = wp_get_attachment_url($attachment_id);
+		$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 		// Cleanup.
-		$medium = str_replace( wp_basename( $original ), 'midsize-' . wp_basename( $original ), $original );
-		if ( file_exists( $medium ) ) {
-			wp_delete_file( $medium );
+		$medium = str_replace(wp_basename($original), 'midsize-' . wp_basename($original), $original);
+		if (file_exists($medium)) {
+			wp_delete_file($medium);
 		}
 
-		if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
-			wp_delete_file( $original );
+		if (empty($_POST['create-new-attachment']) && empty($_POST['skip-cropping'])) {
+			wp_delete_file($original);
 		}
 
 		return $this->finished();
@@ -1100,15 +1100,15 @@ 
 	 * @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 ) {
+		if (2 === $step) {
 			$this->step_2();
-		} elseif ( 3 === $step ) {
+		} elseif (3 === $step) {
 			$this->step_3();
 		} else {
 			$this->step_1();
@@ -1123,7 +1123,7 @@ 
 	 * @param array $form_fields
 	 * @return array $form_fields
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit($form_fields) {
 		return $form_fields;
 	}
 
@@ -1135,7 +1135,7 @@ 
 	 * @param array $tabs
 	 * @return array $tabs
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs($tabs) {
 		return $tabs;
 	}
 
@@ -1151,15 +1151,15 @@ 
 	 *  the key of an image uploaded for that theme (the attachment ID of the image).
 	 *  Or an array of arguments: attachment_id, url, width, height. All are required.
 	 */
-	final public function set_header_image( $choice ) {
-		if ( is_array( $choice ) || is_object( $choice ) ) {
+	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'] ) ) {
+			if (!isset($choice['attachment_id']) || !isset($choice['url'])) {
 				return;
 			}
 
-			$choice['url'] = esc_url_raw( $choice['url'] );
+			$choice['url'] = esc_url_raw($choice['url']);
 
 			$header_image_data = (object) array(
 				'attachment_id' => $choice['attachment_id'],
@@ -1169,36 +1169,36 @@ 
 				'width'         => $choice['width'],
 			);
 
-			update_post_meta( $choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet() );
+			update_post_meta($choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet());
 
-			set_theme_mod( 'header_image', $choice['url'] );
-			set_theme_mod( 'header_image_data', $header_image_data );
+			set_theme_mod('header_image', $choice['url']);
+			set_theme_mod('header_image_data', $header_image_data);
 
 			return;
 		}
 
-		if ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ), true ) ) {
-			set_theme_mod( 'header_image', $choice );
-			remove_theme_mod( 'header_image_data' );
+		if (in_array($choice, array('remove-header', 'random-default-image', 'random-uploaded-image'), true)) {
+			set_theme_mod('header_image', $choice);
+			remove_theme_mod('header_image_data');
 
 			return;
 		}
 
 		$uploaded = get_uploaded_header_images();
 
-		if ( $uploaded && isset( $uploaded[ $choice ] ) ) {
-			$header_image_data = $uploaded[ $choice ];
+		if ($uploaded && isset($uploaded[$choice])) {
+			$header_image_data = $uploaded[$choice];
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) ) {
-				$header_image_data = $this->default_headers[ $choice ];
+			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'] ) );
-		set_theme_mod( 'header_image_data', $header_image_data );
+		set_theme_mod('header_image', esc_url_raw($header_image_data['url']));
+		set_theme_mod('header_image_data', $header_image_data);
 	}
 
 	/**
@@ -1207,7 +1207,7 @@ 
 	 * @since 3.4.0
 	 */
 	final public function remove_header_image() {
-		$this->set_header_image( 'remove-header' );
+		$this->set_header_image('remove-header');
 	}
 
 	/**
@@ -1219,25 +1219,25 @@ 
 	 */
 	final public function reset_header_image() {
 		$this->process_default_headers();
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) {
+		if (!$default) {
 			$this->remove_header_image();
 			return;
 		}
 
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 		$default_data = array();
-		foreach ( $this->default_headers as $header => $details ) {
-			if ( $details['url'] === $default ) {
+		foreach ($this->default_headers as $header => $details) {
+			if ($details['url'] === $default) {
 				$default_data = $details;
 				break;
 			}
 		}
 
-		set_theme_mod( 'header_image', $default );
-		set_theme_mod( 'header_image_data', (object) $default_data );
+		set_theme_mod('header_image', $default);
+		set_theme_mod('header_image_data', (object) $default_data);
 	}
 
 	/**
@@ -1248,41 +1248,41 @@ 
 	 * @param array $dimensions
 	 * @return array dst_height and dst_width of header image.
 	 */
-	final public function get_header_dimensions( $dimensions ) {
+	final public function get_header_dimensions($dimensions) {
 		$max_width       = 0;
-		$width           = absint( $dimensions['width'] );
-		$height          = absint( $dimensions['height'] );
-		$theme_height    = get_theme_support( 'custom-header', 'height' );
-		$theme_width     = get_theme_support( 'custom-header', 'width' );
-		$has_flex_width  = current_theme_supports( 'custom-header', 'flex-width' );
-		$has_flex_height = current_theme_supports( 'custom-header', 'flex-height' );
-		$has_max_width   = current_theme_supports( 'custom-header', 'max-width' );
+		$width           = absint($dimensions['width']);
+		$height          = absint($dimensions['height']);
+		$theme_height    = get_theme_support('custom-header', 'height');
+		$theme_width     = get_theme_support('custom-header', 'width');
+		$has_flex_width  = current_theme_supports('custom-header', 'flex-width');
+		$has_flex_height = current_theme_supports('custom-header', 'flex-height');
+		$has_max_width   = current_theme_supports('custom-header', 'max-width');
 		$dst             = array(
 			'dst_height' => null,
 			'dst_width'  => null,
 		);
 
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise.
-		if ( $has_flex_width ) {
+		if ($has_flex_width) {
 			$max_width = 1500;
 		}
 
-		if ( $has_max_width ) {
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ($has_max_width) {
+			$max_width = max($max_width, get_theme_support('custom-header', 'max-width'));
 		}
-		$max_width = max( $max_width, $theme_width );
+		$max_width = max($max_width, $theme_width);
 
-		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 ) {
+		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) {
 			$dst['dst_height'] = $height;
 		} 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 ) {
+		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) {
 			$dst['dst_width'] = $width;
 		} else {
 			$dst['dst_width'] = $theme_width;
@@ -1300,17 +1300,17 @@ 
 	 * @param int    $parent_attachment_id Attachment ID of parent image.
 	 * @return array An array with attachment object data.
 	 */
-	final public function create_attachment_object( $cropped, $parent_attachment_id ) {
-		$parent     = get_post( $parent_attachment_id );
-		$parent_url = wp_get_attachment_url( $parent->ID );
-		$url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
+	final public function create_attachment_object($cropped, $parent_attachment_id) {
+		$parent     = get_post($parent_attachment_id);
+		$parent_url = wp_get_attachment_url($parent->ID);
+		$url        = str_replace(wp_basename($parent_url), wp_basename($cropped), $parent_url);
 
-		$size       = wp_getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+		$size       = wp_getimagesize($cropped);
+		$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 		$attachment = array(
 			'ID'             => $parent_attachment_id,
-			'post_title'     => wp_basename( $cropped ),
+			'post_title'     => wp_basename($cropped),
 			'post_mime_type' => $image_type,
 			'guid'           => $url,
 			'context'        => 'custom-header',
@@ -1329,15 +1329,15 @@ 
 	 * @param string $cropped    File path to cropped image.
 	 * @return int Attachment ID.
 	 */
-	final public function insert_attachment( $attachment, $cropped ) {
-		$parent_id = isset( $attachment['post_parent'] ) ? $attachment['post_parent'] : null;
-		unset( $attachment['post_parent'] );
+	final public function insert_attachment($attachment, $cropped) {
+		$parent_id = isset($attachment['post_parent']) ? $attachment['post_parent'] : null;
+		unset($attachment['post_parent']);
 
-		$attachment_id = wp_insert_attachment( $attachment, $cropped );
-		$metadata      = wp_generate_attachment_metadata( $attachment_id, $cropped );
+		$attachment_id = wp_insert_attachment($attachment, $cropped);
+		$metadata      = wp_generate_attachment_metadata($attachment_id, $cropped);
 
 		// If this is a crop, save the original attachment ID as metadata.
-		if ( $parent_id ) {
+		if ($parent_id) {
 			$metadata['attachment_parent'] = $parent_id;
 		}
 
@@ -1350,9 +1350,9 @@ 
 		 *
 		 * @param array $metadata Attachment metadata.
 		 */
-		$metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
+		$metadata = apply_filters('wp_header_image_attachment_metadata', $metadata);
 
-		wp_update_attachment_metadata( $attachment_id, $metadata );
+		wp_update_attachment_metadata($attachment_id, $metadata);
 
 		return $attachment_id;
 	}
@@ -1364,13 +1364,13 @@ 
 	 * @since 3.9.0
 	 */
 	public function ajax_header_crop() {
-		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
+		check_ajax_referer('image_editor-' . $_POST['id'], 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if (!current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if (!current_theme_supports('custom-header', 'uploads')) {
 			wp_send_json_error();
 		}
 
@@ -1383,7 +1383,7 @@ 
 			)
 		);
 
-		$attachment_id = absint( $_POST['id'] );
+		$attachment_id = absint($_POST['id']);
 
 		$cropped = wp_crop_image(
 			$attachment_id,
@@ -1395,32 +1395,32 @@ 
 			(int) $dimensions['dst_height']
 		);
 
-		if ( ! $cropped || is_wp_error( $cropped ) ) {
-			wp_send_json_error( array( 'message' => __( 'Image could not be processed. Please go back and try again.' ) ) );
+		if (!$cropped || is_wp_error($cropped)) {
+			wp_send_json_error(array('message' => __('Image could not be processed. Please go back and try again.')));
 		}
 
 		/** This filter is documented in wp-admin/includes/class-custom-image-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication.
 
-		$attachment = $this->create_attachment_object( $cropped, $attachment_id );
+		$attachment = $this->create_attachment_object($cropped, $attachment_id);
 
-		$previous = $this->get_previous_crop( $attachment );
+		$previous = $this->get_previous_crop($attachment);
 
-		if ( $previous ) {
+		if ($previous) {
 			$attachment['ID'] = $previous;
 		} else {
-			unset( $attachment['ID'] );
+			unset($attachment['ID']);
 		}
 
-		$new_attachment_id = $this->insert_attachment( $attachment, $cropped );
+		$new_attachment_id = $this->insert_attachment($attachment, $cropped);
 
 		$attachment['attachment_id'] = $new_attachment_id;
-		$attachment['url']           = wp_get_attachment_url( $new_attachment_id );
+		$attachment['url']           = wp_get_attachment_url($new_attachment_id);
 
 		$attachment['width']  = $dimensions['dst_width'];
 		$attachment['height'] = $dimensions['dst_height'];
 
-		wp_send_json_success( $attachment );
+		wp_send_json_success($attachment);
 	}
 
 	/**
@@ -1433,20 +1433,20 @@ 
 	 * @since 3.9.0
 	 */
 	public function ajax_header_add() {
-		check_ajax_referer( 'header-add', 'nonce' );
+		check_ajax_referer('header-add', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if (!current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
 		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		update_post_meta($attachment_id, $key, time());
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1461,20 +1461,20 @@ 
 	 * @since 3.9.0
 	 */
 	public function ajax_header_remove() {
-		check_ajax_referer( 'header-remove', 'nonce' );
+		check_ajax_referer('header-remove', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if (!current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
 		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		delete_post_meta( $attachment_id, $key );
-		delete_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		delete_post_meta($attachment_id, $key);
+		delete_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1486,23 +1486,23 @@ 
 	 *
 	 * @param WP_Customize_Manager $wp_customize Customize manager.
 	 */
-	public function customize_set_last_used( $wp_customize ) {
+	public function customize_set_last_used($wp_customize) {
 
-		$header_image_data_setting = $wp_customize->get_setting( 'header_image_data' );
+		$header_image_data_setting = $wp_customize->get_setting('header_image_data');
 
-		if ( ! $header_image_data_setting ) {
+		if (!$header_image_data_setting) {
 			return;
 		}
 
 		$data = $header_image_data_setting->post_value();
 
-		if ( ! isset( $data['attachment_id'] ) ) {
+		if (!isset($data['attachment_id'])) {
 			return;
 		}
 
 		$attachment_id = $data['attachment_id'];
 		$key           = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
+		update_post_meta($attachment_id, $key, time());
 	}
 
 	/**
@@ -1516,24 +1516,24 @@ 
 		$this->process_default_headers();
 
 		// Get the default image if there is one.
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) { // If not, easy peasy.
+		if (!$default) { // If not, easy peasy.
 			return $this->default_headers;
 		}
 
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 		$already_has_default = false;
 
-		foreach ( $this->default_headers as $k => $h ) {
-			if ( $h['url'] === $default ) {
+		foreach ($this->default_headers as $k => $h) {
+			if ($h['url'] === $default) {
 				$already_has_default = true;
 				break;
 			}
 		}
 
-		if ( $already_has_default ) {
+		if ($already_has_default) {
 			return $this->default_headers;
 		}
 
@@ -1546,7 +1546,7 @@ 
 		);
 
 		// The rest of the set comes after.
-		return array_merge( $header_images, $this->default_headers );
+		return array_merge($header_images, $this->default_headers);
 	}
 
 	/**
@@ -1561,10 +1561,10 @@ 
 		$timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
 		$alt_text_key  = '_wp_attachment_image_alt';
 
-		foreach ( $header_images as &$header_image ) {
-			$header_meta               = get_post_meta( $header_image['attachment_id'] );
-			$header_image['timestamp'] = isset( $header_meta[ $timestamp_key ] ) ? $header_meta[ $timestamp_key ] : '';
-			$header_image['alt_text']  = isset( $header_meta[ $alt_text_key ] ) ? $header_meta[ $alt_text_key ] : '';
+		foreach ($header_images as &$header_image) {
+			$header_meta               = get_post_meta($header_image['attachment_id']);
+			$header_image['timestamp'] = isset($header_meta[$timestamp_key]) ? $header_meta[$timestamp_key] : '';
+			$header_image['alt_text']  = isset($header_meta[$alt_text_key]) ? $header_meta[$alt_text_key] : '';
 		}
 
 		return $header_images;
@@ -1578,18 +1578,18 @@ 
 	 * @param array $attachment An array with a cropped attachment object data.
 	 * @return int|false An attachment ID if one exists. False if none.
 	 */
-	public function get_previous_crop( $attachment ) {
+	public function get_previous_crop($attachment) {
 		$header_images = $this->get_uploaded_header_images();
 
 		// Bail early if there are no header images.
-		if ( empty( $header_images ) ) {
+		if (empty($header_images)) {
 			return false;
 		}
 
 		$previous = false;
 
-		foreach ( $header_images as $image ) {
-			if ( $image['attachment_parent'] === $attachment['post_parent'] ) {
+		foreach ($header_images as $image) {
+			if ($image['attachment_parent'] === $attachment['post_parent']) {
 				$previous = $image['attachment_id'];
 				break;
 			}

brighty/wp-admin/includes/admin-filters.php

Spacing +97 added lines, -97 removed lines

@@ -8,162 +8,162 @@
  */
 
 // Bookmark hooks.
-add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
+add_action('admin_page_access_denied', 'wp_link_manager_disabled_message');
 
 // Dashboard hooks.
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
-add_action( 'welcome_panel', 'wp_welcome_panel' );
+add_action('activity_box_end', 'wp_dashboard_quota');
+add_action('welcome_panel', 'wp_welcome_panel');
 
 // Media hooks.
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
-add_filter( 'plupload_init', 'wp_show_heic_upload_error' );
+add_action('attachment_submitbox_misc_actions', 'attachment_submitbox_metadata');
+add_filter('plupload_init', 'wp_show_heic_upload_error');
 
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file', 'wp_media_upload_handler' );
+add_action('media_upload_image', 'wp_media_upload_handler');
+add_action('media_upload_audio', 'wp_media_upload_handler');
+add_action('media_upload_video', 'wp_media_upload_handler');
+add_action('media_upload_file', 'wp_media_upload_handler');
 
-add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' );
+add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
 
-add_action( 'post-html-upload-ui', 'media_upload_html_bypass' );
+add_action('post-html-upload-ui', 'media_upload_html_bypass');
 
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file', 'get_media_item', 10, 2 );
+add_filter('async_upload_image', 'get_media_item', 10, 2);
+add_filter('async_upload_audio', 'get_media_item', 10, 2);
+add_filter('async_upload_video', 'get_media_item', 10, 2);
+add_filter('async_upload_file', 'get_media_item', 10, 2);
 
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
+add_filter('media_upload_gallery', 'media_upload_gallery');
+add_filter('media_upload_library', 'media_upload_library');
 
-add_filter( 'media_upload_tabs', 'update_gallery_tab' );
+add_filter('media_upload_tabs', 'update_gallery_tab');
 
 // Admin color schemes.
-add_action( 'admin_init', 'register_admin_color_schemes', 1 );
-add_action( 'admin_head', 'wp_color_scheme_settings' );
-add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
+add_action('admin_init', 'register_admin_color_schemes', 1);
+add_action('admin_head', 'wp_color_scheme_settings');
+add_action('admin_color_scheme_picker', 'admin_color_scheme_picker');
 
 // Misc hooks.
-add_action( 'admin_init', 'wp_admin_headers' );
-add_action( 'login_init', 'wp_admin_headers' );
-add_action( 'admin_init', 'send_frame_options_header', 10, 0 );
-add_action( 'admin_head', 'wp_admin_canonical_url' );
-add_action( 'admin_head', 'wp_site_icon' );
-add_action( 'admin_head', 'wp_admin_viewport_meta' );
-add_action( 'customize_controls_head', 'wp_admin_viewport_meta' );
-add_filter( 'nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object' );
+add_action('admin_init', 'wp_admin_headers');
+add_action('login_init', 'wp_admin_headers');
+add_action('admin_init', 'send_frame_options_header', 10, 0);
+add_action('admin_head', 'wp_admin_canonical_url');
+add_action('admin_head', 'wp_site_icon');
+add_action('admin_head', 'wp_admin_viewport_meta');
+add_action('customize_controls_head', 'wp_admin_viewport_meta');
+add_filter('nav_menu_meta_box_object', '_wp_nav_menu_meta_box_object');
 
 // Prerendering.
-if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+if (!is_customize_preview()) {
+	add_filter('admin_print_styles', 'wp_resource_hints', 1);
 }
 
-add_action( 'admin_print_scripts', 'print_emoji_detection_script' );
-add_action( 'admin_print_scripts', 'print_head_scripts', 20 );
-add_action( 'admin_print_footer_scripts', '_wp_footer_scripts' );
-add_action( 'admin_print_styles', 'print_emoji_styles' );
-add_action( 'admin_print_styles', 'print_admin_styles', 20 );
+add_action('admin_print_scripts', 'print_emoji_detection_script');
+add_action('admin_print_scripts', 'print_head_scripts', 20);
+add_action('admin_print_footer_scripts', '_wp_footer_scripts');
+add_action('admin_print_styles', 'print_emoji_styles');
+add_action('admin_print_styles', 'print_admin_styles', 20);
 
-add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' );
-add_action( 'admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js' );
-add_action( 'admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js' );
+add_action('admin_print_scripts-index.php', 'wp_localize_community_events');
+add_action('admin_print_scripts-post.php', 'wp_page_reload_on_back_button_js');
+add_action('admin_print_scripts-post-new.php', 'wp_page_reload_on_back_button_js');
 
-add_action( 'update_option_home', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 );
-add_action( 'update_option_admin_email', 'wp_site_admin_email_change_notification', 10, 3 );
+add_action('update_option_home', 'update_home_siteurl', 10, 2);
+add_action('update_option_siteurl', 'update_home_siteurl', 10, 2);
+add_action('update_option_page_on_front', 'update_home_siteurl', 10, 2);
+add_action('update_option_admin_email', 'wp_site_admin_email_change_notification', 10, 3);
 
-add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
-add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+add_action('add_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
+add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
 
-add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 );
-add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 );
-add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
+add_filter('heartbeat_received', 'wp_check_locked_posts', 10, 3);
+add_filter('heartbeat_received', 'wp_refresh_post_lock', 10, 3);
+add_filter('heartbeat_received', 'heartbeat_autosave', 500, 2);
 
-add_filter( 'wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3 );
-add_filter( 'wp_refresh_nonces', 'wp_refresh_heartbeat_nonces' );
+add_filter('wp_refresh_nonces', 'wp_refresh_post_nonces', 10, 3);
+add_filter('wp_refresh_nonces', 'wp_refresh_heartbeat_nonces');
 
-add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' );
+add_filter('heartbeat_settings', 'wp_heartbeat_set_suspension');
 
-add_action( 'use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2 );
-add_action( 'edit_form_after_title', '_disable_content_editor_for_navigation_post_type' );
-add_action( 'edit_form_after_editor', '_enable_content_editor_for_navigation_post_type' );
+add_action('use_block_editor_for_post_type', '_disable_block_editor_for_navigation_post_type', 10, 2);
+add_action('edit_form_after_title', '_disable_content_editor_for_navigation_post_type');
+add_action('edit_form_after_editor', '_enable_content_editor_for_navigation_post_type');
 
 // Nav Menu hooks.
-add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
+add_action('admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items');
 
 // Plugin hooks.
-add_filter( 'allowed_options', 'option_update_filter' );
+add_filter('allowed_options', 'option_update_filter');
 
 // Plugin Install hooks.
-add_action( 'install_plugins_featured', 'install_dashboard' );
-add_action( 'install_plugins_upload', 'install_plugins_upload' );
-add_action( 'install_plugins_search', 'display_plugins_table' );
-add_action( 'install_plugins_popular', 'display_plugins_table' );
-add_action( 'install_plugins_recommended', 'display_plugins_table' );
-add_action( 'install_plugins_new', 'display_plugins_table' );
-add_action( 'install_plugins_beta', 'display_plugins_table' );
-add_action( 'install_plugins_favorites', 'display_plugins_table' );
-add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
+add_action('install_plugins_featured', 'install_dashboard');
+add_action('install_plugins_upload', 'install_plugins_upload');
+add_action('install_plugins_search', 'display_plugins_table');
+add_action('install_plugins_popular', 'display_plugins_table');
+add_action('install_plugins_recommended', 'display_plugins_table');
+add_action('install_plugins_new', 'display_plugins_table');
+add_action('install_plugins_beta', 'display_plugins_table');
+add_action('install_plugins_favorites', 'display_plugins_table');
+add_action('install_plugins_pre_plugin-information', 'install_plugin_information');
 
 // Template hooks.
-add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
-add_action( 'user_register', array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
+add_action('admin_enqueue_scripts', array('WP_Internal_Pointers', 'enqueue_scripts'));
+add_action('user_register', array('WP_Internal_Pointers', 'dismiss_pointers_for_new_users'));
 
 // Theme hooks.
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
+add_action('customize_controls_print_footer_scripts', 'customize_themes_print_templates');
 
 // Theme Install hooks.
-add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
+add_action('install_themes_pre_theme-information', 'install_theme_information');
 
 // User hooks.
-add_action( 'admin_init', 'default_password_nag_handler' );
+add_action('admin_init', 'default_password_nag_handler');
 
-add_action( 'admin_notices', 'default_password_nag' );
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
+add_action('admin_notices', 'default_password_nag');
+add_action('admin_notices', 'new_user_email_admin_notice');
 
-add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 );
+add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
 
-add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
+add_action('personal_options_update', 'send_confirmation_on_profile_email');
 
 // Update hooks.
-add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
-add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
+add_action('load-plugins.php', 'wp_plugin_update_rows', 20); // After wp_update_plugins() is called.
+add_action('load-themes.php', 'wp_theme_update_rows', 20); // After wp_update_themes() is called.
 
-add_action( 'admin_notices', 'update_nag', 3 );
-add_action( 'admin_notices', 'deactivated_plugins_notice', 5 );
-add_action( 'admin_notices', 'paused_plugins_notice', 5 );
-add_action( 'admin_notices', 'paused_themes_notice', 5 );
-add_action( 'admin_notices', 'maintenance_nag', 10 );
-add_action( 'admin_notices', 'wp_recovery_mode_nag', 1 );
+add_action('admin_notices', 'update_nag', 3);
+add_action('admin_notices', 'deactivated_plugins_notice', 5);
+add_action('admin_notices', 'paused_plugins_notice', 5);
+add_action('admin_notices', 'paused_themes_notice', 5);
+add_action('admin_notices', 'maintenance_nag', 10);
+add_action('admin_notices', 'wp_recovery_mode_nag', 1);
 
-add_filter( 'update_footer', 'core_update_footer' );
+add_filter('update_footer', 'core_update_footer');
 
 // Update Core hooks.
-add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
+add_action('_core_updated_successfully', '_redirect_to_about_wordpress');
 
 // Upgrade hooks.
-add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
-add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
-add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+add_action('upgrader_process_complete', array('Language_Pack_Upgrader', 'async_upgrade'), 20);
+add_action('upgrader_process_complete', 'wp_version_check', 10, 0);
+add_action('upgrader_process_complete', 'wp_update_plugins', 10, 0);
+add_action('upgrader_process_complete', 'wp_update_themes', 10, 0);
 
 // Privacy hooks.
-add_filter( 'wp_privacy_personal_data_erasure_page', 'wp_privacy_process_personal_data_erasure_page', 10, 5 );
-add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 7 );
-add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );
-add_action( 'wp_privacy_personal_data_erased', '_wp_privacy_send_erasure_fulfillment_notification', 10 );
+add_filter('wp_privacy_personal_data_erasure_page', 'wp_privacy_process_personal_data_erasure_page', 10, 5);
+add_filter('wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 7);
+add_action('wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10);
+add_action('wp_privacy_personal_data_erased', '_wp_privacy_send_erasure_fulfillment_notification', 10);
 
 // Privacy policy text changes check.
-add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 100 );
+add_action('admin_init', array('WP_Privacy_Policy_Content', 'text_change_check'), 100);
 
 // Show a "postbox" with the text suggestions for a privacy policy.
-add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'notice' ) );
+add_action('admin_notices', array('WP_Privacy_Policy_Content', 'notice'));
 
 // Add the suggested policy text from WordPress.
-add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 );
+add_action('admin_init', array('WP_Privacy_Policy_Content', 'add_suggested_content'), 1);
 
 // Update the cached policy info when the policy page is updated.
-add_action( 'post_updated', array( 'WP_Privacy_Policy_Content', '_policy_page_updated' ) );
+add_action('post_updated', array('WP_Privacy_Policy_Content', '_policy_page_updated'));
 
 // Append '(Draft)' to draft page titles in the privacy page dropdown.
-add_filter( 'list_pages', '_wp_privacy_settings_filter_draft_page_titles', 10, 2 );
+add_filter('list_pages', '_wp_privacy_settings_filter_draft_page_titles', 10, 2);

brighty/wp-admin/includes/class-theme-upgrader-skin.php

Spacing +34 added lines, -34 removed lines

@@ -36,18 +36,18 @@ 
 	 * @param array $args Optional. The theme upgrader skin arguments to
 	 *                    override default options. Default empty array.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$defaults = array(
 			'url'   => '',
 			'theme' => '',
 			'nonce' => '',
-			'title' => __( 'Update Theme' ),
+			'title' => __('Update Theme'),
 		);
-		$args     = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$this->theme = $args['theme'];
 
-		parent::__construct( $args );
+		parent::__construct($args);
 	}
 
 	/**
@@ -56,75 +56,75 @@ 
 	 * @since 2.8.0
 	 */
 	public function after() {
-		$this->decrement_update_count( 'theme' );
+		$this->decrement_update_count('theme');
 
 		$update_actions = array();
 		$theme_info     = $this->upgrader->theme_info();
-		if ( $theme_info ) {
-			$name       = $theme_info->display( 'Name' );
+		if ($theme_info) {
+			$name       = $theme_info->display('Name');
 			$stylesheet = $this->upgrader->result['destination_name'];
 			$template   = $theme_info->get_template();
 
 			$activate_link = add_query_arg(
 				array(
 					'action'     => 'activate',
-					'template'   => urlencode( $template ),
-					'stylesheet' => urlencode( $stylesheet ),
+					'template'   => urlencode($template),
+					'stylesheet' => urlencode($stylesheet),
 				),
-				admin_url( 'themes.php' )
+				admin_url('themes.php')
 			);
-			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+			$activate_link = wp_nonce_url($activate_link, 'switch-theme_' . $stylesheet);
 
 			$customize_url = add_query_arg(
 				array(
-					'theme'  => urlencode( $stylesheet ),
-					'return' => urlencode( admin_url( 'themes.php' ) ),
+					'theme'  => urlencode($stylesheet),
+					'return' => urlencode(admin_url('themes.php')),
 				),
-				admin_url( 'customize.php' )
+				admin_url('customize.php')
 			);
 
-			if ( get_stylesheet() === $stylesheet ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+			if (get_stylesheet() === $stylesheet) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
 					$update_actions['preview'] = sprintf(
 						'<a href="%s" class="hide-if-no-customize load-customize">' .
 						'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-						esc_url( $customize_url ),
-						__( 'Customize' ),
+						esc_url($customize_url),
+						__('Customize'),
 						/* translators: %s: Theme name. */
-						sprintf( __( 'Customize &#8220;%s&#8221;' ), $name )
+						sprintf(__('Customize &#8220;%s&#8221;'), $name)
 					);
 				}
-			} elseif ( current_user_can( 'switch_themes' ) ) {
-				if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+			} elseif (current_user_can('switch_themes')) {
+				if (current_user_can('edit_theme_options') && current_user_can('customize')) {
 					$update_actions['preview'] = sprintf(
 						'<a href="%s" class="hide-if-no-customize load-customize">' .
 						'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-						esc_url( $customize_url ),
-						__( 'Live Preview' ),
+						esc_url($customize_url),
+						__('Live Preview'),
 						/* translators: %s: Theme name. */
-						sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name )
+						sprintf(__('Live Preview &#8220;%s&#8221;'), $name)
 					);
 				}
 
 				$update_actions['activate'] = sprintf(
 					'<a href="%s" class="activatelink">' .
 					'<span aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></a>',
-					esc_url( $activate_link ),
-					__( 'Activate' ),
+					esc_url($activate_link),
+					__('Activate'),
 					/* translators: %s: Theme name. */
-					sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $name )
+					sprintf(_x('Activate &#8220;%s&#8221;', 'theme'), $name)
 				);
 			}
 
-			if ( ! $this->result || is_wp_error( $this->result ) || is_network_admin() ) {
-				unset( $update_actions['preview'], $update_actions['activate'] );
+			if (!$this->result || is_wp_error($this->result) || is_network_admin()) {
+				unset($update_actions['preview'], $update_actions['activate']);
 			}
 		}
 
 		$update_actions['themes_page'] = sprintf(
 			'<a href="%s" target="_parent">%s</a>',
-			self_admin_url( 'themes.php' ),
-			__( 'Go to Themes page' )
+			self_admin_url('themes.php'),
+			__('Go to Themes page')
 		);
 
 		/**
@@ -135,10 +135,10 @@ 
 		 * @param string[] $update_actions Array of theme action links.
 		 * @param string   $theme          Theme directory name.
 		 */
-		$update_actions = apply_filters( 'update_theme_complete_actions', $update_actions, $this->theme );
+		$update_actions = apply_filters('update_theme_complete_actions', $update_actions, $this->theme);
 
-		if ( ! empty( $update_actions ) ) {
-			$this->feedback( implode( ' | ', (array) $update_actions ) );
+		if (!empty($update_actions)) {
+			$this->feedback(implode(' | ', (array) $update_actions));
 		}
 	}
 }

brighty/wp-admin/includes/plugin-install.php

Spacing +232 added lines, -232 removed lines

@@ -99,26 +99,26 @@ 
  *         {@link https://developer.wordpress.org/reference/functions/plugins_api/ function reference article}
  *         for more information on the make-up of possible return values depending on the value of `$action`.
  */
-function plugins_api( $action, $args = array() ) {
+function plugins_api($action, $args = array()) {
 	// Include an unmodified $wp_version.
 	require ABSPATH . WPINC . '/version.php';
 
-	if ( is_array( $args ) ) {
+	if (is_array($args)) {
 		$args = (object) $args;
 	}
 
-	if ( 'query_plugins' === $action ) {
-		if ( ! isset( $args->per_page ) ) {
+	if ('query_plugins' === $action) {
+		if (!isset($args->per_page)) {
 			$args->per_page = 24;
 		}
 	}
 
-	if ( ! isset( $args->locale ) ) {
+	if (!isset($args->locale)) {
 		$args->locale = get_user_locale();
 	}
 
-	if ( ! isset( $args->wp_version ) ) {
-		$args->wp_version = substr( $wp_version, 0, 3 ); // x.y
+	if (!isset($args->wp_version)) {
+		$args->wp_version = substr($wp_version, 0, 3); // x.y
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @param object $args   Plugin API arguments.
 	 * @param string $action The type of information being requested from the Plugin Installation API.
 	 */
-	$args = apply_filters( 'plugins_api_args', $args, $action );
+	$args = apply_filters('plugins_api_args', $args, $action);
 
 	/**
 	 * Filters the response for the current WordPress.org Plugin Installation API request.
@@ -147,9 +147,9 @@ 
 	 * @param string             $action The type of information being requested from the Plugin Installation API.
 	 * @param object             $args   Plugin API arguments.
 	 */
-	$res = apply_filters( 'plugins_api', false, $action, $args );
+	$res = apply_filters('plugins_api', false, $action, $args);
 
-	if ( false === $res ) {
+	if (false === $res) {
 
 		$url = 'http://api.wordpress.org/plugins/info/1.2/';
 		$url = add_query_arg(
@@ -161,64 +161,64 @@ 
 		);
 
 		$http_url = $url;
-		$ssl      = wp_http_supports( array( 'ssl' ) );
-		if ( $ssl ) {
-			$url = set_url_scheme( $url, 'https' );
+		$ssl      = wp_http_supports(array('ssl'));
+		if ($ssl) {
+			$url = set_url_scheme($url, 'https');
 		}
 
 		$http_args = array(
 			'timeout'    => 15,
-			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
+			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url('/'),
 		);
-		$request   = wp_remote_get( $url, $http_args );
+		$request = wp_remote_get($url, $http_args);
 
-		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! wp_is_json_request() ) {
+		if ($ssl && is_wp_error($request)) {
+			if (!wp_is_json_request()) {
 				trigger_error(
 					sprintf(
 						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
-					) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ),
+						__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+						__('https://wordpress.org/support/forums/')
+					) . ' ' . __('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'),
 					headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
 				);
 			}
 
-			$request = wp_remote_get( $http_url, $http_args );
+			$request = wp_remote_get($http_url, $http_args);
 		}
 
-		if ( is_wp_error( $request ) ) {
+		if (is_wp_error($request)) {
 			$res = new WP_Error(
 				'plugins_api_failed',
 				sprintf(
 					/* translators: %s: Support forums URL. */
-					__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-					__( 'https://wordpress.org/support/forums/' )
+					__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+					__('https://wordpress.org/support/forums/')
 				),
 				$request->get_error_message()
 			);
 		} else {
-			$res = json_decode( wp_remote_retrieve_body( $request ), true );
-			if ( is_array( $res ) ) {
+			$res = json_decode(wp_remote_retrieve_body($request), true);
+			if (is_array($res)) {
 				// Object casting is required in order to match the info/1.0 format.
 				$res = (object) $res;
-			} elseif ( null === $res ) {
+			} elseif (null === $res) {
 				$res = new WP_Error(
 					'plugins_api_failed',
 					sprintf(
 						/* translators: %s: Support forums URL. */
-						__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.' ),
-						__( 'https://wordpress.org/support/forums/' )
+						__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="%s">support forums</a>.'),
+						__('https://wordpress.org/support/forums/')
 					),
-					wp_remote_retrieve_body( $request )
+					wp_remote_retrieve_body($request)
 				);
 			}
 
-			if ( isset( $res->error ) ) {
-				$res = new WP_Error( 'plugins_api_failed', $res->error );
+			if (isset($res->error)) {
+				$res = new WP_Error('plugins_api_failed', $res->error);
 			}
 		}
-	} elseif ( ! is_wp_error( $res ) ) {
+	} elseif (!is_wp_error($res)) {
 		$res->external = true;
 	}
 
@@ -231,7 +231,7 @@ 
 	 * @param string          $action The type of information being requested from the Plugin Installation API.
 	 * @param object          $args   Plugin API arguments.
 	 */
-	return apply_filters( 'plugins_api_result', $res, $action, $args );
+	return apply_filters('plugins_api_result', $res, $action, $args);
 }
 
 /**
@@ -242,20 +242,20 @@ 
  * @param array $args
  * @return array|WP_Error
  */
-function install_popular_tags( $args = array() ) {
-	$key  = md5( serialize( $args ) );
-	$tags = get_site_transient( 'poptags_' . $key );
-	if ( false !== $tags ) {
+function install_popular_tags($args = array()) {
+	$key  = md5(serialize($args));
+	$tags = get_site_transient('poptags_' . $key);
+	if (false !== $tags) {
 		return $tags;
 	}
 
-	$tags = plugins_api( 'hot_tags', $args );
+	$tags = plugins_api('hot_tags', $args);
 
-	if ( is_wp_error( $tags ) ) {
+	if (is_wp_error($tags)) {
 		return $tags;
 	}
 
-	set_site_transient( 'poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS );
+	set_site_transient('poptags_' . $key, $tags, 3 * HOUR_IN_SECONDS);
 
 	return $tags;
 }
@@ -270,36 +270,36 @@ 
 	?>
 
 	<div class="plugins-popular-tags-wrapper">
-	<h2><?php _e( 'Popular tags' ); ?></h2>
-	<p><?php _e( 'You may also browse based on the most popular tags in the Plugin Directory:' ); ?></p>
+	<h2><?php _e('Popular tags'); ?></h2>
+	<p><?php _e('You may also browse based on the most popular tags in the Plugin Directory:'); ?></p>
 	<?php
 
 	$api_tags = install_popular_tags();
 
 	echo '<p class="popular-tags">';
-	if ( is_wp_error( $api_tags ) ) {
+	if (is_wp_error($api_tags)) {
 		echo $api_tags->get_error_message();
 	} else {
 		// Set up the tags in a way which can be interpreted by wp_generate_tag_cloud().
 		$tags = array();
-		foreach ( (array) $api_tags as $tag ) {
-			$url                  = self_admin_url( 'plugin-install.php?tab=search&type=tag&s=' . urlencode( $tag['name'] ) );
+		foreach ((array) $api_tags as $tag) {
+			$url                  = self_admin_url('plugin-install.php?tab=search&type=tag&s=' . urlencode($tag['name']));
 			$data                 = array(
-				'link'  => esc_url( $url ),
+				'link'  => esc_url($url),
 				'name'  => $tag['name'],
 				'slug'  => $tag['slug'],
-				'id'    => sanitize_title_with_dashes( $tag['name'] ),
+				'id'    => sanitize_title_with_dashes($tag['name']),
 				'count' => $tag['count'],
 			);
-			$tags[ $tag['name'] ] = (object) $data;
+			$tags[$tag['name']] = (object) $data;
 		}
 		echo wp_generate_tag_cloud(
 			$tags,
 			array(
 				/* translators: %s: Number of plugins. */
-				'single_text'   => __( '%s plugin' ),
+				'single_text'   => __('%s plugin'),
 				/* translators: %s: Number of plugins. */
-				'multiple_text' => __( '%s plugins' ),
+				'multiple_text' => __('%s plugins'),
 			)
 		);
 	}
@@ -314,21 +314,21 @@ 
  *
  * @param bool $deprecated Not used.
  */
-function install_search_form( $deprecated = true ) {
-	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
+function install_search_form($deprecated = true) {
+	$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+	$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
 	?>
 	<form class="search-form search-plugins" method="get">
 		<input type="hidden" name="tab" value="search" />
-		<label class="screen-reader-text" for="typeselector"><?php _e( 'Search plugins by:' ); ?></label>
+		<label class="screen-reader-text" for="typeselector"><?php _e('Search plugins by:'); ?></label>
 		<select name="type" id="typeselector">
-			<option value="term"<?php selected( 'term', $type ); ?>><?php _e( 'Keyword' ); ?></option>
-			<option value="author"<?php selected( 'author', $type ); ?>><?php _e( 'Author' ); ?></option>
-			<option value="tag"<?php selected( 'tag', $type ); ?>><?php _ex( 'Tag', 'Plugin Installer' ); ?></option>
+			<option value="term"<?php selected('term', $type); ?>><?php _e('Keyword'); ?></option>
+			<option value="author"<?php selected('author', $type); ?>><?php _e('Author'); ?></option>
+			<option value="tag"<?php selected('tag', $type); ?>><?php _ex('Tag', 'Plugin Installer'); ?></option>
 		</select>
-		<label class="screen-reader-text" for="search-plugins"><?php _e( 'Search Plugins' ); ?></label>
-		<input type="search" name="s" id="search-plugins" value="<?php echo esc_attr( $term ); ?>" class="wp-filter-search" placeholder="<?php esc_attr_e( 'Search plugins...' ); ?>" />
-		<?php submit_button( __( 'Search Plugins' ), 'hide-if-js', false, false, array( 'id' => 'search-submit' ) ); ?>
+		<label class="screen-reader-text" for="search-plugins"><?php _e('Search Plugins'); ?></label>
+		<input type="search" name="s" id="search-plugins" value="<?php echo esc_attr($term); ?>" class="wp-filter-search" placeholder="<?php esc_attr_e('Search plugins...'); ?>" />
+		<?php submit_button(__('Search Plugins'), 'hide-if-js', false, false, array('id' => 'search-submit')); ?>
 	</form>
 	<?php
 }
@@ -341,12 +341,12 @@ 
 function install_plugins_upload() {
 	?>
 <div class="upload-plugin">
-	<p class="install-help"><?php _e( 'If you have a plugin in a .zip format, you may install or update it by uploading it here.' ); ?></p>
-	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-plugin' ); ?>">
-		<?php wp_nonce_field( 'plugin-upload' ); ?>
-		<label class="screen-reader-text" for="pluginzip"><?php _e( 'Plugin zip file' ); ?></label>
+	<p class="install-help"><?php _e('If you have a plugin in a .zip format, you may install or update it by uploading it here.'); ?></p>
+	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-plugin'); ?>">
+		<?php wp_nonce_field('plugin-upload'); ?>
+		<label class="screen-reader-text" for="pluginzip"><?php _e('Plugin zip file'); ?></label>
 		<input type="file" id="pluginzip" name="pluginzip" accept=".zip" />
-		<?php submit_button( __( 'Install Now' ), '', 'install-plugin-submit', false ); ?>
+		<?php submit_button(__('Install Now'), '', 'install-plugin-submit', false); ?>
 	</form>
 </div>
 	<?php
@@ -358,17 +358,17 @@ 
  * @since 3.5.0
  */
 function install_plugins_favorites_form() {
-	$user   = get_user_option( 'wporg_favorites' );
+	$user   = get_user_option('wporg_favorites');
 	$action = 'save_wporg_username_' . get_current_user_id();
 	?>
-	<p><?php _e( 'If you have marked plugins as favorites on WordPress.org, you can browse them here.' ); ?></p>
+	<p><?php _e('If you have marked plugins as favorites on WordPress.org, you can browse them here.'); ?></p>
 	<form method="get">
 		<input type="hidden" name="tab" value="favorites" />
 		<p>
-			<label for="user"><?php _e( 'Your WordPress.org username:' ); ?></label>
-			<input type="search" id="user" name="user" value="<?php echo esc_attr( $user ); ?>" />
-			<input type="submit" class="button" value="<?php esc_attr_e( 'Get Favorites' ); ?>" />
-			<input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr( wp_create_nonce( $action ) ); ?>" />
+			<label for="user"><?php _e('Your WordPress.org username:'); ?></label>
+			<input type="search" id="user" name="user" value="<?php echo esc_attr($user); ?>" />
+			<input type="submit" class="button" value="<?php esc_attr_e('Get Favorites'); ?>" />
+			<input type="hidden" id="wporg-username-nonce" name="_wpnonce" value="<?php echo esc_attr(wp_create_nonce($action)); ?>" />
 		</p>
 	</form>
 	<?php
@@ -384,26 +384,26 @@ 
 function display_plugins_table() {
 	global $wp_list_table;
 
-	switch ( current_filter() ) {
+	switch (current_filter()) {
 		case 'install_plugins_beta':
 			printf(
 				/* translators: %s: URL to "Features as Plugins" page. */
-				'<p>' . __( 'You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.' ) . '</p>',
+				'<p>' . __('You are using a development version of WordPress. These feature plugins are also under development. <a href="%s">Learn more</a>.') . '</p>',
 				'https://make.wordpress.org/core/handbook/about/release-cycle/features-as-plugins/'
 			);
 			break;
 		case 'install_plugins_featured':
 			printf(
 				/* translators: %s: https://wordpress.org/plugins/ */
-				'<p>' . __( 'Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.' ) . '</p>',
-				__( 'https://wordpress.org/plugins/' )
+				'<p>' . __('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="%s">WordPress Plugin Directory</a> or upload a plugin in .zip format by clicking the button at the top of this page.') . '</p>',
+				__('https://wordpress.org/plugins/')
 			);
 			break;
 		case 'install_plugins_recommended':
-			echo '<p>' . __( 'These suggestions are based on the plugins you and other users have installed.' ) . '</p>';
+			echo '<p>' . __('These suggestions are based on the plugins you and other users have installed.') . '</p>';
 			break;
 		case 'install_plugins_favorites':
-			if ( empty( $_GET['user'] ) && ! get_user_option( 'wporg_favorites' ) ) {
+			if (empty($_GET['user']) && !get_user_option('wporg_favorites')) {
 				return;
 			}
 			break;
@@ -431,9 +431,9 @@ 
  *     @type string $file    Plugin filename relative to the plugins directory.
  * }
  */
-function install_plugin_install_status( $api, $loop = false ) {
+function install_plugin_install_status($api, $loop = false) {
 	// This function is called recursively, $loop prevents further loops.
-	if ( is_array( $api ) ) {
+	if (is_array($api)) {
 		$api = (object) $api;
 	}
 
@@ -447,62 +447,62 @@ 
 	 * Check to see if this plugin is known to be installed,
 	 * and has an update awaiting it.
 	 */
-	$update_plugins = get_site_transient( 'update_plugins' );
-	if ( isset( $update_plugins->response ) ) {
-		foreach ( (array) $update_plugins->response as $file => $plugin ) {
-			if ( $plugin->slug === $api->slug ) {
+	$update_plugins = get_site_transient('update_plugins');
+	if (isset($update_plugins->response)) {
+		foreach ((array) $update_plugins->response as $file => $plugin) {
+			if ($plugin->slug === $api->slug) {
 				$status      = 'update_available';
 				$update_file = $file;
 				$version     = $plugin->new_version;
-				if ( current_user_can( 'update_plugins' ) ) {
-					$url = wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' . $update_file ), 'upgrade-plugin_' . $update_file );
+				if (current_user_can('update_plugins')) {
+					$url = wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=' . $update_file), 'upgrade-plugin_' . $update_file);
 				}
 				break;
 			}
 		}
 	}
 
-	if ( 'install' === $status ) {
-		if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
-			$installed_plugin = get_plugins( '/' . $api->slug );
-			if ( empty( $installed_plugin ) ) {
-				if ( current_user_can( 'install_plugins' ) ) {
-					$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug );
+	if ('install' === $status) {
+		if (is_dir(WP_PLUGIN_DIR . '/' . $api->slug)) {
+			$installed_plugin = get_plugins('/' . $api->slug);
+			if (empty($installed_plugin)) {
+				if (current_user_can('install_plugins')) {
+					$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
 				}
 			} else {
-				$key = array_keys( $installed_plugin );
+				$key = array_keys($installed_plugin);
 				// Use the first plugin regardless of the name.
 				// Could have issues for multiple plugins in one directory if they share different version numbers.
-				$key = reset( $key );
+				$key = reset($key);
 
 				$update_file = $api->slug . '/' . $key;
-				if ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '=' ) ) {
+				if (version_compare($api->version, $installed_plugin[$key]['Version'], '=')) {
 					$status = 'latest_installed';
-				} elseif ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '<' ) ) {
+				} elseif (version_compare($api->version, $installed_plugin[$key]['Version'], '<')) {
 					$status  = 'newer_installed';
-					$version = $installed_plugin[ $key ]['Version'];
+					$version = $installed_plugin[$key]['Version'];
 				} else {
 					// If the above update check failed, then that probably means that the update checker has out-of-date information, force a refresh.
-					if ( ! $loop ) {
-						delete_site_transient( 'update_plugins' );
+					if (!$loop) {
+						delete_site_transient('update_plugins');
 						wp_update_plugins();
-						return install_plugin_install_status( $api, true );
+						return install_plugin_install_status($api, true);
 					}
 				}
 			}
 		} else {
 			// "install" & no directory with that slug.
-			if ( current_user_can( 'install_plugins' ) ) {
-				$url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=' . $api->slug ), 'install-plugin_' . $api->slug );
+			if (current_user_can('install_plugins')) {
+				$url = wp_nonce_url(self_admin_url('update.php?action=install-plugin&plugin=' . $api->slug), 'install-plugin_' . $api->slug);
 			}
 		}
 	}
-	if ( isset( $_GET['from'] ) ) {
-		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+	if (isset($_GET['from'])) {
+		$url .= '&amp;from=' . urlencode(wp_unslash($_GET['from']));
 	}
 
 	$file = $update_file;
-	return compact( 'status', 'url', 'version', 'file' );
+	return compact('status', 'url', 'version', 'file');
 }
 
 /**
@@ -515,19 +515,19 @@ 
 function install_plugin_information() {
 	global $tab;
 
-	if ( empty( $_REQUEST['plugin'] ) ) {
+	if (empty($_REQUEST['plugin'])) {
 		return;
 	}
 
 	$api = plugins_api(
 		'plugin_information',
 		array(
-			'slug' => wp_unslash( $_REQUEST['plugin'] ),
+			'slug' => wp_unslash($_REQUEST['plugin']),
 		)
 	);
 
-	if ( is_wp_error( $api ) ) {
-		wp_die( $api );
+	if (is_wp_error($api)) {
+		wp_die($api);
 	}
 
 	$plugins_allowedtags = array(
@@ -536,14 +536,14 @@ 
 			'title'  => array(),
 			'target' => array(),
 		),
-		'abbr'       => array( 'title' => array() ),
-		'acronym'    => array( 'title' => array() ),
+		'abbr'       => array('title' => array()),
+		'acronym'    => array('title' => array()),
 		'code'       => array(),
 		'pre'        => array(),
 		'em'         => array(),
 		'strong'     => array(),
-		'div'        => array( 'class' => array() ),
-		'span'       => array( 'class' => array() ),
+		'div'        => array('class' => array()),
+		'span'       => array('class' => array()),
 		'p'          => array(),
 		'br'         => array(),
 		'ul'         => array(),
@@ -560,55 +560,55 @@ 
 			'class' => array(),
 			'alt'   => array(),
 		),
-		'blockquote' => array( 'cite' => true ),
+		'blockquote' => array('cite' => true),
 	);
 
 	$plugins_section_titles = array(
-		'description'  => _x( 'Description', 'Plugin installer section title' ),
-		'installation' => _x( 'Installation', 'Plugin installer section title' ),
-		'faq'          => _x( 'FAQ', 'Plugin installer section title' ),
-		'screenshots'  => _x( 'Screenshots', 'Plugin installer section title' ),
-		'changelog'    => _x( 'Changelog', 'Plugin installer section title' ),
-		'reviews'      => _x( 'Reviews', 'Plugin installer section title' ),
-		'other_notes'  => _x( 'Other Notes', 'Plugin installer section title' ),
+		'description'  => _x('Description', 'Plugin installer section title'),
+		'installation' => _x('Installation', 'Plugin installer section title'),
+		'faq'          => _x('FAQ', 'Plugin installer section title'),
+		'screenshots'  => _x('Screenshots', 'Plugin installer section title'),
+		'changelog'    => _x('Changelog', 'Plugin installer section title'),
+		'reviews'      => _x('Reviews', 'Plugin installer section title'),
+		'other_notes'  => _x('Other Notes', 'Plugin installer section title'),
 	);
 
 	// Sanitize HTML.
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		$api->sections[ $section_name ] = wp_kses( $content, $plugins_allowedtags );
+	foreach ((array) $api->sections as $section_name => $content) {
+		$api->sections[$section_name] = wp_kses($content, $plugins_allowedtags);
 	}
 
-	foreach ( array( 'version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug' ) as $key ) {
-		if ( isset( $api->$key ) ) {
-			$api->$key = wp_kses( $api->$key, $plugins_allowedtags );
+	foreach (array('version', 'author', 'requires', 'tested', 'homepage', 'downloaded', 'slug') as $key) {
+		if (isset($api->$key)) {
+			$api->$key = wp_kses($api->$key, $plugins_allowedtags);
 		}
 	}
 
-	$_tab = esc_attr( $tab );
+	$_tab = esc_attr($tab);
 
 	// Default to the Description tab, Do not translate, API returns English.
-	$section = isset( $_REQUEST['section'] ) ? wp_unslash( $_REQUEST['section'] ) : 'description';
-	if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
-		$section_titles = array_keys( (array) $api->sections );
-		$section        = reset( $section_titles );
+	$section = isset($_REQUEST['section']) ? wp_unslash($_REQUEST['section']) : 'description';
+	if (empty($section) || !isset($api->sections[$section])) {
+		$section_titles = array_keys((array) $api->sections);
+		$section        = reset($section_titles);
 	}
 
-	iframe_header( __( 'Plugin Installation' ) );
+	iframe_header(__('Plugin Installation'));
 
 	$_with_banner = '';
 
-	if ( ! empty( $api->banners ) && ( ! empty( $api->banners['low'] ) || ! empty( $api->banners['high'] ) ) ) {
+	if (!empty($api->banners) && (!empty($api->banners['low']) || !empty($api->banners['high']))) {
 		$_with_banner = 'with-banner';
-		$low          = empty( $api->banners['low'] ) ? $api->banners['high'] : $api->banners['low'];
-		$high         = empty( $api->banners['high'] ) ? $api->banners['low'] : $api->banners['high'];
+		$low          = empty($api->banners['low']) ? $api->banners['high'] : $api->banners['low'];
+		$high         = empty($api->banners['high']) ? $api->banners['low'] : $api->banners['high'];
 		?>
 		<style type="text/css">
 			#plugin-information-title.with-banner {
-				background-image: url( <?php echo esc_url( $low ); ?> );
+				background-image: url( <?php echo esc_url($low); ?> );
 			}
 			@media only screen and ( -webkit-min-device-pixel-ratio: 1.5 ) {
 				#plugin-information-title.with-banner {
-					background-image: url( <?php echo esc_url( $high ); ?> );
+					background-image: url( <?php echo esc_url($high); ?> );
 				}
 			}
 		</style>
@@ -619,26 +619,26 @@ 
 	echo "<div id='{$_tab}-title' class='{$_with_banner}'><div class='vignette'></div><h2>{$api->name}</h2></div>";
 	echo "<div id='{$_tab}-tabs' class='{$_with_banner}'>\n";
 
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		if ( 'reviews' === $section_name && ( empty( $api->ratings ) || 0 === array_sum( (array) $api->ratings ) ) ) {
+	foreach ((array) $api->sections as $section_name => $content) {
+		if ('reviews' === $section_name && (empty($api->ratings) || 0 === array_sum((array) $api->ratings))) {
 			continue;
 		}
 
-		if ( isset( $plugins_section_titles[ $section_name ] ) ) {
-			$title = $plugins_section_titles[ $section_name ];
+		if (isset($plugins_section_titles[$section_name])) {
+			$title = $plugins_section_titles[$section_name];
 		} else {
-			$title = ucwords( str_replace( '_', ' ', $section_name ) );
+			$title = ucwords(str_replace('_', ' ', $section_name));
 		}
 
-		$class       = ( $section_name === $section ) ? ' class="current"' : '';
+		$class       = ($section_name === $section) ? ' class="current"' : '';
 		$href        = add_query_arg(
 			array(
 				'tab'     => $tab,
 				'section' => $section_name,
 			)
 		);
-		$href        = esc_url( $href );
-		$san_section = esc_attr( $section_name );
+		$href        = esc_url($href);
+		$san_section = esc_attr($section_name);
 		echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";
 	}
 
@@ -648,62 +648,62 @@ 
 <div id="<?php echo $_tab; ?>-content" class='<?php echo $_with_banner; ?>'>
 	<div class="fyi">
 		<ul>
-			<?php if ( ! empty( $api->version ) ) { ?>
-				<li><strong><?php _e( 'Version:' ); ?></strong> <?php echo $api->version; ?></li>
-			<?php } if ( ! empty( $api->author ) ) { ?>
-				<li><strong><?php _e( 'Author:' ); ?></strong> <?php echo links_add_target( $api->author, '_blank' ); ?></li>
-			<?php } if ( ! empty( $api->last_updated ) ) { ?>
-				<li><strong><?php _e( 'Last Updated:' ); ?></strong>
+			<?php if (!empty($api->version)) { ?>
+				<li><strong><?php _e('Version:'); ?></strong> <?php echo $api->version; ?></li>
+			<?php } if (!empty($api->author)) { ?>
+				<li><strong><?php _e('Author:'); ?></strong> <?php echo links_add_target($api->author, '_blank'); ?></li>
+			<?php } if (!empty($api->last_updated)) { ?>
+				<li><strong><?php _e('Last Updated:'); ?></strong>
 					<?php
 					/* translators: %s: Human-readable time difference. */
-					printf( __( '%s ago' ), human_time_diff( strtotime( $api->last_updated ) ) );
+					printf(__('%s ago'), human_time_diff(strtotime($api->last_updated)));
 					?>
 				</li>
-			<?php } if ( ! empty( $api->requires ) ) { ?>
+			<?php } if (!empty($api->requires)) { ?>
 				<li>
-					<strong><?php _e( 'Requires WordPress Version:' ); ?></strong>
+					<strong><?php _e('Requires WordPress Version:'); ?></strong>
 					<?php
 					/* translators: %s: Version number. */
-					printf( __( '%s or higher' ), $api->requires );
+					printf(__('%s or higher'), $api->requires);
 					?>
 				</li>
-			<?php } if ( ! empty( $api->tested ) ) { ?>
-				<li><strong><?php _e( 'Compatible up to:' ); ?></strong> <?php echo $api->tested; ?></li>
-			<?php } if ( ! empty( $api->requires_php ) ) { ?>
+			<?php } if (!empty($api->tested)) { ?>
+				<li><strong><?php _e('Compatible up to:'); ?></strong> <?php echo $api->tested; ?></li>
+			<?php } if (!empty($api->requires_php)) { ?>
 				<li>
-					<strong><?php _e( 'Requires PHP Version:' ); ?></strong>
+					<strong><?php _e('Requires PHP Version:'); ?></strong>
 					<?php
 					/* translators: %s: Version number. */
-					printf( __( '%s or higher' ), $api->requires_php );
+					printf(__('%s or higher'), $api->requires_php);
 					?>
 				</li>
-			<?php } if ( isset( $api->active_installs ) ) { ?>
-				<li><strong><?php _e( 'Active Installations:' ); ?></strong>
+			<?php } if (isset($api->active_installs)) { ?>
+				<li><strong><?php _e('Active Installations:'); ?></strong>
 				<?php
-				if ( $api->active_installs >= 1000000 ) {
-					$active_installs_millions = floor( $api->active_installs / 1000000 );
+				if ($api->active_installs >= 1000000) {
+					$active_installs_millions = floor($api->active_installs / 1000000);
 					printf(
 						/* translators: %s: Number of millions. */
-						_nx( '%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations' ),
-						number_format_i18n( $active_installs_millions )
+						_nx('%s+ Million', '%s+ Million', $active_installs_millions, 'Active plugin installations'),
+						number_format_i18n($active_installs_millions)
 					);
-				} elseif ( $api->active_installs < 10 ) {
-					_ex( 'Less Than 10', 'Active plugin installations' );
+				} elseif ($api->active_installs < 10) {
+					_ex('Less Than 10', 'Active plugin installations');
 				} else {
-					echo number_format_i18n( $api->active_installs ) . '+';
+					echo number_format_i18n($api->active_installs) . '+';
 				}
 				?>
 				</li>
-			<?php } if ( ! empty( $api->slug ) && empty( $api->external ) ) { ?>
-				<li><a target="_blank" href="<?php echo esc_url( __( 'https://wordpress.org/plugins/' ) . $api->slug ); ?>/"><?php _e( 'WordPress.org Plugin Page &#187;' ); ?></a></li>
-			<?php } if ( ! empty( $api->homepage ) ) { ?>
-				<li><a target="_blank" href="<?php echo esc_url( $api->homepage ); ?>"><?php _e( 'Plugin Homepage &#187;' ); ?></a></li>
-			<?php } if ( ! empty( $api->donate_link ) && empty( $api->contributors ) ) { ?>
-				<li><a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a></li>
+			<?php } if (!empty($api->slug) && empty($api->external)) { ?>
+				<li><a target="_blank" href="<?php echo esc_url(__('https://wordpress.org/plugins/') . $api->slug); ?>/"><?php _e('WordPress.org Plugin Page &#187;'); ?></a></li>
+			<?php } if (!empty($api->homepage)) { ?>
+				<li><a target="_blank" href="<?php echo esc_url($api->homepage); ?>"><?php _e('Plugin Homepage &#187;'); ?></a></li>
+			<?php } if (!empty($api->donate_link) && empty($api->contributors)) { ?>
+				<li><a target="_blank" href="<?php echo esc_url($api->donate_link); ?>"><?php _e('Donate to this plugin &#187;'); ?></a></li>
 			<?php } ?>
 		</ul>
-		<?php if ( ! empty( $api->rating ) ) { ?>
-			<h3><?php _e( 'Average Rating' ); ?></h3>
+		<?php if (!empty($api->rating)) { ?>
+			<h3><?php _e('Average Rating'); ?></h3>
 			<?php
 			wp_star_rating(
 				array(
@@ -717,22 +717,22 @@ 
 				<?php
 				printf(
 					/* translators: %s: Number of ratings. */
-					_n( '(based on %s rating)', '(based on %s ratings)', $api->num_ratings ),
-					number_format_i18n( $api->num_ratings )
+					_n('(based on %s rating)', '(based on %s ratings)', $api->num_ratings),
+					number_format_i18n($api->num_ratings)
 				);
 				?>
 			</p>
 			<?php
 		}
 
-		if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
+		if (!empty($api->ratings) && array_sum((array) $api->ratings) > 0) {
 			?>
-			<h3><?php _e( 'Reviews' ); ?></h3>
-			<p class="fyi-description"><?php _e( 'Read all reviews on WordPress.org or write your own!' ); ?></p>
+			<h3><?php _e('Reviews'); ?></h3>
+			<p class="fyi-description"><?php _e('Read all reviews on WordPress.org or write your own!'); ?></p>
 			<?php
-			foreach ( $api->ratings as $key => $ratecount ) {
+			foreach ($api->ratings as $key => $ratecount) {
 				// Avoid div-by-zero.
-				$_rating    = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
+				$_rating    = $api->num_ratings ? ($ratecount / $api->num_ratings) : 0;
 				$aria_label = esc_attr(
 					sprintf(
 						/* translators: 1: Number of stars (used to determine singular/plural), 2: Number of reviews. */
@@ -742,7 +742,7 @@ 
 							$key
 						),
 						$key,
-						number_format_i18n( $ratecount )
+						number_format_i18n($ratecount)
 					)
 				);
 				?>
@@ -754,92 +754,92 @@ 
 								"https://wordpress.org/support/plugin/{$api->slug}/reviews/?filter={$key}",
 								$aria_label,
 								/* translators: %s: Number of stars. */
-								sprintf( _n( '%d star', '%d stars', $key ), $key )
+								sprintf(_n('%d star', '%d stars', $key), $key)
 							);
 							?>
 						</span>
 						<span class="counter-back">
 							<span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
 						</span>
-					<span class="counter-count" aria-hidden="true"><?php echo number_format_i18n( $ratecount ); ?></span>
+					<span class="counter-count" aria-hidden="true"><?php echo number_format_i18n($ratecount); ?></span>
 				</div>
 				<?php
 			}
 		}
-		if ( ! empty( $api->contributors ) ) {
+		if (!empty($api->contributors)) {
 			?>
-			<h3><?php _e( 'Contributors' ); ?></h3>
+			<h3><?php _e('Contributors'); ?></h3>
 			<ul class="contributors">
 				<?php
-				foreach ( (array) $api->contributors as $contrib_username => $contrib_details ) {
+				foreach ((array) $api->contributors as $contrib_username => $contrib_details) {
 					$contrib_name = $contrib_details['display_name'];
-					if ( ! $contrib_name ) {
+					if (!$contrib_name) {
 						$contrib_name = $contrib_username;
 					}
-					$contrib_name = esc_html( $contrib_name );
+					$contrib_name = esc_html($contrib_name);
 
-					$contrib_profile = esc_url( $contrib_details['profile'] );
-					$contrib_avatar  = esc_url( add_query_arg( 's', '36', $contrib_details['avatar'] ) );
+					$contrib_profile = esc_url($contrib_details['profile']);
+					$contrib_avatar  = esc_url(add_query_arg('s', '36', $contrib_details['avatar']));
 
 					echo "<li><a href='{$contrib_profile}' target='_blank'><img src='{$contrib_avatar}' width='18' height='18' alt='' />{$contrib_name}</a></li>";
 				}
 				?>
 			</ul>
-					<?php if ( ! empty( $api->donate_link ) ) { ?>
-				<a target="_blank" href="<?php echo esc_url( $api->donate_link ); ?>"><?php _e( 'Donate to this plugin &#187;' ); ?></a>
+					<?php if (!empty($api->donate_link)) { ?>
+				<a target="_blank" href="<?php echo esc_url($api->donate_link); ?>"><?php _e('Donate to this plugin &#187;'); ?></a>
 			<?php } ?>
 				<?php } ?>
 	</div>
 	<div id="section-holder">
 	<?php
-	$requires_php = isset( $api->requires_php ) ? $api->requires_php : null;
-	$requires_wp  = isset( $api->requires ) ? $api->requires : null;
+	$requires_php = isset($api->requires_php) ? $api->requires_php : null;
+	$requires_wp  = isset($api->requires) ? $api->requires : null;
 
-	$compatible_php = is_php_version_compatible( $requires_php );
-	$compatible_wp  = is_wp_version_compatible( $requires_wp );
-	$tested_wp      = ( empty( $api->tested ) || version_compare( get_bloginfo( 'version' ), $api->tested, '<=' ) );
+	$compatible_php = is_php_version_compatible($requires_php);
+	$compatible_wp  = is_wp_version_compatible($requires_wp);
+	$tested_wp      = (empty($api->tested) || version_compare(get_bloginfo('version'), $api->tested, '<='));
 
-	if ( ! $compatible_php ) {
+	if (!$compatible_php) {
 		echo '<div class="notice notice-error notice-alt"><p>';
-		_e( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.' );
-		if ( current_user_can( 'update_php' ) ) {
+		_e('<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.');
+		if (current_user_can('update_php')) {
 			printf(
 				/* translators: %s: URL to Update PHP page. */
-				' ' . __( '<a href="%s" target="_blank">Click here to learn more about updating PHP</a>.' ),
-				esc_url( wp_get_update_php_url() )
+				' ' . __('<a href="%s" target="_blank">Click here to learn more about updating PHP</a>.'),
+				esc_url(wp_get_update_php_url())
 			);
 
-			wp_update_php_annotation( '</p><p><em>', '</em>' );
+			wp_update_php_annotation('</p><p><em>', '</em>');
 		} else {
 			echo '</p>';
 		}
 		echo '</div>';
 	}
 
-	if ( ! $tested_wp ) {
+	if (!$tested_wp) {
 		echo '<div class="notice notice-warning notice-alt"><p>';
-		_e( '<strong>Warning:</strong> This plugin <strong>has not been tested</strong> with your current version of WordPress.' );
+		_e('<strong>Warning:</strong> This plugin <strong>has not been tested</strong> with your current version of WordPress.');
 		echo '</p></div>';
-	} elseif ( ! $compatible_wp ) {
+	} elseif (!$compatible_wp) {
 		echo '<div class="notice notice-error notice-alt"><p>';
-		_e( '<strong>Error:</strong> This plugin <strong>requires a newer version of WordPress</strong>.' );
-		if ( current_user_can( 'update_core' ) ) {
+		_e('<strong>Error:</strong> This plugin <strong>requires a newer version of WordPress</strong>.');
+		if (current_user_can('update_core')) {
 			printf(
 				/* translators: %s: URL to WordPress Updates screen. */
-				' ' . __( '<a href="%s" target="_parent">Click here to update WordPress</a>.' ),
-				self_admin_url( 'update-core.php' )
+				' ' . __('<a href="%s" target="_parent">Click here to update WordPress</a>.'),
+				self_admin_url('update-core.php')
 			);
 		}
 		echo '</p></div>';
 	}
 
-	foreach ( (array) $api->sections as $section_name => $content ) {
-		$content = links_add_base_url( $content, 'https://wordpress.org/plugins/' . $api->slug . '/' );
-		$content = links_add_target( $content, '_blank' );
+	foreach ((array) $api->sections as $section_name => $content) {
+		$content = links_add_base_url($content, 'https://wordpress.org/plugins/' . $api->slug . '/');
+		$content = links_add_target($content, '_blank');
 
-		$san_section = esc_attr( $section_name );
+		$san_section = esc_attr($section_name);
 
-		$display = ( $section_name === $section ) ? 'block' : 'none';
+		$display = ($section_name === $section) ? 'block' : 'none';
 
 		echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";
 		echo $content;
@@ -849,39 +849,39 @@ 
 	echo "</div>\n";
 	echo "</div>\n"; // #plugin-information-scrollable
 	echo "<div id='$tab-footer'>\n";
-	if ( ! empty( $api->download_link ) && ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) ) {
-		$status = install_plugin_install_status( $api );
-		switch ( $status['status'] ) {
+	if (!empty($api->download_link) && (current_user_can('install_plugins') || current_user_can('update_plugins'))) {
+		$status = install_plugin_install_status($api);
+		switch ($status['status']) {
 			case 'install':
-				if ( $status['url'] ) {
-					if ( $compatible_php && $compatible_wp ) {
-						echo '<a data-slug="' . esc_attr( $api->slug ) . '" id="plugin_install_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Now' ) . '</a>';
+				if ($status['url']) {
+					if ($compatible_php && $compatible_wp) {
+						echo '<a data-slug="' . esc_attr($api->slug) . '" id="plugin_install_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __('Install Now') . '</a>';
 					} else {
 						printf(
 							'<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>',
-							_x( 'Cannot Install', 'plugin' )
+							_x('Cannot Install', 'plugin')
 						);
 					}
 				}
 				break;
 			case 'update_available':
-				if ( $status['url'] ) {
-					if ( $compatible_php ) {
-						echo '<a data-slug="' . esc_attr( $api->slug ) . '" data-plugin="' . esc_attr( $status['file'] ) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __( 'Install Update Now' ) . '</a>';
+				if ($status['url']) {
+					if ($compatible_php) {
+						echo '<a data-slug="' . esc_attr($api->slug) . '" data-plugin="' . esc_attr($status['file']) . '" id="plugin_update_from_iframe" class="button button-primary right" href="' . $status['url'] . '" target="_parent">' . __('Install Update Now') . '</a>';
 					} else {
 						printf(
 							'<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>',
-							_x( 'Cannot Update', 'plugin' )
+							_x('Cannot Update', 'plugin')
 						);
 					}
 				}
 				break;
 			case 'newer_installed':
 				/* translators: %s: Plugin version. */
-				echo '<a class="button button-primary right disabled">' . sprintf( __( 'Newer Version (%s) Installed' ), esc_html( $status['version'] ) ) . '</a>';
+				echo '<a class="button button-primary right disabled">' . sprintf(__('Newer Version (%s) Installed'), esc_html($status['version'])) . '</a>';
 				break;
 			case 'latest_installed':
-				echo '<a class="button button-primary right disabled">' . __( 'Latest Version Installed' ) . '</a>';
+				echo '<a class="button button-primary right disabled">' . __('Latest Version Installed') . '</a>';
 				break;
 		}
 	}

brighty/wp-admin/includes/class-custom-background.php

Spacing +173 added lines, -173 removed lines

@@ -44,16 +44,16 @@ 
 	 * @param callable $admin_header_callback
 	 * @param callable $admin_image_div_callback Optional custom image div output callback.
 	 */
-	public function __construct( $admin_header_callback = '', $admin_image_div_callback = '' ) {
+	public function __construct($admin_header_callback = '', $admin_image_div_callback = '') {
 		$this->admin_header_callback    = $admin_header_callback;
 		$this->admin_image_div_callback = $admin_image_div_callback;
 
-		add_action( 'admin_menu', array( $this, 'init' ) );
+		add_action('admin_menu', array($this, 'init'));
 
-		add_action( 'wp_ajax_custom-background-add', array( $this, 'ajax_background_add' ) );
+		add_action('wp_ajax_custom-background-add', array($this, 'ajax_background_add'));
 
 		// Unused since 3.5.0.
-		add_action( 'wp_ajax_set-background-image', array( $this, 'wp_set_background_image' ) );
+		add_action('wp_ajax_set-background-image', array($this, 'wp_set_background_image'));
 	}
 
 	/**
@@ -62,17 +62,17 @@ 
 	 * @since 3.0.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Background' ), __( 'Background' ), 'edit_theme_options', 'custom-background', array( $this, 'admin_page' ) );
-		if ( ! $page ) {
+		$page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
+		if (!$page) {
 			return;
 		}
 
-		add_action( "load-{$page}", array( $this, 'admin_load' ) );
-		add_action( "load-{$page}", array( $this, 'take_action' ), 49 );
-		add_action( "load-{$page}", array( $this, 'handle_upload' ), 49 );
+		add_action("load-{$page}", array($this, 'admin_load'));
+		add_action("load-{$page}", array($this, 'take_action'), 49);
+		add_action("load-{$page}", array($this, 'handle_upload'), 49);
 
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-{$page}", $this->admin_header_callback, 51 );
+		if ($this->admin_header_callback) {
+			add_action("admin_head-{$page}", $this->admin_header_callback, 51);
 		}
 	}
 
@@ -85,24 +85,24 @@ 
 		get_current_screen()->add_help_tab(
 			array(
 				'id'      => 'overview',
-				'title'   => __( 'Overview' ),
+				'title'   => __('Overview'),
 				'content' =>
-					'<p>' . __( 'You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.' ) . '</p>' .
-					'<p>' . __( 'To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.' ) . '</p>' .
-					'<p>' . __( 'You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.' ) . '</p>' .
-					'<p>' . __( 'Do not forget to click on the Save Changes button when you are finished.' ) . '</p>',
+					'<p>' . __('You can customize the look of your site without touching any of your theme&#8217;s code by using a custom background. Your background can be an image or a color.') . '</p>' .
+					'<p>' . __('To use a background image, simply upload it or choose an image that has already been uploaded to your Media Library by clicking the &#8220;Choose Image&#8221; button. You can display a single instance of your image, or tile it to fill the screen. You can have your background fixed in place, so your site content moves on top of it, or you can have it scroll with your site.') . '</p>' .
+					'<p>' . __('You can also choose a background color by clicking the Select Color button and either typing in a legitimate HTML hex value, e.g. &#8220;#ff0000&#8221; for red, or by choosing a color using the color picker.') . '</p>' .
+					'<p>' . __('Do not forget to click on the Save Changes button when you are finished.') . '</p>',
 			)
 		);
 
 		get_current_screen()->set_help_sidebar(
-			'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Background_Screen">Documentation on Custom Background</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
+			'<p><strong>' . __('For more information:') . '</strong></p>' .
+			'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Background_Screen">Documentation on Custom Background</a>') . '</p>' .
+			'<p>' . __('<a href="https://wordpress.org/support/">Support</a>') . '</p>'
 		);
 
 		wp_enqueue_media();
-		wp_enqueue_script( 'custom-background' );
-		wp_enqueue_style( 'wp-color-picker' );
+		wp_enqueue_script('custom-background');
+		wp_enqueue_style('wp-color-picker');
 	}
 
 	/**
@@ -111,110 +111,110 @@ 
 	 * @since 3.0.0
 	 */
 	public function take_action() {
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			return;
 		}
 
-		if ( isset( $_POST['reset-background'] ) ) {
-			check_admin_referer( 'custom-background-reset', '_wpnonce-custom-background-reset' );
+		if (isset($_POST['reset-background'])) {
+			check_admin_referer('custom-background-reset', '_wpnonce-custom-background-reset');
 
-			remove_theme_mod( 'background_image' );
-			remove_theme_mod( 'background_image_thumb' );
+			remove_theme_mod('background_image');
+			remove_theme_mod('background_image_thumb');
 
 			$this->updated = true;
 			return;
 		}
 
-		if ( isset( $_POST['remove-background'] ) ) {
+		if (isset($_POST['remove-background'])) {
 			// @todo Uploaded files are not removed here.
-			check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );
+			check_admin_referer('custom-background-remove', '_wpnonce-custom-background-remove');
 
-			set_theme_mod( 'background_image', '' );
-			set_theme_mod( 'background_image_thumb', '' );
+			set_theme_mod('background_image', '');
+			set_theme_mod('background_image_thumb', '');
 
 			$this->updated = true;
-			wp_safe_redirect( $_POST['_wp_http_referer'] );
+			wp_safe_redirect($_POST['_wp_http_referer']);
 			return;
 		}
 
-		if ( isset( $_POST['background-preset'] ) ) {
-			check_admin_referer( 'custom-background' );
+		if (isset($_POST['background-preset'])) {
+			check_admin_referer('custom-background');
 
-			if ( in_array( $_POST['background-preset'], array( 'default', 'fill', 'fit', 'repeat', 'custom' ), true ) ) {
+			if (in_array($_POST['background-preset'], array('default', 'fill', 'fit', 'repeat', 'custom'), true)) {
 				$preset = $_POST['background-preset'];
 			} else {
 				$preset = 'default';
 			}
 
-			set_theme_mod( 'background_preset', $preset );
+			set_theme_mod('background_preset', $preset);
 		}
 
-		if ( isset( $_POST['background-position'] ) ) {
-			check_admin_referer( 'custom-background' );
+		if (isset($_POST['background-position'])) {
+			check_admin_referer('custom-background');
 
-			$position = explode( ' ', $_POST['background-position'] );
+			$position = explode(' ', $_POST['background-position']);
 
-			if ( in_array( $position[0], array( 'left', 'center', 'right' ), true ) ) {
+			if (in_array($position[0], array('left', 'center', 'right'), true)) {
 				$position_x = $position[0];
 			} else {
 				$position_x = 'left';
 			}
 
-			if ( in_array( $position[1], array( 'top', 'center', 'bottom' ), true ) ) {
+			if (in_array($position[1], array('top', 'center', 'bottom'), true)) {
 				$position_y = $position[1];
 			} else {
 				$position_y = 'top';
 			}
 
-			set_theme_mod( 'background_position_x', $position_x );
-			set_theme_mod( 'background_position_y', $position_y );
+			set_theme_mod('background_position_x', $position_x);
+			set_theme_mod('background_position_y', $position_y);
 		}
 
-		if ( isset( $_POST['background-size'] ) ) {
-			check_admin_referer( 'custom-background' );
+		if (isset($_POST['background-size'])) {
+			check_admin_referer('custom-background');
 
-			if ( in_array( $_POST['background-size'], array( 'auto', 'contain', 'cover' ), true ) ) {
+			if (in_array($_POST['background-size'], array('auto', 'contain', 'cover'), true)) {
 				$size = $_POST['background-size'];
 			} else {
 				$size = 'auto';
 			}
 
-			set_theme_mod( 'background_size', $size );
+			set_theme_mod('background_size', $size);
 		}
 
-		if ( isset( $_POST['background-repeat'] ) ) {
-			check_admin_referer( 'custom-background' );
+		if (isset($_POST['background-repeat'])) {
+			check_admin_referer('custom-background');
 
 			$repeat = $_POST['background-repeat'];
 
-			if ( 'no-repeat' !== $repeat ) {
+			if ('no-repeat' !== $repeat) {
 				$repeat = 'repeat';
 			}
 
-			set_theme_mod( 'background_repeat', $repeat );
+			set_theme_mod('background_repeat', $repeat);
 		}
 
-		if ( isset( $_POST['background-attachment'] ) ) {
-			check_admin_referer( 'custom-background' );
+		if (isset($_POST['background-attachment'])) {
+			check_admin_referer('custom-background');
 
 			$attachment = $_POST['background-attachment'];
 
-			if ( 'fixed' !== $attachment ) {
+			if ('fixed' !== $attachment) {
 				$attachment = 'scroll';
 			}
 
-			set_theme_mod( 'background_attachment', $attachment );
+			set_theme_mod('background_attachment', $attachment);
 		}
 
-		if ( isset( $_POST['background-color'] ) ) {
-			check_admin_referer( 'custom-background' );
+		if (isset($_POST['background-color'])) {
+			check_admin_referer('custom-background');
 
-			$color = preg_replace( '/[^0-9a-fA-F]/', '', $_POST['background-color'] );
+			$color = preg_replace('/[^0-9a-fA-F]/', '', $_POST['background-color']);
 
-			if ( strlen( $color ) === 6 || strlen( $color ) === 3 ) {
-				set_theme_mod( 'background_color', $color );
+			if (strlen($color) === 6 || strlen($color) === 3) {
+				set_theme_mod('background_color', $color);
 			} else {
-				set_theme_mod( 'background_color', '' );
+				set_theme_mod('background_color', '');
 			}
 		}
 
@@ -229,58 +229,58 @@ 
 	public function admin_page() {
 		?>
 <div class="wrap" id="custom-background">
-<h1><?php _e( 'Custom Background' ); ?></h1>
+<h1><?php _e('Custom Background'); ?></h1>
 
-		<?php if ( current_user_can( 'customize' ) ) { ?>
+		<?php if (current_user_can('customize')) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
 			<?php
 			printf(
 				/* translators: %s: URL to background image configuration in Customizer. */
-				__( 'You can now manage and live-preview Custom Backgrounds in the <a href="%s">Customizer</a>.' ),
-				admin_url( 'customize.php?autofocus[control]=background_image' )
+				__('You can now manage and live-preview Custom Backgrounds in the <a href="%s">Customizer</a>.'),
+				admin_url('customize.php?autofocus[control]=background_image')
 			);
 			?>
 	</p>
 </div>
 		<?php } ?>
 
-		<?php if ( ! empty( $this->updated ) ) { ?>
+		<?php if (!empty($this->updated)) { ?>
 <div id="message" class="updated">
 	<p>
 			<?php
 			/* translators: %s: Home URL. */
-			printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) );
+			printf(__('Background updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url('/'));
 			?>
 	</p>
 </div>
 		<?php } ?>
 
-<h2><?php _e( 'Background Image' ); ?></h2>
+<h2><?php _e('Background Image'); ?></h2>
 
 <table class="form-table" role="presentation">
 <tbody>
 <tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
+<th scope="row"><?php _e('Preview'); ?></th>
 <td>
 		<?php
-		if ( $this->admin_image_div_callback ) {
-			call_user_func( $this->admin_image_div_callback );
+		if ($this->admin_image_div_callback) {
+			call_user_func($this->admin_image_div_callback);
 		} else {
 			$background_styles = '';
 			$bgcolor           = get_background_color();
-			if ( $bgcolor ) {
+			if ($bgcolor) {
 				$background_styles .= 'background-color: #' . $bgcolor . ';';
 			}
 
 			$background_image_thumb = get_background_image();
-			if ( $background_image_thumb ) {
-				$background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', $background_image_thumb ) ) ) );
-				$background_position_x  = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
-				$background_position_y  = get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) );
-				$background_size        = get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) );
-				$background_repeat      = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
-				$background_attachment  = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
+			if ($background_image_thumb) {
+				$background_image_thumb = esc_url(set_url_scheme(get_theme_mod('background_image_thumb', str_replace('%', '%%', $background_image_thumb))));
+				$background_position_x  = get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x'));
+				$background_position_y  = get_theme_mod('background_position_y', get_theme_support('custom-background', 'default-position-y'));
+				$background_size        = get_theme_mod('background_size', get_theme_support('custom-background', 'default-size'));
+				$background_repeat      = get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'));
+				$background_attachment  = get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'));
 
 				// Background-image URL must be single quote, see below.
 				$background_styles .= " background-image: url('$background_image_thumb');"
@@ -291,7 +291,7 @@ 
 			}
 			?>
 	<div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // Must be double quote, see above. ?>
-			<?php if ( $background_image_thumb ) { ?>
+			<?php if ($background_image_thumb) { ?>
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" />
 		<?php } ?>
@@ -300,49 +300,49 @@ 
 </td>
 </tr>
 
-		<?php if ( get_background_image() ) : ?>
+		<?php if (get_background_image()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<th scope="row"><?php _e('Remove Image'); ?></th>
 <td>
 <form method="post">
-			<?php wp_nonce_field( 'custom-background-remove', '_wpnonce-custom-background-remove' ); ?>
-			<?php submit_button( __( 'Remove Background Image' ), '', 'remove-background', false ); ?><br/>
-			<?php _e( 'This will remove the background image. You will not be able to restore any customizations.' ); ?>
+			<?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
+			<?php submit_button(__('Remove Background Image'), '', 'remove-background', false); ?><br/>
+			<?php _e('This will remove the background image. You will not be able to restore any customizations.'); ?>
 </form>
 </td>
 </tr>
 		<?php endif; ?>
 
-		<?php $default_image = get_theme_support( 'custom-background', 'default-image' ); ?>
-		<?php if ( $default_image && get_background_image() !== $default_image ) : ?>
+		<?php $default_image = get_theme_support('custom-background', 'default-image'); ?>
+		<?php if ($default_image && get_background_image() !== $default_image) : ?>
 <tr>
-<th scope="row"><?php _e( 'Restore Original Image' ); ?></th>
+<th scope="row"><?php _e('Restore Original Image'); ?></th>
 <td>
 <form method="post">
-			<?php wp_nonce_field( 'custom-background-reset', '_wpnonce-custom-background-reset' ); ?>
-			<?php submit_button( __( 'Restore Original Image' ), '', 'reset-background', false ); ?><br/>
-			<?php _e( 'This will restore the original background image. You will not be able to restore any customizations.' ); ?>
+			<?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
+			<?php submit_button(__('Restore Original Image'), '', 'reset-background', false); ?><br/>
+			<?php _e('This will restore the original background image. You will not be able to restore any customizations.'); ?>
 </form>
 </td>
 </tr>
 		<?php endif; ?>
 
-		<?php if ( current_user_can( 'upload_files' ) ) : ?>
+		<?php if (current_user_can('upload_files')) : ?>
 <tr>
-<th scope="row"><?php _e( 'Select Image' ); ?></th>
+<th scope="row"><?php _e('Select Image'); ?></th>
 <td><form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post">
 	<p>
-		<label for="upload"><?php _e( 'Choose an image from your computer:' ); ?></label><br />
+		<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-			<?php wp_nonce_field( 'custom-background-upload', '_wpnonce-custom-background-upload' ); ?>
-			<?php submit_button( __( 'Upload' ), '', 'submit', false ); ?>
+			<?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload'); ?>
+			<?php submit_button(__('Upload'), '', 'submit', false); ?>
 	</p>
 	<p>
-		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+		<label for="choose-from-library-link"><?php _e('Or choose an image from your media library:'); ?></label><br />
 		<button id="choose-from-library-link" class="button"
-			data-choose="<?php esc_attr_e( 'Choose a Background Image' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as background' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-choose="<?php esc_attr_e('Choose a Background Image'); ?>"
+			data-update="<?php esc_attr_e('Set as background'); ?>"><?php _e('Choose Image'); ?></button>
 	</p>
 	</form>
 </td>
@@ -351,75 +351,75 @@ 
 </tbody>
 </table>
 
-<h2><?php _e( 'Display Options' ); ?></h2>
+<h2><?php _e('Display Options'); ?></h2>
 <form method="post">
 <table class="form-table" role="presentation">
 <tbody>
-		<?php if ( get_background_image() ) : ?>
+		<?php if (get_background_image()) : ?>
 <input name="background-preset" type="hidden" value="custom">
 
 			<?php
 			$background_position = sprintf(
 				'%s %s',
-				get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) ),
-				get_theme_mod( 'background_position_y', get_theme_support( 'custom-background', 'default-position-y' ) )
+				get_theme_mod('background_position_x', get_theme_support('custom-background', 'default-position-x')),
+				get_theme_mod('background_position_y', get_theme_support('custom-background', 'default-position-y'))
 			);
 
 			$background_position_options = array(
 				array(
 					'left top'   => array(
-						'label' => __( 'Top Left' ),
+						'label' => __('Top Left'),
 						'icon'  => 'dashicons dashicons-arrow-left-alt',
 					),
 					'center top' => array(
-						'label' => __( 'Top' ),
+						'label' => __('Top'),
 						'icon'  => 'dashicons dashicons-arrow-up-alt',
 					),
 					'right top'  => array(
-						'label' => __( 'Top Right' ),
+						'label' => __('Top Right'),
 						'icon'  => 'dashicons dashicons-arrow-right-alt',
 					),
 				),
 				array(
 					'left center'   => array(
-						'label' => __( 'Left' ),
+						'label' => __('Left'),
 						'icon'  => 'dashicons dashicons-arrow-left-alt',
 					),
 					'center center' => array(
-						'label' => __( 'Center' ),
+						'label' => __('Center'),
 						'icon'  => 'background-position-center-icon',
 					),
 					'right center'  => array(
-						'label' => __( 'Right' ),
+						'label' => __('Right'),
 						'icon'  => 'dashicons dashicons-arrow-right-alt',
 					),
 				),
 				array(
 					'left bottom'   => array(
-						'label' => __( 'Bottom Left' ),
+						'label' => __('Bottom Left'),
 						'icon'  => 'dashicons dashicons-arrow-left-alt',
 					),
 					'center bottom' => array(
-						'label' => __( 'Bottom' ),
+						'label' => __('Bottom'),
 						'icon'  => 'dashicons dashicons-arrow-down-alt',
 					),
 					'right bottom'  => array(
-						'label' => __( 'Bottom Right' ),
+						'label' => __('Bottom Right'),
 						'icon'  => 'dashicons dashicons-arrow-right-alt',
 					),
 				),
 			);
 			?>
 <tr>
-<th scope="row"><?php _e( 'Image Position' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Position' ); ?></span></legend>
+<th scope="row"><?php _e('Image Position'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Image Position'); ?></span></legend>
 <div class="background-position-control">
-			<?php foreach ( $background_position_options as $group ) : ?>
+			<?php foreach ($background_position_options as $group) : ?>
 	<div class="button-group">
-				<?php foreach ( $group as $value => $input ) : ?>
+				<?php foreach ($group as $value => $input) : ?>
 		<label>
-			<input class="ui-helper-hidden-accessible" name="background-position" type="radio" value="<?php echo esc_attr( $value ); ?>"<?php checked( $value, $background_position ); ?>>
-			<span class="button display-options position"><span class="<?php echo esc_attr( $input['icon'] ); ?>" aria-hidden="true"></span></span>
+			<input class="ui-helper-hidden-accessible" name="background-position" type="radio" value="<?php echo esc_attr($value); ?>"<?php checked($value, $background_position); ?>>
+			<span class="button display-options position"><span class="<?php echo esc_attr($input['icon']); ?>" aria-hidden="true"></span></span>
 			<span class="screen-reader-text"><?php echo $input['label']; ?></span>
 		</label>
 	<?php endforeach; ?>
@@ -430,49 +430,49 @@ 
 </tr>
 
 <tr>
-<th scope="row"><label for="background-size"><?php _e( 'Image Size' ); ?></label></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Image Size' ); ?></span></legend>
+<th scope="row"><label for="background-size"><?php _e('Image Size'); ?></label></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Image Size'); ?></span></legend>
 <select id="background-size" name="background-size">
-<option value="auto"<?php selected( 'auto', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _ex( 'Original', 'Original Size' ); ?></option>
-<option value="contain"<?php selected( 'contain', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fit to Screen' ); ?></option>
-<option value="cover"<?php selected( 'cover', get_theme_mod( 'background_size', get_theme_support( 'custom-background', 'default-size' ) ) ); ?>><?php _e( 'Fill Screen' ); ?></option>
+<option value="auto"<?php selected('auto', get_theme_mod('background_size', get_theme_support('custom-background', 'default-size'))); ?>><?php _ex('Original', 'Original Size'); ?></option>
+<option value="contain"<?php selected('contain', get_theme_mod('background_size', get_theme_support('custom-background', 'default-size'))); ?>><?php _e('Fit to Screen'); ?></option>
+<option value="cover"<?php selected('cover', get_theme_mod('background_size', get_theme_support('custom-background', 'default-size'))); ?>><?php _e('Fill Screen'); ?></option>
 </select>
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><?php _ex( 'Repeat', 'Background Repeat' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Repeat', 'Background Repeat' ); ?></span></legend>
+<th scope="row"><?php _ex('Repeat', 'Background Repeat'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _ex('Repeat', 'Background Repeat'); ?></span></legend>
 <input name="background-repeat" type="hidden" value="no-repeat">
-<label><input type="checkbox" name="background-repeat" value="repeat"<?php checked( 'repeat', get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) ); ?>> <?php _e( 'Repeat Background Image' ); ?></label>
+<label><input type="checkbox" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', get_theme_support('custom-background', 'default-repeat'))); ?>> <?php _e('Repeat Background Image'); ?></label>
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><?php _ex( 'Scroll', 'Background Scroll' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _ex( 'Scroll', 'Background Scroll' ); ?></span></legend>
+<th scope="row"><?php _ex('Scroll', 'Background Scroll'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _ex('Scroll', 'Background Scroll'); ?></span></legend>
 <input name="background-attachment" type="hidden" value="fixed">
-<label><input name="background-attachment" type="checkbox" value="scroll" <?php checked( 'scroll', get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) ) ); ?>> <?php _e( 'Scroll with Page' ); ?></label>
+<label><input name="background-attachment" type="checkbox" value="scroll" <?php checked('scroll', get_theme_mod('background_attachment', get_theme_support('custom-background', 'default-attachment'))); ?>> <?php _e('Scroll with Page'); ?></label>
 </fieldset></td>
 </tr>
 <?php endif; // get_background_image() ?>
 <tr>
-<th scope="row"><?php _e( 'Background Color' ); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Color' ); ?></span></legend>
+<th scope="row"><?php _e('Background Color'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Background Color'); ?></span></legend>
 		<?php
 		$default_color = '';
-		if ( current_theme_supports( 'custom-background', 'default-color' ) ) {
-			$default_color = ' data-default-color="#' . esc_attr( get_theme_support( 'custom-background', 'default-color' ) ) . '"';
+		if (current_theme_supports('custom-background', 'default-color')) {
+			$default_color = ' data-default-color="#' . esc_attr(get_theme_support('custom-background', 'default-color')) . '"';
 		}
 		?>
-<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr( get_background_color() ); ?>"<?php echo $default_color; ?>>
+<input type="text" name="background-color" id="background-color" value="#<?php echo esc_attr(get_background_color()); ?>"<?php echo $default_color; ?>>
 </fieldset></td>
 </tr>
 </tbody>
 </table>
 
-		<?php wp_nonce_field( 'custom-background' ); ?>
-		<?php submit_button( null, 'primary', 'save-background-options' ); ?>
+		<?php wp_nonce_field('custom-background'); ?>
+		<?php submit_button(null, 'primary', 'save-background-options'); ?>
 </form>
 
 </div>
@@ -485,30 +485,30 @@ 
 	 * @since 3.0.0
 	 */
 	public function handle_upload() {
-		if ( empty( $_FILES ) ) {
+		if (empty($_FILES)) {
 			return;
 		}
 
-		check_admin_referer( 'custom-background-upload', '_wpnonce-custom-background-upload' );
+		check_admin_referer('custom-background-upload', '_wpnonce-custom-background-upload');
 
-		$overrides = array( 'test_form' => false );
+		$overrides = array('test_form' => false);
 
 		$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.' ) );
+		$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.'));
 		}
 
-		$file = wp_handle_upload( $uploaded_file, $overrides );
+		$file = wp_handle_upload($uploaded_file, $overrides);
 
-		if ( isset( $file['error'] ) ) {
-			wp_die( $file['error'] );
+		if (isset($file['error'])) {
+			wp_die($file['error']);
 		}
 
 		$url      = $file['url'];
 		$type     = $file['type'];
 		$file     = $file['file'];
-		$filename = wp_basename( $file );
+		$filename = wp_basename($file);
 
 		// Construct the attachment array.
 		$attachment = array(
@@ -520,19 +520,19 @@ 
 		);
 
 		// Save the data.
-		$id = wp_insert_attachment( $attachment, $file );
+		$id = wp_insert_attachment($attachment, $file);
 
 		// Add the metadata.
-		wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-		update_post_meta( $id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
+		wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $file));
+		update_post_meta($id, '_wp_attachment_is_custom_background', get_option('stylesheet'));
 
-		set_theme_mod( 'background_image', esc_url_raw( $url ) );
+		set_theme_mod('background_image', esc_url_raw($url));
 
-		$thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
-		set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+		$thumbnail = wp_get_attachment_image_src($id, 'thumbnail');
+		set_theme_mod('background_image_thumb', esc_url_raw($thumbnail[0]));
 
 		/** This action is documented in wp-admin/includes/class-custom-image-header.php */
-		do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication.
+		do_action('wp_create_file_in_uploads', $file, $id); // For replication.
 		$this->updated = true;
 	}
 
@@ -545,18 +545,18 @@ 
 	 * @since 4.1.0
 	 */
 	public function ajax_background_add() {
-		check_ajax_referer( 'background-add', 'nonce' );
+		check_ajax_referer('background-add', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if (!current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_stylesheet() );
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_background', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -568,7 +568,7 @@ 
 	 * @param array $form_fields
 	 * @return array $form_fields
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit($form_fields) {
 		return $form_fields;
 	}
 
@@ -579,7 +579,7 @@ 
 	 * @param array $tabs
 	 * @return array $tabs
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs($tabs) {
 		return $tabs;
 	}
 
@@ -588,38 +588,38 @@ 
 	 * @deprecated 3.5.0
 	 */
 	public function wp_set_background_image() {
-		check_ajax_referer( 'custom-background' );
+		check_ajax_referer('custom-background');
 
-		if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['attachment_id'] ) ) {
+		if (!current_user_can('edit_theme_options') || !isset($_POST['attachment_id'])) {
 			exit;
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
+		$attachment_id = absint($_POST['attachment_id']);
 
 		$sizes = array_keys(
 			/** This filter is documented in wp-admin/includes/media.php */
 			apply_filters(
 				'image_size_names_choose',
 				array(
-					'thumbnail' => __( 'Thumbnail' ),
-					'medium'    => __( 'Medium' ),
-					'large'     => __( 'Large' ),
-					'full'      => __( 'Full Size' ),
+					'thumbnail' => __('Thumbnail'),
+					'medium'    => __('Medium'),
+					'large'     => __('Large'),
+					'full'      => __('Full Size'),
 				)
 			)
 		);
 
 		$size = 'thumbnail';
-		if ( in_array( $_POST['size'], $sizes, true ) ) {
-			$size = esc_attr( $_POST['size'] );
+		if (in_array($_POST['size'], $sizes, true)) {
+			$size = esc_attr($_POST['size']);
 		}
 
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option( 'stylesheet' ) );
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_background', get_option('stylesheet'));
 
-		$url       = wp_get_attachment_image_src( $attachment_id, $size );
-		$thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
-		set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
-		set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
+		$url       = wp_get_attachment_image_src($attachment_id, $size);
+		$thumbnail = wp_get_attachment_image_src($attachment_id, 'thumbnail');
+		set_theme_mod('background_image', esc_url_raw($url[0]));
+		set_theme_mod('background_image_thumb', esc_url_raw($thumbnail[0]));
 		exit;
 	}
 }

brighty/wp-admin/includes/class-wp-themes-list-table.php

Spacing +86 added lines, -86 removed lines

@@ -29,11 +29,11 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		parent::__construct(
 			array(
 				'ajax'   => true,
-				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+				'screen' => isset($args['screen']) ? $args['screen'] : null,
 			)
 		);
 	}
@@ -43,43 +43,43 @@ 
 	 */
 	public function ajax_user_can() {
 		// Do not check edit_theme_options here. Ajax calls for available themes require switch_themes.
-		return current_user_can( 'switch_themes' );
+		return current_user_can('switch_themes');
 	}
 
 	/**
 	 */
 	public function prepare_items() {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
+		$themes = wp_get_themes(array('allowed' => true));
 
-		if ( ! empty( $_REQUEST['s'] ) ) {
-			$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		if (!empty($_REQUEST['s'])) {
+			$this->search_terms = array_unique(array_filter(array_map('trim', explode(',', strtolower(wp_unslash($_REQUEST['s']))))));
 		}
 
-		if ( ! empty( $_REQUEST['features'] ) ) {
+		if (!empty($_REQUEST['features'])) {
 			$this->features = $_REQUEST['features'];
 		}
 
-		if ( $this->search_terms || $this->features ) {
-			foreach ( $themes as $key => $theme ) {
-				if ( ! $this->search_theme( $theme ) ) {
-					unset( $themes[ $key ] );
+		if ($this->search_terms || $this->features) {
+			foreach ($themes as $key => $theme) {
+				if (!$this->search_theme($theme)) {
+					unset($themes[$key]);
 				}
 			}
 		}
 
-		unset( $themes[ get_option( 'stylesheet' ) ] );
-		WP_Theme::sort_by_name( $themes );
+		unset($themes[get_option('stylesheet')]);
+		WP_Theme::sort_by_name($themes);
 
 		$per_page = 36;
 		$page     = $this->get_pagenum();
 
-		$start = ( $page - 1 ) * $per_page;
+		$start = ($page - 1) * $per_page;
 
-		$this->items = array_slice( $themes, $start, $per_page, true );
+		$this->items = array_slice($themes, $start, $per_page, true);
 
 		$this->set_pagination_args(
 			array(
-				'total_items'     => count( $themes ),
+				'total_items'     => count($themes),
 				'per_page'        => $per_page,
 				'infinite_scroll' => true,
 			)
@@ -89,38 +89,38 @@ 
 	/**
 	 */
 	public function no_items() {
-		if ( $this->search_terms || $this->features ) {
-			_e( 'No items found.' );
+		if ($this->search_terms || $this->features) {
+			_e('No items found.');
 			return;
 		}
 
 		$blog_id = get_current_blog_id();
-		if ( is_multisite() ) {
-			if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
+		if (is_multisite()) {
+			if (current_user_can('install_themes') && current_user_can('manage_network_themes')) {
 				printf(
 					/* translators: 1: URL to Themes tab on Edit Site screen, 2: URL to Add Themes screen. */
-					__( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ),
-					network_admin_url( 'site-themes.php?id=' . $blog_id ),
-					network_admin_url( 'theme-install.php' )
+					__('You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.'),
+					network_admin_url('site-themes.php?id=' . $blog_id),
+					network_admin_url('theme-install.php')
 				);
 
 				return;
-			} elseif ( current_user_can( 'manage_network_themes' ) ) {
+			} elseif (current_user_can('manage_network_themes')) {
 				printf(
 					/* translators: %s: URL to Themes tab on Edit Site screen. */
-					__( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%s">enable</a> more themes.' ),
-					network_admin_url( 'site-themes.php?id=' . $blog_id )
+					__('You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%s">enable</a> more themes.'),
+					network_admin_url('site-themes.php?id=' . $blog_id)
 				);
 
 				return;
 			}
 			// Else, fallthrough. install_themes doesn't help if you can't enable it.
 		} else {
-			if ( current_user_can( 'install_themes' ) ) {
+			if (current_user_can('install_themes')) {
 				printf(
 					/* translators: %s: URL to Add Themes screen. */
-					__( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ),
-					admin_url( 'theme-install.php' )
+					__('You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.'),
+					admin_url('theme-install.php')
 				);
 
 				return;
@@ -129,21 +129,21 @@ 
 		// Fallthrough.
 		printf(
 			/* translators: %s: Network title. */
-			__( 'Only the active theme is available to you. Contact the %s administrator for information about accessing additional themes.' ),
-			get_site_option( 'site_name' )
+			__('Only the active theme is available to you. Contact the %s administrator for information about accessing additional themes.'),
+			get_site_option('site_name')
 		);
 	}
 
 	/**
 	 * @param string $which
 	 */
-	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) {
+	public function tablenav($which = 'top') {
+		if ($this->get_pagination_arg('total_pages') <= 1) {
 			return;
 		}
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
-			<?php $this->pagination( $which ); ?>
+			<?php $this->pagination($which); ?>
 			<span class="spinner"></span>
 			<br class="clear" />
 		</div>
@@ -158,15 +158,15 @@ 
 	 * @since 3.1.0
 	 */
 	public function display() {
-		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field('fetch-list-' . get_class($this), '_ajax_fetch_list_nonce');
 		?>
-		<?php $this->tablenav( 'top' ); ?>
+		<?php $this->tablenav('top'); ?>
 
 		<div id="availablethemes">
 			<?php $this->display_rows_or_placeholder(); ?>
 		</div>
 
-		<?php $this->tablenav( 'bottom' ); ?>
+		<?php $this->tablenav('bottom'); ?>
 		<?php
 	}
 
@@ -180,7 +180,7 @@ 
 	/**
 	 */
 	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
+		if ($this->has_items()) {
 			$this->display_rows();
 		} else {
 			echo '<div class="no-items">';
@@ -194,65 +194,65 @@ 
 	public function display_rows() {
 		$themes = $this->items;
 
-		foreach ( $themes as $theme ) :
+		foreach ($themes as $theme) :
 			?>
 			<div class="available-theme">
 			<?php
 
 			$template   = $theme->get_template();
 			$stylesheet = $theme->get_stylesheet();
-			$title      = $theme->display( 'Name' );
-			$version    = $theme->display( 'Version' );
-			$author     = $theme->display( 'Author' );
+			$title      = $theme->display('Name');
+			$version    = $theme->display('Version');
+			$author     = $theme->display('Author');
 
-			$activate_link = wp_nonce_url( 'themes.php?action=activate&amp;template=' . urlencode( $template ) . '&amp;stylesheet=' . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
+			$activate_link = wp_nonce_url('themes.php?action=activate&amp;template=' . urlencode($template) . '&amp;stylesheet=' . urlencode($stylesheet), 'switch-theme_' . $stylesheet);
 
 			$actions             = array();
 			$actions['activate'] = sprintf(
 				'<a href="%s" class="activatelink" title="%s">%s</a>',
 				$activate_link,
 				/* translators: %s: Theme name. */
-				esc_attr( sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $title ) ),
-				__( 'Activate' )
+				esc_attr(sprintf(_x('Activate &#8220;%s&#8221;', 'theme'), $title)),
+				__('Activate')
 			);
 
-			if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+			if (current_user_can('edit_theme_options') && current_user_can('customize')) {
 				$actions['preview'] .= sprintf(
 					'<a href="%s" class="load-customize hide-if-no-customize">%s</a>',
-					wp_customize_url( $stylesheet ),
-					__( 'Live Preview' )
+					wp_customize_url($stylesheet),
+					__('Live Preview')
 				);
 			}
 
-			if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) {
+			if (!is_multisite() && current_user_can('delete_themes')) {
 				$actions['delete'] = sprintf(
 					'<a class="submitdelete deletion" href="%s" onclick="return confirm( \'%s\' );">%s</a>',
-					wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet ),
+					wp_nonce_url('themes.php?action=delete&amp;stylesheet=' . urlencode($stylesheet), 'delete-theme_' . $stylesheet),
 					/* translators: %s: Theme name. */
-					esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) ),
-					__( 'Delete' )
+					esc_js(sprintf(__("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $title)),
+					__('Delete')
 				);
 			}
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions = apply_filters( 'theme_action_links', $actions, $theme, 'all' );
+			$actions = apply_filters('theme_action_links', $actions, $theme, 'all');
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions       = apply_filters( "theme_action_links_{$stylesheet}", $actions, $theme, 'all' );
-			$delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
-			unset( $actions['delete'] );
+			$actions       = apply_filters("theme_action_links_{$stylesheet}", $actions, $theme, 'all');
+			$delete_action = isset($actions['delete']) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
+			unset($actions['delete']);
 
 			$screenshot = $theme->get_screenshot();
 			?>
 
 			<span class="screenshot hide-if-customize">
-				<?php if ( $screenshot ) : ?>
-					<img src="<?php echo esc_url( $screenshot . '?ver=' . $theme->version ); ?>" alt="" />
+				<?php if ($screenshot) : ?>
+					<img src="<?php echo esc_url($screenshot . '?ver=' . $theme->version); ?>" alt="" />
 				<?php endif; ?>
 			</span>
-			<a href="<?php echo wp_customize_url( $stylesheet ); ?>" class="screenshot load-customize hide-if-no-customize">
-				<?php if ( $screenshot ) : ?>
-					<img src="<?php echo esc_url( $screenshot . '?ver=' . $theme->version ); ?>" alt="" />
+			<a href="<?php echo wp_customize_url($stylesheet); ?>" class="screenshot load-customize hide-if-no-customize">
+				<?php if ($screenshot) : ?>
+					<img src="<?php echo esc_url($screenshot . '?ver=' . $theme->version); ?>" alt="" />
 				<?php endif; ?>
 			</a>
 
@@ -260,31 +260,31 @@ 
 			<div class="theme-author">
 				<?php
 					/* translators: %s: Theme author. */
-					printf( __( 'By %s' ), $author );
+					printf(__('By %s'), $author);
 				?>
 			</div>
 			<div class="action-links">
 				<ul>
-					<?php foreach ( $actions as $action ) : ?>
+					<?php foreach ($actions as $action) : ?>
 						<li><?php echo $action; ?></li>
 					<?php endforeach; ?>
-					<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e( 'Details' ); ?></a></li>
+					<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details'); ?></a></li>
 				</ul>
 				<?php echo $delete_action; ?>
 
-				<?php theme_update_available( $theme ); ?>
+				<?php theme_update_available($theme); ?>
 			</div>
 
 			<div class="themedetaildiv hide-if-js">
-				<p><strong><?php _e( 'Version:' ); ?></strong> <?php echo $version; ?></p>
-				<p><?php echo $theme->display( 'Description' ); ?></p>
+				<p><strong><?php _e('Version:'); ?></strong> <?php echo $version; ?></p>
+				<p><?php echo $theme->display('Description'); ?></p>
 				<?php
-				if ( $theme->parent() ) {
+				if ($theme->parent()) {
 					printf(
 						/* translators: 1: Link to documentation on child themes, 2: Name of parent theme. */
-						' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
-						__( 'https://developer.wordpress.org/themes/advanced-topics/child-themes/' ),
-						$theme->parent()->display( 'Name' )
+						' <p class="howto">' . __('This <a href="%1$s">child theme</a> requires its parent theme, %2$s.') . '</p>',
+						__('https://developer.wordpress.org/themes/advanced-topics/child-themes/'),
+						$theme->parent()->display('Name')
 					);
 				}
 				?>
@@ -299,32 +299,32 @@ 
 	 * @param WP_Theme $theme
 	 * @return bool
 	 */
-	public function search_theme( $theme ) {
+	public function search_theme($theme) {
 		// Search the features.
-		foreach ( $this->features as $word ) {
-			if ( ! in_array( $word, $theme->get( 'Tags' ), true ) ) {
+		foreach ($this->features as $word) {
+			if (!in_array($word, $theme->get('Tags'), true)) {
 				return false;
 			}
 		}
 
 		// Match all phrases.
-		foreach ( $this->search_terms as $word ) {
-			if ( in_array( $word, $theme->get( 'Tags' ), true ) ) {
+		foreach ($this->search_terms as $word) {
+			if (in_array($word, $theme->get('Tags'), true)) {
 				continue;
 			}
 
-			foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
+			foreach (array('Name', 'Description', 'Author', 'AuthorURI') as $header) {
 				// Don't mark up; Do translate.
-				if ( false !== stripos( strip_tags( $theme->display( $header, false, true ) ), $word ) ) {
+				if (false !== stripos(strip_tags($theme->display($header, false, true)), $word)) {
 					continue 2;
 				}
 			}
 
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) ) {
+			if (false !== stripos($theme->get_stylesheet(), $word)) {
 				continue;
 			}
 
-			if ( false !== stripos( $theme->get_template(), $word ) ) {
+			if (false !== stripos($theme->get_template(), $word)) {
 				continue;
 			}
 
@@ -341,21 +341,21 @@ 
 	 *
 	 * @param array $extra_args
 	 */
-	public function _js_vars( $extra_args = array() ) {
-		$search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	public function _js_vars($extra_args = array()) {
+		$search_string = isset($_REQUEST['s']) ? esc_attr(wp_unslash($_REQUEST['s'])) : '';
 
 		$args = array(
 			'search'      => $search_string,
 			'features'    => $this->features,
 			'paged'       => $this->get_pagenum(),
-			'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
+			'total_pages' => !empty($this->_pagination_args['total_pages']) ? $this->_pagination_args['total_pages'] : 1,
 		);
 
-		if ( is_array( $extra_args ) ) {
-			$args = array_merge( $args, $extra_args );
+		if (is_array($extra_args)) {
+			$args = array_merge($args, $extra_args);
 		}
 
-		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
+		printf("<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode($args));
 		parent::_js_vars();
 	}
 }

brighty/wp-admin/includes/class-wp-site-icon.php

Spacing +36 added lines, -36 removed lines

@@ -69,8 +69,8 @@ 
 	 * @since 4.3.0
 	 */
 	public function __construct() {
-		add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
-		add_filter( 'get_post_metadata', array( $this, 'get_post_metadata' ), 10, 4 );
+		add_action('delete_attachment', array($this, 'delete_attachment_data'));
+		add_filter('get_post_metadata', array($this, 'get_post_metadata'), 10, 4);
 	}
 
 	/**
@@ -82,17 +82,17 @@ 
 	 * @param int    $parent_attachment_id Attachment ID of parent image.
 	 * @return array An array with attachment object data.
 	 */
-	public function create_attachment_object( $cropped, $parent_attachment_id ) {
-		$parent     = get_post( $parent_attachment_id );
-		$parent_url = wp_get_attachment_url( $parent->ID );
-		$url        = str_replace( wp_basename( $parent_url ), wp_basename( $cropped ), $parent_url );
+	public function create_attachment_object($cropped, $parent_attachment_id) {
+		$parent     = get_post($parent_attachment_id);
+		$parent_url = wp_get_attachment_url($parent->ID);
+		$url        = str_replace(wp_basename($parent_url), wp_basename($cropped), $parent_url);
 
-		$size       = wp_getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+		$size       = wp_getimagesize($cropped);
+		$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 		$attachment = array(
 			'ID'             => $parent_attachment_id,
-			'post_title'     => wp_basename( $cropped ),
+			'post_title'     => wp_basename($cropped),
 			'post_content'   => $url,
 			'post_mime_type' => $image_type,
 			'guid'           => $url,
@@ -111,9 +111,9 @@ 
 	 * @param string $file       File path of the attached image.
 	 * @return int               Attachment ID.
 	 */
-	public function insert_attachment( $attachment, $file ) {
-		$attachment_id = wp_insert_attachment( $attachment, $file );
-		$metadata      = wp_generate_attachment_metadata( $attachment_id, $file );
+	public function insert_attachment($attachment, $file) {
+		$attachment_id = wp_insert_attachment($attachment, $file);
+		$metadata      = wp_generate_attachment_metadata($attachment_id, $file);
 
 		/**
 		 * Filters the site icon attachment metadata.
@@ -124,8 +124,8 @@ 
 		 *
 		 * @param array $metadata Attachment metadata.
 		 */
-		$metadata = apply_filters( 'site_icon_attachment_metadata', $metadata );
-		wp_update_attachment_metadata( $attachment_id, $metadata );
+		$metadata = apply_filters('site_icon_attachment_metadata', $metadata);
+		wp_update_attachment_metadata($attachment_id, $metadata);
 
 		return $attachment_id;
 	}
@@ -138,7 +138,7 @@ 
 	 * @param array[] $sizes Array of arrays containing information for additional sizes.
 	 * @return array[] Array of arrays containing additional image sizes.
 	 */
-	public function additional_sizes( $sizes = array() ) {
+	public function additional_sizes($sizes = array()) {
 		$only_crop_sizes = array();
 
 		/**
@@ -148,22 +148,22 @@ 
 		 *
 		 * @param int[] $site_icon_sizes Array of sizes available for the Site Icon.
 		 */
-		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
+		$this->site_icon_sizes = apply_filters('site_icon_image_sizes', $this->site_icon_sizes);
 
 		// Use a natural sort of numbers.
-		natsort( $this->site_icon_sizes );
-		$this->site_icon_sizes = array_reverse( $this->site_icon_sizes );
+		natsort($this->site_icon_sizes);
+		$this->site_icon_sizes = array_reverse($this->site_icon_sizes);
 
 		// Ensure that we only resize the image into sizes that allow cropping.
-		foreach ( $sizes as $name => $size_array ) {
-			if ( isset( $size_array['crop'] ) ) {
-				$only_crop_sizes[ $name ] = $size_array;
+		foreach ($sizes as $name => $size_array) {
+			if (isset($size_array['crop'])) {
+				$only_crop_sizes[$name] = $size_array;
 			}
 		}
 
-		foreach ( $this->site_icon_sizes as $size ) {
-			if ( $size < $this->min_size ) {
-				$only_crop_sizes[ 'site_icon-' . $size ] = array(
+		foreach ($this->site_icon_sizes as $size) {
+			if ($size < $this->min_size) {
+				$only_crop_sizes['site_icon-' . $size] = array(
 					'width ' => $size,
 					'height' => $size,
 					'crop'   => true,
@@ -182,10 +182,10 @@ 
 	 * @param string[] $sizes Array of image size names.
 	 * @return string[] Array of image size names.
 	 */
-	public function intermediate_image_sizes( $sizes = array() ) {
+	public function intermediate_image_sizes($sizes = array()) {
 		/** This filter is documented in wp-admin/includes/class-wp-site-icon.php */
-		$this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
-		foreach ( $this->site_icon_sizes as $size ) {
+		$this->site_icon_sizes = apply_filters('site_icon_image_sizes', $this->site_icon_sizes);
+		foreach ($this->site_icon_sizes as $size) {
 			$sizes[] = 'site_icon-' . $size;
 		}
 
@@ -199,11 +199,11 @@ 
 	 *
 	 * @param int $post_id Attachment ID.
 	 */
-	public function delete_attachment_data( $post_id ) {
-		$site_icon_id = get_option( 'site_icon' );
+	public function delete_attachment_data($post_id) {
+		$site_icon_id = get_option('site_icon');
 
-		if ( $site_icon_id && $post_id == $site_icon_id ) {
-			delete_option( 'site_icon' );
+		if ($site_icon_id && $post_id == $site_icon_id) {
+			delete_option('site_icon');
 		}
 	}
 
@@ -219,12 +219,12 @@ 
 	 * @param bool              $single   Whether to return only the first value of the specified `$meta_key`.
 	 * @return array|null|string The attachment metadata value, array of values, or null.
 	 */
-	public function get_post_metadata( $value, $post_id, $meta_key, $single ) {
-		if ( $single && '_wp_attachment_backup_sizes' === $meta_key ) {
-			$site_icon_id = get_option( 'site_icon' );
+	public function get_post_metadata($value, $post_id, $meta_key, $single) {
+		if ($single && '_wp_attachment_backup_sizes' === $meta_key) {
+			$site_icon_id = get_option('site_icon');
 
-			if ( $post_id == $site_icon_id ) {
-				add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+			if ($post_id == $site_icon_id) {
+				add_filter('intermediate_image_sizes', array($this, 'intermediate_image_sizes'));
 			}
 		}