iqltechnologies / brighty

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

Indentation +916 added lines, -916 removed lines

@@ -21,120 +21,120 @@ 
  * @param array $request The unsanitized request values.
  */
 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'] : '';
-
-	if ( ! $response_format || ! in_array( $response_format, array( 'json', 'markup' ), true ) ) {
-		$response_format = 'json';
-	}
-
-	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'] ) ) {
-				$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 ) {
-					echo wp_json_encode(
-						array(
-							'ID'         => $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'] ) ) {
-				$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 );
-					echo wp_json_encode(
-						array(
-							'ID'         => $object_id,
-							'post_title' => $post_obj->name,
-							'post_type'  => $object_type,
-						)
-					);
-					echo "\n";
-				}
-			}
-		}
-	} 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(
-					'no_found_rows'          => true,
-					'update_post_meta_cache' => false,
-					'update_post_term_cache' => false,
-					'posts_per_page'         => 10,
-					'post_type'              => $matches[2],
-					's'                      => $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() ) {
-				return;
-			}
-			while ( $search_results_query->have_posts() ) {
-				$post = $search_results_query->next_post();
-				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 wp_json_encode(
-						array(
-							'ID'         => $post->ID,
-							'post_title' => get_the_title( $post->ID ),
-							'post_type'  => $matches[2],
-						)
-					);
-					echo "\n";
-				}
-			}
-		} elseif ( 'taxonomy' === $matches[1] ) {
-			$terms = get_terms(
-				array(
-					'taxonomy'   => $matches[2],
-					'name__like' => $query,
-					'number'     => 10,
-					'hide_empty' => false,
-				)
-			);
-			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 ) {
-					echo wp_json_encode(
-						array(
-							'ID'         => $term->term_id,
-							'post_title' => $term->name,
-							'post_type'  => $matches[2],
-						)
-					);
-					echo "\n";
-				}
-			}
-		}
-	}
+    $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'] : '';
+
+    if ( ! $response_format || ! in_array( $response_format, array( 'json', 'markup' ), true ) ) {
+        $response_format = 'json';
+    }
+
+    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'] ) ) {
+                $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 ) {
+                    echo wp_json_encode(
+                        array(
+                            'ID'         => $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'] ) ) {
+                $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 );
+                    echo wp_json_encode(
+                        array(
+                            'ID'         => $object_id,
+                            'post_title' => $post_obj->name,
+                            'post_type'  => $object_type,
+                        )
+                    );
+                    echo "\n";
+                }
+            }
+        }
+    } 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(
+                    'no_found_rows'          => true,
+                    'update_post_meta_cache' => false,
+                    'update_post_term_cache' => false,
+                    'posts_per_page'         => 10,
+                    'post_type'              => $matches[2],
+                    's'                      => $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() ) {
+                return;
+            }
+            while ( $search_results_query->have_posts() ) {
+                $post = $search_results_query->next_post();
+                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 wp_json_encode(
+                        array(
+                            'ID'         => $post->ID,
+                            'post_title' => get_the_title( $post->ID ),
+                            'post_type'  => $matches[2],
+                        )
+                    );
+                    echo "\n";
+                }
+            }
+        } elseif ( 'taxonomy' === $matches[1] ) {
+            $terms = get_terms(
+                array(
+                    'taxonomy'   => $matches[2],
+                    'name__like' => $query,
+                    'number'     => 10,
+                    'hide_empty' => false,
+                )
+            );
+            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 ) {
+                    echo wp_json_encode(
+                        array(
+                            'ID'         => $term->term_id,
+                            'post_title' => $term->name,
+                            'post_type'  => $matches[2],
+                        )
+                    );
+                    echo "\n";
+                }
+            }
+        }
+    }
 }
 
 /**
@@ -143,29 +143,29 @@ 
  * @since 3.0.0
  */
 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' );
-	wp_nav_menu_taxonomy_meta_boxes();
-
-	// Register advanced menu items (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' ) ) {
-		$user = wp_get_current_user();
-		update_user_meta(
-			$user->ID,
-			'managenav-menuscolumnshidden',
-			array(
-				0 => 'link-target',
-				1 => 'css-classes',
-				2 => 'xfn',
-				3 => 'description',
-				4 => 'title-attribute',
-			)
-		);
-	}
+    // 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' );
+    wp_nav_menu_taxonomy_meta_boxes();
+
+    // Register advanced menu items (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' ) ) {
+        $user = wp_get_current_user();
+        update_user_meta(
+            $user->ID,
+            'managenav-menuscolumnshidden',
+            array(
+                0 => 'link-target',
+                1 => 'css-classes',
+                2 => 'xfn',
+                3 => 'description',
+                4 => 'title-attribute',
+            )
+        );
+    }
 }
 
 /**
@@ -176,29 +176,29 @@ 
  * @global array $wp_meta_boxes
  */
 function wp_initial_nav_menu_meta_boxes() {
-	global $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' );
-	$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'] );
-				} else {
-					$hidden_meta_boxes[] = $box['id'];
-				}
-			}
-		}
-	}
-
-	$user = wp_get_current_user();
-	update_user_meta( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes );
+    global $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' );
+    $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'] );
+                } else {
+                    $hidden_meta_boxes[] = $box['id'];
+                }
+            }
+        }
+    }
+
+    $user = wp_get_current_user();
+    update_user_meta( $user->ID, 'metaboxhidden_nav-menus', $hidden_meta_boxes );
 }
 
 /**
@@ -207,33 +207,33 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_post_type_meta_boxes() {
-	$post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
-
-	if ( ! $post_types ) {
-		return;
-	}
-
-	foreach ( $post_types as $post_type ) {
-		/**
-		 * Filters whether a menu items meta box will be added for the current
-		 * object type.
-		 *
-		 * If a falsey value is returned instead of an object, the menu items
-		 * meta box for the current meta box object will not be added.
-		 *
-		 * @since 3.0.0
-		 *
-		 * @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 ) {
-			$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 );
-		}
-	}
+    $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
+
+    if ( ! $post_types ) {
+        return;
+    }
+
+    foreach ( $post_types as $post_type ) {
+        /**
+         * Filters whether a menu items meta box will be added for the current
+         * object type.
+         *
+         * If a falsey value is returned instead of an object, the menu items
+         * meta box for the current meta box object will not be added.
+         *
+         * @since 3.0.0
+         *
+         * @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 ) {
+            $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 );
+        }
+    }
 }
 
 /**
@@ -242,20 +242,20 @@ 
  * @since 3.0.0
  */
 function wp_nav_menu_taxonomy_meta_boxes() {
-	$taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
-
-	if ( ! $taxonomies ) {
-		return;
-	}
-
-	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 ) {
-			$id = $tax->name;
-			add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
-		}
-	}
+    $taxonomies = get_taxonomies( array( 'show_in_nav_menus' => true ), 'object' );
+
+    if ( ! $taxonomies ) {
+        return;
+    }
+
+    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 ) {
+            $id = $tax->name;
+            add_meta_box( "add-{$id}", $tax->labels->name, 'wp_nav_menu_item_taxonomy_meta_box', 'nav-menus', 'side', 'default', $tax );
+        }
+    }
 }
 
 /**
@@ -271,13 +271,13 @@ 
  * @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 ) {
-	global $one_theme_location_no_menus;
+    global $one_theme_location_no_menus;
 
-	if ( $one_theme_location_no_menus ) {
-		return false;
-	}
+    if ( $one_theme_location_no_menus ) {
+        return false;
+    }
 
-	return disabled( $nav_menu_selected_id, 0, $display );
+    return disabled( $nav_menu_selected_id, 0, $display );
 }
 
 /**
@@ -289,11 +289,11 @@ 
  * @global int|string $nav_menu_selected_id
  */
 function wp_nav_menu_item_link_meta_box() {
-	global $_nav_menu_placeholder, $nav_menu_selected_id;
+    global $_nav_menu_placeholder, $nav_menu_selected_id;
 
-	$_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1;
+    $_nav_menu_placeholder = 0 > $_nav_menu_placeholder ? $_nav_menu_placeholder - 1 : -1;
 
-	?>
+    ?>
 	<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">
@@ -336,175 +336,175 @@ 
  * }
  */
 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 );
-	$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;
-
-	$args = array(
-		'offset'                 => $offset,
-		'order'                  => 'ASC',
-		'orderby'                => 'title',
-		'posts_per_page'         => $per_page,
-		'post_type'              => $post_type_name,
-		'suppress_filters'       => true,
-		'update_post_term_cache' => false,
-		'update_post_meta_cache' => false,
-	);
-
-	if ( isset( $box['args']->_default_query ) ) {
-		$args = array_merge( $args, (array) $box['args']->_default_query );
-	}
-
-	/*
+    global $_nav_menu_placeholder, $nav_menu_selected_id;
+
+    $post_type_name = $box['args']->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;
+
+    $args = array(
+        'offset'                 => $offset,
+        'order'                  => 'ASC',
+        'orderby'                => 'title',
+        'posts_per_page'         => $per_page,
+        'post_type'              => $post_type_name,
+        'suppress_filters'       => true,
+        'update_post_term_cache' => false,
+        'update_post_meta_cache' => false,
+    );
+
+    if ( isset( $box['args']->_default_query ) ) {
+        $args = array_merge( $args, (array) $box['args']->_default_query );
+    }
+
+    /*
 	 * If we're dealing with pages, let's prioritize the Front Page,
 	 * Posts Page and Privacy Policy Page at the top of the list.
 	 */
-	$important_pages = array();
-	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_obj = null;
-		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;
-			$front_page_obj        = (object) array(
-				'front_or_home' => true,
-				'ID'            => 0,
-				'object_id'     => $_nav_menu_placeholder,
-				'post_content'  => '',
-				'post_excerpt'  => '',
-				'post_parent'   => '',
-				'post_title'    => _x( 'Home', 'nav menu home label' ),
-				'post_type'     => 'nav_menu_item',
-				'type'          => 'custom',
-				'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;
-
-		if ( ! empty( $posts_page ) ) {
-			$posts_page_obj             = get_post( $posts_page );
-			$posts_page_obj->posts_page = true;
-
-			$important_pages[]   = $posts_page_obj;
-			$suppress_page_ids[] = $posts_page_obj->ID;
-		}
-
-		// Insert Privacy Policy Page.
-		$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 ) {
-				$privacy_policy_page->privacy_policy_page = true;
-
-				$important_pages[]   = $privacy_policy_page;
-				$suppress_page_ids[] = $privacy_policy_page->ID;
-			}
-		}
-
-		// Add suppression array to arguments for WP_Query.
-		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 );
-
-	// 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'] );
-			$get_posts = new WP_Query;
-			$posts     = $get_posts->query( $args );
-		} else {
-			echo '<p>' . __( 'No items.' ) . '</p>';
-			return;
-		}
-	} elseif ( ! empty( $important_pages ) ) {
-		$posts = array_merge( $important_pages, $posts );
-	}
-
-	$num_pages = $get_posts->max_num_pages;
-
-	$page_links = paginate_links(
-		array(
-			'base'               => add_query_arg(
-				array(
-					$tab_name     => 'all',
-					'paged'       => '%#%',
-					'item-type'   => 'post_type',
-					'item-object' => $post_type_name,
-				)
-			),
-			'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> ',
-			'total'              => $num_pages,
-			'current'            => $pagenum,
-		)
-	);
-
-	$db_fields = false;
-	if ( is_post_type_hierarchical( $post_type_name ) ) {
-		$db_fields = array(
-			'parent' => 'post_parent',
-			'id'     => 'ID',
-		);
-	}
-
-	$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 ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
-		$current_tab = 'search';
-	}
-
-	$removed_args = array(
-		'action',
-		'customlink-tab',
-		'edit-menu-item',
-		'menu-item',
-		'page-tab',
-		'_wpnonce',
-	);
-
-	$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 ) ) );
-	}
-	?>
+    $important_pages = array();
+    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_obj = null;
+        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;
+            $front_page_obj        = (object) array(
+                'front_or_home' => true,
+                'ID'            => 0,
+                'object_id'     => $_nav_menu_placeholder,
+                'post_content'  => '',
+                'post_excerpt'  => '',
+                'post_parent'   => '',
+                'post_title'    => _x( 'Home', 'nav menu home label' ),
+                'post_type'     => 'nav_menu_item',
+                'type'          => 'custom',
+                '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;
+
+        if ( ! empty( $posts_page ) ) {
+            $posts_page_obj             = get_post( $posts_page );
+            $posts_page_obj->posts_page = true;
+
+            $important_pages[]   = $posts_page_obj;
+            $suppress_page_ids[] = $posts_page_obj->ID;
+        }
+
+        // Insert Privacy Policy Page.
+        $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 ) {
+                $privacy_policy_page->privacy_policy_page = true;
+
+                $important_pages[]   = $privacy_policy_page;
+                $suppress_page_ids[] = $privacy_policy_page->ID;
+            }
+        }
+
+        // Add suppression array to arguments for WP_Query.
+        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 );
+
+    // 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'] );
+            $get_posts = new WP_Query;
+            $posts     = $get_posts->query( $args );
+        } else {
+            echo '<p>' . __( 'No items.' ) . '</p>';
+            return;
+        }
+    } elseif ( ! empty( $important_pages ) ) {
+        $posts = array_merge( $important_pages, $posts );
+    }
+
+    $num_pages = $get_posts->max_num_pages;
+
+    $page_links = paginate_links(
+        array(
+            'base'               => add_query_arg(
+                array(
+                    $tab_name     => 'all',
+                    'paged'       => '%#%',
+                    'item-type'   => 'post_type',
+                    'item-object' => $post_type_name,
+                )
+            ),
+            '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> ',
+            'total'              => $num_pages,
+            'current'            => $pagenum,
+        )
+    );
+
+    $db_fields = false;
+    if ( is_post_type_hierarchical( $post_type_name ) ) {
+        $db_fields = array(
+            'parent' => 'post_parent',
+            'id'     => 'ID',
+        );
+    }
+
+    $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 ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
+        $current_tab = 'search';
+    }
+
+    $removed_args = array(
+        'action',
+        'customlink-tab',
+        'edit-menu-item',
+        'menu-item',
+        'page-tab',
+        '_wpnonce',
+    );
+
+    $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 ) ) );
+    }
+    ?>
 	<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"' : '' ); ?>>
@@ -527,60 +527,60 @@ 
 		<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(
-					$args,
-					array(
-						'orderby'        => 'post_date',
-						'order'          => 'DESC',
-						'posts_per_page' => 15,
-					)
-				);
-				$most_recent    = $get_posts->query( $recent_args );
-				$args['walker'] = $walker;
-
-				/**
-				 * Filters the posts displayed in the 'Most Recent' tab of the current
-				 * post type's menu items meta box.
-				 *
-				 * The dynamic portion of the hook name, `$post_type_name`, refers to the post type name.
-				 *
-				 * Possible hook names include:
-				 *
-				 *  - `nav_menu_items_post_recent`
-				 *  - `nav_menu_items_page_recent`
-				 *
-				 * @since 4.3.0
-				 * @since 4.9.0 Added the `$recent_args` parameter.
-				 *
-				 * @param WP_Post[] $most_recent An array of post objects being listed.
-				 * @param array     $args        An array of `WP_Query` arguments for the meta box.
-				 * @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 );
-
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $most_recent ), 0, (object) $args );
-				?>
+                $recent_args    = array_merge(
+                    $args,
+                    array(
+                        'orderby'        => 'post_date',
+                        'order'          => 'DESC',
+                        'posts_per_page' => 15,
+                    )
+                );
+                $most_recent    = $get_posts->query( $recent_args );
+                $args['walker'] = $walker;
+
+                /**
+                 * Filters the posts displayed in the 'Most Recent' tab of the current
+                 * post type's menu items meta box.
+                 *
+                 * The dynamic portion of the hook name, `$post_type_name`, refers to the post type name.
+                 *
+                 * Possible hook names include:
+                 *
+                 *  - `nav_menu_items_post_recent`
+                 *  - `nav_menu_items_page_recent`
+                 *
+                 * @since 4.3.0
+                 * @since 4.9.0 Added the `$recent_args` parameter.
+                 *
+                 * @param WP_Post[] $most_recent An array of post objects being listed.
+                 * @param array     $args        An array of `WP_Query` arguments for the meta box.
+                 * @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 );
+
+                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">
 			<?php
-			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,
-						'post_type' => $post_type_name,
-						'fields'    => 'all',
-						'order'     => 'DESC',
-					)
-				);
-			} else {
-				$searched       = '';
-				$search_results = array();
-			}
-			?>
+            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,
+                        'post_type' => $post_type_name,
+                        'fields'    => 'all',
+                        'order'     => 'DESC',
+                    )
+                );
+            } else {
+                $searched       = '';
+                $search_results = array();
+            }
+            ?>
 			<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; ?>" />
@@ -591,9 +591,9 @@ 
 			<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
-				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
-				?>
+                $args['walker'] = $walker;
+                echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
+                ?>
 			<?php elseif ( is_wp_error( $search_results ) ) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
 			<?php elseif ( ! empty( $searched ) ) : ?>
@@ -610,54 +610,54 @@ 
 			<?php endif; ?>
 			<ul id="<?php echo $post_type_name; ?>checklist" data-wp-lists="list:<?php echo $post_type_name; ?>" class="categorychecklist form-no-clear">
 				<?php
-				$args['walker'] = $walker;
-
-				if ( $post_type->has_archive ) {
-					$_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
-					array_unshift(
-						$posts,
-						(object) array(
-							'ID'           => 0,
-							'object_id'    => $_nav_menu_placeholder,
-							'object'       => $post_type_name,
-							'post_content' => '',
-							'post_excerpt' => '',
-							'post_title'   => $post_type->labels->archives,
-							'post_type'    => 'nav_menu_item',
-							'type'         => 'post_type_archive',
-							'url'          => get_post_type_archive_link( $post_type_name ),
-						)
-					);
-				}
-
-				/**
-				 * Filters the posts displayed in the 'View All' tab of the current
-				 * post type's menu items meta box.
-				 *
-				 * The dynamic portion of the hook name, `$post_type_name`, refers
-				 * to the slug of the current post type.
-				 *
-				 * Possible hook names include:
-				 *
-				 *  - `nav_menu_items_post`
-				 *  - `nav_menu_items_page`
-				 *
-				 * @since 3.2.0
-				 * @since 4.6.0 Converted the `$post_type` parameter to accept a WP_Post_Type object.
-				 *
-				 * @see WP_Query::query()
-				 *
-				 * @param object[]     $posts     The posts for the current post type. Mostly `WP_Post` objects, but
-				 *                                can also contain "fake" post objects to represent other menu items.
-				 * @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 );
-
-				$checkbox_items = walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $posts ), 0, (object) $args );
-
-				echo $checkbox_items;
-				?>
+                $args['walker'] = $walker;
+
+                if ( $post_type->has_archive ) {
+                    $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
+                    array_unshift(
+                        $posts,
+                        (object) array(
+                            'ID'           => 0,
+                            'object_id'    => $_nav_menu_placeholder,
+                            'object'       => $post_type_name,
+                            'post_content' => '',
+                            'post_excerpt' => '',
+                            'post_title'   => $post_type->labels->archives,
+                            'post_type'    => 'nav_menu_item',
+                            'type'         => 'post_type_archive',
+                            'url'          => get_post_type_archive_link( $post_type_name ),
+                        )
+                    );
+                }
+
+                /**
+                 * Filters the posts displayed in the 'View All' tab of the current
+                 * post type's menu items meta box.
+                 *
+                 * The dynamic portion of the hook name, `$post_type_name`, refers
+                 * to the slug of the current post type.
+                 *
+                 * Possible hook names include:
+                 *
+                 *  - `nav_menu_items_post`
+                 *  - `nav_menu_items_page`
+                 *
+                 * @since 3.2.0
+                 * @since 4.6.0 Converted the `$post_type` parameter to accept a WP_Post_Type object.
+                 *
+                 * @see WP_Query::query()
+                 *
+                 * @param object[]     $posts     The posts for the current post type. Mostly `WP_Post` objects, but
+                 *                                can also contain "fake" post objects to represent other menu items.
+                 * @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 );
+
+                $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 ) ) : ?>
 				<div class="add-menu-item-pagelinks">
@@ -700,107 +700,107 @@ 
  * }
  */
 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 );
-	$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;
-
-	$args = array(
-		'taxonomy'     => $taxonomy_name,
-		'child_of'     => 0,
-		'exclude'      => '',
-		'hide_empty'   => false,
-		'hierarchical' => 1,
-		'include'      => '',
-		'number'       => $per_page,
-		'offset'       => $offset,
-		'order'        => 'ASC',
-		'orderby'      => 'name',
-		'pad_counts'   => false,
-	);
-
-	$terms = get_terms( $args );
-
-	if ( ! $terms || is_wp_error( $terms ) ) {
-		echo '<p>' . __( 'No items.' ) . '</p>';
-		return;
-	}
-
-	$num_pages = ceil(
-		wp_count_terms(
-			array_merge(
-				$args,
-				array(
-					'number' => '',
-					'offset' => '',
-				)
-			)
-		) / $per_page
-	);
-
-	$page_links = paginate_links(
-		array(
-			'base'               => add_query_arg(
-				array(
-					$tab_name     => 'all',
-					'paged'       => '%#%',
-					'item-type'   => 'taxonomy',
-					'item-object' => $taxonomy_name,
-				)
-			),
-			'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> ',
-			'total'              => $num_pages,
-			'current'            => $pagenum,
-		)
-	);
-
-	$db_fields = false;
-	if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
-		$db_fields = array(
-			'parent' => 'parent',
-			'id'     => 'term_id',
-		);
-	}
-
-	$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 ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
-		$current_tab = 'search';
-	}
-
-	$removed_args = array(
-		'action',
-		'customlink-tab',
-		'edit-menu-item',
-		'menu-item',
-		'page-tab',
-		'_wpnonce',
-	);
-
-	$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 ) ) );
-	}
-	?>
+    global $nav_menu_selected_id;
+
+    $taxonomy_name = $box['args']->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;
+
+    $args = array(
+        'taxonomy'     => $taxonomy_name,
+        'child_of'     => 0,
+        'exclude'      => '',
+        'hide_empty'   => false,
+        'hierarchical' => 1,
+        'include'      => '',
+        'number'       => $per_page,
+        'offset'       => $offset,
+        'order'        => 'ASC',
+        'orderby'      => 'name',
+        'pad_counts'   => false,
+    );
+
+    $terms = get_terms( $args );
+
+    if ( ! $terms || is_wp_error( $terms ) ) {
+        echo '<p>' . __( 'No items.' ) . '</p>';
+        return;
+    }
+
+    $num_pages = ceil(
+        wp_count_terms(
+            array_merge(
+                $args,
+                array(
+                    'number' => '',
+                    'offset' => '',
+                )
+            )
+        ) / $per_page
+    );
+
+    $page_links = paginate_links(
+        array(
+            'base'               => add_query_arg(
+                array(
+                    $tab_name     => 'all',
+                    'paged'       => '%#%',
+                    'item-type'   => 'taxonomy',
+                    'item-object' => $taxonomy_name,
+                )
+            ),
+            '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> ',
+            'total'              => $num_pages,
+            'current'            => $pagenum,
+        )
+    );
+
+    $db_fields = false;
+    if ( is_taxonomy_hierarchical( $taxonomy_name ) ) {
+        $db_fields = array(
+            'parent' => 'parent',
+            'id'     => 'term_id',
+        );
+    }
+
+    $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 ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
+        $current_tab = 'search';
+    }
+
+    $removed_args = array(
+        'action',
+        'customlink-tab',
+        'edit-menu-item',
+        'menu-item',
+        'page-tab',
+        '_wpnonce',
+    );
+
+    $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 ) ) );
+    }
+    ?>
 	<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"' : '' ); ?>>
@@ -823,18 +823,18 @@ 
 		<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(
-					array(
-						'taxonomy'     => $taxonomy_name,
-						'orderby'      => 'count',
-						'order'        => 'DESC',
-						'number'       => 10,
-						'hierarchical' => false,
-					)
-				);
-				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $popular_terms ), 0, (object) $args );
-				?>
+                $popular_terms  = get_terms(
+                    array(
+                        'taxonomy'     => $taxonomy_name,
+                        'orderby'      => 'count',
+                        'order'        => 'DESC',
+                        'number'       => 10,
+                        'hierarchical' => false,
+                    )
+                );
+                $args['walker'] = $walker;
+                echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $popular_terms ), 0, (object) $args );
+                ?>
 			</ul>
 		</div><!-- /.tabs-panel -->
 
@@ -846,9 +846,9 @@ 
 			<?php endif; ?>
 			<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 );
-				?>
+                $args['walker'] = $walker;
+                echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $terms ), 0, (object) $args );
+                ?>
 			</ul>
 			<?php if ( ! empty( $page_links ) ) : ?>
 				<div class="add-menu-item-pagelinks">
@@ -859,23 +859,23 @@ 
 
 		<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 ] );
-				$search_results = get_terms(
-					array(
-						'taxonomy'     => $taxonomy_name,
-						'name__like'   => $searched,
-						'fields'       => 'all',
-						'orderby'      => 'count',
-						'order'        => 'DESC',
-						'hierarchical' => false,
-					)
-				);
-			} else {
-				$searched       = '';
-				$search_results = array();
-			}
-			?>
+            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,
+                        'name__like'   => $searched,
+                        'fields'       => 'all',
+                        'orderby'      => 'count',
+                        'order'        => 'DESC',
+                        'hierarchical' => false,
+                    )
+                );
+            } else {
+                $searched       = '';
+                $search_results = array();
+            }
+            ?>
 			<p class="quick-search-wrap">
 				<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; ?>" />
@@ -886,9 +886,9 @@ 
 			<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
-				$args['walker'] = $walker;
-				echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
-				?>
+                $args['walker'] = $walker;
+                echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', $search_results ), 0, (object) $args );
+                ?>
 			<?php elseif ( is_wp_error( $search_results ) ) : ?>
 				<li><?php echo $search_results->get_error_message(); ?></li>
 			<?php elseif ( ! empty( $searched ) ) : ?>
@@ -923,63 +923,63 @@ 
  * @return int[] The database IDs of the items saved
  */
 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 ) ) {
-
-		// Loop through all the menu items' POST values.
-		foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
-			if (
-				// Checkbox is not checked.
-				empty( $_item_object_data['menu-item-object-id'] ) &&
-				(
-					// And item type either isn't set.
-					! isset( $_item_object_data['menu-item-type'] ) ||
-					// Or URL is the default.
-					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'] ) ) ||
-					// Or it *is* a custom menu item that already exists.
-					! empty( $_item_object_data['menu-item-db-id'] )
-				)
-			) {
-				// Then this potential menu item is not getting added to this menu.
-				continue;
-			}
-
-			// 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 ) ||
-				$_possible_db_id != $_item_object_data['menu-item-db-id']
-			) {
-				$_actual_db_id = 0;
-			} else {
-				$_actual_db_id = (int) $_item_object_data['menu-item-db-id'];
-			}
-
-			$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'] : '' ),
-			);
-
-			$items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
-
-		}
-	}
-	return $items_saved;
+    $menu_id     = (int) $menu_id;
+    $items_saved = array();
+
+    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 ) {
+            if (
+                // Checkbox is not checked.
+                empty( $_item_object_data['menu-item-object-id'] ) &&
+                (
+                    // And item type either isn't set.
+                    ! isset( $_item_object_data['menu-item-type'] ) ||
+                    // Or URL is the default.
+                    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'] ) ) ||
+                    // Or it *is* a custom menu item that already exists.
+                    ! empty( $_item_object_data['menu-item-db-id'] )
+                )
+            ) {
+                // Then this potential menu item is not getting added to this menu.
+                continue;
+            }
+
+            // 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 ) ||
+                $_possible_db_id != $_item_object_data['menu-item-db-id']
+            ) {
+                $_actual_db_id = 0;
+            } else {
+                $_actual_db_id = (int) $_item_object_data['menu-item-db-id'];
+            }
+
+            $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'] : '' ),
+            );
+
+            $items_saved[] = wp_update_nav_menu_item( $menu_id, $_actual_db_id, $args );
+
+        }
+    }
+    return $items_saved;
 }
 
 /**
@@ -993,36 +993,36 @@ 
  * @return object The post type or taxonomy object.
  */
 function _wp_nav_menu_meta_box_object( $data_object = null ) {
-	if ( isset( $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 ) {
-			$data_object->_default_query = array(
-				'post_status' => 'publish',
-			);
-
-			// Categories should be in reverse chronological order.
-		} elseif ( 'category' === $data_object->name ) {
-			$data_object->_default_query = array(
-				'orderby' => 'id',
-				'order'   => 'DESC',
-			);
-
-			// Custom post types should show only published items.
-		} else {
-			$data_object->_default_query = array(
-				'post_status' => 'publish',
-			);
-		}
-	}
-
-	return $data_object;
+    if ( isset( $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 ) {
+            $data_object->_default_query = array(
+                'post_status' => 'publish',
+            );
+
+            // Categories should be in reverse chronological order.
+        } elseif ( 'category' === $data_object->name ) {
+            $data_object->_default_query = array(
+                'orderby' => 'id',
+                'order'   => 'DESC',
+            );
+
+            // Custom post types should show only published items.
+        } else {
+            $data_object->_default_query = array(
+                'post_status' => 'publish',
+            );
+        }
+    }
+
+    return $data_object;
 }
 
 /**
@@ -1034,69 +1034,69 @@ 
  * @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 );
-
-	// 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' ) );
-		$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    .= '</div>';
-
-		if ( empty( $menu_items ) ) {
-			return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
-		}
-
-		/**
-		 * Filters the Walker class used when adding nav menu items.
-		 *
-		 * @since 3.0.0
-		 *
-		 * @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 );
-
-		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.' ),
-					'<strong>' . $walker_class_name . '</strong>'
-				)
-			);
-		}
-
-		$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 ) {
-				$some_pending_menu_items = true;
-			}
-			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_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 .= ' </ul> ';
-		return $result;
-	} elseif ( is_wp_error( $menu ) ) {
-		return $menu;
-	}
+    $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' ) );
+        $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    .= '</div>';
+
+        if ( empty( $menu_items ) ) {
+            return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
+        }
+
+        /**
+         * Filters the Walker class used when adding nav menu items.
+         *
+         * @since 3.0.0
+         *
+         * @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 );
+
+        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.' ),
+                    '<strong>' . $walker_class_name . '</strong>'
+                )
+            );
+        }
+
+        $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 ) {
+                $some_pending_menu_items = true;
+            }
+            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_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 .= ' </ul> ';
+        return $result;
+    } elseif ( is_wp_error( $menu ) ) {
+        return $menu;
+    }
 
 }
 
@@ -1108,15 +1108,15 @@ 
  * @return string[] Array of column titles keyed by their column name.
  */
 function wp_nav_menu_manage_columns() {
-	return array(
-		'_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' ),
-	);
+    return array(
+        '_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' ),
+    );
 }
 
 /**
@@ -1128,15 +1128,15 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.
  */
 function _wp_delete_orphaned_draft_menu_items() {
-	global $wpdb;
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+    global $wpdb;
+    $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 ) );
+    // 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 ) );
 
-	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 );
+    }
 }
 
 /**
@@ -1149,113 +1149,113 @@ 
  * @return array The menu updated message
  */
 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(
-			'orderby'     => 'ID',
-			'output'      => ARRAY_A,
-			'output_key'  => 'ID',
-			'post_status' => 'draft,publish',
-		)
-	);
-
-	$messages   = array();
-	$menu_items = array();
-
-	// Index menu items by DB ID.
-	foreach ( $unsorted_menu_items as $_item ) {
-		$menu_items[ $_item->db_id ] = $_item;
-	}
-
-	$post_fields = array(
-		'menu-item-db-id',
-		'menu-item-object-id',
-		'menu-item-object',
-		'menu-item-parent-id',
-		'menu-item-position',
-		'menu-item-type',
-		'menu-item-title',
-		'menu-item-url',
-		'menu-item-description',
-		'menu-item-attr-title',
-		'menu-item-target',
-		'menu-item-classes',
-		'menu-item-xfn',
-	);
-
-	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 ) {
-
-			// Menu item title can't be blank.
-			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 ] : '';
-			}
-
-			$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 ) ) {
-				$messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
-			} else {
-				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 );
-			}
-		}
-	}
-
-	// Store 'auto-add' pages.
-	$auto_add        = ! empty( $_POST['auto-add-pages'] );
-	$nav_menu_option = (array) get_option( 'nav_menu_options' );
-
-	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 ) ) {
-			$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 ] );
-		}
-	}
-
-	// 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 );
-
-	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 );
-
-	$messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
-		sprintf(
-			/* translators: %s: Nav menu title. */
-			__( '%s has been updated.' ),
-			'<strong>' . $nav_menu_selected_title . '</strong>'
-		) . '</p></div>';
-
-	unset( $menu_items, $unsorted_menu_items );
-
-	return $messages;
+    $unsorted_menu_items = wp_get_nav_menu_items(
+        $nav_menu_selected_id,
+        array(
+            'orderby'     => 'ID',
+            'output'      => ARRAY_A,
+            'output_key'  => 'ID',
+            'post_status' => 'draft,publish',
+        )
+    );
+
+    $messages   = array();
+    $menu_items = array();
+
+    // Index menu items by DB ID.
+    foreach ( $unsorted_menu_items as $_item ) {
+        $menu_items[ $_item->db_id ] = $_item;
+    }
+
+    $post_fields = array(
+        'menu-item-db-id',
+        'menu-item-object-id',
+        'menu-item-object',
+        'menu-item-parent-id',
+        'menu-item-position',
+        'menu-item-type',
+        'menu-item-title',
+        'menu-item-url',
+        'menu-item-description',
+        'menu-item-attr-title',
+        'menu-item-target',
+        'menu-item-classes',
+        'menu-item-xfn',
+    );
+
+    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 ) {
+
+            // Menu item title can't be blank.
+            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 ] : '';
+            }
+
+            $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 ) ) {
+                $messages[] = '<div id="message" class="error"><p>' . $menu_item_db_id->get_error_message() . '</p></div>';
+            } else {
+                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 );
+            }
+        }
+    }
+
+    // Store 'auto-add' pages.
+    $auto_add        = ! empty( $_POST['auto-add-pages'] );
+    $nav_menu_option = (array) get_option( 'nav_menu_options' );
+
+    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 ) ) {
+            $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 ] );
+        }
+    }
+
+    // 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 );
+
+    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 );
+
+    $messages[] = '<div id="message" class="updated notice is-dismissible"><p>' .
+        sprintf(
+            /* translators: %s: Nav menu title. */
+            __( '%s has been updated.' ),
+            '<strong>' . $nav_menu_selected_title . '</strong>'
+        ) . '</p></div>';
+
+    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'] ) ) {
-		return;
-	}
-
-	$data = json_decode( stripslashes( $_POST['nav-menu-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 );
-
-			$array_bits = array( $matches[1] );
-
-			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 );
-				} else {
-					$new_post_data = array( $array_bits[ $i ] => $new_post_data );
-				}
-			}
-
-			$_POST = array_replace_recursive( $_POST, $new_post_data );
-		}
-	}
+    if ( ! isset( $_POST['nav-menu-data'] ) ) {
+        return;
+    }
+
+    $data = json_decode( stripslashes( $_POST['nav-menu-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 );
+
+            $array_bits = array( $matches[1] );
+
+            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 );
+                } else {
+                    $new_post_data = array( $array_bits[ $i ] => $new_post_data );
+                }
+            }
+
+            $_POST = array_replace_recursive( $_POST, $new_post_data );
+        }
+    }
 }

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

Indentation +142 added lines, -142 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 if ( ! class_exists( 'WP_Privacy_Requests_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-requests-table.php';
+    require_once ABSPATH . 'wp-admin/includes/class-wp-privacy-requests-table.php';
 }
 
 /**
@@ -17,152 +17,152 @@ 
  * @since 4.9.6
  */
 class WP_Privacy_Data_Removal_Requests_List_Table extends WP_Privacy_Requests_Table {
-	/**
-	 * Action name for the requests this table will work with.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @var string $request_type Name of action.
-	 */
-	protected $request_type = 'remove_personal_data';
-
-	/**
-	 * Post type for the requests.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @var string $post_type The post type.
-	 */
-	protected $post_type = 'user_request';
-
-	/**
-	 * Actions column.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param WP_User_Request $item Item being shown.
-	 * @return string Email column markup.
-	 */
-	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 ) {
-			/** 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 );
-
-			$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 ) .
-				'">';
-
-			$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 ) {
-			$complete_request_markup  = '<span>';
-			$complete_request_markup .= sprintf(
-				'<a href="%s" class="complete-request" aria-label="%s">%s</a>',
-				esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'action'     => 'complete',
-								'request_id' => array( $request_id ),
-							),
-							admin_url( 'erase-personal-data.php' )
-						),
-						'bulk-privacy_requests'
-					)
-				),
-				esc_attr(
-					sprintf(
-						/* translators: %s: Request email. */
-						__( 'Mark export request for &#8220;%s&#8221; as completed.' ),
-						$item->email
-					)
-				),
-				__( 'Complete request' )
-			);
-			$complete_request_markup .= '</span>';
-		}
-
-		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 ) );
-	}
-
-	/**
-	 * Next steps column.
-	 *
-	 * @since 4.9.6
-	 *
-	 * @param WP_User_Request $item Item being shown.
-	 */
-	public function column_next_steps( $item ) {
-		$status = $item->status;
-
-		switch ( $status ) {
-			case 'request-pending':
-				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 );
-				$request_id    = $item->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 ) .
-					'">';
-
-				?>
+    /**
+     * Action name for the requests this table will work with.
+     *
+     * @since 4.9.6
+     *
+     * @var string $request_type Name of action.
+     */
+    protected $request_type = 'remove_personal_data';
+
+    /**
+     * Post type for the requests.
+     *
+     * @since 4.9.6
+     *
+     * @var string $post_type The post type.
+     */
+    protected $post_type = 'user_request';
+
+    /**
+     * Actions column.
+     *
+     * @since 4.9.6
+     *
+     * @param WP_User_Request $item Item being shown.
+     * @return string Email column markup.
+     */
+    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 ) {
+            /** 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 );
+
+            $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 ) .
+                '">';
+
+            $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 ) {
+            $complete_request_markup  = '<span>';
+            $complete_request_markup .= sprintf(
+                '<a href="%s" class="complete-request" aria-label="%s">%s</a>',
+                esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'action'     => 'complete',
+                                'request_id' => array( $request_id ),
+                            ),
+                            admin_url( 'erase-personal-data.php' )
+                        ),
+                        'bulk-privacy_requests'
+                    )
+                ),
+                esc_attr(
+                    sprintf(
+                        /* translators: %s: Request email. */
+                        __( 'Mark export request for &#8220;%s&#8221; as completed.' ),
+                        $item->email
+                    )
+                ),
+                __( 'Complete request' )
+            );
+            $complete_request_markup .= '</span>';
+        }
+
+        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 ) );
+    }
+
+    /**
+     * Next steps column.
+     *
+     * @since 4.9.6
+     *
+     * @param WP_User_Request $item Item being shown.
+     */
+    public function column_next_steps( $item ) {
+        $status = $item->status;
+
+        switch ( $status ) {
+            case 'request-pending':
+                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 );
+                $request_id    = $item->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 ) .
+                    '">';
+
+                ?>
 				<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>';
-				break;
-			case 'request-completed':
-				echo '<a href="' . esc_url(
-					wp_nonce_url(
-						add_query_arg(
-							array(
-								'action'     => 'delete',
-								'request_id' => array( $item->ID ),
-							),
-							admin_url( 'erase-personal-data.php' )
-						),
-						'bulk-privacy_requests'
-					)
-				) . '">' . esc_html__( 'Remove request' ) . '</a>';
-				break;
-		}
-	}
+                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>';
+                break;
+            case 'request-completed':
+                echo '<a href="' . esc_url(
+                    wp_nonce_url(
+                        add_query_arg(
+                            array(
+                                'action'     => 'delete',
+                                'request_id' => array( $item->ID ),
+                            ),
+                            admin_url( 'erase-personal-data.php' )
+                        ),
+                        'bulk-privacy_requests'
+                    )
+                ) . '">' . esc_html__( 'Remove request' ) . '</a>';
+                break;
+        }
+    }
 
 }

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

Indentation +1301 added lines, -1301 removed lines

@@ -13,360 +13,360 @@ 
  */
 class Custom_Image_Header {
 
-	/**
-	 * Callback for administration header.
-	 *
-	 * @var callable
-	 * @since 2.1.0
-	 */
-	public $admin_header_callback;
-
-	/**
-	 * Callback for header div.
-	 *
-	 * @var callable
-	 * @since 3.0.0
-	 */
-	public $admin_image_div_callback;
-
-	/**
-	 * Holds default headers.
-	 *
-	 * @var array
-	 * @since 3.0.0
-	 */
-	public $default_headers = array();
-
-	/**
-	 * Used to trigger a success message when settings updated and set to true.
-	 *
-	 * @since 3.0.0
-	 * @var bool
-	 */
-	private $updated;
-
-	/**
-	 * Constructor - Register administration header callback.
-	 *
-	 * @since 2.1.0
-	 * @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 = '' ) {
-		$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( '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' ) );
-	}
-
-	/**
-	 * Set up the hooks for the Custom Header admin page.
-	 *
-	 * @since 2.1.0
-	 */
-	public function init() {
-		$page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_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 );
-
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-{$page}", $this->admin_header_callback, 51 );
-		}
-	}
-
-	/**
-	 * Adds contextual help.
-	 *
-	 * @since 3.0.0
-	 */
-	public function help() {
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => '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>',
-			)
-		);
-
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => 'set-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>',
-			)
-		);
-
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => 'set-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' )
-					) .
-					'</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>'
-		);
-	}
-
-	/**
-	 * Get the current step.
-	 *
-	 * @since 2.6.0
-	 *
-	 * @return int Current step.
-	 */
-	public function 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' ) )
-		) {
-			return 1;
-		}
-
-		return $step;
-	}
-
-	/**
-	 * Set up the enqueue for the JavaScript files.
-	 *
-	 * @since 2.1.0
-	 */
-	public function js_includes() {
-		$step = $this->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' );
-			}
-		} elseif ( 2 === $step ) {
-			wp_enqueue_script( 'imgareaselect' );
-		}
-	}
-
-	/**
-	 * Set up the enqueue for the CSS files
-	 *
-	 * @since 2.7.0
-	 */
-	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' );
-		}
-	}
-
-	/**
-	 * Execute custom header modification.
-	 *
-	 * @since 2.6.0
-	 */
-	public function take_action() {
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			return;
-		}
-
-		if ( empty( $_POST ) ) {
-			return;
-		}
-
-		$this->updated = true;
-
-		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' );
-
-			$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' );
-
-			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'] );
-
-			$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 ( isset( $_POST['default-header'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-
-			$this->set_header_image( $_POST['default-header'] );
-
-			return;
-		}
-	}
-
-	/**
-	 * Process the default headers
-	 *
-	 * @since 3.0.0
-	 *
-	 * @global array $_wp_default_headers
-	 */
-	public function process_default_headers() {
-		global $_wp_default_headers;
-
-		if ( ! isset( $_wp_default_headers ) ) {
-			return;
-		}
-
-		if ( ! empty( $this->default_headers ) ) {
-			return;
-		}
-
-		$this->default_headers    = $_wp_default_headers;
-		$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'],
-				$template_directory_uri,
-				$stylesheet_directory_uri
-			);
-
-			$this->default_headers[ $header ]['thumbnail_url'] = sprintf(
-				$this->default_headers[ $header ]['thumbnail_url'],
-				$template_directory_uri,
-				$stylesheet_directory_uri
-			);
-		}
-	}
-
-	/**
-	 * Display UI for selecting one of several default headers.
-	 *
-	 * Show the random image option if this theme has multiple header images.
-	 * Random image option is on by default if no header has been set.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @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 ) {
-			$headers = $this->default_headers;
-		} else {
-			$headers = get_uploaded_header_images();
-			$type    = 'uploaded';
-		}
-
-		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>';
-			echo '</div>';
-		}
-
-		echo '<div class="available-headers">';
-
-		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'];
-
-			echo '<div class="default-header">';
-			echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
-			$width = '';
-			if ( ! empty( $header['attachment_id'] ) ) {
-				$width = ' width="230"';
-			}
-			echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) . '"' . $width . ' /></label>';
-			echo '</div>';
-		}
-
-		echo '<div class="clear"></div></div>';
-	}
-
-	/**
-	 * Execute JavaScript depending on step.
-	 *
-	 * @since 2.1.0
-	 */
-	public function js() {
-		$step = $this->step();
-
-		if ( ( 1 === $step || 3 === $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
-			$this->js_1();
-		} elseif ( 2 === $step ) {
-			$this->js_2();
-		}
-	}
-
-	/**
-	 * Display JavaScript based on Step 1 and 3.
-	 *
-	 * @since 2.6.0
-	 */
-	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, '#' ) ) {
-				$default_color = '#' . $default_color;
-			}
-		}
-		?>
+    /**
+     * Callback for administration header.
+     *
+     * @var callable
+     * @since 2.1.0
+     */
+    public $admin_header_callback;
+
+    /**
+     * Callback for header div.
+     *
+     * @var callable
+     * @since 3.0.0
+     */
+    public $admin_image_div_callback;
+
+    /**
+     * Holds default headers.
+     *
+     * @var array
+     * @since 3.0.0
+     */
+    public $default_headers = array();
+
+    /**
+     * Used to trigger a success message when settings updated and set to true.
+     *
+     * @since 3.0.0
+     * @var bool
+     */
+    private $updated;
+
+    /**
+     * Constructor - Register administration header callback.
+     *
+     * @since 2.1.0
+     * @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 = '' ) {
+        $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( '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' ) );
+    }
+
+    /**
+     * Set up the hooks for the Custom Header admin page.
+     *
+     * @since 2.1.0
+     */
+    public function init() {
+        $page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_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 );
+
+        if ( $this->admin_header_callback ) {
+            add_action( "admin_head-{$page}", $this->admin_header_callback, 51 );
+        }
+    }
+
+    /**
+     * Adds contextual help.
+     *
+     * @since 3.0.0
+     */
+    public function help() {
+        get_current_screen()->add_help_tab(
+            array(
+                'id'      => '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>',
+            )
+        );
+
+        get_current_screen()->add_help_tab(
+            array(
+                'id'      => 'set-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>',
+            )
+        );
+
+        get_current_screen()->add_help_tab(
+            array(
+                'id'      => 'set-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' )
+                    ) .
+                    '</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>'
+        );
+    }
+
+    /**
+     * Get the current step.
+     *
+     * @since 2.6.0
+     *
+     * @return int Current step.
+     */
+    public function 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' ) )
+        ) {
+            return 1;
+        }
+
+        return $step;
+    }
+
+    /**
+     * Set up the enqueue for the JavaScript files.
+     *
+     * @since 2.1.0
+     */
+    public function js_includes() {
+        $step = $this->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' );
+            }
+        } elseif ( 2 === $step ) {
+            wp_enqueue_script( 'imgareaselect' );
+        }
+    }
+
+    /**
+     * Set up the enqueue for the CSS files
+     *
+     * @since 2.7.0
+     */
+    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' );
+        }
+    }
+
+    /**
+     * Execute custom header modification.
+     *
+     * @since 2.6.0
+     */
+    public function take_action() {
+        if ( ! current_user_can( 'edit_theme_options' ) ) {
+            return;
+        }
+
+        if ( empty( $_POST ) ) {
+            return;
+        }
+
+        $this->updated = true;
+
+        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' );
+
+            $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' );
+
+            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'] );
+
+            $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 ( isset( $_POST['default-header'] ) ) {
+            check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+
+            $this->set_header_image( $_POST['default-header'] );
+
+            return;
+        }
+    }
+
+    /**
+     * Process the default headers
+     *
+     * @since 3.0.0
+     *
+     * @global array $_wp_default_headers
+     */
+    public function process_default_headers() {
+        global $_wp_default_headers;
+
+        if ( ! isset( $_wp_default_headers ) ) {
+            return;
+        }
+
+        if ( ! empty( $this->default_headers ) ) {
+            return;
+        }
+
+        $this->default_headers    = $_wp_default_headers;
+        $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'],
+                $template_directory_uri,
+                $stylesheet_directory_uri
+            );
+
+            $this->default_headers[ $header ]['thumbnail_url'] = sprintf(
+                $this->default_headers[ $header ]['thumbnail_url'],
+                $template_directory_uri,
+                $stylesheet_directory_uri
+            );
+        }
+    }
+
+    /**
+     * Display UI for selecting one of several default headers.
+     *
+     * Show the random image option if this theme has multiple header images.
+     * Random image option is on by default if no header has been set.
+     *
+     * @since 3.0.0
+     *
+     * @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 ) {
+            $headers = $this->default_headers;
+        } else {
+            $headers = get_uploaded_header_images();
+            $type    = 'uploaded';
+        }
+
+        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>';
+            echo '</div>';
+        }
+
+        echo '<div class="available-headers">';
+
+        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'];
+
+            echo '<div class="default-header">';
+            echo '<label><input name="default-header" type="radio" value="' . esc_attr( $header_key ) . '" ' . checked( $header_url, get_theme_mod( 'header_image' ), false ) . ' />';
+            $width = '';
+            if ( ! empty( $header['attachment_id'] ) ) {
+                $width = ' width="230"';
+            }
+            echo '<img src="' . set_url_scheme( $header_thumbnail ) . '" alt="' . esc_attr( $header_alt_text ) . '"' . $width . ' /></label>';
+            echo '</div>';
+        }
+
+        echo '<div class="clear"></div></div>';
+    }
+
+    /**
+     * Execute JavaScript depending on step.
+     *
+     * @since 2.1.0
+     */
+    public function js() {
+        $step = $this->step();
+
+        if ( ( 1 === $step || 3 === $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+            $this->js_1();
+        } elseif ( 2 === $step ) {
+            $this->js_2();
+        }
+    }
+
+    /**
+     * Display JavaScript based on Step 1 and 3.
+     *
+     * @since 2.6.0
+     */
+    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, '#' ) ) {
+                $default_color = '#' . $default_color;
+            }
+        }
+        ?>
 <script type="text/javascript">
 (function($){
 	var default_color = '<?php echo esc_js( $default_color ); ?>',
@@ -412,16 +412,16 @@ 
 })(jQuery);
 </script>
 		<?php
-	}
+    }
 
-	/**
-	 * Display JavaScript based on Step 2.
-	 *
-	 * @since 2.6.0
-	 */
-	public function js_2() {
+    /**
+     * Display JavaScript based on Step 2.
+     *
+     * @since 2.6.0
+     */
+    public function js_2() {
 
-		?>
+        ?>
 <script type="text/javascript">
 	function onEndCrop( coords ) {
 		jQuery( '#x1' ).val(coords.x);
@@ -456,24 +456,24 @@ 
 			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' ); ?>,
 				<?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' ); ?>,
 				<?php
-			}
-			?>
+            }
+            ?>
 			onInit: function () {
 				jQuery('#width').val(xinit);
 				jQuery('#height').val(yinit);
@@ -488,16 +488,16 @@ 
 	} );
 </script>
 		<?php
-	}
+    }
 
-	/**
-	 * Display first step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
-	public function step_1() {
-		$this->process_default_headers();
-		?>
+    /**
+     * Display first step of custom header image page.
+     *
+     * @since 2.1.0
+     */
+    public function step_1() {
+        $this->process_default_headers();
+        ?>
 
 <div class="wrap">
 <h1><?php _e( 'Custom Header' ); ?></h1>
@@ -506,12 +506,12 @@ 
 <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' )
-			);
-			?>
+            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' )
+            );
+            ?>
 	</p>
 </div>
 		<?php } ?>
@@ -520,9 +520,9 @@ 
 <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( '/' ) );
-			?>
+            /* translators: %s: Home URL. */
+            printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) );
+            ?>
 	</p>
 </div>
 		<?php } ?>
@@ -537,33 +537,33 @@ 
 <th scope="row"><?php _e( 'Preview' ); ?></th>
 <td>
 			<?php
-			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 ) . ');';
-				} else {
-					$header_image_style = '';
-				}
-
-				if ( $custom_header->width ) {
-					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-				}
-				if ( $custom_header->height ) {
-					$header_image_style .= 'height:' . $custom_header->height . 'px;';
-				}
-				?>
+            if ( $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 ) . ');';
+                } else {
+                    $header_image_style = '';
+                }
+
+                if ( $custom_header->width ) {
+                    $header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+                }
+                if ( $custom_header->height ) {
+                    $header_image_style .= 'height:' . $custom_header->height . 'px;';
+                }
+                ?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 				<?php
-				if ( display_header_text() ) {
-					$style = ' style="color:#' . get_header_textcolor() . ';"';
-				} else {
-					$style = ' style="display:none;"';
-				}
-				?>
+                if ( display_header_text() ) {
+                    $style = ' style="color:#' . get_header_textcolor() . ';"';
+                } else {
+                    $style = ' style="display:none;"';
+                }
+                ?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo( 'url' ); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
 	</div>
@@ -578,69 +578,69 @@ 
 <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 />
 			<?php
-			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' )
-				);
-			} 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.' ) . ' ',
-						sprintf(
-							/* translators: %d: 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' ) ) {
-					printf(
-						/* translators: %s: Size in pixels. */
-						__( 'Images should be at least %s tall.' ) . ' ',
-						sprintf(
-							/* translators: %d: 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', 'width' ) ) {
-					printf(
-						/* translators: %s: Size in pixels. */
-						__( 'Suggested width is %s.' ) . ' ',
-						sprintf(
-							/* translators: %d: Custom header width. */
-							'<strong>' . __( '%d pixels' ) . '</strong>',
-							get_theme_support( 'custom-header', 'width' )
-						)
-					);
-				}
-
-				if ( current_theme_supports( 'custom-header', 'height' ) ) {
-					printf(
-						/* translators: %s: Size in pixels. */
-						__( 'Suggested height is %s.' ) . ' ',
-						sprintf(
-							/* translators: %d: 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' )
+            ) {
+                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' )
+                );
+            } 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.' ) . ' ',
+                        sprintf(
+                            /* translators: %d: 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' ) ) {
+                    printf(
+                        /* translators: %s: Size in pixels. */
+                        __( 'Images should be at least %s tall.' ) . ' ',
+                        sprintf(
+                            /* translators: %d: 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', 'width' ) ) {
+                    printf(
+                        /* translators: %s: Size in pixels. */
+                        __( 'Suggested width is %s.' ) . ' ',
+                        sprintf(
+                            /* translators: %d: Custom header width. */
+                            '<strong>' . __( '%d pixels' ) . '</strong>',
+                            get_theme_support( 'custom-header', 'width' )
+                        )
+                    );
+                }
+
+                if ( current_theme_supports( 'custom-header', 'height' ) ) {
+                    printf(
+                        /* translators: %s: Size in pixels. */
+                        __( 'Suggested height is %s.' ) . ' ',
+                        sprintf(
+                            /* translators: %d: 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 ) ); ?>">
 	<p>
@@ -651,15 +651,15 @@ 
 			<?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' ),
-				),
-				admin_url( 'themes.php' )
-			);
-			?>
+            $modal_update_href = add_query_arg(
+                array(
+                    'page'                          => 'custom-header',
+                    'step'                          => 2,
+                    '_wpnonce-custom-header-upload' => wp_create_nonce( 'custom-header-upload' ),
+                ),
+                admin_url( 'themes.php' )
+            );
+            ?>
 	<p>
 		<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"
@@ -684,14 +684,14 @@ 
 <td>
 	<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 ) ) :
-			?>
+    endif;
+        if ( ! empty( $this->default_headers ) ) :
+            ?>
 <tr>
 <th scope="row"><?php _e( 'Default Images' ); ?></th>
 <td>
@@ -701,14 +701,14 @@ 
 	<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() ) :
-			?>
+    endif;
+        if ( get_header_image() ) :
+            ?>
 <tr>
 <th scope="row"><?php _e( 'Remove Image' ); ?></th>
 <td>
@@ -717,16 +717,16 @@ 
 </td>
 </tr>
 			<?php
-	endif;
+    endif;
 
-		$default_image = sprintf(
-			get_theme_support( 'custom-header', 'default-image' ),
-			get_template_directory_uri(),
-			get_stylesheet_directory_uri()
-		);
+        $default_image = sprintf(
+            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>
 <td>
@@ -758,27 +758,27 @@ 
 <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, '#' ) ) {
-					$default_color = '#' . $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 = '#' . $header_textcolor;
-			}
-
-			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>';
-			}
-			?>
+            $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 ) . '"' : '';
+
+            $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 ) {
+                /* translators: %s: Default text color. */
+                echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+            }
+            ?>
 	</p>
 </td>
 </tr>
@@ -787,126 +787,126 @@ 
 			<?php
 endif;
 
-		/**
-		 * Fires just before the submit button in the custom header options form.
-		 *
-		 * @since 3.1.0
-		 */
-		do_action( 'custom_header_options' );
+        /**
+         * Fires just before the submit button in the custom header options form.
+         *
+         * @since 3.1.0
+         */
+        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' ); ?>
 </form>
 </div>
 
 		<?php
-	}
-
-	/**
-	 * Display second step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
-	public function step_2() {
-		check_admin_referer( 'custom-header-upload', '_wpnonce-custom-header-upload' );
-
-		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>',
-				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' );
-			$url           = $url[0];
-		} 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 );
-		} 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 );
-		}
-
-		$max_width = 0;
-
-		// For flex, limit size of image displayed to 1500px unless theme says otherwise.
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-			$max_width = 1500;
-		}
-
-		if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
-		}
-
-		$max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
-
-		// If flexible height isn't supported and the image is the exact right size.
-		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 ) );
-			}
-
-			$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
-
-			/**
-			 * Fires after the header image is set or an error is returned.
-			 *
-			 * @since 2.1.0
-			 *
-			 * @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.
-
-			return $this->finished();
-		} elseif ( $width > $max_width ) {
-			$oitar = $width / $max_width;
-
-			$image = wp_crop_image(
-				$attachment_id,
-				0,
-				0,
-				$width,
-				$height,
-				$max_width,
-				$height / $oitar,
-				false,
-				str_replace( 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' ) );
-			}
-
-			/** 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.
-
-			$url    = str_replace( wp_basename( $url ), wp_basename( $image ), $url );
-			$width  = $width / $oitar;
-			$height = $height / $oitar;
-		} else {
-			$oitar = 1;
-		}
-		?>
+    }
+
+    /**
+     * Display second step of custom header image page.
+     *
+     * @since 2.1.0
+     */
+    public function step_2() {
+        check_admin_referer( 'custom-header-upload', '_wpnonce-custom-header-upload' );
+
+        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>',
+                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' );
+            $url           = $url[0];
+        } 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 );
+        } 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 );
+        }
+
+        $max_width = 0;
+
+        // For flex, limit size of image displayed to 1500px unless theme says otherwise.
+        if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+            $max_width = 1500;
+        }
+
+        if ( current_theme_supports( 'custom-header', 'max-width' ) ) {
+            $max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+        }
+
+        $max_width = max( $max_width, get_theme_support( 'custom-header', 'width' ) );
+
+        // If flexible height isn't supported and the image is the exact right size.
+        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 ) );
+            }
+
+            $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+
+            /**
+             * Fires after the header image is set or an error is returned.
+             *
+             * @since 2.1.0
+             *
+             * @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.
+
+            return $this->finished();
+        } elseif ( $width > $max_width ) {
+            $oitar = $width / $max_width;
+
+            $image = wp_crop_image(
+                $attachment_id,
+                0,
+                0,
+                $width,
+                $height,
+                $max_width,
+                $height / $oitar,
+                false,
+                str_replace( 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' ) );
+            }
+
+            /** 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.
+
+            $url    = str_replace( wp_basename( $url ), wp_basename( $image ), $url );
+            $width  = $width / $oitar;
+            $height = $height / $oitar;
+        } else {
+            $oitar = 1;
+        }
+        ?>
 
 <div class="wrap">
 <h1><?php _e( 'Crop Header Image' ); ?></h1>
@@ -933,668 +933,668 @@ 
 	<p class="submit">
 		<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
 		<?php
-		if ( isset( $oitar ) && 1 === $oitar
-			&& ( current_theme_supports( 'custom-header', 'flex-height' )
-				|| current_theme_supports( 'custom-header', 'flex-width' ) )
-		) {
-			submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
-		}
-		?>
+        if ( isset( $oitar ) && 1 === $oitar
+            && ( current_theme_supports( 'custom-header', 'flex-height' )
+                || current_theme_supports( 'custom-header', 'flex-width' ) )
+        ) {
+            submit_button( __( 'Skip Cropping, Publish Image as Is' ), '', 'skip-cropping', false );
+        }
+        ?>
 	</p>
 </form>
 </div>
 		<?php
-	}
-
-
-	/**
-	 * Upload the file to be cropped in the second step.
-	 *
-	 * @since 3.4.0
-	 */
-	public function step_2_manage_upload() {
-		$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.' ) );
-		}
-
-		$file = wp_handle_upload( $uploaded_file, $overrides );
-
-		if ( isset( $file['error'] ) ) {
-			wp_die( $file['error'], __( 'Image Upload Error' ) );
-		}
-
-		$url      = $file['url'];
-		$type     = $file['type'];
-		$file     = $file['file'];
-		$filename = wp_basename( $file );
-
-		// Construct the attachment array.
-		$attachment = array(
-			'post_title'     => $filename,
-			'post_content'   => $url,
-			'post_mime_type' => $type,
-			'guid'           => $url,
-			'context'        => 'custom-header',
-		);
-
-		// Save the data.
-		$attachment_id = wp_insert_attachment( $attachment, $file );
-
-		return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
-	}
-
-	/**
-	 * Display third step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 * @since 4.4.0 Switched to using wp_get_attachment_url() instead of the guid
-	 *              for retrieving the header image URL.
-	 */
-	public function step_3() {
-		check_admin_referer( 'custom-header-crop-image' );
-
-		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>',
-				403
-			);
-		}
-
-		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>',
-				403
-			);
-		}
-
-		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 );
-
-		$dimensions = $this->get_header_dimensions(
-			array(
-				'height' => $_POST['height'],
-				'width'  => $_POST['width'],
-			)
-		);
-		$height     = $dimensions['dst_height'];
-		$width      = $dimensions['dst_width'];
-
-		if ( empty( $_POST['skip-cropping'] ) ) {
-			$cropped = wp_crop_image(
-				$attachment_id,
-				(int) $_POST['x1'],
-				(int) $_POST['y1'],
-				(int) $_POST['width'],
-				(int) $_POST['height'],
-				$width,
-				$height
-			);
-		} elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
-			$cropped = _copy_image_file( $attachment_id );
-		} else {
-			$cropped = get_attached_file( $attachment_id );
-		}
-
-		if ( ! $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.
-
-		$attachment = $this->create_attachment_object( $cropped, $attachment_id );
-
-		if ( ! empty( $_POST['create-new-attachment'] ) ) {
-			unset( $attachment['ID'] );
-		}
-
-		// Update the attachment.
-		$attachment_id = $this->insert_attachment( $attachment, $cropped );
-
-		$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 );
-		}
-
-		if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
-			wp_delete_file( $original );
-		}
-
-		return $this->finished();
-	}
-
-	/**
-	 * Display last step of custom header image page.
-	 *
-	 * @since 2.1.0
-	 */
-	public function finished() {
-		$this->updated = true;
-		$this->step_1();
-	}
-
-	/**
-	 * Display the page based on the current step.
-	 *
-	 * @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.' ) );
-		}
-
-		$step = $this->step();
-
-		if ( 2 === $step ) {
-			$this->step_2();
-		} elseif ( 3 === $step ) {
-			$this->step_3();
-		} else {
-			$this->step_1();
-		}
-	}
-
-	/**
-	 * Unused since 3.5.0.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param array $form_fields
-	 * @return array $form_fields
-	 */
-	public function attachment_fields_to_edit( $form_fields ) {
-		return $form_fields;
-	}
-
-	/**
-	 * Unused since 3.5.0.
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param array $tabs
-	 * @return array $tabs
-	 */
-	public function filter_upload_tabs( $tabs ) {
-		return $tabs;
-	}
-
-	/**
-	 * Choose a header image, selected from existing uploaded and default headers,
-	 * or provide an array of uploaded header data (either new, or from media library).
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param mixed $choice Which header image to select. Allows for values of 'random-default-image',
-	 *  for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
-	 *  among the uploaded images; the key of a default image registered for that theme; and
-	 *  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 ) ) {
-			$choice = (array) $choice;
-
-			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
-				return;
-			}
-
-			$choice['url'] = esc_url_raw( $choice['url'] );
-
-			$header_image_data = (object) array(
-				'attachment_id' => $choice['attachment_id'],
-				'url'           => $choice['url'],
-				'thumbnail_url' => $choice['url'],
-				'height'        => $choice['height'],
-				'width'         => $choice['width'],
-			);
-
-			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 );
-
-			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' );
-
-			return;
-		}
-
-		$uploaded = get_uploaded_header_images();
-
-		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 ];
-			} else {
-				return;
-			}
-		}
-
-		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
-		set_theme_mod( 'header_image_data', $header_image_data );
-	}
-
-	/**
-	 * Remove a header image.
-	 *
-	 * @since 3.4.0
-	 */
-	final public function remove_header_image() {
-		$this->set_header_image( 'remove-header' );
-	}
-
-	/**
-	 * Reset a header image to the default image for the theme.
-	 *
-	 * This method does not do anything if the theme does not have a default header image.
-	 *
-	 * @since 3.4.0
-	 */
-	final public function reset_header_image() {
-		$this->process_default_headers();
-		$default = get_theme_support( 'custom-header', 'default-image' );
-
-		if ( ! $default ) {
-			$this->remove_header_image();
-			return;
-		}
-
-		$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 ) {
-				$default_data = $details;
-				break;
-			}
-		}
-
-		set_theme_mod( 'header_image', $default );
-		set_theme_mod( 'header_image_data', (object) $default_data );
-	}
-
-	/**
-	 * Calculate width and height based on what the currently selected theme supports.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param array $dimensions
-	 * @return array dst_height and dst_width of header image.
-	 */
-	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' );
-		$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 ) {
-			$max_width = 1500;
-		}
-
-		if ( $has_max_width ) {
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-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 ) {
-			$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 ) {
-			$dst['dst_width'] = $width;
-		} else {
-			$dst['dst_width'] = $theme_width;
-		}
-
-		return $dst;
-	}
-
-	/**
-	 * Create an attachment 'object'.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param string $cropped              Cropped image URL.
-	 * @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 );
-
-		$size       = wp_getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
-
-		$attachment = array(
-			'ID'             => $parent_attachment_id,
-			'post_title'     => wp_basename( $cropped ),
-			'post_mime_type' => $image_type,
-			'guid'           => $url,
-			'context'        => 'custom-header',
-			'post_parent'    => $parent_attachment_id,
-		);
-
-		return $attachment;
-	}
-
-	/**
-	 * Insert an attachment and its metadata.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param array  $attachment An array with attachment object data.
-	 * @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'] );
-
-		$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 ) {
-			$metadata['attachment_parent'] = $parent_id;
-		}
-
-		/**
-		 * Filters the header image attachment metadata.
-		 *
-		 * @since 3.9.0
-		 *
-		 * @see wp_generate_attachment_metadata()
-		 *
-		 * @param array $metadata Attachment metadata.
-		 */
-		$metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
-
-		wp_update_attachment_metadata( $attachment_id, $metadata );
-
-		return $attachment_id;
-	}
-
-	/**
-	 * Gets attachment uploaded by Media Manager, crops it, then saves it as a
-	 * new object. Returns JSON-encoded object details.
-	 *
-	 * @since 3.9.0
-	 */
-	public function ajax_header_crop() {
-		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
-
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			wp_send_json_error();
-		}
-
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
-			wp_send_json_error();
-		}
-
-		$crop_details = $_POST['cropDetails'];
-
-		$dimensions = $this->get_header_dimensions(
-			array(
-				'height' => $crop_details['height'],
-				'width'  => $crop_details['width'],
-			)
-		);
-
-		$attachment_id = absint( $_POST['id'] );
-
-		$cropped = wp_crop_image(
-			$attachment_id,
-			(int) $crop_details['x1'],
-			(int) $crop_details['y1'],
-			(int) $crop_details['width'],
-			(int) $crop_details['height'],
-			(int) $dimensions['dst_width'],
-			(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.' ) ) );
-		}
-
-		/** 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.
-
-		$attachment = $this->create_attachment_object( $cropped, $attachment_id );
-
-		$previous = $this->get_previous_crop( $attachment );
-
-		if ( $previous ) {
-			$attachment['ID'] = $previous;
-		} else {
-			unset( $attachment['ID'] );
-		}
-
-		$new_attachment_id = $this->insert_attachment( $attachment, $cropped );
-
-		$attachment['attachment_id'] = $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 );
-	}
-
-	/**
-	 * Given an attachment ID for a header image, updates its "last used"
-	 * timestamp to now.
-	 *
-	 * Triggered when the user tries adds a new header image from the
-	 * Media Manager, even if s/he doesn't save that change.
-	 *
-	 * @since 3.9.0
-	 */
-	public function ajax_header_add() {
-		check_ajax_referer( 'header-add', 'nonce' );
-
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			wp_send_json_error();
-		}
-
-		$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() );
-
-		wp_send_json_success();
-	}
-
-	/**
-	 * Given an attachment ID for a header image, unsets it as a user-uploaded
-	 * header image for the active theme.
-	 *
-	 * Triggered when the user clicks the overlay "X" button next to each image
-	 * choice in the Customizer's Header tool.
-	 *
-	 * @since 3.9.0
-	 */
-	public function ajax_header_remove() {
-		check_ajax_referer( 'header-remove', 'nonce' );
-
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			wp_send_json_error();
-		}
-
-		$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() );
-
-		wp_send_json_success();
-	}
-
-	/**
-	 * Updates the last-used postmeta on a header image attachment after saving a new header image via the Customizer.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @param WP_Customize_Manager $wp_customize Customize manager.
-	 */
-	public function customize_set_last_used( $wp_customize ) {
-
-		$header_image_data_setting = $wp_customize->get_setting( 'header_image_data' );
-
-		if ( ! $header_image_data_setting ) {
-			return;
-		}
-
-		$data = $header_image_data_setting->post_value();
-
-		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() );
-	}
-
-	/**
-	 * Gets the details of default header images if defined.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return array Default header images.
-	 */
-	public function get_default_header_images() {
-		$this->process_default_headers();
-
-		// Get the default image if there is one.
-		$default = get_theme_support( 'custom-header', 'default-image' );
-
-		if ( ! $default ) { // If not, easy peasy.
-			return $this->default_headers;
-		}
-
-		$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 ) {
-				$already_has_default = true;
-				break;
-			}
-		}
-
-		if ( $already_has_default ) {
-			return $this->default_headers;
-		}
-
-		// If the one true image isn't included in the default set, prepend it.
-		$header_images            = array();
-		$header_images['default'] = array(
-			'url'           => $default,
-			'thumbnail_url' => $default,
-			'description'   => 'Default',
-		);
-
-		// The rest of the set comes after.
-		return array_merge( $header_images, $this->default_headers );
-	}
-
-	/**
-	 * Gets the previously uploaded header images.
-	 *
-	 * @since 3.9.0
-	 *
-	 * @return array Uploaded header images.
-	 */
-	public function get_uploaded_header_images() {
-		$header_images = get_uploaded_header_images();
-		$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 ] : '';
-		}
-
-		return $header_images;
-	}
-
-	/**
-	 * Get the ID of a previous crop from the same base image.
-	 *
-	 * @since 4.9.0
-	 *
-	 * @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 ) {
-		$header_images = $this->get_uploaded_header_images();
-
-		// Bail early if there are no header images.
-		if ( empty( $header_images ) ) {
-			return false;
-		}
-
-		$previous = false;
-
-		foreach ( $header_images as $image ) {
-			if ( $image['attachment_parent'] === $attachment['post_parent'] ) {
-				$previous = $image['attachment_id'];
-				break;
-			}
-		}
-
-		return $previous;
-	}
+    }
+
+
+    /**
+     * Upload the file to be cropped in the second step.
+     *
+     * @since 3.4.0
+     */
+    public function step_2_manage_upload() {
+        $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.' ) );
+        }
+
+        $file = wp_handle_upload( $uploaded_file, $overrides );
+
+        if ( isset( $file['error'] ) ) {
+            wp_die( $file['error'], __( 'Image Upload Error' ) );
+        }
+
+        $url      = $file['url'];
+        $type     = $file['type'];
+        $file     = $file['file'];
+        $filename = wp_basename( $file );
+
+        // Construct the attachment array.
+        $attachment = array(
+            'post_title'     => $filename,
+            'post_content'   => $url,
+            'post_mime_type' => $type,
+            'guid'           => $url,
+            'context'        => 'custom-header',
+        );
+
+        // Save the data.
+        $attachment_id = wp_insert_attachment( $attachment, $file );
+
+        return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
+    }
+
+    /**
+     * Display third step of custom header image page.
+     *
+     * @since 2.1.0
+     * @since 4.4.0 Switched to using wp_get_attachment_url() instead of the guid
+     *              for retrieving the header image URL.
+     */
+    public function step_3() {
+        check_admin_referer( 'custom-header-crop-image' );
+
+        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>',
+                403
+            );
+        }
+
+        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>',
+                403
+            );
+        }
+
+        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 );
+
+        $dimensions = $this->get_header_dimensions(
+            array(
+                'height' => $_POST['height'],
+                'width'  => $_POST['width'],
+            )
+        );
+        $height     = $dimensions['dst_height'];
+        $width      = $dimensions['dst_width'];
+
+        if ( empty( $_POST['skip-cropping'] ) ) {
+            $cropped = wp_crop_image(
+                $attachment_id,
+                (int) $_POST['x1'],
+                (int) $_POST['y1'],
+                (int) $_POST['width'],
+                (int) $_POST['height'],
+                $width,
+                $height
+            );
+        } elseif ( ! empty( $_POST['create-new-attachment'] ) ) {
+            $cropped = _copy_image_file( $attachment_id );
+        } else {
+            $cropped = get_attached_file( $attachment_id );
+        }
+
+        if ( ! $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.
+
+        $attachment = $this->create_attachment_object( $cropped, $attachment_id );
+
+        if ( ! empty( $_POST['create-new-attachment'] ) ) {
+            unset( $attachment['ID'] );
+        }
+
+        // Update the attachment.
+        $attachment_id = $this->insert_attachment( $attachment, $cropped );
+
+        $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 );
+        }
+
+        if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
+            wp_delete_file( $original );
+        }
+
+        return $this->finished();
+    }
+
+    /**
+     * Display last step of custom header image page.
+     *
+     * @since 2.1.0
+     */
+    public function finished() {
+        $this->updated = true;
+        $this->step_1();
+    }
+
+    /**
+     * Display the page based on the current step.
+     *
+     * @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.' ) );
+        }
+
+        $step = $this->step();
+
+        if ( 2 === $step ) {
+            $this->step_2();
+        } elseif ( 3 === $step ) {
+            $this->step_3();
+        } else {
+            $this->step_1();
+        }
+    }
+
+    /**
+     * Unused since 3.5.0.
+     *
+     * @since 3.4.0
+     *
+     * @param array $form_fields
+     * @return array $form_fields
+     */
+    public function attachment_fields_to_edit( $form_fields ) {
+        return $form_fields;
+    }
+
+    /**
+     * Unused since 3.5.0.
+     *
+     * @since 3.4.0
+     *
+     * @param array $tabs
+     * @return array $tabs
+     */
+    public function filter_upload_tabs( $tabs ) {
+        return $tabs;
+    }
+
+    /**
+     * Choose a header image, selected from existing uploaded and default headers,
+     * or provide an array of uploaded header data (either new, or from media library).
+     *
+     * @since 3.4.0
+     *
+     * @param mixed $choice Which header image to select. Allows for values of 'random-default-image',
+     *  for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
+     *  among the uploaded images; the key of a default image registered for that theme; and
+     *  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 ) ) {
+            $choice = (array) $choice;
+
+            if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
+                return;
+            }
+
+            $choice['url'] = esc_url_raw( $choice['url'] );
+
+            $header_image_data = (object) array(
+                'attachment_id' => $choice['attachment_id'],
+                'url'           => $choice['url'],
+                'thumbnail_url' => $choice['url'],
+                'height'        => $choice['height'],
+                'width'         => $choice['width'],
+            );
+
+            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 );
+
+            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' );
+
+            return;
+        }
+
+        $uploaded = get_uploaded_header_images();
+
+        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 ];
+            } else {
+                return;
+            }
+        }
+
+        set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
+        set_theme_mod( 'header_image_data', $header_image_data );
+    }
+
+    /**
+     * Remove a header image.
+     *
+     * @since 3.4.0
+     */
+    final public function remove_header_image() {
+        $this->set_header_image( 'remove-header' );
+    }
+
+    /**
+     * Reset a header image to the default image for the theme.
+     *
+     * This method does not do anything if the theme does not have a default header image.
+     *
+     * @since 3.4.0
+     */
+    final public function reset_header_image() {
+        $this->process_default_headers();
+        $default = get_theme_support( 'custom-header', 'default-image' );
+
+        if ( ! $default ) {
+            $this->remove_header_image();
+            return;
+        }
+
+        $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 ) {
+                $default_data = $details;
+                break;
+            }
+        }
+
+        set_theme_mod( 'header_image', $default );
+        set_theme_mod( 'header_image_data', (object) $default_data );
+    }
+
+    /**
+     * Calculate width and height based on what the currently selected theme supports.
+     *
+     * @since 3.9.0
+     *
+     * @param array $dimensions
+     * @return array dst_height and dst_width of header image.
+     */
+    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' );
+        $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 ) {
+            $max_width = 1500;
+        }
+
+        if ( $has_max_width ) {
+            $max_width = max( $max_width, get_theme_support( 'custom-header', 'max-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 ) {
+            $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 ) {
+            $dst['dst_width'] = $width;
+        } else {
+            $dst['dst_width'] = $theme_width;
+        }
+
+        return $dst;
+    }
+
+    /**
+     * Create an attachment 'object'.
+     *
+     * @since 3.9.0
+     *
+     * @param string $cropped              Cropped image URL.
+     * @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 );
+
+        $size       = wp_getimagesize( $cropped );
+        $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+
+        $attachment = array(
+            'ID'             => $parent_attachment_id,
+            'post_title'     => wp_basename( $cropped ),
+            'post_mime_type' => $image_type,
+            'guid'           => $url,
+            'context'        => 'custom-header',
+            'post_parent'    => $parent_attachment_id,
+        );
+
+        return $attachment;
+    }
+
+    /**
+     * Insert an attachment and its metadata.
+     *
+     * @since 3.9.0
+     *
+     * @param array  $attachment An array with attachment object data.
+     * @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'] );
+
+        $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 ) {
+            $metadata['attachment_parent'] = $parent_id;
+        }
+
+        /**
+         * Filters the header image attachment metadata.
+         *
+         * @since 3.9.0
+         *
+         * @see wp_generate_attachment_metadata()
+         *
+         * @param array $metadata Attachment metadata.
+         */
+        $metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
+
+        wp_update_attachment_metadata( $attachment_id, $metadata );
+
+        return $attachment_id;
+    }
+
+    /**
+     * Gets attachment uploaded by Media Manager, crops it, then saves it as a
+     * new object. Returns JSON-encoded object details.
+     *
+     * @since 3.9.0
+     */
+    public function ajax_header_crop() {
+        check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
+
+        if ( ! current_user_can( 'edit_theme_options' ) ) {
+            wp_send_json_error();
+        }
+
+        if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+            wp_send_json_error();
+        }
+
+        $crop_details = $_POST['cropDetails'];
+
+        $dimensions = $this->get_header_dimensions(
+            array(
+                'height' => $crop_details['height'],
+                'width'  => $crop_details['width'],
+            )
+        );
+
+        $attachment_id = absint( $_POST['id'] );
+
+        $cropped = wp_crop_image(
+            $attachment_id,
+            (int) $crop_details['x1'],
+            (int) $crop_details['y1'],
+            (int) $crop_details['width'],
+            (int) $crop_details['height'],
+            (int) $dimensions['dst_width'],
+            (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.' ) ) );
+        }
+
+        /** 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.
+
+        $attachment = $this->create_attachment_object( $cropped, $attachment_id );
+
+        $previous = $this->get_previous_crop( $attachment );
+
+        if ( $previous ) {
+            $attachment['ID'] = $previous;
+        } else {
+            unset( $attachment['ID'] );
+        }
+
+        $new_attachment_id = $this->insert_attachment( $attachment, $cropped );
+
+        $attachment['attachment_id'] = $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 );
+    }
+
+    /**
+     * Given an attachment ID for a header image, updates its "last used"
+     * timestamp to now.
+     *
+     * Triggered when the user tries adds a new header image from the
+     * Media Manager, even if s/he doesn't save that change.
+     *
+     * @since 3.9.0
+     */
+    public function ajax_header_add() {
+        check_ajax_referer( 'header-add', 'nonce' );
+
+        if ( ! current_user_can( 'edit_theme_options' ) ) {
+            wp_send_json_error();
+        }
+
+        $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() );
+
+        wp_send_json_success();
+    }
+
+    /**
+     * Given an attachment ID for a header image, unsets it as a user-uploaded
+     * header image for the active theme.
+     *
+     * Triggered when the user clicks the overlay "X" button next to each image
+     * choice in the Customizer's Header tool.
+     *
+     * @since 3.9.0
+     */
+    public function ajax_header_remove() {
+        check_ajax_referer( 'header-remove', 'nonce' );
+
+        if ( ! current_user_can( 'edit_theme_options' ) ) {
+            wp_send_json_error();
+        }
+
+        $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() );
+
+        wp_send_json_success();
+    }
+
+    /**
+     * Updates the last-used postmeta on a header image attachment after saving a new header image via the Customizer.
+     *
+     * @since 3.9.0
+     *
+     * @param WP_Customize_Manager $wp_customize Customize manager.
+     */
+    public function customize_set_last_used( $wp_customize ) {
+
+        $header_image_data_setting = $wp_customize->get_setting( 'header_image_data' );
+
+        if ( ! $header_image_data_setting ) {
+            return;
+        }
+
+        $data = $header_image_data_setting->post_value();
+
+        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() );
+    }
+
+    /**
+     * Gets the details of default header images if defined.
+     *
+     * @since 3.9.0
+     *
+     * @return array Default header images.
+     */
+    public function get_default_header_images() {
+        $this->process_default_headers();
+
+        // Get the default image if there is one.
+        $default = get_theme_support( 'custom-header', 'default-image' );
+
+        if ( ! $default ) { // If not, easy peasy.
+            return $this->default_headers;
+        }
+
+        $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 ) {
+                $already_has_default = true;
+                break;
+            }
+        }
+
+        if ( $already_has_default ) {
+            return $this->default_headers;
+        }
+
+        // If the one true image isn't included in the default set, prepend it.
+        $header_images            = array();
+        $header_images['default'] = array(
+            'url'           => $default,
+            'thumbnail_url' => $default,
+            'description'   => 'Default',
+        );
+
+        // The rest of the set comes after.
+        return array_merge( $header_images, $this->default_headers );
+    }
+
+    /**
+     * Gets the previously uploaded header images.
+     *
+     * @since 3.9.0
+     *
+     * @return array Uploaded header images.
+     */
+    public function get_uploaded_header_images() {
+        $header_images = get_uploaded_header_images();
+        $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 ] : '';
+        }
+
+        return $header_images;
+    }
+
+    /**
+     * Get the ID of a previous crop from the same base image.
+     *
+     * @since 4.9.0
+     *
+     * @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 ) {
+        $header_images = $this->get_uploaded_header_images();
+
+        // Bail early if there are no header images.
+        if ( empty( $header_images ) ) {
+            return false;
+        }
+
+        $previous = false;
+
+        foreach ( $header_images as $image ) {
+            if ( $image['attachment_parent'] === $attachment['post_parent'] ) {
+                $previous = $image['attachment_id'];
+                break;
+            }
+        }
+
+        return $previous;
+    }
 }

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

Indentation +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
 // Prerendering.
 if ( ! is_customize_preview() ) {
-	add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
+    add_filter( 'admin_print_styles', 'wp_resource_hints', 1 );
 }
 
 add_action( 'admin_print_scripts', 'print_emoji_detection_script' );

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

Indentation +111 added lines, -111 removed lines

@@ -17,128 +17,128 @@
  */
 class Theme_Upgrader_Skin extends WP_Upgrader_Skin {
 
-	/**
-	 * Holds the theme slug in the Theme Directory.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @var string
-	 */
-	public $theme = '';
+    /**
+     * Holds the theme slug in the Theme Directory.
+     *
+     * @since 2.8.0
+     *
+     * @var string
+     */
+    public $theme = '';
 
-	/**
-	 * Constructor.
-	 *
-	 * Sets up the theme upgrader skin.
-	 *
-	 * @since 2.8.0
-	 *
-	 * @param array $args Optional. The theme upgrader skin arguments to
-	 *                    override default options. Default empty array.
-	 */
-	public function __construct( $args = array() ) {
-		$defaults = array(
-			'url'   => '',
-			'theme' => '',
-			'nonce' => '',
-			'title' => __( 'Update Theme' ),
-		);
-		$args     = wp_parse_args( $args, $defaults );
+    /**
+     * Constructor.
+     *
+     * Sets up the theme upgrader skin.
+     *
+     * @since 2.8.0
+     *
+     * @param array $args Optional. The theme upgrader skin arguments to
+     *                    override default options. Default empty array.
+     */
+    public function __construct( $args = array() ) {
+        $defaults = array(
+            'url'   => '',
+            'theme' => '',
+            'nonce' => '',
+            'title' => __( 'Update Theme' ),
+        );
+        $args     = wp_parse_args( $args, $defaults );
 
-		$this->theme = $args['theme'];
+        $this->theme = $args['theme'];
 
-		parent::__construct( $args );
-	}
+        parent::__construct( $args );
+    }
 
-	/**
-	 * Action to perform following a single theme update.
-	 *
-	 * @since 2.8.0
-	 */
-	public function after() {
-		$this->decrement_update_count( 'theme' );
+    /**
+     * Action to perform following a single theme update.
+     *
+     * @since 2.8.0
+     */
+    public function after() {
+        $this->decrement_update_count( 'theme' );
 
-		$update_actions = array();
-		$theme_info     = $this->upgrader->theme_info();
-		if ( $theme_info ) {
-			$name       = $theme_info->display( 'Name' );
-			$stylesheet = $this->upgrader->result['destination_name'];
-			$template   = $theme_info->get_template();
+        $update_actions = array();
+        $theme_info     = $this->upgrader->theme_info();
+        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 ),
-				),
-				admin_url( 'themes.php' )
-			);
-			$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+            $activate_link = add_query_arg(
+                array(
+                    'action'     => 'activate',
+                    'template'   => urlencode( $template ),
+                    'stylesheet' => urlencode( $stylesheet ),
+                ),
+                admin_url( 'themes.php' )
+            );
+            $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' ) ),
-				),
-				admin_url( 'customize.php' )
-			);
+            $customize_url = add_query_arg(
+                array(
+                    'theme'  => urlencode( $stylesheet ),
+                    'return' => urlencode( admin_url( 'themes.php' ) ),
+                ),
+                admin_url( 'customize.php' )
+            );
 
-			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' ),
-						/* translators: %s: Theme name. */
-						sprintf( __( 'Customize &#8220;%s&#8221;' ), $name )
-					);
-				}
-			} 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' ),
-						/* translators: %s: Theme name. */
-						sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name )
-					);
-				}
+            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' ),
+                        /* translators: %s: Theme name. */
+                        sprintf( __( 'Customize &#8220;%s&#8221;' ), $name )
+                    );
+                }
+            } 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' ),
+                        /* translators: %s: Theme 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' ),
-					/* translators: %s: Theme name. */
-					sprintf( _x( 'Activate &#8220;%s&#8221;', 'theme' ), $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' ),
+                    /* translators: %s: 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' )
-		);
+        $update_actions['themes_page'] = sprintf(
+            '<a href="%s" target="_parent">%s</a>',
+            self_admin_url( 'themes.php' ),
+            __( 'Go to Themes page' )
+        );
 
-		/**
-		 * Filters the list of action links available following a single theme update.
-		 *
-		 * @since 2.8.0
-		 *
-		 * @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 );
+        /**
+         * Filters the list of action links available following a single theme update.
+         *
+         * @since 2.8.0
+         *
+         * @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 );
 
-		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

Indentation +575 added lines, -575 removed lines

@@ -100,138 +100,138 @@ 
  *         for more information on the make-up of possible return values depending on the value of `$action`.
  */
 function plugins_api( $action, $args = array() ) {
-	// Include an unmodified $wp_version.
-	require ABSPATH . WPINC . '/version.php';
-
-	if ( is_array( $args ) ) {
-		$args = (object) $args;
-	}
-
-	if ( 'query_plugins' === $action ) {
-		if ( ! isset( $args->per_page ) ) {
-			$args->per_page = 24;
-		}
-	}
-
-	if ( ! isset( $args->locale ) ) {
-		$args->locale = get_user_locale();
-	}
-
-	if ( ! isset( $args->wp_version ) ) {
-		$args->wp_version = substr( $wp_version, 0, 3 ); // x.y
-	}
-
-	/**
-	 * Filters the WordPress.org Plugin Installation API arguments.
-	 *
-	 * Important: An object MUST be returned to this filter.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @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 );
-
-	/**
-	 * Filters the response for the current WordPress.org Plugin Installation API request.
-	 *
-	 * Returning a non-false value will effectively short-circuit the WordPress.org API request.
-	 *
-	 * If `$action` is 'query_plugins' or 'plugin_information', an object MUST be passed.
-	 * If `$action` is 'hot_tags' or 'hot_categories', an array should be passed.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param false|object|array $result The result object or array. Default false.
-	 * @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 );
-
-	if ( false === $res ) {
-
-		$url = 'http://api.wordpress.org/plugins/info/1.2/';
-		$url = add_query_arg(
-			array(
-				'action'  => $action,
-				'request' => $args,
-			),
-			$url
-		);
-
-		$http_url = $url;
-		$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( '/' ),
-		);
-		$request   = wp_remote_get( $url, $http_args );
-
-		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.)' ),
-					headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
-				);
-			}
-
-			$request = wp_remote_get( $http_url, $http_args );
-		}
-
-		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/' )
-				),
-				$request->get_error_message()
-			);
-		} else {
-			$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 ) {
-				$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/' )
-					),
-					wp_remote_retrieve_body( $request )
-				);
-			}
-
-			if ( isset( $res->error ) ) {
-				$res = new WP_Error( 'plugins_api_failed', $res->error );
-			}
-		}
-	} elseif ( ! is_wp_error( $res ) ) {
-		$res->external = true;
-	}
-
-	/**
-	 * Filters the Plugin Installation API response results.
-	 *
-	 * @since 2.7.0
-	 *
-	 * @param object|WP_Error $res    Response object or WP_Error.
-	 * @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 );
+    // Include an unmodified $wp_version.
+    require ABSPATH . WPINC . '/version.php';
+
+    if ( is_array( $args ) ) {
+        $args = (object) $args;
+    }
+
+    if ( 'query_plugins' === $action ) {
+        if ( ! isset( $args->per_page ) ) {
+            $args->per_page = 24;
+        }
+    }
+
+    if ( ! isset( $args->locale ) ) {
+        $args->locale = get_user_locale();
+    }
+
+    if ( ! isset( $args->wp_version ) ) {
+        $args->wp_version = substr( $wp_version, 0, 3 ); // x.y
+    }
+
+    /**
+     * Filters the WordPress.org Plugin Installation API arguments.
+     *
+     * Important: An object MUST be returned to this filter.
+     *
+     * @since 2.7.0
+     *
+     * @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 );
+
+    /**
+     * Filters the response for the current WordPress.org Plugin Installation API request.
+     *
+     * Returning a non-false value will effectively short-circuit the WordPress.org API request.
+     *
+     * If `$action` is 'query_plugins' or 'plugin_information', an object MUST be passed.
+     * If `$action` is 'hot_tags' or 'hot_categories', an array should be passed.
+     *
+     * @since 2.7.0
+     *
+     * @param false|object|array $result The result object or array. Default false.
+     * @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 );
+
+    if ( false === $res ) {
+
+        $url = 'http://api.wordpress.org/plugins/info/1.2/';
+        $url = add_query_arg(
+            array(
+                'action'  => $action,
+                'request' => $args,
+            ),
+            $url
+        );
+
+        $http_url = $url;
+        $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( '/' ),
+        );
+        $request   = wp_remote_get( $url, $http_args );
+
+        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.)' ),
+                    headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
+                );
+            }
+
+            $request = wp_remote_get( $http_url, $http_args );
+        }
+
+        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/' )
+                ),
+                $request->get_error_message()
+            );
+        } else {
+            $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 ) {
+                $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/' )
+                    ),
+                    wp_remote_retrieve_body( $request )
+                );
+            }
+
+            if ( isset( $res->error ) ) {
+                $res = new WP_Error( 'plugins_api_failed', $res->error );
+            }
+        }
+    } elseif ( ! is_wp_error( $res ) ) {
+        $res->external = true;
+    }
+
+    /**
+     * Filters the Plugin Installation API response results.
+     *
+     * @since 2.7.0
+     *
+     * @param object|WP_Error $res    Response object or WP_Error.
+     * @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 );
 }
 
 /**
@@ -243,21 +243,21 @@ 
  * @return array|WP_Error
  */
 function install_popular_tags( $args = array() ) {
-	$key  = md5( serialize( $args ) );
-	$tags = get_site_transient( 'poptags_' . $key );
-	if ( false !== $tags ) {
-		return $tags;
-	}
+    $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 ) ) {
-		return $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;
+    return $tags;
 }
 
 /**
@@ -266,44 +266,44 @@ 
  * @since 2.7.0
  */
 function install_dashboard() {
-	display_plugins_table();
-	?>
+    display_plugins_table();
+    ?>
 
 	<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>
 	<?php
 
-	$api_tags = install_popular_tags();
-
-	echo '<p class="popular-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'] ) );
-			$data                 = array(
-				'link'  => esc_url( $url ),
-				'name'  => $tag['name'],
-				'slug'  => $tag['slug'],
-				'id'    => sanitize_title_with_dashes( $tag['name'] ),
-				'count' => $tag['count'],
-			);
-			$tags[ $tag['name'] ] = (object) $data;
-		}
-		echo wp_generate_tag_cloud(
-			$tags,
-			array(
-				/* translators: %s: Number of plugins. */
-				'single_text'   => __( '%s plugin' ),
-				/* translators: %s: Number of plugins. */
-				'multiple_text' => __( '%s plugins' ),
-			)
-		);
-	}
-	echo '</p><br class="clear" /></div>';
+    $api_tags = install_popular_tags();
+
+    echo '<p class="popular-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'] ) );
+            $data                 = array(
+                'link'  => esc_url( $url ),
+                'name'  => $tag['name'],
+                'slug'  => $tag['slug'],
+                'id'    => sanitize_title_with_dashes( $tag['name'] ),
+                'count' => $tag['count'],
+            );
+            $tags[ $tag['name'] ] = (object) $data;
+        }
+        echo wp_generate_tag_cloud(
+            $tags,
+            array(
+                /* translators: %s: Number of plugins. */
+                'single_text'   => __( '%s plugin' ),
+                /* translators: %s: Number of plugins. */
+                'multiple_text' => __( '%s plugins' ),
+            )
+        );
+    }
+    echo '</p><br class="clear" /></div>';
 }
 
 /**
@@ -315,9 +315,9 @@ 
  * @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'] ) : '';
-	?>
+    $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>
@@ -339,7 +339,7 @@ 
  * @since 2.8.0
  */
 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' ); ?>">
@@ -358,9 +358,9 @@ 
  * @since 3.5.0
  */
 function install_plugins_favorites_form() {
-	$user   = get_user_option( 'wporg_favorites' );
-	$action = 'save_wporg_username_' . get_current_user_id();
-	?>
+    $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>
 	<form method="get">
 		<input type="hidden" name="tab" value="favorites" />
@@ -382,33 +382,33 @@ 
  * @global WP_List_Table $wp_list_table
  */
 function display_plugins_table() {
-	global $wp_list_table;
-
-	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>',
-				'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/' )
-			);
-			break;
-		case 'install_plugins_recommended':
-			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' ) ) {
-				return;
-			}
-			break;
-	}
-	?>
+    global $wp_list_table;
+
+    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>',
+                '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/' )
+            );
+            break;
+        case 'install_plugins_recommended':
+            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' ) ) {
+                return;
+            }
+            break;
+    }
+    ?>
 	<form id="plugin-filter" method="post">
 		<?php $wp_list_table->display(); ?>
 	</form>
@@ -432,77 +432,77 @@ 
  * }
  */
 function install_plugin_install_status( $api, $loop = false ) {
-	// This function is called recursively, $loop prevents further loops.
-	if ( is_array( $api ) ) {
-		$api = (object) $api;
-	}
-
-	// Default to a "new" plugin.
-	$status      = 'install';
-	$url         = false;
-	$update_file = false;
-	$version     = '';
-
-	/*
+    // This function is called recursively, $loop prevents further loops.
+    if ( is_array( $api ) ) {
+        $api = (object) $api;
+    }
+
+    // Default to a "new" plugin.
+    $status      = 'install';
+    $url         = false;
+    $update_file = false;
+    $version     = '';
+
+    /*
 	 * 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 ) {
-				$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 );
-				}
-				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 );
-				}
-			} else {
-				$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 );
-
-				$update_file = $api->slug . '/' . $key;
-				if ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '=' ) ) {
-					$status = 'latest_installed';
-				} elseif ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '<' ) ) {
-					$status  = 'newer_installed';
-					$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' );
-						wp_update_plugins();
-						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 ( isset( $_GET['from'] ) ) {
-		$url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
-	}
-
-	$file = $update_file;
-	return compact( 'status', 'url', 'version', 'file' );
+    $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 );
+                }
+                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 );
+                }
+            } else {
+                $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 );
+
+                $update_file = $api->slug . '/' . $key;
+                if ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '=' ) ) {
+                    $status = 'latest_installed';
+                } elseif ( version_compare( $api->version, $installed_plugin[ $key ]['Version'], '<' ) ) {
+                    $status  = 'newer_installed';
+                    $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' );
+                        wp_update_plugins();
+                        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 ( isset( $_GET['from'] ) ) {
+        $url .= '&amp;from=' . urlencode( wp_unslash( $_GET['from'] ) );
+    }
+
+    $file = $update_file;
+    return compact( 'status', 'url', 'version', 'file' );
 }
 
 /**
@@ -513,95 +513,95 @@ 
  * @global string $tab
  */
 function install_plugin_information() {
-	global $tab;
-
-	if ( empty( $_REQUEST['plugin'] ) ) {
-		return;
-	}
-
-	$api = plugins_api(
-		'plugin_information',
-		array(
-			'slug' => wp_unslash( $_REQUEST['plugin'] ),
-		)
-	);
-
-	if ( is_wp_error( $api ) ) {
-		wp_die( $api );
-	}
-
-	$plugins_allowedtags = array(
-		'a'          => array(
-			'href'   => array(),
-			'title'  => array(),
-			'target' => 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() ),
-		'p'          => array(),
-		'br'         => array(),
-		'ul'         => array(),
-		'ol'         => array(),
-		'li'         => array(),
-		'h1'         => array(),
-		'h2'         => array(),
-		'h3'         => array(),
-		'h4'         => array(),
-		'h5'         => array(),
-		'h6'         => array(),
-		'img'        => array(
-			'src'   => array(),
-			'class' => array(),
-			'alt'   => array(),
-		),
-		'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' ),
-	);
-
-	// Sanitize HTML.
-	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 );
-		}
-	}
-
-	$_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 );
-	}
-
-	iframe_header( __( 'Plugin Installation' ) );
-
-	$_with_banner = '';
-
-	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'];
-		?>
+    global $tab;
+
+    if ( empty( $_REQUEST['plugin'] ) ) {
+        return;
+    }
+
+    $api = plugins_api(
+        'plugin_information',
+        array(
+            'slug' => wp_unslash( $_REQUEST['plugin'] ),
+        )
+    );
+
+    if ( is_wp_error( $api ) ) {
+        wp_die( $api );
+    }
+
+    $plugins_allowedtags = array(
+        'a'          => array(
+            'href'   => array(),
+            'title'  => array(),
+            'target' => 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() ),
+        'p'          => array(),
+        'br'         => array(),
+        'ul'         => array(),
+        'ol'         => array(),
+        'li'         => array(),
+        'h1'         => array(),
+        'h2'         => array(),
+        'h3'         => array(),
+        'h4'         => array(),
+        'h5'         => array(),
+        'h6'         => array(),
+        'img'        => array(
+            'src'   => array(),
+            'class' => array(),
+            'alt'   => array(),
+        ),
+        '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' ),
+    );
+
+    // Sanitize HTML.
+    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 );
+        }
+    }
+
+    $_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 );
+    }
+
+    iframe_header( __( 'Plugin Installation' ) );
+
+    $_with_banner = '';
+
+    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'];
+        ?>
 		<style type="text/css">
 			#plugin-information-title.with-banner {
 				background-image: url( <?php echo esc_url( $low ); ?> );
@@ -613,38 +613,38 @@ 
 			}
 		</style>
 		<?php
-	}
-
-	echo '<div id="plugin-information-scrollable">';
-	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 ) ) ) {
-			continue;
-		}
-
-		if ( isset( $plugins_section_titles[ $section_name ] ) ) {
-			$title = $plugins_section_titles[ $section_name ];
-		} else {
-			$title = ucwords( str_replace( '_', ' ', $section_name ) );
-		}
-
-		$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 );
-		echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";
-	}
-
-	echo "</div>\n";
-
-	?>
+    }
+
+    echo '<div id="plugin-information-scrollable">';
+    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 ) ) ) {
+            continue;
+        }
+
+        if ( isset( $plugins_section_titles[ $section_name ] ) ) {
+            $title = $plugins_section_titles[ $section_name ];
+        } else {
+            $title = ucwords( str_replace( '_', ' ', $section_name ) );
+        }
+
+        $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 );
+        echo "\t<a name='$san_section' href='$href' $class>$title</a>\n";
+    }
+
+    echo "</div>\n";
+
+    ?>
 <div id="<?php echo $_tab; ?>-content" class='<?php echo $_with_banner; ?>'>
 	<div class="fyi">
 		<ul>
@@ -655,17 +655,17 @@ 
 			<?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 ) ) );
-					?>
+                    /* translators: %s: Human-readable time difference. */
+                    printf( __( '%s ago' ), human_time_diff( strtotime( $api->last_updated ) ) );
+                    ?>
 				</li>
 			<?php } if ( ! empty( $api->requires ) ) { ?>
 				<li>
 					<strong><?php _e( 'Requires WordPress Version:' ); ?></strong>
 					<?php
-					/* translators: %s: Version number. */
-					printf( __( '%s or higher' ), $api->requires );
-					?>
+                    /* translators: %s: Version number. */
+                    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>
@@ -673,26 +673,26 @@ 
 				<li>
 					<strong><?php _e( 'Requires PHP Version:' ); ?></strong>
 					<?php
-					/* translators: %s: Version number. */
-					printf( __( '%s or higher' ), $api->requires_php );
-					?>
+                    /* translators: %s: Version number. */
+                    printf( __( '%s or higher' ), $api->requires_php );
+                    ?>
 				</li>
 			<?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 );
-					printf(
-						/* translators: %s: Number of 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' );
-				} else {
-					echo number_format_i18n( $api->active_installs ) . '+';
-				}
-				?>
+                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 )
+                    );
+                } elseif ( $api->active_installs < 10 ) {
+                    _ex( 'Less Than 10', 'Active plugin installations' );
+                } else {
+                    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>
@@ -705,58 +705,58 @@ 
 		<?php if ( ! empty( $api->rating ) ) { ?>
 			<h3><?php _e( 'Average Rating' ); ?></h3>
 			<?php
-			wp_star_rating(
-				array(
-					'rating' => $api->rating,
-					'type'   => 'percent',
-					'number' => $api->num_ratings,
-				)
-			);
-			?>
+            wp_star_rating(
+                array(
+                    'rating' => $api->rating,
+                    'type'   => 'percent',
+                    'number' => $api->num_ratings,
+                )
+            );
+            ?>
 			<p aria-hidden="true" class="fyi-description">
 				<?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 )
-				);
-				?>
+                printf(
+                    /* translators: %s: Number of 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>
 			<?php
-			foreach ( $api->ratings as $key => $ratecount ) {
-				// Avoid div-by-zero.
-				$_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. */
-						_n(
-							'Reviews with %1$d star: %2$s. Opens in a new tab.',
-							'Reviews with %1$d stars: %2$s. Opens in a new tab.',
-							$key
-						),
-						$key,
-						number_format_i18n( $ratecount )
-					)
-				);
-				?>
+            foreach ( $api->ratings as $key => $ratecount ) {
+                // Avoid div-by-zero.
+                $_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. */
+                        _n(
+                            'Reviews with %1$d star: %2$s. Opens in a new tab.',
+                            'Reviews with %1$d stars: %2$s. Opens in a new tab.',
+                            $key
+                        ),
+                        $key,
+                        number_format_i18n( $ratecount )
+                    )
+                );
+                ?>
 				<div class="counter-container">
 						<span class="counter-label">
 							<?php
-							printf(
-								'<a href="%s" target="_blank" aria-label="%s">%s</a>',
-								"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 )
-							);
-							?>
+                            printf(
+                                '<a href="%s" target="_blank" aria-label="%s">%s</a>',
+                                "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 )
+                            );
+                            ?>
 						</span>
 						<span class="counter-back">
 							<span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
@@ -764,26 +764,26 @@ 
 					<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>
 			<ul class="contributors">
 				<?php
-				foreach ( (array) $api->contributors as $contrib_username => $contrib_details ) {
-					$contrib_name = $contrib_details['display_name'];
-					if ( ! $contrib_name ) {
-						$contrib_name = $contrib_username;
-					}
-					$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'] ) );
-
-					echo "<li><a href='{$contrib_profile}' target='_blank'><img src='{$contrib_avatar}' width='18' height='18' alt='' />{$contrib_name}</a></li>";
-				}
-				?>
+                foreach ( (array) $api->contributors as $contrib_username => $contrib_details ) {
+                    $contrib_name = $contrib_details['display_name'];
+                    if ( ! $contrib_name ) {
+                        $contrib_name = $contrib_username;
+                    }
+                    $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'] ) );
+
+                    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>
@@ -792,101 +792,101 @@ 
 	</div>
 	<div id="section-holder">
 	<?php
-	$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, '<=' ) );
-
-	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' ) ) {
-			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() )
-			);
-
-			wp_update_php_annotation( '</p><p><em>', '</em>' );
-		} else {
-			echo '</p>';
-		}
-		echo '</div>';
-	}
-
-	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.' );
-		echo '</p></div>';
-	} 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' ) ) {
-			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' )
-			);
-		}
-		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' );
-
-		$san_section = esc_attr( $section_name );
-
-		$display = ( $section_name === $section ) ? 'block' : 'none';
-
-		echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";
-		echo $content;
-		echo "\t</div>\n";
-	}
-	echo "</div>\n";
-	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'] ) {
-			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>';
-					} else {
-						printf(
-							'<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>',
-							_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>';
-					} else {
-						printf(
-							'<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>',
-							_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>';
-				break;
-			case 'latest_installed':
-				echo '<a class="button button-primary right disabled">' . __( 'Latest Version Installed' ) . '</a>';
-				break;
-		}
-	}
-	echo "</div>\n";
-
-	iframe_footer();
-	exit;
+    $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, '<=' ) );
+
+    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' ) ) {
+            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() )
+            );
+
+            wp_update_php_annotation( '</p><p><em>', '</em>' );
+        } else {
+            echo '</p>';
+        }
+        echo '</div>';
+    }
+
+    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.' );
+        echo '</p></div>';
+    } 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' ) ) {
+            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' )
+            );
+        }
+        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' );
+
+        $san_section = esc_attr( $section_name );
+
+        $display = ( $section_name === $section ) ? 'block' : 'none';
+
+        echo "\t<div id='section-{$san_section}' class='section' style='display: {$display};'>\n";
+        echo $content;
+        echo "\t</div>\n";
+    }
+    echo "</div>\n";
+    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'] ) {
+            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>';
+                    } else {
+                        printf(
+                            '<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>',
+                            _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>';
+                    } else {
+                        printf(
+                            '<button type="button" class="button button-primary button-disabled right" disabled="disabled">%s</button>',
+                            _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>';
+                break;
+            case 'latest_installed':
+                echo '<a class="button button-primary right disabled">' . __( 'Latest Version Installed' ) . '</a>';
+                break;
+        }
+    }
+    echo "</div>\n";
+
+    iframe_footer();
+    exit;
 }

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

Indentation +443 added lines, -443 removed lines

@@ -13,221 +13,221 @@ 
  */
 class Custom_Background {
 
-	/**
-	 * Callback for administration header.
-	 *
-	 * @var callable
-	 * @since 3.0.0
-	 */
-	public $admin_header_callback;
-
-	/**
-	 * Callback for header div.
-	 *
-	 * @var callable
-	 * @since 3.0.0
-	 */
-	public $admin_image_div_callback;
-
-	/**
-	 * Used to trigger a success message when settings updated and set to true.
-	 *
-	 * @since 3.0.0
-	 * @var bool
-	 */
-	private $updated;
-
-	/**
-	 * Constructor - Register administration header callback.
-	 *
-	 * @since 3.0.0
-	 * @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 = '' ) {
-		$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( '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' ) );
-	}
-
-	/**
-	 * Set up the hooks for the Custom Background admin page.
-	 *
-	 * @since 3.0.0
-	 */
-	public function init() {
-		$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 );
-
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-{$page}", $this->admin_header_callback, 51 );
-		}
-	}
-
-	/**
-	 * Set up the enqueue for the CSS & JavaScript files.
-	 *
-	 * @since 3.0.0
-	 */
-	public function admin_load() {
-		get_current_screen()->add_help_tab(
-			array(
-				'id'      => '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>',
-			)
-		);
-
-		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>'
-		);
-
-		wp_enqueue_media();
-		wp_enqueue_script( 'custom-background' );
-		wp_enqueue_style( 'wp-color-picker' );
-	}
-
-	/**
-	 * Execute custom background modification.
-	 *
-	 * @since 3.0.0
-	 */
-	public function take_action() {
-		if ( empty( $_POST ) ) {
-			return;
-		}
-
-		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' );
-
-			$this->updated = true;
-			return;
-		}
-
-		if ( isset( $_POST['remove-background'] ) ) {
-			// @todo Uploaded files are not removed here.
-			check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );
-
-			set_theme_mod( 'background_image', '' );
-			set_theme_mod( 'background_image_thumb', '' );
-
-			$this->updated = true;
-			wp_safe_redirect( $_POST['_wp_http_referer'] );
-			return;
-		}
-
-		if ( isset( $_POST['background-preset'] ) ) {
-			check_admin_referer( 'custom-background' );
-
-			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 );
-		}
-
-		if ( isset( $_POST['background-position'] ) ) {
-			check_admin_referer( 'custom-background' );
-
-			$position = explode( ' ', $_POST['background-position'] );
-
-			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 ) ) {
-				$position_y = $position[1];
-			} else {
-				$position_y = 'top';
-			}
-
-			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 ( in_array( $_POST['background-size'], array( 'auto', 'contain', 'cover' ), true ) ) {
-				$size = $_POST['background-size'];
-			} else {
-				$size = 'auto';
-			}
-
-			set_theme_mod( 'background_size', $size );
-		}
-
-		if ( isset( $_POST['background-repeat'] ) ) {
-			check_admin_referer( 'custom-background' );
-
-			$repeat = $_POST['background-repeat'];
-
-			if ( 'no-repeat' !== $repeat ) {
-				$repeat = 'repeat';
-			}
-
-			set_theme_mod( 'background_repeat', $repeat );
-		}
+    /**
+     * Callback for administration header.
+     *
+     * @var callable
+     * @since 3.0.0
+     */
+    public $admin_header_callback;
+
+    /**
+     * Callback for header div.
+     *
+     * @var callable
+     * @since 3.0.0
+     */
+    public $admin_image_div_callback;
+
+    /**
+     * Used to trigger a success message when settings updated and set to true.
+     *
+     * @since 3.0.0
+     * @var bool
+     */
+    private $updated;
+
+    /**
+     * Constructor - Register administration header callback.
+     *
+     * @since 3.0.0
+     * @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 = '' ) {
+        $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( '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' ) );
+    }
+
+    /**
+     * Set up the hooks for the Custom Background admin page.
+     *
+     * @since 3.0.0
+     */
+    public function init() {
+        $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 );
+
+        if ( $this->admin_header_callback ) {
+            add_action( "admin_head-{$page}", $this->admin_header_callback, 51 );
+        }
+    }
+
+    /**
+     * Set up the enqueue for the CSS & JavaScript files.
+     *
+     * @since 3.0.0
+     */
+    public function admin_load() {
+        get_current_screen()->add_help_tab(
+            array(
+                'id'      => '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>',
+            )
+        );
+
+        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>'
+        );
+
+        wp_enqueue_media();
+        wp_enqueue_script( 'custom-background' );
+        wp_enqueue_style( 'wp-color-picker' );
+    }
+
+    /**
+     * Execute custom background modification.
+     *
+     * @since 3.0.0
+     */
+    public function take_action() {
+        if ( empty( $_POST ) ) {
+            return;
+        }
+
+        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' );
+
+            $this->updated = true;
+            return;
+        }
+
+        if ( isset( $_POST['remove-background'] ) ) {
+            // @todo Uploaded files are not removed here.
+            check_admin_referer( 'custom-background-remove', '_wpnonce-custom-background-remove' );
+
+            set_theme_mod( 'background_image', '' );
+            set_theme_mod( 'background_image_thumb', '' );
+
+            $this->updated = true;
+            wp_safe_redirect( $_POST['_wp_http_referer'] );
+            return;
+        }
+
+        if ( isset( $_POST['background-preset'] ) ) {
+            check_admin_referer( 'custom-background' );
+
+            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 );
+        }
+
+        if ( isset( $_POST['background-position'] ) ) {
+            check_admin_referer( 'custom-background' );
+
+            $position = explode( ' ', $_POST['background-position'] );
+
+            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 ) ) {
+                $position_y = $position[1];
+            } else {
+                $position_y = 'top';
+            }
+
+            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 ( in_array( $_POST['background-size'], array( 'auto', 'contain', 'cover' ), true ) ) {
+                $size = $_POST['background-size'];
+            } else {
+                $size = 'auto';
+            }
+
+            set_theme_mod( 'background_size', $size );
+        }
+
+        if ( isset( $_POST['background-repeat'] ) ) {
+            check_admin_referer( 'custom-background' );
+
+            $repeat = $_POST['background-repeat'];
+
+            if ( 'no-repeat' !== $repeat ) {
+                $repeat = 'repeat';
+            }
+
+            set_theme_mod( 'background_repeat', $repeat );
+        }
 
-		if ( isset( $_POST['background-attachment'] ) ) {
-			check_admin_referer( 'custom-background' );
-
-			$attachment = $_POST['background-attachment'];
+        if ( isset( $_POST['background-attachment'] ) ) {
+            check_admin_referer( 'custom-background' );
+
+            $attachment = $_POST['background-attachment'];
 
-			if ( 'fixed' !== $attachment ) {
-				$attachment = 'scroll';
-			}
+            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 );
-			} else {
-				set_theme_mod( 'background_color', '' );
-			}
-		}
+            if ( strlen( $color ) === 6 || strlen( $color ) === 3 ) {
+                set_theme_mod( 'background_color', $color );
+            } else {
+                set_theme_mod( 'background_color', '' );
+            }
+        }
 
-		$this->updated = true;
-	}
+        $this->updated = true;
+    }
 
-	/**
-	 * Display the custom background page.
-	 *
-	 * @since 3.0.0
-	 */
-	public function admin_page() {
-		?>
+    /**
+     * Display the custom background page.
+     *
+     * @since 3.0.0
+     */
+    public function admin_page() {
+        ?>
 <div class="wrap" id="custom-background">
 <h1><?php _e( 'Custom Background' ); ?></h1>
 
@@ -235,12 +235,12 @@ 
 <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' )
-			);
-			?>
+            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' )
+            );
+            ?>
 	</p>
 </div>
 		<?php } ?>
@@ -249,9 +249,9 @@ 
 <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( '/' ) );
-			?>
+            /* translators: %s: Home URL. */
+            printf( __( 'Background updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) );
+            ?>
 	</p>
 </div>
 		<?php } ?>
@@ -264,32 +264,32 @@ 
 <th scope="row"><?php _e( 'Preview' ); ?></th>
 <td>
 		<?php
-		if ( $this->admin_image_div_callback ) {
-			call_user_func( $this->admin_image_div_callback );
-		} else {
-			$background_styles = '';
-			$bgcolor           = get_background_color();
-			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' ) );
-
-				// Background-image URL must be single quote, see below.
-				$background_styles .= " background-image: url('$background_image_thumb');"
-				. " background-size: $background_size;"
-				. " background-position: $background_position_x $background_position_y;"
-				. " background-repeat: $background_repeat;"
-				. " background-attachment: $background_attachment;";
-			}
-			?>
+        if ( $this->admin_image_div_callback ) {
+            call_user_func( $this->admin_image_div_callback );
+        } else {
+            $background_styles = '';
+            $bgcolor           = get_background_color();
+            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' ) );
+
+                // Background-image URL must be single quote, see below.
+                $background_styles .= " background-image: url('$background_image_thumb');"
+                . " background-size: $background_size;"
+                . " background-position: $background_position_x $background_position_y;"
+                . " background-repeat: $background_repeat;"
+                . " background-attachment: $background_attachment;";
+            }
+            ?>
 	<div id="custom-background-image" style="<?php echo $background_styles; ?>"><?php // Must be double quote, see above. ?>
 			<?php if ( $background_image_thumb ) { ?>
 		<img class="custom-background-image" src="<?php echo $background_image_thumb; ?>" style="visibility:hidden;" alt="" /><br />
@@ -359,57 +359,57 @@ 
 <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' ) )
-			);
-
-			$background_position_options = array(
-				array(
-					'left top'   => array(
-						'label' => __( 'Top Left' ),
-						'icon'  => 'dashicons dashicons-arrow-left-alt',
-					),
-					'center top' => array(
-						'label' => __( 'Top' ),
-						'icon'  => 'dashicons dashicons-arrow-up-alt',
-					),
-					'right top'  => array(
-						'label' => __( 'Top Right' ),
-						'icon'  => 'dashicons dashicons-arrow-right-alt',
-					),
-				),
-				array(
-					'left center'   => array(
-						'label' => __( 'Left' ),
-						'icon'  => 'dashicons dashicons-arrow-left-alt',
-					),
-					'center center' => array(
-						'label' => __( 'Center' ),
-						'icon'  => 'background-position-center-icon',
-					),
-					'right center'  => array(
-						'label' => __( 'Right' ),
-						'icon'  => 'dashicons dashicons-arrow-right-alt',
-					),
-				),
-				array(
-					'left bottom'   => array(
-						'label' => __( 'Bottom Left' ),
-						'icon'  => 'dashicons dashicons-arrow-left-alt',
-					),
-					'center bottom' => array(
-						'label' => __( 'Bottom' ),
-						'icon'  => 'dashicons dashicons-arrow-down-alt',
-					),
-					'right bottom'  => array(
-						'label' => __( 'Bottom Right' ),
-						'icon'  => 'dashicons dashicons-arrow-right-alt',
-					),
-				),
-			);
-			?>
+            $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' ) )
+            );
+
+            $background_position_options = array(
+                array(
+                    'left top'   => array(
+                        'label' => __( 'Top Left' ),
+                        'icon'  => 'dashicons dashicons-arrow-left-alt',
+                    ),
+                    'center top' => array(
+                        'label' => __( 'Top' ),
+                        'icon'  => 'dashicons dashicons-arrow-up-alt',
+                    ),
+                    'right top'  => array(
+                        'label' => __( 'Top Right' ),
+                        'icon'  => 'dashicons dashicons-arrow-right-alt',
+                    ),
+                ),
+                array(
+                    'left center'   => array(
+                        'label' => __( 'Left' ),
+                        'icon'  => 'dashicons dashicons-arrow-left-alt',
+                    ),
+                    'center center' => array(
+                        'label' => __( 'Center' ),
+                        'icon'  => 'background-position-center-icon',
+                    ),
+                    'right center'  => array(
+                        'label' => __( 'Right' ),
+                        'icon'  => 'dashicons dashicons-arrow-right-alt',
+                    ),
+                ),
+                array(
+                    'left bottom'   => array(
+                        'label' => __( 'Bottom Left' ),
+                        'icon'  => 'dashicons dashicons-arrow-left-alt',
+                    ),
+                    'center bottom' => array(
+                        'label' => __( 'Bottom' ),
+                        'icon'  => 'dashicons dashicons-arrow-down-alt',
+                    ),
+                    'right bottom'  => array(
+                        '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>
@@ -460,11 +460,11 @@ 
 <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' ) ) . '"';
-		}
-		?>
+        $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; ?>>
 </fieldset></td>
 </tr>
@@ -477,149 +477,149 @@ 
 
 </div>
 		<?php
-	}
-
-	/**
-	 * Handle an Image upload for the background image.
-	 *
-	 * @since 3.0.0
-	 */
-	public function handle_upload() {
-		if ( empty( $_FILES ) ) {
-			return;
-		}
-
-		check_admin_referer( 'custom-background-upload', '_wpnonce-custom-background-upload' );
-
-		$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.' ) );
-		}
-
-		$file = wp_handle_upload( $uploaded_file, $overrides );
-
-		if ( isset( $file['error'] ) ) {
-			wp_die( $file['error'] );
-		}
-
-		$url      = $file['url'];
-		$type     = $file['type'];
-		$file     = $file['file'];
-		$filename = wp_basename( $file );
-
-		// Construct the attachment array.
-		$attachment = array(
-			'post_title'     => $filename,
-			'post_content'   => $url,
-			'post_mime_type' => $type,
-			'guid'           => $url,
-			'context'        => 'custom-background',
-		);
-
-		// Save the data.
-		$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' ) );
-
-		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] ) );
-
-		/** This action is documented in wp-admin/includes/class-custom-image-header.php */
-		do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication.
-		$this->updated = true;
-	}
-
-	/**
-	 * Ajax handler for adding custom background context to an attachment.
-	 *
-	 * Triggers when the user adds a new background image from the
-	 * Media Manager.
-	 *
-	 * @since 4.1.0
-	 */
-	public function ajax_background_add() {
-		check_ajax_referer( 'background-add', 'nonce' );
-
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			wp_send_json_error();
-		}
-
-		$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() );
-
-		wp_send_json_success();
-	}
-
-	/**
-	 * @since 3.4.0
-	 * @deprecated 3.5.0
-	 *
-	 * @param array $form_fields
-	 * @return array $form_fields
-	 */
-	public function attachment_fields_to_edit( $form_fields ) {
-		return $form_fields;
-	}
-
-	/**
-	 * @since 3.4.0
-	 * @deprecated 3.5.0
-	 *
-	 * @param array $tabs
-	 * @return array $tabs
-	 */
-	public function filter_upload_tabs( $tabs ) {
-		return $tabs;
-	}
-
-	/**
-	 * @since 3.4.0
-	 * @deprecated 3.5.0
-	 */
-	public function wp_set_background_image() {
-		check_ajax_referer( 'custom-background' );
-
-		if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['attachment_id'] ) ) {
-			exit;
-		}
-
-		$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' ),
-				)
-			)
-		);
-
-		$size = 'thumbnail';
-		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' ) );
-
-		$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;
-	}
+    }
+
+    /**
+     * Handle an Image upload for the background image.
+     *
+     * @since 3.0.0
+     */
+    public function handle_upload() {
+        if ( empty( $_FILES ) ) {
+            return;
+        }
+
+        check_admin_referer( 'custom-background-upload', '_wpnonce-custom-background-upload' );
+
+        $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.' ) );
+        }
+
+        $file = wp_handle_upload( $uploaded_file, $overrides );
+
+        if ( isset( $file['error'] ) ) {
+            wp_die( $file['error'] );
+        }
+
+        $url      = $file['url'];
+        $type     = $file['type'];
+        $file     = $file['file'];
+        $filename = wp_basename( $file );
+
+        // Construct the attachment array.
+        $attachment = array(
+            'post_title'     => $filename,
+            'post_content'   => $url,
+            'post_mime_type' => $type,
+            'guid'           => $url,
+            'context'        => 'custom-background',
+        );
+
+        // Save the data.
+        $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' ) );
+
+        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] ) );
+
+        /** This action is documented in wp-admin/includes/class-custom-image-header.php */
+        do_action( 'wp_create_file_in_uploads', $file, $id ); // For replication.
+        $this->updated = true;
+    }
+
+    /**
+     * Ajax handler for adding custom background context to an attachment.
+     *
+     * Triggers when the user adds a new background image from the
+     * Media Manager.
+     *
+     * @since 4.1.0
+     */
+    public function ajax_background_add() {
+        check_ajax_referer( 'background-add', 'nonce' );
+
+        if ( ! current_user_can( 'edit_theme_options' ) ) {
+            wp_send_json_error();
+        }
+
+        $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() );
+
+        wp_send_json_success();
+    }
+
+    /**
+     * @since 3.4.0
+     * @deprecated 3.5.0
+     *
+     * @param array $form_fields
+     * @return array $form_fields
+     */
+    public function attachment_fields_to_edit( $form_fields ) {
+        return $form_fields;
+    }
+
+    /**
+     * @since 3.4.0
+     * @deprecated 3.5.0
+     *
+     * @param array $tabs
+     * @return array $tabs
+     */
+    public function filter_upload_tabs( $tabs ) {
+        return $tabs;
+    }
+
+    /**
+     * @since 3.4.0
+     * @deprecated 3.5.0
+     */
+    public function wp_set_background_image() {
+        check_ajax_referer( 'custom-background' );
+
+        if ( ! current_user_can( 'edit_theme_options' ) || ! isset( $_POST['attachment_id'] ) ) {
+            exit;
+        }
+
+        $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' ),
+                )
+            )
+        );
+
+        $size = 'thumbnail';
+        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' ) );
+
+        $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

Indentation +288 added lines, -288 removed lines

@@ -17,149 +17,149 @@ 
  */
 class WP_Themes_List_Table extends WP_List_Table {
 
-	protected $search_terms = array();
-	public $features        = array();
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @see WP_List_Table::__construct() for more information on default arguments.
-	 *
-	 * @param array $args An associative array of arguments.
-	 */
-	public function __construct( $args = array() ) {
-		parent::__construct(
-			array(
-				'ajax'   => true,
-				'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-			)
-		);
-	}
-
-	/**
-	 * @return bool
-	 */
-	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' );
-	}
-
-	/**
-	 */
-	public function prepare_items() {
-		$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['features'] ) ) {
-			$this->features = $_REQUEST['features'];
-		}
-
-		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 );
-
-		$per_page = 36;
-		$page     = $this->get_pagenum();
-
-		$start = ( $page - 1 ) * $per_page;
-
-		$this->items = array_slice( $themes, $start, $per_page, true );
-
-		$this->set_pagination_args(
-			array(
-				'total_items'     => count( $themes ),
-				'per_page'        => $per_page,
-				'infinite_scroll' => true,
-			)
-		);
-	}
-
-	/**
-	 */
-	public function no_items() {
-		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' ) ) {
-				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' )
-				);
-
-				return;
-			} 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 )
-				);
-
-				return;
-			}
-			// Else, fallthrough. install_themes doesn't help if you can't enable it.
-		} else {
-			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' )
-				);
-
-				return;
-			}
-		}
-		// 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' )
-		);
-	}
-
-	/**
-	 * @param string $which
-	 */
-	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) {
-			return;
-		}
-		?>
+    protected $search_terms = array();
+    public $features        = array();
+
+    /**
+     * Constructor.
+     *
+     * @since 3.1.0
+     *
+     * @see WP_List_Table::__construct() for more information on default arguments.
+     *
+     * @param array $args An associative array of arguments.
+     */
+    public function __construct( $args = array() ) {
+        parent::__construct(
+            array(
+                'ajax'   => true,
+                'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
+            )
+        );
+    }
+
+    /**
+     * @return bool
+     */
+    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' );
+    }
+
+    /**
+     */
+    public function prepare_items() {
+        $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['features'] ) ) {
+            $this->features = $_REQUEST['features'];
+        }
+
+        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 );
+
+        $per_page = 36;
+        $page     = $this->get_pagenum();
+
+        $start = ( $page - 1 ) * $per_page;
+
+        $this->items = array_slice( $themes, $start, $per_page, true );
+
+        $this->set_pagination_args(
+            array(
+                'total_items'     => count( $themes ),
+                'per_page'        => $per_page,
+                'infinite_scroll' => true,
+            )
+        );
+    }
+
+    /**
+     */
+    public function no_items() {
+        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' ) ) {
+                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' )
+                );
+
+                return;
+            } 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 )
+                );
+
+                return;
+            }
+            // Else, fallthrough. install_themes doesn't help if you can't enable it.
+        } else {
+            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' )
+                );
+
+                return;
+            }
+        }
+        // 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' )
+        );
+    }
+
+    /**
+     * @param string $which
+     */
+    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 ); ?>
 			<span class="spinner"></span>
 			<br class="clear" />
 		</div>
 		<?php
-	}
-
-	/**
-	 * Displays the themes table.
-	 *
-	 * Overrides the parent display() method to provide a different container.
-	 *
-	 * @since 3.1.0
-	 */
-	public function display() {
-		wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
-		?>
+    }
+
+    /**
+     * Displays the themes table.
+     *
+     * Overrides the parent display() method to provide a different container.
+     *
+     * @since 3.1.0
+     */
+    public function display() {
+        wp_nonce_field( 'fetch-list-' . get_class( $this ), '_ajax_fetch_list_nonce' );
+        ?>
 		<?php $this->tablenav( 'top' ); ?>
 
 		<div id="availablethemes">
@@ -168,82 +168,82 @@ 
 
 		<?php $this->tablenav( 'bottom' ); ?>
 		<?php
-	}
-
-	/**
-	 * @return array
-	 */
-	public function get_columns() {
-		return array();
-	}
-
-	/**
-	 */
-	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
-			$this->display_rows();
-		} else {
-			echo '<div class="no-items">';
-			$this->no_items();
-			echo '</div>';
-		}
-	}
-
-	/**
-	 */
-	public function display_rows() {
-		$themes = $this->items;
-
-		foreach ( $themes as $theme ) :
-			?>
+    }
+
+    /**
+     * @return array
+     */
+    public function get_columns() {
+        return array();
+    }
+
+    /**
+     */
+    public function display_rows_or_placeholder() {
+        if ( $this->has_items() ) {
+            $this->display_rows();
+        } else {
+            echo '<div class="no-items">';
+            $this->no_items();
+            echo '</div>';
+        }
+    }
+
+    /**
+     */
+    public function display_rows() {
+        $themes = $this->items;
+
+        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' );
-
-			$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' )
-			);
-
-			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' )
-				);
-			}
-
-			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 ),
-					/* translators: %s: Theme name. */
-					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' );
-
-			/** 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'] );
-
-			$screenshot = $theme->get_screenshot();
-			?>
+            $template   = $theme->get_template();
+            $stylesheet = $theme->get_stylesheet();
+            $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 );
+
+            $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' )
+            );
+
+            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' )
+                );
+            }
+
+            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 ),
+                    /* translators: %s: Theme name. */
+                    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' );
+
+            /** 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'] );
+
+            $screenshot = $theme->get_screenshot();
+            ?>
 
 			<span class="screenshot hide-if-customize">
 				<?php if ( $screenshot ) : ?>
@@ -259,9 +259,9 @@ 
 			<h3><?php echo $title; ?></h3>
 			<div class="theme-author">
 				<?php
-					/* translators: %s: Theme author. */
-					printf( __( 'By %s' ), $author );
-				?>
+                    /* translators: %s: Theme author. */
+                    printf( __( 'By %s' ), $author );
+                ?>
 			</div>
 			<div class="action-links">
 				<ul>
@@ -279,83 +279,83 @@ 
 				<p><strong><?php _e( 'Version:' ); ?></strong> <?php echo $version; ?></p>
 				<p><?php echo $theme->display( 'Description' ); ?></p>
 				<?php
-				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' )
-					);
-				}
-				?>
+                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' )
+                    );
+                }
+                ?>
 			</div>
 
 			</div>
 			<?php
-		endforeach;
-	}
-
-	/**
-	 * @param WP_Theme $theme
-	 * @return bool
-	 */
-	public function search_theme( $theme ) {
-		// Search the features.
-		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 ) ) {
-				continue;
-			}
-
-			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 ) ) {
-					continue 2;
-				}
-			}
-
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) ) {
-				continue;
-			}
-
-			if ( false !== stripos( $theme->get_template(), $word ) ) {
-				continue;
-			}
-
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Send required variables to JavaScript land
-	 *
-	 * @since 3.4.0
-	 *
-	 * @param array $extra_args
-	 */
-	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,
-		);
-
-		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 ) );
-		parent::_js_vars();
-	}
+        endforeach;
+    }
+
+    /**
+     * @param WP_Theme $theme
+     * @return bool
+     */
+    public function search_theme( $theme ) {
+        // Search the features.
+        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 ) ) {
+                continue;
+            }
+
+            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 ) ) {
+                    continue 2;
+                }
+            }
+
+            if ( false !== stripos( $theme->get_stylesheet(), $word ) ) {
+                continue;
+            }
+
+            if ( false !== stripos( $theme->get_template(), $word ) ) {
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Send required variables to JavaScript land
+     *
+     * @since 3.4.0
+     *
+     * @param array $extra_args
+     */
+    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,
+        );
+
+        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 ) );
+        parent::_js_vars();
+    }
 }

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

Indentation +201 added lines, -201 removed lines

@@ -14,220 +14,220 @@
  */
 class WP_Site_Icon {
 
-	/**
-	 * The minimum size of the site icon.
-	 *
-	 * @since 4.3.0
-	 * @var int
-	 */
-	public $min_size = 512;
-
-	/**
-	 * The size to which to crop the image so that we can display it in the UI nicely.
-	 *
-	 * @since 4.3.0
-	 * @var int
-	 */
-	public $page_crop = 512;
-
-	/**
-	 * List of site icon sizes.
-	 *
-	 * @since 4.3.0
-	 * @var int[]
-	 */
-	public $site_icon_sizes = array(
-		/*
+    /**
+     * The minimum size of the site icon.
+     *
+     * @since 4.3.0
+     * @var int
+     */
+    public $min_size = 512;
+
+    /**
+     * The size to which to crop the image so that we can display it in the UI nicely.
+     *
+     * @since 4.3.0
+     * @var int
+     */
+    public $page_crop = 512;
+
+    /**
+     * List of site icon sizes.
+     *
+     * @since 4.3.0
+     * @var int[]
+     */
+    public $site_icon_sizes = array(
+        /*
 		 * Square, medium sized tiles for IE11+.
 		 *
 		 * See https://msdn.microsoft.com/library/dn455106(v=vs.85).aspx
 		 */
-		270,
+        270,
 
-		/*
+        /*
 		 * App icon for Android/Chrome.
 		 *
 		 * @link https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
 		 * @link https://developer.chrome.com/multidevice/android/installtohomescreen
 		 */
-		192,
+        192,
 
-		/*
+        /*
 		 * App icons up to iPhone 6 Plus.
 		 *
 		 * See https://developer.apple.com/library/prerelease/ios/documentation/UserExperience/Conceptual/MobileHIG/IconMatrix.html
 		 */
-		180,
-
-		// Our regular Favicon.
-		32,
-	);
-
-	/**
-	 * Registers actions and filters.
-	 *
-	 * @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 );
-	}
-
-	/**
-	 * Creates an attachment 'object'.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param string $cropped              Cropped image URL.
-	 * @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 );
-
-		$size       = wp_getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
-
-		$attachment = array(
-			'ID'             => $parent_attachment_id,
-			'post_title'     => wp_basename( $cropped ),
-			'post_content'   => $url,
-			'post_mime_type' => $image_type,
-			'guid'           => $url,
-			'context'        => 'site-icon',
-		);
-
-		return $attachment;
-	}
-
-	/**
-	 * Inserts an attachment.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param array  $attachment An array with attachment object data.
-	 * @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 );
-
-		/**
-		 * Filters the site icon attachment metadata.
-		 *
-		 * @since 4.3.0
-		 *
-		 * @see wp_generate_attachment_metadata()
-		 *
-		 * @param array $metadata Attachment metadata.
-		 */
-		$metadata = apply_filters( 'site_icon_attachment_metadata', $metadata );
-		wp_update_attachment_metadata( $attachment_id, $metadata );
-
-		return $attachment_id;
-	}
-
-	/**
-	 * Adds additional sizes to be made when creating the site icon images.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @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() ) {
-		$only_crop_sizes = array();
-
-		/**
-		 * Filters the different dimensions that a site icon is saved in.
-		 *
-		 * @since 4.3.0
-		 *
-		 * @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 );
-
-		// Use a natural sort of numbers.
-		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 ( $this->site_icon_sizes as $size ) {
-			if ( $size < $this->min_size ) {
-				$only_crop_sizes[ 'site_icon-' . $size ] = array(
-					'width ' => $size,
-					'height' => $size,
-					'crop'   => true,
-				);
-			}
-		}
-
-		return $only_crop_sizes;
-	}
-
-	/**
-	 * Adds Site Icon sizes to the array of image sizes on demand.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param string[] $sizes Array of image size names.
-	 * @return string[] Array of image size names.
-	 */
-	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 ) {
-			$sizes[] = 'site_icon-' . $size;
-		}
-
-		return $sizes;
-	}
-
-	/**
-	 * Deletes the Site Icon when the image file is deleted.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param int $post_id Attachment ID.
-	 */
-	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' );
-		}
-	}
-
-	/**
-	 * Adds custom image sizes when meta data for an image is requested, that happens to be used as Site Icon.
-	 *
-	 * @since 4.3.0
-	 *
-	 * @param null|array|string $value    The value get_metadata() should return a single metadata value, or an
-	 *                                    array of values.
-	 * @param int               $post_id  Post ID.
-	 * @param string            $meta_key Meta key.
-	 * @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' );
-
-			if ( $post_id == $site_icon_id ) {
-				add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
-			}
-		}
-
-		return $value;
-	}
+        180,
+
+        // Our regular Favicon.
+        32,
+    );
+
+    /**
+     * Registers actions and filters.
+     *
+     * @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 );
+    }
+
+    /**
+     * Creates an attachment 'object'.
+     *
+     * @since 4.3.0
+     *
+     * @param string $cropped              Cropped image URL.
+     * @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 );
+
+        $size       = wp_getimagesize( $cropped );
+        $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+
+        $attachment = array(
+            'ID'             => $parent_attachment_id,
+            'post_title'     => wp_basename( $cropped ),
+            'post_content'   => $url,
+            'post_mime_type' => $image_type,
+            'guid'           => $url,
+            'context'        => 'site-icon',
+        );
+
+        return $attachment;
+    }
+
+    /**
+     * Inserts an attachment.
+     *
+     * @since 4.3.0
+     *
+     * @param array  $attachment An array with attachment object data.
+     * @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 );
+
+        /**
+         * Filters the site icon attachment metadata.
+         *
+         * @since 4.3.0
+         *
+         * @see wp_generate_attachment_metadata()
+         *
+         * @param array $metadata Attachment metadata.
+         */
+        $metadata = apply_filters( 'site_icon_attachment_metadata', $metadata );
+        wp_update_attachment_metadata( $attachment_id, $metadata );
+
+        return $attachment_id;
+    }
+
+    /**
+     * Adds additional sizes to be made when creating the site icon images.
+     *
+     * @since 4.3.0
+     *
+     * @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() ) {
+        $only_crop_sizes = array();
+
+        /**
+         * Filters the different dimensions that a site icon is saved in.
+         *
+         * @since 4.3.0
+         *
+         * @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 );
+
+        // Use a natural sort of numbers.
+        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 ( $this->site_icon_sizes as $size ) {
+            if ( $size < $this->min_size ) {
+                $only_crop_sizes[ 'site_icon-' . $size ] = array(
+                    'width ' => $size,
+                    'height' => $size,
+                    'crop'   => true,
+                );
+            }
+        }
+
+        return $only_crop_sizes;
+    }
+
+    /**
+     * Adds Site Icon sizes to the array of image sizes on demand.
+     *
+     * @since 4.3.0
+     *
+     * @param string[] $sizes Array of image size names.
+     * @return string[] Array of image size names.
+     */
+    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 ) {
+            $sizes[] = 'site_icon-' . $size;
+        }
+
+        return $sizes;
+    }
+
+    /**
+     * Deletes the Site Icon when the image file is deleted.
+     *
+     * @since 4.3.0
+     *
+     * @param int $post_id Attachment ID.
+     */
+    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' );
+        }
+    }
+
+    /**
+     * Adds custom image sizes when meta data for an image is requested, that happens to be used as Site Icon.
+     *
+     * @since 4.3.0
+     *
+     * @param null|array|string $value    The value get_metadata() should return a single metadata value, or an
+     *                                    array of values.
+     * @param int               $post_id  Post ID.
+     * @param string            $meta_key Meta key.
+     * @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' );
+
+            if ( $post_id == $site_icon_id ) {
+                add_filter( 'intermediate_image_sizes', array( $this, 'intermediate_image_sizes' ) );
+            }
+        }
+
+        return $value;
+    }
 }