enmi-conf.org: comparison wp/wp-admin/includes/theme.php

equal deleted inserted replaced

-:490d5cc509ed
+:cf61fcea0001
 /**
 * Remove a theme
 *
 * @since 2.8.0
 *
+* @global WP_Filesystem_Base $wp_filesystem Subclass
+*
 * @param string $stylesheet Stylesheet of the theme to delete
 * @param string $redirect Redirect to page when complete.
-* @return mixed
+* @return void|bool|WP_Error When void, echoes content.
 */
 function delete_theme($stylesheet, $redirect = '') {
 	global $wp_filesystem;
 	if ( empty($stylesheet) )
 		return false;
+	if ( empty( $redirect ) ) {
+		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	}
 	ob_start();
-	if ( empty( $redirect ) )
+	$credentials = request_filesystem_credentials( $redirect );
-		$redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+	$data = ob_get_clean();
-	if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
-		$data = ob_get_contents();
+	if ( false === $credentials ) {
-		ob_end_clean();
+		if ( ! empty( $data ) ){
-		if ( ! empty($data) ){
 			include_once( ABSPATH . 'wp-admin/admin-header.php');
 			echo $data;
 			include( ABSPATH . 'wp-admin/admin-footer.php');
 			exit;
 		}
 		return;
 	}
-	if ( ! WP_Filesystem($credentials) ) {
+	if ( ! WP_Filesystem( $credentials ) ) {
-		request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
+		ob_start();
-		$data = ob_get_contents();
+		request_filesystem_credentials( $redirect, '', true ); // Failed to connect, Error and request again.
-		ob_end_clean();
+		$data = ob_get_clean();
 		if ( ! empty($data) ) {
 			include_once( ABSPATH . 'wp-admin/admin-header.php');
 			echo $data;
 			include( ABSPATH . 'wp-admin/admin-footer.php');
 			exit;
 			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' );
 			$wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' );
 		}
 	}
+	// Remove the theme from allowed themes on the network.
+	if ( is_multisite() ) {
+		WP_Theme::network_disable_theme( $stylesheet );
+	}
 	// Force refresh of theme update information.
 	delete_site_transient( 'update_themes' );
 	return true;
 }
 /**
 * Get the Page Templates available in this theme
 *
 * @since 1.5.0
-*
+* @since 4.7.0 Added the `$post_type` parameter.
-* @param WP_Post|null $post Optional. The post being edited, provided for context.
+*
+* @param WP_Post|null $post      Optional. The post being edited, provided for context.
+* @param string       $post_type Optional. Post type to get the templates for. Default 'page'.
 * @return array Key is the template name, value is the filename of the template
 */
-function get_page_templates( $post = null ) {
+function get_page_templates( $post = null, $post_type = 'page' ) {
-	return array_flip( wp_get_theme()->get_page_templates( $post ) );
+	return array_flip( wp_get_theme()->get_page_templates( $post, $post_type ) );
 }
 /**
 * Tidies a filename for url display by the theme editor.
 *
 * Will display link, if there is an update available.
 *
 * @since 2.7.0
 * @see get_theme_update_available()
 *
-* @param object $theme Theme data object.
+* @param WP_Theme $theme Theme data object.
 */
 function theme_update_available( $theme ) {
 	echo get_theme_update_available( $theme );
 }
 *
 * Will return a link if there is an update available.
 *
 * @since 3.8.0
 *
+* @staticvar object $themes_update
+*
 * @param WP_Theme $theme WP_Theme object.
 * @return false|string HTML for the update link, or false if invalid info was passed.
 */
 function get_theme_update_available( $theme ) {
-	static $themes_update;
+	static $themes_update = null;
 	if ( !current_user_can('update_themes' ) )
 		return false;
 	if ( !isset($themes_update) )
 	if ( isset($themes_update->response[ $stylesheet ]) ) {
 		$update = $themes_update->response[ $stylesheet ];
 		$theme_name = $theme->display('Name');
 		$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
 		$update_url = wp_nonce_url( admin_url( 'update.php?action=upgrade-theme&amp;theme=' . urlencode( $stylesheet ) ), 'upgrade-theme_' . $stylesheet );
-		$update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
 		if ( !is_multisite() ) {
 			if ( ! current_user_can('update_themes') ) {
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.' ) . '</strong></p>',
+				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
-					$theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
+				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>.' ) . '</strong></p>',
+					$theme_name,
+					esc_url( $details_url ),
+					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+						/* translators: 1: theme name, 2: version number */
+						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+					),
+					$update['new_version']
+				);
 			} elseif ( empty( $update['package'] ) ) {
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number */
-					$theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
+				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
+					$theme_name,
+					esc_url( $details_url ),
+					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+						/* translators: 1: theme name, 2: version number */
+						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+					),
+					$update['new_version']
+				);
 			} else {
-				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.' ) . '</strong></p>',
+				/* translators: 1: theme name, 2: theme details URL, 3: additional link attributes, 4: version number, 5: update URL, 6: additional link attributes */
-					$theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'], $update_url, $update_onclick );
+				$html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" %3$s>View version %4$s details</a> or <a href="%5$s" %6$s>update now</a>.' ) . '</strong></p>',
+					$theme_name,
+					esc_url( $details_url ),
+					sprintf( 'class="thickbox open-plugin-details-modal" aria-label="%s"',
+						/* translators: 1: theme name, 2: version number */
+						esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $update['new_version'] ) )
+					),
+					$update['new_version'],
+					$update_url,
+					sprintf( 'aria-label="%s" id="update-theme" data-slug="%s"',
+						/* translators: %s: theme name */
+						esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) ),
+						$stylesheet
+					)
+				);
 			}
 		}
 	}
 	return $html;
 /**
 * Retrieve list of WordPress theme features (aka theme tags)
 *
 * @since 3.1.0
 *
-* @param bool $api Optional. Whether try to fetch tags from the WP.org API. Defaults to true.
+* @param bool $api Optional. Whether try to fetch tags from the WordPress.org API. Defaults to true.
 * @return array Array of features keyed by category with translations keyed by slug.
 */
 function get_theme_feature_list( $api = true ) {
 	// Hard-coded list is used if api not accessible.
 	$features = array(
-			__( 'Colors' ) => array(
-				'black'   => __( 'Black' ),
+		__( 'Subject' )  => array(
-				'blue'    => __( 'Blue' ),
+			'blog'           => __( 'Blog' ),
-				'brown'   => __( 'Brown' ),
+			'e-commerce'     => __( 'E-Commerce' ),
-				'gray'    => __( 'Gray' ),
+			'education'      => __( 'Education' ),
-				'green'   => __( 'Green' ),
+			'entertainment'  => __( 'Entertainment' ),
-				'orange'  => __( 'Orange' ),
+			'food-and-drink' => __( 'Food & Drink' ),
-				'pink'    => __( 'Pink' ),
+			'holiday'        => __( 'Holiday' ),
-				'purple'  => __( 'Purple' ),
+			'news'           => __( 'News' ),
-				'red'     => __( 'Red' ),
+			'photography'    => __( 'Photography' ),
-				'silver'  => __( 'Silver' ),
+			'portfolio'      => __( 'Portfolio' ),
-				'tan'     => __( 'Tan' ),
+		),
-				'white'   => __( 'White' ),
-				'yellow'  => __( 'Yellow' ),
+		__( 'Features' ) => array(
-				'dark'    => __( 'Dark' ),
+			'accessibility-ready'   => __( 'Accessibility Ready' ),
-				'light'   => __( 'Light' ),
+			'custom-background'     => __( 'Custom Background' ),
-			),
+			'custom-colors'         => __( 'Custom Colors' ),
+			'custom-header'         => __( 'Custom Header' ),
+			'custom-logo'           => __( 'Custom Logo' ),
+			'editor-style'          => __( 'Editor Style' ),
+			'featured-image-header' => __( 'Featured Image Header' ),
+			'featured-images'       => __( 'Featured Images' ),
+			'footer-widgets'        => __( 'Footer Widgets' ),
+			'full-width-template'   => __( 'Full Width Template' ),
+			'post-formats'          => __( 'Post Formats' ),
+			'sticky-post'           => __( 'Sticky Post' ),
+			'theme-options'         => __( 'Theme Options' ),
+		),
 		__( 'Layout' ) => array(
-			'fixed-layout'      => __( 'Fixed Layout' ),
+			'grid-layout'   => __( 'Grid Layout' ),
-			'fluid-layout'      => __( 'Fluid Layout' ),
-			'responsive-layout' => __( 'Responsive Layout' ),
 			'one-column'    => __( 'One Column' ),
 			'two-columns'   => __( 'Two Columns' ),
 			'three-columns' => __( 'Three Columns' ),
 			'four-columns'  => __( 'Four Columns' ),
 			'left-sidebar'  => __( 'Left Sidebar' ),
 			'right-sidebar' => __( 'Right Sidebar' ),
-		),
-		__( 'Features' ) => array(
-			'accessibility-ready'   => __( 'Accessibility Ready' ),
-			'blavatar'              => __( 'Blavatar' ),
-			'buddypress'            => __( 'BuddyPress' ),
-			'custom-background'     => __( 'Custom Background' ),
-			'custom-colors'         => __( 'Custom Colors' ),
-			'custom-header'         => __( 'Custom Header' ),
-			'custom-menu'           => __( 'Custom Menu' ),
-			'editor-style'          => __( 'Editor Style' ),
-			'featured-image-header' => __( 'Featured Image Header' ),
-			'featured-images'       => __( 'Featured Images' ),
-			'flexible-header'       => __( 'Flexible Header' ),
-			'front-page-post-form'  => __( 'Front Page Posting' ),
-			'full-width-template'   => __( 'Full Width Template' ),
-			'microformats'          => __( 'Microformats' ),
-			'post-formats'          => __( 'Post Formats' ),
-			'rtl-language-support'  => __( 'RTL Language Support' ),
-			'sticky-post'           => __( 'Sticky Post' ),
-			'theme-options'         => __( 'Theme Options' ),
-			'threaded-comments'     => __( 'Threaded Comments' ),
-			'translation-ready'     => __( 'Translation Ready' ),
-		),
-		__( 'Subject' )  => array(
-			'holiday'       => __( 'Holiday' ),
-			'photoblogging' => __( 'Photoblogging' ),
-			'seasonal'      => __( 'Seasonal' ),
 		)
 	);
 	if ( ! $api || ! current_user_can( 'install_themes' ) )
 		return $features;
 		return $features;
 	set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 	$category_translations = array(
-		'Colors'   => __( 'Colors' ),
 		'Layout'   => __( 'Layout' ),
 		'Features' => __( 'Features' ),
-		'Subject'  => __( 'Subject' )
+		'Subject'  => __( 'Subject' ),
 	);
 	// Loop over the wporg canonical list and apply translations
 	$wporg_features = array();
 	foreach ( (array) $feature_list as $feature_category => $feature_items ) {
 	return $wporg_features;
 }
 /**
-* Retrieve theme installer pages from WordPress Themes API.
+* Retrieves theme installer pages from the WordPress.org Themes API.
 *
 * It is possible for a theme to override the Themes API result with three
 * filters. Assume this is for themes, which can extend on the Theme Info to
 * offer more choices. This is very powerful and must be used with care, when
 * overriding the filters.
 *
-* The first filter, 'themes_api_args', is for the args and gives the action as
+* The first filter, {@see 'themes_api_args'}, is for the args and gives the action
-* the second parameter. The hook for 'themes_api_args' must ensure that an
+* as the second parameter. The hook for {@see 'themes_api_args'} must ensure that
-* object is returned.
+* an object is returned.
 *
-* The second filter, 'themes_api', is the result that would be returned.
+* The second filter, {@see 'themes_api'}, allows a plugin to override the WordPress.org
+* Theme API entirely. If `$action` is 'query_themes', 'theme_information', or 'feature_list',
+* an object MUST be passed. If `$action` is 'hot_tags', an array should be passed.
+*
+* Finally, the third filter, {@see 'themes_api_result'}, makes it possible to filter the
+* response object or array, depending on the `$action` type.
+*
+* Supported arguments per action:
+*
+* | Argument Name      | 'query_themes' | 'theme_information' | 'hot_tags' | 'feature_list'   |
+* | -------------------| :------------: | :-----------------: | :--------: | :--------------: |
+* | `$slug`            | No             |  Yes                | No         | No               |
+* | `$per_page`        | Yes            |  No                 | No         | No               |
+* | `$page`            | Yes            |  No                 | No         | No               |
+* | `$number`          | No             |  No                 | Yes        | No               |
+* | `$search`          | Yes            |  No                 | No         | No               |
+* | `$tag`             | Yes            |  No                 | No         | No               |
+* | `$author`          | Yes            |  No                 | No         | No               |
+* | `$user`            | Yes            |  No                 | No         | No               |
+* | `$browse`          | Yes            |  No                 | No         | No               |
+* | `$locale`          | Yes            |  Yes                | No         | No               |
+* | `$fields`          | Yes            |  Yes                | No         | No               |
 *
 * @since 2.8.0
 *
-* @param string       $action The requested action. Likely values are 'theme_information',
+* @param string       $action API action to perform: 'query_themes', 'theme_information',
-*                             'feature_list', or 'query_themes'.
+*                             'hot_tags' or 'feature_list'.
-* @param array|object $args   Optional. Arguments to serialize for the Theme Info API.
+* @param array|object $args   {
-* @return mixed
+*     Optional. Array or object of arguments to serialize for the Themes API.
-*/
+*
-function themes_api( $action, $args = null ) {
+*     @type string  $slug     The theme slug. Default empty.
+*     @type int     $per_page Number of themes per page. Default 24.
+*     @type int     $page     Number of current page. Default 1.
+*     @type int     $number   Number of tags to be queried.
+*     @type string  $search   A search term. Default empty.
+*     @type string  $tag      Tag to filter themes. Default empty.
+*     @type string  $author   Username of an author to filter themes. Default empty.
+*     @type string  $user     Username to query for their favorites. Default empty.
+*     @type string  $browse   Browse view: 'featured', 'popular', 'updated', 'favorites'.
+*     @type string  $locale   Locale to provide context-sensitive results. Default is the value of get_locale().
+*     @type array   $fields   {
+*         Array of fields which should or should not be returned.
+*
+*         @type bool $description        Whether to return the theme full description. Default false.
+*         @type bool $sections           Whether to return the theme readme sections: description, installation,
+*                                        FAQ, screenshots, other notes, and changelog. Default false.
+*         @type bool $rating             Whether to return the rating in percent and total number of ratings.
+*                                        Default false.
+*         @type bool $ratings            Whether to return the number of rating for each star (1-5). Default false.
+*         @type bool $downloaded         Whether to return the download count. Default false.
+*         @type bool $downloadlink       Whether to return the download link for the package. Default false.
+*         @type bool $last_updated       Whether to return the date of the last update. Default false.
+*         @type bool $tags               Whether to return the assigned tags. Default false.
+*         @type bool $homepage           Whether to return the theme homepage link. Default false.
+*         @type bool $screenshots        Whether to return the screenshots. Default false.
+*         @type int  $screenshot_count   Number of screenshots to return. Default 1.
+*         @type bool $screenshot_url     Whether to return the URL of the first screenshot. Default false.
+*         @type bool $photon_screenshots Whether to return the screenshots via Photon. Default false.
+*         @type bool $template           Whether to return the slug of the parent theme. Default false.
+*         @type bool $parent             Whether to return the slug, name and homepage of the parent theme. Default false.
+*         @type bool $versions           Whether to return the list of all available versions. Default false.
+*         @type bool $theme_url          Whether to return theme's URL. Default false.
+*         @type bool $extended_author    Whether to return nicename or nicename and display name. Default false.
+*     }
+* }
+* @return object|array|WP_Error Response object or array on success, WP_Error on failure. See the
+*         {@link https://developer.wordpress.org/reference/functions/themes_api/ function reference article}
+*         for more information on the make-up of possible return objects depending on the value of `$action`.
+*/
+function themes_api( $action, $args = array() ) {
 	if ( is_array( $args ) ) {
 		$args = (object) $args;
 	}
 	if ( ! isset( $args->per_page ) ) {
 		$args->per_page = 24;
 	}
 	if ( ! isset( $args->locale ) ) {
-		$args->locale = get_locale();
+		$args->locale = get_user_locale();
 	}
 	/**
-	 * Filter arguments used to query for installer pages from the WordPress.org Themes API.
+	 * Filters arguments used to query for installer pages from the WordPress.org Themes API.
 	 *
 	 * Important: An object MUST be returned to this filter.
 	 *
 	 * @since 2.8.0
 	 *
 	 *                       'feature_list', or 'query_themes'.
 	 */
 	$args = apply_filters( 'themes_api_args', $args, $action );
 	/**
-	 * Filter whether to override the WordPress.org Themes API.
+	 * Filters whether to override the WordPress.org Themes API.
 	 *
-	 * Returning a value of true to this filter allows a theme to completely
+	 * Passing a non-false value will effectively short-circuit the WordPress.org API request.
-	 * override the built-in WordPress.org API.
+	 *
+	 * If `$action` is 'query_themes', 'theme_information', or 'feature_list', an object MUST
+	 * be passed. If `$action` is 'hot_tags', an array should be passed.
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param bool   $bool   Whether to override the WordPress.org Themes API. Default false.
+	 * @param false|object|array $override Whether to override the WordPress.org Themes API. Default false.
-	 * @param string $action Requested action. Likely values are 'theme_information',
+	 * @param string             $action   Requested action. Likely values are 'theme_information',
-	 *                       'feature_list', or 'query_themes'.
+	 *                                    'feature_list', or 'query_themes'.
-	 * @param object $args   Arguments used to query for installer pages from the Themes API.
+	 * @param object             $args     Arguments used to query for installer pages from the Themes API.
 	 */
 	$res = apply_filters( 'themes_api', false, $action, $args );
 	if ( ! $res ) {
+		// include an unmodified $wp_version
+		include( ABSPATH . WPINC . '/version.php' );
 		$url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
 		if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
 			$url = set_url_scheme( $url, 'https' );
 		$http_args = array(
+			'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
 			'body' => array(
 				'action' => $action,
 				'request' => serialize( $args )
 			)
 		);
 		$request = wp_remote_post( $url, $http_args );
 		if ( $ssl && is_wp_error( $request ) ) {
-			if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) {
+			if ( ! wp_doing_ajax() ) {
-				trigger_error( __( '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="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(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 );
+				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/' )
+					) . ' ' . __( '(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_post( $http_url, $http_args );
 		}
 		if ( is_wp_error($request) ) {
-			$res = new WP_Error('themes_api_failed', __( '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="https://wordpress.org/support/">support forums</a>.' ), $request->get_error_message() );
+			$res = new WP_Error( 'themes_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/' )
+				),
+				$request->get_error_message()
+			);
 		} else {
 			$res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
-			if ( ! is_object( $res ) && ! is_array( $res ) )
+			if ( ! is_object( $res ) && ! is_array( $res ) ) {
-				$res = new WP_Error('themes_api_failed', __( '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="https://wordpress.org/support/">support forums</a>.' ), wp_remote_retrieve_body( $request ) );
+				$res = new WP_Error( 'themes_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/' )
+					),
+					wp_remote_retrieve_body( $request )
+				);
+			}
 		}
 	}
 	/**
-	 * Filter the returned WordPress.org Themes API response.
+	 * Filters the returned WordPress.org Themes API response.
 	 *
 	 * @since 2.8.0
 	 *
-	 * @param array|object $res    WordPress.org Themes API response.
+	 * @param array|object|WP_Error $res    WordPress.org Themes API response.
-	 * @param string       $action Requested action. Likely values are 'theme_information',
+	 * @param string                $action Requested action. Likely values are 'theme_information',
-	 *                             'feature_list', or 'query_themes'.
+	 *                                      'feature_list', or 'query_themes'.
-	 * @param object       $args   Arguments used to query for installer pages from the WordPress.org Themes API.
+	 * @param object                $args   Arguments used to query for installer pages from the WordPress.org Themes API.
 	 */
 	return apply_filters( 'themes_api_result', $res, $action, $args );
 }
 /**
 */
 function wp_prepare_themes_for_js( $themes = null ) {
 	$current_theme = get_stylesheet();
 	/**
-	 * Filter theme data before it is prepared for JavaScript.
+	 * Filters theme data before it is prepared for JavaScript.
 	 *
 	 * Passing a non-empty array will result in wp_prepare_themes_for_js() returning
 	 * early with that value instead.
 	 *
 	 * @since 4.2.0
 		$slug = $theme->get_stylesheet();
 		$encoded_slug = urlencode( $slug );
 		$parent = false;
 		if ( $theme->parent() ) {
-			$parent = $theme->parent()->display( 'Name' );
+			$parent = $theme->parent();
-			$parents[ $slug ] = $theme->parent()->get_stylesheet();
+			$parents[ $slug ] = $parent->get_stylesheet();
+			$parent = $parent->display( 'Name' );
+		}
+		$customize_action = null;
+		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
+			$customize_action = esc_url( add_query_arg(
+				array(
+					'return' => urlencode( esc_url_raw( remove_query_arg( wp_removable_query_args(), wp_unslash( $_SERVER['REQUEST_URI'] ) ) ) ),
+				),
+				wp_customize_url( $slug )
+			) );
 		}
 		$prepared_themes[ $slug ] = array(
 			'id'           => $slug,
 			'name'         => $theme->display( 'Name' ),
 			'version'      => $theme->display( 'Version' ),
 			'tags'         => $theme->display( 'Tags' ),
 			'parent'       => $parent,
 			'active'       => $slug === $current_theme,
 			'hasUpdate'    => isset( $updates[ $slug ] ),
+			'hasPackage'   => isset( $updates[ $slug ] ) && ! empty( $updates[ $slug ][ 'package' ] ),
 			'update'       => get_theme_update_available( $theme ),
 			'actions'      => array(
 				'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&amp;stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null,
-				'customize' => ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) ? wp_customize_url( $slug ) : null,
+				'customize' => $customize_action,
-				'preview'   => add_query_arg( array(
-					'preview'        => 1,
-					'template'       => urlencode( $theme->get_template() ),
-					'stylesheet'     => urlencode( $slug ),
-					'preview_iframe' => true,
-					'TB_iframe'      => true,
-				), home_url( '/' ) ),
 				'delete'   => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&amp;stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null,
 			),
 		);
 	}
 	if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
 		unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
 	}
 	/**
-	 * Filter the themes prepared for JavaScript, for themes.php.
+	 * Filters the themes prepared for JavaScript, for themes.php.
 	 *
 	 * Could be useful for changing the order, which is by name by default.
 	 *
 	 * @since 3.8.0
 	 *
 * Print JS templates for the theme-browsing UI in the Customizer.
 *
 * @since 4.2.0
 */
 function customize_themes_print_templates() {
-	$preview_url = esc_url( add_query_arg( 'theme', '__THEME__' ) ); // Token because esc_url() strips curly braces.
-	$preview_url = str_replace( '__THEME__', '{{ data.id }}', $preview_url );
 	?>
 	<script type="text/html" id="tmpl-customize-themes-details-view">
 		<div class="theme-backdrop"></div>
-		<div class="theme-wrap">
+		<div class="theme-wrap wp-clearfix" role="document">
 			<div class="theme-header">
 				<button type="button" class="left dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show previous theme' ); ?></span></button>
 				<button type="button" class="right dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Show next theme' ); ?></span></button>
 				<button type="button" class="close dashicons dashicons-no"><span class="screen-reader-text"><?php _e( 'Close details dialog' ); ?></span></button>
 			</div>
-			<div class="theme-about">
+			<div class="theme-about wp-clearfix">
 				<div class="theme-screenshots">
-				<# if ( data.screenshot[0] ) { #>
+				<# if ( data.screenshot && data.screenshot[0] ) { #>
 					<div class="screenshot"><img src="{{ data.screenshot[0] }}" alt="" /></div>
 				<# } else { #>
 					<div class="screenshot blank"></div>
 				<# } #>
 				</div>
 				<div class="theme-info">
 					<# if ( data.active ) { #>
 						<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
 					<# } #>
-					<h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h3>
+					<h2 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{ data.version }}' ); ?></span></h2>
-					<h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h4>
+					<h3 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h3>
-					<p class="theme-description">{{{ data.description }}}</p>
+					<# if ( data.stars && 0 != data.num_ratings ) { #>
+						<div class="theme-rating">
+							{{{ data.stars }}}
+							<span class="num-ratings">
+								<?php
+								/* translators: %s: number of ratings */
+								echo sprintf( __( '(%s ratings)' ), '{{ data.num_ratings }}' );
+								?>
+							</span>
+						</div>
+					<# } #>
+					<# if ( data.hasUpdate ) { #>
+						<div class="notice notice-warning notice-alt notice-large" data-slug="{{ data.id }}">
+							<h3 class="notice-title"><?php _e( 'Update Available' ); ?></h3>
+							{{{ data.update }}}
+						</div>
+					<# } #>
 					<# if ( data.parent ) { #>
 						<p class="parent-theme"><?php printf( __( 'This is a child theme of %s.' ), '<strong>{{{ data.parent }}}</strong>' ); ?></p>
 					<# } #>
+					<p class="theme-description">{{{ data.description }}}</p>
 					<# if ( data.tags ) { #>
-						<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{ data.tags }}</p>
+						<p class="theme-tags"><span><?php _e( 'Tags:' ); ?></span> {{{ data.tags }}}</p>
 					<# } #>
 				</div>
 			</div>
-			<# if ( ! data.active ) { #>
+			<div class="theme-actions">
-				<div class="theme-actions">
+				<# if ( data.active ) { #>
-					<div class="inactive-theme">
+					<button type="button" class="button button-primary customize-theme"><?php _e( 'Customize' ); ?></button>
-						<a href="<?php echo $preview_url; ?>" target="_top" class="button button-primary"><?php _e( 'Live Preview' ); ?></a>
+				<# } else if ( 'installed' === data.type ) { #>
-					</div>
+					<?php if ( current_user_can( 'delete_themes' ) ) { ?>
-				</div>
+						<# if ( data.actions && data.actions['delete'] ) { #>
-			<# } #>
+							<a href="{{{ data.actions['delete'] }}}" data-slug="{{ data.id }}" class="button button-secondary delete-theme"><?php _e( 'Delete' ); ?></a>
+						<# } #>
+					<?php } ?>
+					<button type="button" class="button button-primary preview-theme" data-slug="{{ data.id }}"><?php _e( 'Live Preview' ); ?></button>
+				<# } else { #>
+					<button type="button" class="button theme-install" data-slug="{{ data.id }}"><?php _e( 'Install' ); ?></button>
+					<button type="button" class="button button-primary theme-install preview" data-slug="{{ data.id }}"><?php _e( 'Install &amp; Preview' ); ?></button>
+				<# } #>
+			</div>
 		</div>
 	</script>
 	<?php
 }
-add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );

changeset 7	cf61fcea0001
parent 5	5e2f62d02dcd
child 9	177826044cd9