X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-admin/includes/theme.php diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index cc7c4545..9bbfc721 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -11,9 +11,11 @@ * * @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; @@ -25,8 +27,8 @@ function delete_theme($stylesheet, $redirect = '') { if ( empty( $redirect ) ) $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet); if ( false === ($credentials = request_filesystem_credentials($redirect)) ) { - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); + if ( ! empty($data) ){ include_once( ABSPATH . 'wp-admin/admin-header.php'); echo $data; @@ -38,8 +40,8 @@ function delete_theme($stylesheet, $redirect = '') { if ( ! WP_Filesystem($credentials) ) { request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again - $data = ob_get_contents(); - ob_end_clean(); + $data = ob_get_clean(); + if ( ! empty($data) ) { include_once( ABSPATH . 'wp-admin/admin-header.php'); echo $data; @@ -55,20 +57,34 @@ function delete_theme($stylesheet, $redirect = '') { if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() ) return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors); - //Get the base plugin folder + // Get the base plugin folder. $themes_dir = $wp_filesystem->wp_themes_dir(); - if ( empty($themes_dir) ) - return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress theme directory.')); + if ( empty( $themes_dir ) ) { + return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) ); + } $themes_dir = trailingslashit( $themes_dir ); - $theme_dir = trailingslashit($themes_dir . $stylesheet); - $deleted = $wp_filesystem->delete($theme_dir, true); + $theme_dir = trailingslashit( $themes_dir . $stylesheet ); + $deleted = $wp_filesystem->delete( $theme_dir, true ); + + if ( ! $deleted ) { + return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) ); + } - if ( ! $deleted ) - return new WP_Error('could_not_remove_theme', sprintf(__('Could not fully remove the theme %s.'), $stylesheet) ); + $theme_translations = wp_get_installed_translations( 'themes' ); - // Force refresh of theme update information - delete_site_transient('update_themes'); + // Remove language files, silently. + if ( ! empty( $theme_translations[ $stylesheet ] ) ) { + $translations = $theme_translations[ $stylesheet ]; + + foreach ( $translations as $translation => $data ) { + $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' ); + $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' ); + } + } + + // Force refresh of theme update information. + delete_site_transient( 'update_themes' ); return true; } @@ -78,10 +94,11 @@ function delete_theme($stylesheet, $redirect = '') { * * @since 1.5.0 * + * @param WP_Post|null $post Optional. The post being edited, provided for context. * @return array Key is the template name, value is the filename of the template */ -function get_page_templates() { - return array_flip( wp_get_theme()->get_page_templates() ); +function get_page_templates( $post = null ) { + return array_flip( wp_get_theme()->get_page_templates( $post ) ); } /** @@ -106,7 +123,7 @@ function _get_template_edit_filename($fullpath, $containingfolder) { * @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 ); @@ -119,11 +136,13 @@ function theme_update_available( $theme ) { * * @since 3.8.0 * + * @staticvar object $themes_update + * * @param WP_Theme $theme WP_Theme object. - * @return string|bool HTML for the update link, or false if invalid info was passed. + * @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; @@ -131,8 +150,9 @@ function get_theme_update_available( $theme ) { if ( !isset($themes_update) ) $themes_update = get_site_transient('update_themes'); - if ( ! is_a( $theme, 'WP_Theme' ) ) + if ( ! ( $theme instanceof WP_Theme ) ) { return false; + } $stylesheet = $theme->get_stylesheet(); @@ -147,11 +167,14 @@ function get_theme_update_available( $theme ) { if ( !is_multisite() ) { if ( ! current_user_can('update_themes') ) { - $html = sprintf( '

' . __('There is a new version of %1$s available. View version %3$s details.') . '

', $theme_name, $details_url, $update['new_version']); - } else if ( empty( $update['package'] ) ) { - $html = sprintf( '

' . __('There is a new version of %1$s available. View version %3$s details. Automatic update is unavailable for this theme.') . '

', $theme_name, $details_url, $update['new_version']); + $html = sprintf( '

' . __( 'There is a new version of %1$s available. View version %4$s details.' ) . '

', + $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] ); + } elseif ( empty( $update['package'] ) ) { + $html = sprintf( '

' . __( 'There is a new version of %1$s available. View version %4$s details. Automatic update is unavailable for this theme.' ) . '

', + $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] ); } else { - $html = sprintf( '

' . __('There is a new version of %1$s available. View version %3$s details or update now.') . '

', $theme_name, $details_url, $update['new_version'], $update_url, $update_onclick ); + $html = sprintf( '

' . __( 'There is a new version of %1$s available. View version %4$s details or update now.' ) . '

', + $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'], $update_url, $update_onclick ); } } } @@ -188,7 +211,10 @@ function get_theme_feature_list( $api = true ) { 'light' => __( 'Light' ), ), - __( 'Columns' ) => array( + __( 'Layout' ) => array( + 'fixed-layout' => __( 'Fixed Layout' ), + 'fluid-layout' => __( 'Fluid Layout' ), + 'responsive-layout' => __( 'Responsive Layout' ), 'one-column' => __( 'One Column' ), 'two-columns' => __( 'Two Columns' ), 'three-columns' => __( 'Three Columns' ), @@ -197,12 +223,6 @@ function get_theme_feature_list( $api = true ) { 'right-sidebar' => __( 'Right Sidebar' ), ), - __( 'Layout' ) => array( - 'fixed-layout' => __( 'Fixed Layout' ), - 'fluid-layout' => __( 'Fluid Layout' ), - 'responsive-layout' => __( 'Responsive Layout' ), - ), - __( 'Features' ) => array( 'accessibility-ready' => __( 'Accessibility Ready' ), 'blavatar' => __( 'Blavatar' ), @@ -237,7 +257,7 @@ function get_theme_feature_list( $api = true ) { return $features; if ( !$feature_list = get_site_transient( 'wporg_theme_feature_list' ) ) - set_site_transient( 'wporg_theme_feature_list', array(), 10800); + set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS ); if ( !$feature_list ) { $feature_list = themes_api( 'feature_list', array() ); @@ -248,10 +268,14 @@ function get_theme_feature_list( $api = true ) { if ( !$feature_list ) return $features; - set_site_transient( 'wporg_theme_feature_list', $feature_list, 10800 ); + set_site_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS ); - $category_translations = array( 'Colors' => __('Colors'), 'Columns' => __('Columns'), 'Width' => __('Width'), - 'Features' => __('Features'), 'Subject' => __('Subject') ); + $category_translations = array( + 'Colors' => __( 'Colors' ), + 'Layout' => __( 'Layout' ), + 'Features' => __( 'Features' ), + 'Subject' => __( 'Subject' ) + ); // Loop over the wporg canonical list and apply translations $wporg_features = array(); @@ -277,7 +301,7 @@ function get_theme_feature_list( $api = true ) { * 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 - * overridding the filters. + * overriding the filters. * * The first filter, 'themes_api_args', is for the args and gives the action as * the second parameter. The hook for 'themes_api_args' must ensure that an @@ -294,11 +318,18 @@ function get_theme_feature_list( $api = true ) { */ function themes_api( $action, $args = null ) { - if ( is_array($args) ) - $args = (object)$args; + if ( is_array( $args ) ) { + $args = (object) $args; + } - if ( !isset($args->per_page) ) + if ( ! isset( $args->per_page ) ) { $args->per_page = 24; + } + + if ( ! isset( $args->locale ) ) { + $args->locale = get_locale(); + } + /** * Filter arguments used to query for installer pages from the WordPress.org Themes API. * @@ -309,7 +340,7 @@ function themes_api( $action, $args = null ) { * @param object $args Arguments used to query for installer pages from the WordPress.org Themes API. * @param string $action Requested action. Likely values are 'theme_information', * 'feature_list', or 'query_themes'. - */ + */ $args = apply_filters( 'themes_api_args', $args, $action ); /** @@ -332,25 +363,27 @@ function themes_api( $action, $args = null ) { if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) $url = set_url_scheme( $url, 'https' ); - $args = array( + $http_args = array( 'body' => array( 'action' => $action, 'request' => serialize( $args ) ) ); - $request = wp_remote_post( $url, $args ); + $request = wp_remote_post( $url, $http_args ); if ( $ssl && is_wp_error( $request ) ) { - trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the 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_post( $http_url, $args ); + if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) { + trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the 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_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’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); + $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), $request->get_error_message() ); } else { $res = maybe_unserialize( wp_remote_retrieve_body( $request ) ); 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’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); + $res = new WP_Error('themes_api_failed', __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration. If you continue to have problems, please try the support forums.' ), wp_remote_retrieve_body( $request ) ); } } @@ -380,8 +413,26 @@ function themes_api( $action, $args = null ) { function wp_prepare_themes_for_js( $themes = null ) { $current_theme = get_stylesheet(); + /** + * Filter 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 + * + * @param array $prepared_themes An associative array of theme data. Default empty array. + * @param null|array $themes An array of WP_Theme objects to prepare, if any. + * @param string $current_theme The current theme slug. + */ + $prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme ); + + if ( ! empty( $prepared_themes ) ) { + return $prepared_themes; + } + // Make sure the current theme is listed first. - $prepared_themes = array( $current_theme => array() ); + $prepared_themes[ $current_theme ] = array(); if ( null === $themes ) { $themes = wp_get_themes( array( 'allowed' => true ) ); @@ -399,15 +450,19 @@ function wp_prepare_themes_for_js( $themes = null ) { } WP_Theme::sort_by_name( $themes ); + + $parents = array(); + foreach ( $themes as $theme ) { + $slug = $theme->get_stylesheet(); + $encoded_slug = urlencode( $slug ); + $parent = false; if ( $theme->parent() ) { $parent = $theme->parent()->display( 'Name' ); + $parents[ $slug ] = $theme->parent()->get_stylesheet(); } - $slug = $theme->get_stylesheet(); - $encoded_slug = urlencode( $slug ); - $prepared_themes[ $slug ] = array( 'id' => $slug, 'name' => $theme->display( 'Name' ), @@ -423,19 +478,17 @@ function wp_prepare_themes_for_js( $themes = null ) { 'update' => get_theme_update_available( $theme ), 'actions' => array( 'activate' => current_user_can( 'switch_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=activate&stylesheet=' . $encoded_slug ), 'switch-theme_' . $slug ) : null, - 'customize'=> current_user_can( 'edit_theme_options' ) ? wp_customize_url( $slug ) : null, - 'preview' => add_query_arg( array( - 'preview' => 1, - 'template' => urlencode( $theme->get_template() ), - 'stylesheet' => urlencode( $slug ), - 'preview_iframe' => true, - 'TB_iframe' => true, - ), home_url( '/' ) ), + 'customize' => ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) ? wp_customize_url( $slug ) : null, 'delete' => current_user_can( 'delete_themes' ) ? wp_nonce_url( admin_url( 'themes.php?action=delete&stylesheet=' . $encoded_slug ), 'delete-theme_' . $slug ) : null, ), ); } + // Remove 'delete' action if theme has an active child + 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. * @@ -446,5 +499,62 @@ function wp_prepare_themes_for_js( $themes = null ) { * @param array $prepared_themes Array of themes. */ $prepared_themes = apply_filters( 'wp_prepare_themes_for_js', $prepared_themes ); - return array_values( $prepared_themes ); -} \ No newline at end of file + $prepared_themes = array_values( $prepared_themes ); + return array_filter( $prepared_themes ); +} + +/** + * 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 ); + ?> + +