enmi-conf.org: comparison wp/wp-includes/class-wp-customize-manager.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	/**
 	 * Mapping of 'panel', 'section', 'control' to the ID which should be autofocused.
 	 *
 	 * @since 4.4.0
-	 * @var array
+	 * @var string[]
 	 */
 	protected $autofocus = array();
 	/**
 	 * Messenger channel.
 		 * @since 4.4.0
 		 *
 		 * @see WP_Customize_Manager::__construct()
 		 *
 		 * @param string[]             $components Array of core components to load.
-		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager    WP_Customize_Manager instance.
 		 */
 		$components = apply_filters( 'customize_loaded_components', $this->components, $this );
 		require_once ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php';
 		$this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
 			add_action( 'customize_controls_print_footer_scripts', 'wp_print_admin_notice_templates' );
 		}
 	}
 	/**
-	 * Return true if it's an Ajax request.
+	 * Returns true if it's an Ajax request.
 	 *
 	 * @since 3.4.0
 	 * @since 4.2.0 Added `$action` param.
 	 *
 	 * @param string|null $action Whether the supplied Ajax action is being run.
 		wp_die( $message );
 	}
 	/**
-	 * Return the Ajax wp_die() handler if it's a customized request.
+	 * Returns the Ajax wp_die() handler if it's a customized request.
 	 *
 	 * @since 3.4.0
 	 * @deprecated 4.7.0
 	 *
 	 * @return callable Die handler.
 		return '_default_wp_die_handler';
 	}
 	/**
-	 * Start preview and customize theme.
+	 * Starts preview and customize theme.
 	 *
-	 * Check if customize query variable exist. Init filters to filter the current theme.
+	 * Check if customize query variable exist. Init filters to filter the active theme.
 	 *
 	 * @since 3.4.0
 	 *
-	 * @global string $pagenow
+	 * @global string $pagenow The filename of the current screen.
 	 */
 	public function setup_theme() {
 		global $pagenow;
 		// Check permissions for customize.php access since this method is called before customize.php can run any code.
 		$this->start_previewing_theme();
 	}
 	/**
-	 * Establish the loaded changeset.
+	 * Establishes the loaded changeset.
 	 *
 	 * This method runs right at after_setup_theme and applies the 'customize_changeset_branching' filter to determine
 	 * whether concurrent changesets are allowed. Then if the Customizer is not initialized with a `changeset_uuid` param,
 	 * this method will determine which UUID should be used. If changeset branching is disabled, then the most saved
 	 * changeset will be loaded by default. Otherwise, if there are no existing saved changesets or if changeset branching is
 	 * enabled, then a new UUID will be generated.
 	 *
 	 * @since 4.9.0
 	 *
-	 * @global string $pagenow
+	 * @global string $pagenow The filename of the current screen.
 	 */
 	public function establish_loaded_changeset() {
 		global $pagenow;
 		if ( empty( $this->_changeset_uuid ) ) {
 		/**
 		 * Fires once the Customizer theme preview has started.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		do_action( 'start_previewing_theme', $this );
 	}
 	/**
-	 * Stop previewing the selected theme.
+	 * Stops previewing the selected theme.
 	 *
-	 * Removes filters to change the current theme.
+	 * Removes filters to change the active theme.
 	 *
 	 * @since 3.4.0
 	 */
 	public function stop_previewing_theme() {
 		if ( ! $this->is_preview() ) {
 		/**
 		 * Fires once the Customizer theme preview has stopped.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		do_action( 'stop_previewing_theme', $this );
 	}
 	/**
 		return $this->branching;
 	}
 	/**
-	 * Get the changeset UUID.
+	 * Gets the changeset UUID.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @see WP_Customize_Manager::establish_loaded_changeset()
 	 *
 		}
 		return $this->_changeset_uuid;
 	}
 	/**
-	 * Get the theme being customized.
+	 * Gets the theme being customized.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return WP_Theme
 	 */
 		}
 		return $this->theme;
 	}
 	/**
-	 * Get the registered settings.
+	 * Gets the registered settings.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return array
 	 */
 	public function settings() {
 		return $this->settings;
 	}
 	/**
-	 * Get the registered controls.
+	 * Gets the registered controls.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return array
 	 */
 	public function controls() {
 		return $this->controls;
 	}
 	/**
-	 * Get the registered containers.
+	 * Gets the registered containers.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @return array
 	 */
 	public function containers() {
 		return $this->containers;
 	}
 	/**
-	 * Get the registered sections.
+	 * Gets the registered sections.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return array
 	 */
 	public function sections() {
 		return $this->sections;
 	}
 	/**
-	 * Get the registered panels.
+	 * Gets the registered panels.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @return array Panels.
 	 */
 	public function is_theme_active() {
 		return $this->get_stylesheet() === $this->original_stylesheet;
 	}
 	/**
-	 * Register styles/scripts and initialize the preview of each setting
+	 * Registers styles/scripts and initialize the preview of each setting
 	 *
 	 * @since 3.4.0
 	 */
 	public function wp_loaded() {
 		/**
 		 * Fires once WordPress has loaded, allowing scripts and styles to be initialized.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		do_action( 'customize_register', $this );
 		if ( $this->settings_previewed() ) {
 			foreach ( $this->settings as $setting ) {
 		return $status;
 	}
 	/**
-	 * Find the changeset post ID for a given changeset UUID.
+	 * Finds the changeset post ID for a given changeset UUID.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param string $uuid Changeset UUID.
 	 * @return int|null Returns post ID on success and null on failure.
 		return null;
 	}
 	/**
-	 * Get changeset posts.
+	 * Gets changeset posts.
 	 *
 	 * @since 4.9.0
 	 *
 	 * @param array $args {
 	 *     Args to pass into `get_posts()` to query changesets.
 		return get_posts( $args );
 	}
 	/**
-	 * Dismiss all of the current user's auto-drafts (other than the present one).
+	 * Dismisses all of the current user's auto-drafts (other than the present one).
 	 *
 	 * @since 4.9.0
 	 * @return int The number of auto-drafts that were dismissed.
 	 */
 	protected function dismiss_user_auto_draft_changesets() {
 		}
 		return $dismissed;
 	}
 	/**
-	 * Get the changeset post ID for the loaded changeset.
+	 * Gets the changeset post ID for the loaded changeset.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @return int|null Post ID on success or null if there is no post yet saved.
 	 */
 		}
 		return $this->_changeset_post_id;
 	}
 	/**
-	 * Get the data stored in a changeset post.
+	 * Gets the data stored in a changeset post.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param int $post_id Changeset post ID.
 	 * @return array|WP_Error Changeset data or WP_Error on error.
 		}
 		return $changeset_data;
 	}
 	/**
-	 * Get changeset data.
+	 * Gets changeset data.
 	 *
 	 * @since 4.7.0
 	 * @since 4.9.0 This will return the changeset's data with a user's autosave revision merged on top, if one exists and $autosaved is true.
 	 *
 	 * @return array Changeset data.
 	 * @var array
 	 */
 	protected $pending_starter_content_settings_ids = array();
 	/**
-	 * Import theme starter content into the customized state.
+	 * Imports theme starter content into the customized state.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param array $starter_content Starter content. Defaults to `get_theme_starter_content()`.
 	 */
-	function import_theme_starter_content( $starter_content = array() ) {
+	public function import_theme_starter_content( $starter_content = array() ) {
 		if ( empty( $starter_content ) ) {
 			$starter_content = get_theme_starter_content();
 		}
 		$changeset_data = array();
 			}
 		}
 	}
 	/**
-	 * Prepare starter content attachments.
+	 * Prepares starter content attachments.
 	 *
 	 * Ensure that the attachments are valid and that they have slugs and file name/path.
 	 *
 	 * @since 4.7.0
 	 *
 		}
 		return $prepared_attachments;
 	}
 	/**
-	 * Save starter content changeset.
+	 * Saves starter content changeset.
 	 *
 	 * @since 4.7.0
 	 */
 	public function _save_starter_content_changeset() {
 		$this->pending_starter_content_settings_ids = array();
 	}
 	/**
-	 * Get dirty pre-sanitized setting values in the current customized state.
+	 * Gets dirty pre-sanitized setting values in the current customized state.
 	 *
 	 * The returned array consists of a merge of three sources:
 	 * 1. If the theme is not currently active, then the base array is any stashed
 	 *    theme mods that were modified previously but never published.
 	 * 2. The values from the current changeset, if it exists.
 				if ( ! array_key_exists( 'value', $setting_params ) ) {
 					continue;
 				}
 				if ( isset( $setting_params['type'] ) && 'theme_mod' === $setting_params['type'] ) {
-					// Ensure that theme mods values are only used if they were saved under the current theme.
+					// Ensure that theme mods values are only used if they were saved under the active theme.
 					$namespace_pattern = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
 					if ( preg_match( $namespace_pattern, $setting_id, $matches ) && $this->get_stylesheet() === $matches['stylesheet'] ) {
 						$values[ $matches['setting_id'] ] = $setting_params['value'];
 					}
 				} else {
 	 * The name "post_value" is a carry-over from when the customized state was exclusively
 	 * sourced from `$_POST['customized']`. Nevertheless, the value returned will come
 	 * from the current changeset post and from the incoming post data.
 	 *
 	 * @since 3.4.0
-	 * @since 4.1.1 Introduced the `$default` parameter.
+	 * @since 4.1.1 Introduced the `$default_value` parameter.
-	 * @since 4.6.0 `$default` is now returned early when the setting post value is invalid.
+	 * @since 4.6.0 `$default_value` is now returned early when the setting post value is invalid.
 	 *
 	 * @see WP_REST_Server::dispatch()
 	 * @see WP_REST_Request::sanitize_params()
 	 * @see WP_REST_Request::has_valid_params()
 	 *
-	 * @param WP_Customize_Setting $setting A WP_Customize_Setting derived object.
+	 * @param WP_Customize_Setting $setting       A WP_Customize_Setting derived object.
-	 * @param mixed                $default Value returned $setting has no post value (added in 4.2.0)
+	 * @param mixed                $default_value Value returned if `$setting` has no post value (added in 4.2.0)
-	 *                                      or the post value is invalid (added in 4.6.0).
+	 *                                            or the post value is invalid (added in 4.6.0).
-	 * @return string|mixed Sanitized value or the $default provided.
+	 * @return string|mixed Sanitized value or the `$default_value` provided.
 	 */
-	public function post_value( $setting, $default = null ) {
+	public function post_value( $setting, $default_value = null ) {
 		$post_values = $this->unsanitized_post_values();
 		if ( ! array_key_exists( $setting->id, $post_values ) ) {
-			return $default;
+			return $default_value;
 		}
 		$value = $post_values[ $setting->id ];
 		$valid = $setting->validate( $value );
 		if ( is_wp_error( $valid ) ) {
-			return $default;
+			return $default_value;
 		}
 		$value = $setting->sanitize( $value );
 		if ( is_null( $value ) || is_wp_error( $value ) ) {
-			return $default;
+			return $default_value;
 		}
 		return $value;
 	}
 	/**
-	 * Override a setting's value in the current customized state.
+	 * Overrides a setting's value in the current customized state.
 	 *
 	 * The name "post_value" is a carry-over from when the customized state was
 	 * exclusively sourced from `$_POST['customized']`.
 	 *
 	 * @since 4.2.0
 	public function set_post_value( $setting_id, $value ) {
 		$this->unsanitized_post_values(); // Populate _post_values from $_POST['customized'].
 		$this->_post_values[ $setting_id ] = $value;
 		/**
-		 * Announce when a specific setting's unsanitized post value has been set.
+		 * Announces when a specific setting's unsanitized post value has been set.
 		 *
 		 * Fires when the WP_Customize_Manager::set_post_value() method is called.
 		 *
 		 * The dynamic portion of the hook name, `$setting_id`, refers to the setting ID.
 		 *
 		 * @since 4.4.0
 		 *
-		 * @param mixed                $value Unsanitized setting post value.
+		 * @param mixed                $value   Unsanitized setting post value.
-		 * @param WP_Customize_Manager $this  WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		do_action( "customize_post_value_set_{$setting_id}", $value, $this );
 		/**
-		 * Announce when any setting's unsanitized post value has been set.
+		 * Announces when any setting's unsanitized post value has been set.
 		 *
 		 * Fires when the WP_Customize_Manager::set_post_value() method is called.
 		 *
 		 * This is useful for `WP_Customize_Setting` instances to watch
 		 * in order to update a cached previewed value.
 		 *
 		 * @since 4.4.0
 		 *
 		 * @param string               $setting_id Setting ID.
 		 * @param mixed                $value      Unsanitized setting post value.
-		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager    WP_Customize_Manager instance.
 		 */
 		do_action( 'customize_post_value_set', $setting_id, $value, $this );
 	}
 	/**
-	 * Print JavaScript settings.
+	 * Prints JavaScript settings.
 	 *
 	 * @since 3.4.0
 	 */
 	public function customize_preview_init() {
 		 * Fires once the Customizer preview has initialized and JavaScript
 		 * settings have been printed.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		do_action( 'customize_preview_init', $this );
 	}
 	/**
 		$headers['Content-Security-Policy'] = "frame-ancestors 'self'";
 		return $headers;
 	}
 	/**
-	 * Add customize state query params to a given URL if preview is allowed.
+	 * Adds customize state query params to a given URL if preview is allowed.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @see wp_redirect()
 	 * @see WP_Customize_Manager::get_allowed_url()
 		return $url;
 	}
 	/**
-	 * Prevent sending a 404 status when returning the response for the customize
+	 * Prevents sending a 404 status when returning the response for the customize
 	 * preview, since it causes the jQuery Ajax to fail. Send 200 instead.
 	 *
 	 * @since 4.0.0
 	 * @deprecated 4.7.0
 	 */
 	public function customize_preview_override_404_status() {
 		_deprecated_function( __METHOD__, '4.7.0' );
 	}
 	/**
-	 * Print base element for preview frame.
+	 * Prints base element for preview frame.
 	 *
 	 * @since 3.4.0
 	 * @deprecated 4.7.0
 	 */
 	public function customize_preview_base() {
 		_deprecated_function( __METHOD__, '4.7.0' );
 	}
 	/**
-	 * Print a workaround to handle HTML5 tags in IE < 9.
+	 * Prints a workaround to handle HTML5 tags in IE < 9.
 	 *
 	 * @since 3.4.0
 	 * @deprecated 4.7.0 Customizer no longer supports IE8, so all supported browsers recognize HTML5.
 	 */
 	public function customize_preview_html5() {
 		_deprecated_function( __FUNCTION__, '4.7.0' );
 	}
 	/**
-	 * Print CSS for loading indicators for the Customizer preview.
+	 * Prints CSS for loading indicators for the Customizer preview.
 	 *
 	 * @since 4.2.0
 	 */
 	public function customize_preview_loading_style() {
 		?>
 		</style>
 		<?php
 	}
 	/**
-	 * Remove customize_messenger_channel query parameter from the preview window when it is not in an iframe.
+	 * Removes customize_messenger_channel query parameter from the preview window when it is not in an iframe.
 	 *
 	 * This ensures that the admin bar will be shown. It also ensures that link navigation will
 	 * work as expected since the parent frame is not being sent the URL to navigate to.
 	 *
 	 * @since 4.7.0
 		</script>
 		<?php
 	}
 	/**
-	 * Print JavaScript settings for preview frame.
+	 * Prints JavaScript settings for preview frame.
 	 *
 	 * @since 3.4.0
 	 */
 	public function customize_preview_settings() {
 		$post_values                 = $this->unsanitized_post_values( array( 'exclude_changeset' => true ) );
 	 * Removes the signature in case we experience a case where the Customizer was not properly executed.
 	 *
 	 * @since 3.4.0
 	 * @deprecated 4.7.0
 	 *
-	 * @param mixed $return Value passed through for {@see 'wp_die_handler'} filter.
+	 * @param callable|null $callback Optional. Value passed through for {@see 'wp_die_handler'} filter.
-	 * @return mixed Value passed through for {@see 'wp_die_handler'} filter.
+	 *                                Default null.
-	 */
+	 * @return callable|null Value passed through for {@see 'wp_die_handler'} filter.
-	public function remove_preview_signature( $return = null ) {
+	 */
+	public function remove_preview_signature( $callback = null ) {
 		_deprecated_function( __METHOD__, '4.7.0' );
-		return $return;
+		return $callback;
 	}
 	/**
-	 * Is it a theme preview?
+	 * Determines whether it is a theme preview or not.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return bool True if it's a preview, false if not.
 	 */
 	public function is_preview() {
 		return (bool) $this->previewing;
 	}
 	/**
-	 * Retrieve the template name of the previewed theme.
+	 * Retrieves the template name of the previewed theme.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return string Template name.
 	 */
 	public function get_template() {
 		return $this->theme()->get_template();
 	}
 	/**
-	 * Retrieve the stylesheet name of the previewed theme.
+	 * Retrieves the stylesheet name of the previewed theme.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return string Stylesheet name.
 	 */
 	public function get_stylesheet() {
 		return $this->theme()->get_stylesheet();
 	}
 	/**
-	 * Retrieve the template root of the previewed theme.
+	 * Retrieves the template root of the previewed theme.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return string Theme root.
 	 */
 	public function get_template_root() {
 		return get_raw_theme_root( $this->get_template(), true );
 	}
 	/**
-	 * Retrieve the stylesheet root of the previewed theme.
+	 * Retrieves the stylesheet root of the previewed theme.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @return string Theme root.
 	 */
 	public function get_stylesheet_root() {
 		return get_raw_theme_root( $this->get_stylesheet(), true );
 	}
 	/**
-	 * Filters the current theme and return the name of the previewed theme.
+	 * Filters the active theme and return the name of the previewed theme.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param mixed $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 			return true;
 		}
 	}
 	/**
-	 * Handle customize_save WP Ajax request to save/update a changeset.
+	 * Handles customize_save WP Ajax request to save/update a changeset.
 	 *
 	 * @since 3.4.0
 	 * @since 4.7.0 The semantics of this method have changed to update a changeset, optionally to also change the status and other attributes.
 	 */
 	public function save() {
 		 *
 		 * @since 4.2.0
 		 *
 		 * @param array                $response Additional information passed back to the 'saved'
 		 *                                       event on `wp.customize`.
-		 * @param WP_Customize_Manager $this     WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager  WP_Customize_Manager instance.
 		 */
 		$response = apply_filters( 'customize_save_response', $response, $this );
 		if ( is_wp_error( $r ) ) {
 			wp_send_json_error( $response );
 			wp_send_json_success( $response );
 		}
 	}
 	/**
-	 * Save the post for the loaded changeset.
+	 * Saves the post for the loaded changeset.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param array $args {
 	 *     Args for changeset post.
 	 *     @type bool   $autosave        Whether this is a request to create an autosave revision.
 	 * }
 	 *
 	 * @return array|WP_Error Returns array on success and WP_Error with array data on error.
 	 */
-	function save_changeset_post( $args = array() ) {
+	public function save_changeset_post( $args = array() ) {
 		$args = array_merge(
 			array(
 				'status'          => null,
 				'title'           => null,
 		 * at this point to catch any settings registered after `customize_register`.
 		 * The dynamic portion of the hook name, `$this->ID` refers to the setting ID.
 		 *
 		 * @since 4.6.0
 		 *
-		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		do_action( 'customize_save_validation_before', $this );
 		// Validate settings.
 		$validated_values      = array_merge(
 		return $response;
 	}
 	/**
-	 * Preserve the initial JSON post_content passed to save into the post.
+	 * Preserves the initial JSON post_content passed to save into the post.
 	 *
 	 * This is needed to prevent KSES and other {@see 'content_save_pre'} filters
 	 * from corrupting JSON data.
 	 *
 	 * Note that WP_Customize_Manager::validate_setting_values() have already
 		}
 		return $data;
 	}
 	/**
-	 * Trash or delete a changeset post.
+	 * Trashes or deletes a changeset post.
 	 *
 	 * The following re-formulates the logic from `wp_trash_post()` as done in
 	 * `wp_publish_post()`. The reason for bypassing `wp_trash_post()` is that it
 	 * will mutate the the `post_content` and the `post_name` when they should be
 	 * untouched.
 		return $post;
 	}
 	/**
-	 * Handle request to trash a changeset.
+	 * Handles request to trash a changeset.
 	 *
 	 * @since 4.9.0
 	 */
 	public function handle_changeset_trash_request() {
 		if ( ! is_user_logged_in() ) {
 			)
 		);
 	}
 	/**
-	 * Re-map 'edit_post' meta cap for a customize_changeset post to be the same as 'customize' maps.
+	 * Re-maps 'edit_post' meta cap for a customize_changeset post to be the same as 'customize' maps.
 	 *
 	 * There is essentially a "meta meta" cap in play here, where 'edit_post' meta cap maps to
 	 * the 'customize' meta cap which then maps to 'edit_theme_options'. This is currently
 	 * required in core for `wp_create_post_autosave()` because it will call
 	 * `_wp_translate_postdata()` which in turn will check if a user can 'edit_post', but the
 	 */
 	public function refresh_changeset_lock( $changeset_post_id ) {
 		if ( ! $changeset_post_id ) {
 			return;
 		}
 		$lock = get_post_meta( $changeset_post_id, '_edit_lock', true );
 		$lock = explode( ':', $lock );
 		if ( $lock && ! empty( $lock[1] ) ) {
 			$user_id         = (int) $lock[1];
 	/**
 	 * Filters heartbeat settings for the Customizer.
 	 *
 	 * @since 4.9.0
+	 *
+	 * @global string $pagenow The filename of the current screen.
+	 *
 	 * @param array $settings Current settings to filter.
 	 * @return array Heartbeat settings.
 	 */
 	public function add_customize_screen_to_heartbeat_settings( $settings ) {
 		global $pagenow;
 		if ( 'customize.php' === $pagenow ) {
 			$settings['screenId'] = 'customize';
 		}
 		return $settings;
 	}
 	/**
-	 * Get lock user data.
+	 * Gets lock user data.
 	 *
 	 * @since 4.9.0
 	 *
 	 * @param int $user_id User ID.
 	 * @return array|null User data formatted for client.
 	 */
 	protected function get_lock_user_data( $user_id ) {
 		if ( ! $user_id ) {
 			return null;
 		}
 		$lock_user = get_userdata( $user_id );
 		if ( ! $lock_user ) {
 			return null;
 		}
 		return array(
 			'id'     => $lock_user->ID,
 			'name'   => $lock_user->display_name,
 			'avatar' => get_avatar_url( $lock_user->ID, array( 'size' => 128 ) ),
 		);
 	}
 	/**
-	 * Check locked changeset with heartbeat API.
+	 * Checks locked changeset with heartbeat API.
 	 *
 	 * @since 4.9.0
 	 *
 	 * @param array  $response  The Heartbeat response.
 	 * @param array  $data      The $_POST data sent.
 		wp_send_json_success( 'changeset_taken_over' );
 	}
 	/**
-	 * Whether a changeset revision should be made.
+	 * Determines whether a changeset revision should be made.
 	 *
 	 * @since 4.7.0
 	 * @var bool
 	 */
 	protected $store_changeset_revision;
 		}
 		return $post_has_changed;
 	}
 	/**
-	 * Publish changeset values.
+	 * Publishes the values of a changeset.
 	 *
-	 * This will the values contained in a changeset, even changesets that do not
+	 * This will publish the values contained in a changeset, even changesets that do not
 	 * correspond to current manager instance. This is called by
 	 * `_wp_customize_publish_changeset()` when a customize_changeset post is
 	 * transitioned to the `publish` status. As such, this method should not be
 	 * called directly and instead `wp_publish_post()` should be used.
 	 *
 		return true;
 	}
 	/**
-	 * Update stashed theme mod settings.
+	 * Updates stashed theme mod settings.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param array $inactive_theme_mod_settings Mapping of stylesheet to arrays of theme mod settings.
 	 * @return array|false Returns array of updated stashed theme mods or false if the update failed or there were no changes.
 		}
 		return $stashed_theme_mod_settings;
 	}
 	/**
-	 * Refresh nonces for the current preview.
+	 * Refreshes nonces for the current preview.
 	 *
 	 * @since 4.2.0
 	 */
 	public function refresh_nonces() {
 		if ( ! $this->is_preview() ) {
 		wp_send_json_success( $this->get_nonces() );
 	}
 	/**
-	 * Delete a given auto-draft changeset or the autosave revision for a given changeset or delete changeset lock.
+	 * Deletes a given auto-draft changeset or the autosave revision for a given changeset or delete changeset lock.
 	 *
 	 * @since 4.9.0
 	 */
 	public function handle_dismiss_autosave_or_lock_request() {
 		// Calls to dismiss_user_auto_draft_changesets() and wp_get_post_autosave() require non-zero get_current_user_id().
 		wp_send_json_error( 'unknown_error', 500 );
 	}
 	/**
-	 * Add a customize setting.
+	 * Adds a customize setting.
 	 *
 	 * @since 3.4.0
 	 * @since 4.5.0 Return added WP_Customize_Setting instance.
 	 *
 	 * @see WP_Customize_Setting::__construct()
 		$this->settings[ $setting->id ] = $setting;
 		return $setting;
 	}
 	/**
-	 * Register any dynamically-created settings, such as those from $_POST['customized']
+	 * Registers any dynamically-created settings, such as those from $_POST['customized']
 	 * that have no corresponding setting created.
 	 *
 	 * This is a mechanism to "wake up" settings that have been dynamically created
 	 * on the front end and have been sent to WordPress in `$_POST['customized']`. When WP
 	 * loads, the dynamically-created settings then will get created and previewed
 		}
 		return $new_settings;
 	}
 	/**
-	 * Retrieve a customize setting.
+	 * Retrieves a customize setting.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param string $id Customize Setting ID.
 	 * @return WP_Customize_Setting|void The setting, if set.
 			return $this->settings[ $id ];
 		}
 	}
 	/**
-	 * Remove a customize setting.
+	 * Removes a customize setting.
 	 *
 	 * Note that removing the setting doesn't destroy the WP_Customize_Setting instance or remove its filters.
 	 *
 	 * @since 3.4.0
 	 *
 	public function remove_setting( $id ) {
 		unset( $this->settings[ $id ] );
 	}
 	/**
-	 * Add a customize panel.
+	 * Adds a customize panel.
 	 *
 	 * @since 4.0.0
 	 * @since 4.5.0 Return added WP_Customize_Panel instance.
 	 *
 	 * @see WP_Customize_Panel::__construct()
 		$this->panels[ $panel->id ] = $panel;
 		return $panel;
 	}
 	/**
-	 * Retrieve a customize panel.
+	 * Retrieves a customize panel.
 	 *
 	 * @since 4.0.0
 	 *
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
 			return $this->panels[ $id ];
 		}
 	}
 	/**
-	 * Remove a customize panel.
+	 * Removes a customize panel.
 	 *
 	 * Note that removing the panel doesn't destroy the WP_Customize_Panel instance or remove its filters.
 	 *
 	 * @since 4.0.0
 	 *
 		}
 		unset( $this->panels[ $id ] );
 	}
 	/**
-	 * Register a customize panel type.
+	 * Registers a customize panel type.
 	 *
 	 * Registered types are eligible to be rendered via JS and created dynamically.
 	 *
 	 * @since 4.3.0
 	 *
 	public function register_panel_type( $panel ) {
 		$this->registered_panel_types[] = $panel;
 	}
 	/**
-	 * Render JS templates for all registered panel types.
+	 * Renders JS templates for all registered panel types.
 	 *
 	 * @since 4.3.0
 	 */
 	public function render_panel_templates() {
 		foreach ( $this->registered_panel_types as $panel_type ) {
 			$panel->print_template();
 		}
 	}
 	/**
-	 * Add a customize section.
+	 * Adds a customize section.
 	 *
 	 * @since 3.4.0
 	 * @since 4.5.0 Return added WP_Customize_Section instance.
 	 *
 	 * @see WP_Customize_Section::__construct()
 		$this->sections[ $section->id ] = $section;
 		return $section;
 	}
 	/**
-	 * Retrieve a customize section.
+	 * Retrieves a customize section.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 			return $this->sections[ $id ];
 		}
 	}
 	/**
-	 * Remove a customize section.
+	 * Removes a customize section.
 	 *
 	 * Note that removing the section doesn't destroy the WP_Customize_Section instance or remove its filters.
 	 *
 	 * @since 3.4.0
 	 *
 	public function remove_section( $id ) {
 		unset( $this->sections[ $id ] );
 	}
 	/**
-	 * Register a customize section type.
+	 * Registers a customize section type.
 	 *
 	 * Registered types are eligible to be rendered via JS and created dynamically.
 	 *
 	 * @since 4.3.0
 	 *
 	public function register_section_type( $section ) {
 		$this->registered_section_types[] = $section;
 	}
 	/**
-	 * Render JS templates for all registered section types.
+	 * Renders JS templates for all registered section types.
 	 *
 	 * @since 4.3.0
 	 */
 	public function render_section_templates() {
 		foreach ( $this->registered_section_types as $section_type ) {
 			$section->print_template();
 		}
 	}
 	/**
-	 * Add a customize control.
+	 * Adds a customize control.
 	 *
 	 * @since 3.4.0
 	 * @since 4.5.0 Return added WP_Customize_Control instance.
 	 *
 	 * @see WP_Customize_Control::__construct()
 		$this->controls[ $control->id ] = $control;
 		return $control;
 	}
 	/**
-	 * Retrieve a customize control.
+	 * Retrieves a customize control.
 	 *
 	 * @since 3.4.0
 	 *
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 			return $this->controls[ $id ];
 		}
 	}
 	/**
-	 * Remove a customize control.
+	 * Removes a customize control.
 	 *
 	 * Note that removing the control doesn't destroy the WP_Customize_Control instance or remove its filters.
 	 *
 	 * @since 3.4.0
 	 *
 	public function remove_control( $id ) {
 		unset( $this->controls[ $id ] );
 	}
 	/**
-	 * Register a customize control type.
+	 * Registers a customize control type.
 	 *
 	 * Registered types are eligible to be rendered via JS and created dynamically.
 	 *
 	 * @since 4.1.0
 	 *
 	public function register_control_type( $control ) {
 		$this->registered_control_types[] = $control;
 	}
 	/**
-	 * Render JS templates for all registered control types.
+	 * Renders JS templates for all registered control types.
 	 *
 	 * @since 4.1.0
 	 */
 	public function render_control_templates() {
 		if ( $this->branching() ) {
 			return $a->priority - $b->priority;
 		}
 	}
 	/**
-	 * Prepare panels, sections, and controls.
+	 * Prepares panels, sections, and controls.
 	 *
 	 * For each, check if required related components exist,
 	 * whether the user has the necessary capabilities,
 	 * and sort by priority.
 	 *
 			true
 		);
 	}
 	/**
-	 * Enqueue scripts for customize controls.
+	 * Enqueues scripts for customize controls.
 	 *
 	 * @since 3.4.0
 	 */
 	public function enqueue_control_scripts() {
 		foreach ( $this->controls as $control ) {
 			);
 		}
 	}
 	/**
-	 * Determine whether the user agent is iOS.
+	 * Determines whether the user agent is iOS.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return bool Whether the user agent is iOS.
 	 */
 	public function is_ios() {
 		return wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
 	}
 	/**
-	 * Get the template string for the Customizer pane document title.
+	 * Gets the template string for the Customizer pane document title.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return string The template string for the document title.
 	 */
 		$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // Because exported to JS and assigned to document.title.
 		return $document_title_tmpl;
 	}
 	/**
-	 * Set the initial URL to be previewed.
+	 * Sets the initial URL to be previewed.
 	 *
 	 * URL is validated.
 	 *
 	 * @since 4.4.0
 	 *
 		$preview_url       = esc_url_raw( $preview_url );
 		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
 	}
 	/**
-	 * Get the initial URL to be previewed.
+	 * Gets the initial URL to be previewed.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @return string URL being previewed.
 	 */
 		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
 		return $cross_domain;
 	}
 	/**
-	 * Get URLs allowed to be previewed.
+	 * Gets URLs allowed to be previewed.
 	 *
 	 * If the front end and the admin are served from the same domain, load the
 	 * preview over ssl if the Customizer is being loaded over ssl. This avoids
 	 * insecure content warnings. This is not attempted if the admin and front end
 	 * are on different domains to avoid the case where the front end doesn't have
 		return $allowed_urls;
 	}
 	/**
-	 * Get messenger channel.
+	 * Gets messenger channel.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @return string Messenger channel.
 	 */
 	public function get_messenger_channel() {
 		return $this->messenger_channel;
 	}
 	/**
-	 * Set URL to link the user to when closing the Customizer.
+	 * Sets URL to link the user to when closing the Customizer.
 	 *
 	 * URL is validated.
 	 *
 	 * @since 4.4.0
 	 *
 		$return_url       = wp_validate_redirect( $return_url );
 		$this->return_url = $return_url;
 	}
 	/**
-	 * Get URL to link the user to when closing the Customizer.
+	 * Gets URL to link the user to when closing the Customizer.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @global array $_registered_pages
 	 *
 		if ( 'themes.php' === $return_url_basename && $return_url_query ) {
 			parse_str( $return_url_query, $query_vars );
 			/*
 			 * If the return URL is a page added by a theme to the Appearance menu via add_submenu_page(),
-			 * verify that belongs to the active theme, otherwise fall back to the Themes screen.
+			 * verify that it belongs to the active theme, otherwise fall back to the Themes screen.
 			 */
 			if ( isset( $query_vars['page'] ) && ! isset( $_registered_pages[ "appearance_page_{$query_vars['page']}" ] ) ) {
 				$return_url = admin_url( 'themes.php' );
 			}
 		}
 		return $return_url;
 	}
 	/**
-	 * Set the autofocused constructs.
+	 * Sets the autofocused constructs.
 	 *
 	 * @since 4.4.0
 	 *
 	 * @param array $autofocus {
 	 *     Mapping of 'panel', 'section', 'control' to the ID which should be autofocused.
 	public function set_autofocus( $autofocus ) {
 		$this->autofocus = array_filter( wp_array_slice_assoc( $autofocus, array( 'panel', 'section', 'control' ) ), 'is_string' );
 	}
 	/**
-	 * Get the autofocused constructs.
+	 * Gets the autofocused constructs.
 	 *
 	 * @since 4.4.0
 	 *
-	 * @return array {
+	 * @return string[] {
 	 *     Mapping of 'panel', 'section', 'control' to the ID which should be autofocused.
 	 *
 	 *     @type string $control ID for control to be autofocused.
 	 *     @type string $section ID for section to be autofocused.
 	 *     @type string $panel   ID for panel to be autofocused.
 	public function get_autofocus() {
 		return $this->autofocus;
 	}
 	/**
-	 * Get nonces for the Customizer.
+	 * Gets nonces for the Customizer.
 	 *
 	 * @since 4.5.0
 	 *
 	 * @return array Nonces.
 	 */
 		/**
 		 * Filters nonces for Customizer.
 		 *
 		 * @since 4.2.0
 		 *
-		 * @param string[]             $nonces Array of refreshed nonces for save and
+		 * @param string[]             $nonces  Array of refreshed nonces for save and
-		 *                                     preview actions.
+		 *                                      preview actions.
-		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
+		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
 		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
 		return $nonces;
 	}
 	/**
-	 * Print JavaScript settings for parent window.
+	 * Prints JavaScript settings for parent window.
 	 *
 	 * @since 4.4.0
 	 */
 	public function customize_pane_settings() {
 		return $devices;
 	}
 	/**
-	 * Register some default controls.
+	 * Registers some default controls.
 	 *
 	 * @since 3.4.0
 	 */
 	public function register_controls() {
 			)
 		);
 	}
 	/**
-	 * Return whether there are published pages.
+	 * Returns whether there are published pages.
 	 *
 	 * Used as active callback for static front page section and controls.
 	 *
 	 * @since 4.7.0
 	 *
 				if ( 'page' === get_post_type( $post_id ) ) {
 					return true;
 				}
 			}
 		}
-		return 0 !== count( get_pages() );
+		return 0 !== count( get_pages( array( 'number' => 1 ) ) );
 	}
 	/**
-	 * Add settings from the POST data that were not added with code, e.g. dynamically-created settings for Widgets
+	 * Adds settings from the POST data that were not added with code, e.g. dynamically-created settings for Widgets
 	 *
 	 * @since 4.2.0
 	 *
 	 * @see add_dynamic_settings()
 	 */
 		$setting_ids = array_keys( $this->unsanitized_post_values() );
 		$this->add_dynamic_settings( $setting_ids );
 	}
 	/**
-	 * Load themes into the theme browsing/installation UI.
+	 * Loads themes into the theme browsing/installation UI.
 	 *
 	 * @since 4.9.0
 	 */
 	public function handle_load_themes_request() {
 		check_ajax_referer( 'switch_themes', 'nonce' );
 		require_once ABSPATH . 'wp-admin/includes/theme.php';
 		if ( 'installed' === $theme_action ) {
 			// Load all installed themes from wp_prepare_themes_for_js().
-			$themes = array( 'themes' => wp_prepare_themes_for_js() );
+			$themes = array( 'themes' => array() );
-			foreach ( $themes['themes'] as &$theme ) {
+			foreach ( wp_prepare_themes_for_js() as $theme ) {
-				$theme['type']   = 'installed';
+				$theme['type']      = 'installed';
-				$theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] );
+				$theme['active']    = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] );
+				$themes['themes'][] = $theme;
 			}
 		} elseif ( 'wporg' === $theme_action ) {
 			// Load WordPress.org themes from the .org API and normalize data to match installed theme objects.
 			if ( ! current_user_can( 'install_themes' ) ) {
 		 *
 		 * @see wp_prepare_themes_for_js()
 		 * @see themes_api()
 		 * @see WP_Customize_Manager::__construct()
 		 *
-		 * @param array                $themes  Nested array of theme data.
+		 * @param array|stdClass       $themes  Nested array or object of theme data.
 		 * @param array                $args    List of arguments, such as page, search term, and tags to query for.
 		 * @param WP_Customize_Manager $manager Instance of Customize manager.
 		 */
 		$themes = apply_filters( 'customize_load_themes', $themes, $args, $this );
 		}
 		return $value;
 	}
 	/**
-	 * Export header video settings to facilitate selective refresh.
+	 * Exports header video settings to facilitate selective refresh.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param array                          $response          Response.
 	 * @param WP_Customize_Selective_Refresh $selective_refresh Selective refresh component.

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6