From 99bac7e17cfb5d534b33ffc3a70bff9d9b86875d Mon Sep 17 00:00:00 2001 From: audrasjb Date: Thu, 20 Jan 2022 23:53:05 +0000 Subject: [PATCH] Docs: Replace "Current theme" with "Active theme" in various DocBlocks. This change replaces "Current theme" with "Active theme" in various DocBlocks for better consistency with user-facing strings. Follow-up to [52580]. Props Presskopp, audrasjb, costdev. Fixes #54831. See #54770. Built from https://develop.svn.wordpress.org/trunk@52610 git-svn-id: http://core.svn.wordpress.org/trunk@52198 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-custom-image-header.php | 2 +- .../includes/class-theme-installer-skin.php | 4 +- wp-admin/includes/class-theme-upgrader.php | 8 +- wp-admin/includes/dashboard.php | 2 +- wp-admin/includes/file.php | 2 +- wp-admin/includes/meta-boxes.php | 2 +- wp-admin/includes/theme.php | 4 +- wp-includes/block-template-utils.php | 2 +- wp-includes/block-template.php | 8 +- wp-includes/class-wp-customize-manager.php | 8 +- wp-includes/class-wp-theme-json-resolver.php | 6 +- wp-includes/class-wp-theme-json.php | 4 +- wp-includes/class-wp-theme.php | 4 +- wp-includes/class.wp-scripts.php | 2 +- wp-includes/class.wp-styles.php | 2 +- .../class-wp-customize-themes-panel.php | 2 +- wp-includes/default-constants.php | 2 +- .../class-wp-rest-themes-controller.php | 2 +- wp-includes/theme.php | 106 +++++++++--------- wp-includes/update.php | 2 +- wp-includes/version.php | 2 +- .../widgets/class-wp-widget-search.php | 2 +- 22 files changed, 89 insertions(+), 89 deletions(-) diff --git a/wp-admin/includes/class-custom-image-header.php b/wp-admin/includes/class-custom-image-header.php index f0bf1a21a6..f8d1bb6630 100644 --- a/wp-admin/includes/class-custom-image-header.php +++ b/wp-admin/includes/class-custom-image-header.php @@ -1455,7 +1455,7 @@ endif; /** * Given an attachment ID for a header image, unsets it as a user-uploaded - * header image for the current theme. + * 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. diff --git a/wp-admin/includes/class-theme-installer-skin.php b/wp-admin/includes/class-theme-installer-skin.php index fbcc7ccd83..91c3a50088 100644 --- a/wp-admin/includes/class-theme-installer-skin.php +++ b/wp-admin/includes/class-theme-installer-skin.php @@ -223,7 +223,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { echo '

' . esc_html__( 'This theme is already installed.' ) . '

'; - // Check errors for current theme. + // Check errors for active theme. if ( is_wp_error( $current_theme_data->errors() ) ) { $this->feedback( 'current_theme_has_errors', $current_theme_data->errors()->get_error_message() ); } @@ -283,7 +283,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { * @since 5.5.0 * * @param string $table The output table with Name, Version, Author, RequiresWP, and RequiresPHP info. - * @param WP_Theme $current_theme_data Current theme data. + * @param WP_Theme $current_theme_data Active theme data. * @param array $new_theme_data Array with uploaded theme data. */ echo apply_filters( 'install_theme_overwrite_comparison', $table, $current_theme_data, $new_theme_data ); diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 0a80209386..864af8f3c5 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -609,7 +609,7 @@ class Theme_Upgrader extends WP_Upgrader { } /** - * Turn on maintenance mode before attempting to upgrade the current theme. + * Turn on maintenance mode before attempting to upgrade the active theme. * * Hooked to the {@see 'upgrader_pre_install'} filter by Theme_Upgrader::upgrade() and * Theme_Upgrader::bulk_upgrade(). @@ -627,7 +627,7 @@ class Theme_Upgrader extends WP_Upgrader { $theme = isset( $theme['theme'] ) ? $theme['theme'] : ''; - // Only run if current theme + // Only run if active theme if ( get_stylesheet() !== $theme ) { return $return; } @@ -641,7 +641,7 @@ class Theme_Upgrader extends WP_Upgrader { } /** - * Turn off maintenance mode after upgrading the current theme. + * Turn off maintenance mode after upgrading the active theme. * * Hooked to the {@see 'upgrader_post_install'} filter by Theme_Upgrader::upgrade() * and Theme_Upgrader::bulk_upgrade(). @@ -659,7 +659,7 @@ class Theme_Upgrader extends WP_Upgrader { $theme = isset( $theme['theme'] ) ? $theme['theme'] : ''; - // Only run if current theme. + // Only run if active theme. if ( get_stylesheet() !== $theme ) { return $return; } diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index a328a33a7a..a823666d6d 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -1987,7 +1987,7 @@ function wp_dashboard_empty() {} * Displays a welcome panel to introduce users to WordPress. * * @since 3.3.0 - * @since 5.9.0 Send users to the Site Editor if the current theme is block-based. + * @since 5.9.0 Send users to the Site Editor if the active theme is block-based. */ function wp_welcome_panel() { list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 79e2d48103..6aa75a4c59 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -287,7 +287,7 @@ function wp_get_theme_file_editable_extensions( $theme ) { * @since 4.4.0 * * @param string[] $default_types An array of editable theme file extensions. - * @param WP_Theme $theme The current theme object. + * @param WP_Theme $theme The active theme object. */ $file_types = apply_filters( 'wp_theme_editor_filetypes', $default_types, $theme ); diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php index 00cede846e..663bce049c 100644 --- a/wp-admin/includes/meta-boxes.php +++ b/wp-admin/includes/meta-boxes.php @@ -485,7 +485,7 @@ function post_format_meta_box( $post, $box ) { if ( ! $post_format ) { $post_format = '0'; } - // Add in the current one if it isn't there yet, in case the current theme doesn't support it. + // Add in the current one if it isn't there yet, in case the active theme doesn't support it. if ( $post_format && ! in_array( $post_format, $post_formats[0], true ) ) { $post_formats[0][] = $post_format; } diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index d7d7d18eaf..1d32a62afb 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -653,7 +653,7 @@ function wp_prepare_themes_for_js( $themes = null ) { * * @param array $prepared_themes An associative array of theme data. Default empty array. * @param WP_Theme[]|null $themes An array of theme objects to prepare, if any. - * @param string $current_theme The current theme slug. + * @param string $current_theme The active theme slug. */ $prepared_themes = (array) apply_filters( 'pre_prepare_themes_for_js', array(), $themes, $current_theme ); @@ -661,7 +661,7 @@ function wp_prepare_themes_for_js( $themes = null ) { return $prepared_themes; } - // Make sure the current theme is listed first. + // Make sure the active theme is listed first. $prepared_themes[ $current_theme ] = array(); if ( null === $themes ) { diff --git a/wp-includes/block-template-utils.php b/wp-includes/block-template-utils.php index 20ca871028..71b90e40e7 100644 --- a/wp-includes/block-template-utils.php +++ b/wp-includes/block-template-utils.php @@ -422,7 +422,7 @@ function _flatten_blocks( &$blocks ) { } /** - * Parses wp_template content and injects the current theme's + * Parses wp_template content and injects the active theme's * stylesheet as a theme attribute into each wp_template_part * * @since 5.9.0 diff --git a/wp-includes/block-template.php b/wp-includes/block-template.php index ee619dbe5c..de266c04f2 100644 --- a/wp-includes/block-template.php +++ b/wp-includes/block-template.php @@ -160,7 +160,7 @@ function resolve_block_template( $template_type, $template_hierarchy, $fallback_ $theme_base_path = get_stylesheet_directory() . DIRECTORY_SEPARATOR; $parent_theme_base_path = get_template_directory() . DIRECTORY_SEPARATOR; - // Is the current theme a child theme, and is the PHP fallback template part of it? + // Is the active theme a child theme, and is the PHP fallback template part of it? if ( strpos( $fallback_template, $theme_base_path ) === 0 && strpos( $fallback_template, $parent_theme_base_path ) === false @@ -180,9 +180,9 @@ function resolve_block_template( $template_type, $template_hierarchy, $fallback_ 'theme' === $templates[0]->source ) { // Unfortunately, we cannot trust $templates[0]->theme, since it will always - // be set to the current theme's slug by _build_block_template_result_from_file(), - // even if the block template is really coming from the current theme's parent. - // (The reason for this is that we want it to be associated with the current theme + // be set to the active theme's slug by _build_block_template_result_from_file(), + // even if the block template is really coming from the active theme's parent. + // (The reason for this is that we want it to be associated with the active theme // -- not its parent -- once we edit it and store it to the DB as a wp_template CPT.) // Instead, we use _get_block_template_file() to locate the block template file. $template_file = _get_block_template_file( 'wp_template', $fallback_template_slug ); diff --git a/wp-includes/class-wp-customize-manager.php b/wp-includes/class-wp-customize-manager.php index 9f74692e7f..b566ae6dff 100644 --- a/wp-includes/class-wp-customize-manager.php +++ b/wp-includes/class-wp-customize-manager.php @@ -496,7 +496,7 @@ final class WP_Customize_Manager { /** * Start 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 * @@ -699,7 +699,7 @@ final class WP_Customize_Manager { /** * Stop previewing the selected theme. * - * Removes filters to change the current theme. + * Removes filters to change the active theme. * * @since 3.4.0 */ @@ -1769,7 +1769,7 @@ final class WP_Customize_Manager { } 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.+?)::(?P.+)$/'; if ( preg_match( $namespace_pattern, $setting_id, $matches ) && $this->get_stylesheet() === $matches['stylesheet'] ) { $values[ $matches['setting_id'] ] = $setting_params['value']; @@ -2297,7 +2297,7 @@ final class WP_Customize_Manager { } /** - * 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 * diff --git a/wp-includes/class-wp-theme-json-resolver.php b/wp-includes/class-wp-theme-json-resolver.php index cf1528d807..b9a3819d40 100644 --- a/wp-includes/class-wp-theme-json-resolver.php +++ b/wp-includes/class-wp-theme-json-resolver.php @@ -217,14 +217,14 @@ class WP_Theme_JSON_Resolver { /** * Returns the custom post type that contains the user's origin config - * for the current theme or a void array if none are found. + * for the active theme or a void array if none are found. * * This can also create and return a new draft custom post type. * * @since 5.9.0 * * @param WP_Theme $theme The theme object. If empty, it - * defaults to the current theme. + * defaults to the active theme. * @param bool $create_post Optional. Whether a new custom post * type should be created if none are * found. Default false. @@ -396,7 +396,7 @@ class WP_Theme_JSON_Resolver { } /** - * Whether the current theme has a theme.json file. + * Whether the active theme has a theme.json file. * * @since 5.8.0 * @since 5.9.0 Added a check in the parent theme. diff --git a/wp-includes/class-wp-theme-json.php b/wp-includes/class-wp-theme-json.php index fb8bd3f27b..f379531598 100644 --- a/wp-includes/class-wp-theme-json.php +++ b/wp-includes/class-wp-theme-json.php @@ -708,7 +708,7 @@ class WP_Theme_JSON { } /** - * Returns the page templates of the current theme. + * Returns the page templates of the active theme. * * @since 5.9.0 * @@ -732,7 +732,7 @@ class WP_Theme_JSON { } /** - * Returns the template part data of current theme. + * Returns the template part data of active theme. * * @since 5.9.0 * diff --git a/wp-includes/class-wp-theme.php b/wp-includes/class-wp-theme.php index 04e3e0ade4..9fa101906a 100644 --- a/wp-includes/class-wp-theme.php +++ b/wp-includes/class-wp-theme.php @@ -698,7 +698,7 @@ final class WP_Theme implements ArrayAccess { * * @since 3.4.0 * - * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme. + * @return WP_Theme|false Parent theme, or false if the active theme is not a child theme. */ public function parent() { return isset( $this->parent ) ? $this->parent : false; @@ -1217,7 +1217,7 @@ final class WP_Theme implements ArrayAccess { * with the value of the translated header name. */ public function get_post_templates() { - // If you screw up your current theme and we invalidate your parent, most things still work. Let it slide. + // If you screw up your active theme and we invalidate your parent, most things still work. Let it slide. if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) { return array(); } diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php index 0f38a48618..10104d6dfa 100644 --- a/wp-includes/class.wp-scripts.php +++ b/wp-includes/class.wp-scripts.php @@ -125,7 +125,7 @@ class WP_Scripts extends WP_Dependencies { /** * Holds a string which contains the type attribute for script tag. * - * If the current theme does not declare HTML5 support for 'script', + * If the active theme does not declare HTML5 support for 'script', * then it initializes as `type='text/javascript'`. * * @since 5.3.0 diff --git a/wp-includes/class.wp-styles.php b/wp-includes/class.wp-styles.php index 62def4575c..91e14aeffc 100644 --- a/wp-includes/class.wp-styles.php +++ b/wp-includes/class.wp-styles.php @@ -103,7 +103,7 @@ class WP_Styles extends WP_Dependencies { /** * Holds a string which contains the type attribute for style tag. * - * If the current theme does not declare HTML5 support for 'style', + * If the active theme does not declare HTML5 support for 'style', * then it initializes as `type='text/css'`. * * @since 5.3.0 diff --git a/wp-includes/customize/class-wp-customize-themes-panel.php b/wp-includes/customize/class-wp-customize-themes-panel.php index ebc02401f4..054396e7f7 100644 --- a/wp-includes/customize/class-wp-customize-themes-panel.php +++ b/wp-includes/customize/class-wp-customize-themes-panel.php @@ -27,7 +27,7 @@ class WP_Customize_Themes_Panel extends WP_Customize_Panel { /** * An Underscore (JS) template for rendering this panel's container. * - * The themes panel renders a custom panel heading with the current theme and a switch themes button. + * The themes panel renders a custom panel heading with the active theme and a switch themes button. * * @see WP_Customize_Panel::print_template() * diff --git a/wp-includes/default-constants.php b/wp-includes/default-constants.php index cd70ca5cf6..64baf0d20c 100644 --- a/wp-includes/default-constants.php +++ b/wp-includes/default-constants.php @@ -402,7 +402,7 @@ function wp_templating_constants() { /** * Slug of the default theme for this installation. * Used as the default theme when installing new sites. - * It will be used as the fallback if the current theme doesn't exist. + * It will be used as the fallback if the active theme doesn't exist. * * @since 3.0.0 * diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php index 05cd65c47a..e1083eaa41 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php @@ -334,7 +334,7 @@ class WP_REST_Themes_Controller extends WP_REST_Controller { $response->add_links( $this->prepare_links( $theme ) ); if ( $theme->get_stylesheet() === wp_get_theme()->get_stylesheet() ) { - // This creates a record for the current theme if not existent. + // This creates a record for the active theme if not existent. $id = WP_Theme_JSON_Resolver::get_user_global_styles_post_id(); } else { $user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( $theme ); diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 6584c99896..f28acc8d15 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -45,7 +45,7 @@ function wp_get_themes( $args = array() ) { $theme_directories = search_theme_directories(); if ( is_array( $wp_theme_directories ) && count( $wp_theme_directories ) > 1 ) { - // Make sure the current theme wins out, in case search_theme_directories() picks the wrong + // Make sure the active theme wins out, in case search_theme_directories() picks the wrong // one in the case of a conflict. (Normally, last registered theme root wins.) $current_theme = get_stylesheet(); if ( isset( $theme_directories[ $current_theme ] ) ) { @@ -105,10 +105,10 @@ function wp_get_themes( $args = array() ) { * * @global array $wp_theme_directories * - * @param string $stylesheet Optional. Directory name for the theme. Defaults to current theme. + * @param string $stylesheet Optional. Directory name for the theme. Defaults to active theme. * @param string $theme_root Optional. Absolute path of the theme root to look in. * If not specified, get_raw_theme_root() is used to calculate - * the theme root for the $stylesheet provided (or current theme). + * the theme root for the $stylesheet provided (or active theme). * @return WP_Theme Theme object. Be sure to check the object's exists() method * if you need to confirm the theme's existence. */ @@ -182,11 +182,11 @@ function get_stylesheet() { } /** - * Retrieves stylesheet directory path for current theme. + * Retrieves stylesheet directory path for the active theme. * * @since 1.5.0 * - * @return string Path to current theme's stylesheet directory. + * @return string Path to active theme's stylesheet directory. */ function get_stylesheet_directory() { $stylesheet = get_stylesheet(); @@ -194,23 +194,23 @@ function get_stylesheet_directory() { $stylesheet_dir = "$theme_root/$stylesheet"; /** - * Filters the stylesheet directory path for current theme. + * Filters the stylesheet directory path for the active theme. * * @since 1.5.0 * - * @param string $stylesheet_dir Absolute path to the current theme. - * @param string $stylesheet Directory name of the current theme. + * @param string $stylesheet_dir Absolute path to the active theme. + * @param string $stylesheet Directory name of the active theme. * @param string $theme_root Absolute path to themes directory. */ return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root ); } /** - * Retrieves stylesheet directory URI for current theme. + * Retrieves stylesheet directory URI for the active theme. * * @since 1.5.0 * - * @return string URI to current theme's stylesheet directory. + * @return string URI to active theme's stylesheet directory. */ function get_stylesheet_directory_uri() { $stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) ); @@ -230,25 +230,25 @@ function get_stylesheet_directory_uri() { } /** - * Retrieves stylesheet URI for current theme. + * Retrieves stylesheet URI for the active theme. * * The stylesheet file name is 'style.css' which is appended to the stylesheet directory URI path. * See get_stylesheet_directory_uri(). * * @since 1.5.0 * - * @return string URI to current theme's stylesheet. + * @return string URI to active theme's stylesheet. */ function get_stylesheet_uri() { $stylesheet_dir_uri = get_stylesheet_directory_uri(); $stylesheet_uri = $stylesheet_dir_uri . '/style.css'; /** - * Filters the URI of the current theme stylesheet. + * Filters the URI of the active theme stylesheet. * * @since 1.5.0 * - * @param string $stylesheet_uri Stylesheet URI for the current theme/child theme. - * @param string $stylesheet_dir_uri Stylesheet directory URI for the current theme/child theme. + * @param string $stylesheet_uri Stylesheet URI for the active theme/child theme. + * @param string $stylesheet_dir_uri Stylesheet directory URI for the active theme/child theme. */ return apply_filters( 'stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri ); } @@ -272,7 +272,7 @@ function get_stylesheet_uri() { * * @global WP_Locale $wp_locale WordPress date and time locale object. * - * @return string URI to current theme's localized stylesheet. + * @return string URI to active theme's localized stylesheet. */ function get_locale_stylesheet_uri() { global $wp_locale; @@ -298,7 +298,7 @@ function get_locale_stylesheet_uri() { } /** - * Retrieves name of the current theme. + * Retrieves name of the active theme. * * @since 1.5.0 * @@ -306,21 +306,21 @@ function get_locale_stylesheet_uri() { */ function get_template() { /** - * Filters the name of the current theme. + * Filters the name of the active theme. * * @since 1.5.0 * - * @param string $template Current theme's directory name. + * @param string $template active theme's directory name. */ return apply_filters( 'template', get_option( 'template' ) ); } /** - * Retrieves template directory path for current theme. + * Retrieves template directory path for the active theme. * * @since 1.5.0 * - * @return string Path to current theme's template directory. + * @return string Path to active theme's template directory. */ function get_template_directory() { $template = get_template(); @@ -328,23 +328,23 @@ function get_template_directory() { $template_dir = "$theme_root/$template"; /** - * Filters the current theme directory path. + * Filters the active theme directory path. * * @since 1.5.0 * - * @param string $template_dir The path of the current theme directory. - * @param string $template Directory name of the current theme. + * @param string $template_dir The path of the active theme directory. + * @param string $template Directory name of the active theme. * @param string $theme_root Absolute path to the themes directory. */ return apply_filters( 'template_directory', $template_dir, $template, $theme_root ); } /** - * Retrieves template directory URI for current theme. + * Retrieves template directory URI for the active theme. * * @since 1.5.0 * - * @return string URI to current theme's template directory. + * @return string URI to active theme's template directory. */ function get_template_directory_uri() { $template = str_replace( '%2F', '/', rawurlencode( get_template() ) ); @@ -352,12 +352,12 @@ function get_template_directory_uri() { $template_dir_uri = "$theme_root_uri/$template"; /** - * Filters the current theme directory URI. + * Filters the active theme directory URI. * * @since 1.5.0 * - * @param string $template_dir_uri The URI of the current theme directory. - * @param string $template Directory name of the current theme. + * @param string $template_dir_uri The URI of the active theme directory. + * @param string $template Directory name of the active theme. * @param string $theme_root_uri The themes root URI. */ return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri ); @@ -499,7 +499,7 @@ function search_theme_directories( $force = false ) { /* Loop the registered theme directories and extract all themes */ foreach ( $wp_theme_directories as $theme_root ) { - // Start with directories in the root of the current theme directory. + // Start with directories in the root of the active theme directory. $dirs = @ scandir( $theme_root ); if ( ! $dirs ) { trigger_error( "$theme_root is not readable", E_USER_NOTICE ); @@ -683,7 +683,7 @@ function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) { $theme_root = false; - // If requesting the root for the current theme, consult options to avoid calling get_theme_roots(). + // If requesting the root for the active theme, consult options to avoid calling get_theme_roots(). if ( ! $skip_cache ) { if ( get_option( 'stylesheet' ) == $stylesheet_or_template ) { $theme_root = get_option( 'stylesheet_root' ); @@ -830,11 +830,11 @@ function switch_theme( $stylesheet ) { } /** - * Checks that the current theme has 'index.php' and 'style.css' files. + * Checks that the active theme has 'index.php' and 'style.css' files. * * Does not initially check the default theme, which is the fallback and should always exist. * But if it doesn't exist, it'll fall back to the latest core default theme that does exist. - * Will switch theme to the fallback theme if current theme does not validate. + * Will switch theme to the fallback theme if active theme does not validate. * * You can use the {@see 'validate_current_theme'} filter to return false to disable * this functionality. @@ -847,11 +847,11 @@ function switch_theme( $stylesheet ) { */ function validate_current_theme() { /** - * Filters whether to validate the current theme. + * Filters whether to validate the active theme. * * @since 2.7.0 * - * @param bool $validate Whether to validate the current theme. Default true. + * @param bool $validate Whether to validate the active theme. Default true. */ if ( wp_installing() || ! apply_filters( 'validate_current_theme', true ) ) { return true; @@ -981,7 +981,7 @@ function get_theme_mods() { } /** - * Retrieves theme modification value for the current theme. + * Retrieves theme modification value for the active theme. * * If the modification name does not exist and `$default` is a string, then the * default will be passed through the {@link https://www.php.net/sprintf sprintf()} @@ -1007,7 +1007,7 @@ function get_theme_mod( $name, $default = false ) { * * @since 2.2.0 * - * @param mixed $current_mod The value of the current theme modification. + * @param mixed $current_mod The value of the active theme modification. */ return apply_filters( "theme_mod_{$name}", $mods[ $name ] ); } @@ -1026,7 +1026,7 @@ function get_theme_mod( $name, $default = false ) { } /** - * Updates theme modification value for the current theme. + * Updates theme modification value for the active theme. * * @since 2.1.0 * @since 5.6.0 A return value was added. @@ -1059,7 +1059,7 @@ function set_theme_mod( $name, $value ) { } /** - * Removes theme modification name from current theme list. + * Removes theme modification name from active theme list. * * If removing the name also removes all elements, then the entire option * will be removed. @@ -1088,7 +1088,7 @@ function remove_theme_mod( $name ) { } /** - * Removes theme modifications option for current theme. + * Removes theme modifications option for the active theme. * * @since 2.1.0 */ @@ -1395,7 +1395,7 @@ function header_image() { } /** - * Gets the header images uploaded for the current theme. + * Gets the header images uploaded for the active theme. * * @since 3.2.0 * @@ -1875,7 +1875,7 @@ function wp_custom_css_cb() { * * @since 4.7.0 * - * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme. + * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the active theme. * @return WP_Post|null The custom_css post or null if none exists. */ function wp_get_custom_css_post( $stylesheet = '' ) { @@ -1926,7 +1926,7 @@ function wp_get_custom_css_post( $stylesheet = '' ) { * * @since 4.7.0 * - * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the current theme. + * @param string $stylesheet Optional. A theme object stylesheet name. Defaults to the active theme. * @return string The Custom CSS Post content. */ function wp_get_custom_css( $stylesheet = '' ) { @@ -1968,7 +1968,7 @@ function wp_get_custom_css( $stylesheet = '' ) { * @type string $preprocessed Optional. Pre-processed CSS, stored in `post_content_filtered`. * Normally empty string. * @type string $stylesheet Optional. Stylesheet (child theme) to update. - * Defaults to current theme/stylesheet. + * Defaults to active theme/stylesheet. * } * @return WP_Post|WP_Error Post on success, error on failure. */ @@ -2127,7 +2127,7 @@ function remove_editor_styles() { */ function get_editor_stylesheets() { $stylesheets = array(); - // Load editor_style.css if the current theme supports it. + // Load editor_style.css if the active theme supports it. if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) { $editor_styles = $GLOBALS['editor_styles']; @@ -3024,7 +3024,7 @@ function _remove_theme_support( $feature ) { * @param string $feature The feature being checked. See add_theme_support() for the list * of possible values. * @param mixed ...$args Optional extra arguments to be checked against certain features. - * @return bool True if the current theme supports the feature, false otherwise. + * @return bool True if the active theme supports the feature, false otherwise. */ function current_theme_supports( $feature, ...$args ) { global $_wp_theme_features; @@ -3074,14 +3074,14 @@ function current_theme_supports( $feature, ...$args ) { } /** - * Filters whether the current theme supports a specific feature. + * Filters whether the active theme supports a specific feature. * * The dynamic portion of the hook name, `$feature`, refers to the specific * theme feature. See add_theme_support() for the list of possible values. * * @since 3.4.0 * - * @param bool $supports Whether the current theme supports the given feature. Default true. + * @param bool $supports Whether the active theme supports the given feature. Default true. * @param array $args Array of arguments for the feature. * @param string $feature The theme feature. */ @@ -3096,7 +3096,7 @@ function current_theme_supports( $feature, ...$args ) { * @param string $feature The feature being checked. See add_theme_support() for the list * of possible values. * @param string $include Path to the file. - * @return bool True if the current theme supports the supplied feature, false otherwise. + * @return bool True if the active theme supports the supplied feature, false otherwise. */ function require_if_theme_supports( $feature, $include ) { if ( current_theme_supports( $feature ) ) { @@ -3109,7 +3109,7 @@ function require_if_theme_supports( $feature, $include ) { /** * Registers a theme feature for use in add_theme_support(). * - * This does not indicate that the current theme supports the feature, it only describes + * This does not indicate that the active theme supports the feature, it only describes * the feature's supported options. * * @since 5.5.0 @@ -3622,7 +3622,7 @@ function _wp_customize_loader_settings() { * * @since 3.4.0 * - * @param string $stylesheet Optional. Theme to customize. Defaults to current theme. + * @param string $stylesheet Optional. Theme to customize. Defaults to active theme. * The theme's stylesheet will be urlencoded if necessary. * @return string */ @@ -4155,11 +4155,11 @@ function create_initial_theme_features() { } /** - * Returns whether the current theme is a block-based theme or not. + * Returns whether the active theme is a block-based theme or not. * * @since 5.9.0 * - * @return boolean Whether the current theme is a block-based theme or not. + * @return boolean Whether the active theme is a block-based theme or not. */ function wp_is_block_theme() { return wp_get_theme()->is_block_theme(); diff --git a/wp-includes/update.php b/wp-includes/update.php index 42ae3ecf3a..e30da7358e 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -568,7 +568,7 @@ function wp_update_themes( $extra_stats = array() ) { $checked = array(); $request = array(); - // Put slug of current theme into request. + // Put slug of active theme into request. $request['active'] = get_option( 'stylesheet' ); foreach ( $installed_themes as $theme ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index c050b21cb6..6f1c03c425 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-52609'; +$wp_version = '6.0-alpha-52610'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/widgets/class-wp-widget-search.php b/wp-includes/widgets/class-wp-widget-search.php index 33837c5013..fe5686654d 100644 --- a/wp-includes/widgets/class-wp-widget-search.php +++ b/wp-includes/widgets/class-wp-widget-search.php @@ -51,7 +51,7 @@ class WP_Widget_Search extends WP_Widget { echo $args['before_title'] . $title . $args['after_title']; } - // Use current theme search form if it exists. + // Use active theme search form if it exists. get_search_form(); echo $args['after_widget'];