--- a/wp/wp-includes/theme.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/theme.php Tue Jun 09 03:35:32 2015 +0200
@@ -137,23 +137,28 @@
* The theme name that the administrator has currently set the front end theme
* as.
*
- * For all extensive purposes, the template name and the stylesheet name are
+ * For all intents and purposes, the template name and the stylesheet name are
* going to be the same for most cases.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'stylesheet' filter on stylesheet name.
*
* @return string Stylesheet name.
*/
function get_stylesheet() {
- return apply_filters('stylesheet', get_option('stylesheet'));
+ /**
+ * Filter the name of current stylesheet.
+ *
+ * @since 1.5.0
+ *
+ * @param string $stylesheet Name of the current stylesheet.
+ */
+ return apply_filters( 'stylesheet', get_option( 'stylesheet' ) );
}
/**
* Retrieve stylesheet directory path for current theme.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'stylesheet_directory' filter on stylesheet directory and theme name.
*
* @return string Path to current theme directory.
*/
@@ -162,6 +167,15 @@
$theme_root = get_theme_root( $stylesheet );
$stylesheet_dir = "$theme_root/$stylesheet";
+ /**
+ * Filter the stylesheet directory path for current theme.
+ *
+ * @since 1.5.0
+ *
+ * @param string $stylesheet_dir Absolute path to the current them.
+ * @param string $stylesheet Directory name of the current theme.
+ * @param string $theme_root Absolute path to themes directory.
+ */
return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root );
}
@@ -173,10 +187,19 @@
* @return string
*/
function get_stylesheet_directory_uri() {
- $stylesheet = get_stylesheet();
+ $stylesheet = str_replace( '%2F', '/', rawurlencode( get_stylesheet() ) );
$theme_root_uri = get_theme_root_uri( $stylesheet );
$stylesheet_dir_uri = "$theme_root_uri/$stylesheet";
+ /**
+ * Filter the stylesheet directory URI.
+ *
+ * @since 1.5.0
+ *
+ * @param string $stylesheet_dir_uri Stylesheet directory URI.
+ * @param string $stylesheet Name of the activated theme's directory.
+ * @param string $theme_root_uri Themes root URI.
+ */
return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri );
}
@@ -187,14 +210,21 @@
* get_stylesheet_directory_uri() stylesheet directory URI} path.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'stylesheet_uri' filter on stylesheet URI path and stylesheet directory URI.
*
* @return string
*/
function get_stylesheet_uri() {
$stylesheet_dir_uri = get_stylesheet_directory_uri();
$stylesheet_uri = $stylesheet_dir_uri . '/style.css';
- return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
+ /**
+ * Filter the URI of the current 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.
+ */
+ return apply_filters( 'stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
}
/**
@@ -212,7 +242,6 @@
* separate folder, then change the latter.
*
* @since 2.1.0
- * @uses apply_filters() Calls 'locale_stylesheet_uri' filter on stylesheet URI path and stylesheet directory URI.
*
* @return string
*/
@@ -227,26 +256,39 @@
$stylesheet_uri = "$stylesheet_dir_uri/{$wp_locale->text_direction}.css";
else
$stylesheet_uri = '';
- return apply_filters('locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
+ /**
+ * Filter the localized stylesheet URI.
+ *
+ * @since 2.1.0
+ *
+ * @param string $stylesheet_uri Localized stylesheet URI.
+ * @param string $stylesheet_dir_uri Stylesheet directory URI.
+ */
+ return apply_filters( 'locale_stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri );
}
/**
* Retrieve name of the current theme.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'template' filter on template option.
*
* @return string Template name.
*/
function get_template() {
- return apply_filters('template', get_option('template'));
+ /**
+ * Filter the name of the current theme.
+ *
+ * @since 1.5.0
+ *
+ * @param string $template Current theme's directory name.
+ */
+ return apply_filters( 'template', get_option( 'template' ) );
}
/**
* Retrieve current theme directory.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'template_directory' filter on template directory path and template name.
*
* @return string Template directory path.
*/
@@ -255,6 +297,15 @@
$theme_root = get_theme_root( $template );
$template_dir = "$theme_root/$template";
+ /**
+ * Filter the current theme directory path.
+ *
+ * @since 1.5.0
+ *
+ * @param string $template_dir The URI of the current theme directory.
+ * @param string $template Directory name of the current theme.
+ * @param string $theme_root Absolute path to the themes directory.
+ */
return apply_filters( 'template_directory', $template_dir, $template, $theme_root );
}
@@ -262,15 +313,23 @@
* Retrieve theme directory URI.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'template_directory_uri' filter on template directory URI path and template name.
*
* @return string Template directory URI.
*/
function get_template_directory_uri() {
- $template = get_template();
+ $template = str_replace( '%2F', '/', rawurlencode( get_template() ) );
$theme_root_uri = get_theme_root_uri( $template );
$template_dir_uri = "$theme_root_uri/$template";
+ /**
+ * Filter the current 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 $theme_root_uri The themes root URI.
+ */
return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri );
}
@@ -310,11 +369,19 @@
// Try prepending as the theme directory could be relative to the content directory
$directory = WP_CONTENT_DIR . '/' . $directory;
// If this directory does not exist, return and do not register
- if ( ! file_exists( $directory ) )
+ if ( ! file_exists( $directory ) ) {
return false;
+ }
}
- $wp_theme_directories[] = $directory;
+ if ( ! is_array( $wp_theme_directories ) ) {
+ $wp_theme_directories = array();
+ }
+
+ $untrailed = untrailingslashit( $directory );
+ if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
+ $wp_theme_directories[] = $untrailed;
+ }
return true;
}
@@ -339,6 +406,7 @@
$found_themes = array();
$wp_theme_directories = (array) $wp_theme_directories;
+ $relative_theme_roots = array();
// Set up maybe-relative, maybe-absolute array of theme directories.
// We always want to return absolute, but we need to cache relative
@@ -350,6 +418,14 @@
$relative_theme_roots[ $theme_root ] = $theme_root;
}
+ /**
+ * Filter whether to get the cache of the registered theme directories.
+ *
+ * @since 3.4.0
+ *
+ * @param bool $cache_expiration Whether to get the cache of the theme directories. Default false.
+ * @param string $cache_directory Directory to be searched for the cache.
+ */
if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
$cached_roots = get_site_transient( 'theme_roots' );
if ( is_array( $cached_roots ) ) {
@@ -441,7 +517,6 @@
* Does not have trailing slash.
*
* @since 1.5.0
- * @uses apply_filters() Calls 'theme_root' filter on path.
*
* @param string $stylesheet_or_template The stylesheet or template name of the theme
* @return string Theme path.
@@ -458,6 +533,13 @@
$theme_root = WP_CONTENT_DIR . '/themes';
}
+ /**
+ * Filter the absolute path to the themes directory.
+ *
+ * @since 1.5.0
+ *
+ * @param string $theme_root Absolute path to themes directory.
+ */
return apply_filters( 'theme_root', $theme_root );
}
@@ -498,7 +580,16 @@
$theme_root_uri = content_url( 'themes' );
}
- return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template );
+ /**
+ * Filter the URI for themes directory.
+ *
+ * @since 1.5.0
+ *
+ * @param string $theme_root_uri The URI for themes directory.
+ * @param string $siteurl WordPress web address which is set in General Options.
+ * @param string $stylesheet_or_template Stylesheet or template name of the theme.
+ */
+ return apply_filters( 'theme_root_uri', $theme_root_uri, get_option( 'siteurl' ), $stylesheet_or_template );
}
/**
@@ -585,7 +676,6 @@
ob_start( 'preview_theme_ob_filter' );
}
-add_action('setup_theme', 'preview_theme');
/**
* Private function to modify the current template when previewing a theme
@@ -665,15 +755,22 @@
* of two arguments: $template then $stylesheet. This is for backwards compatibility.
*
* @since 2.5.0
- * @uses do_action() Calls 'switch_theme' action, passing the new theme.
*
* @param string $stylesheet Stylesheet name
*/
function switch_theme( $stylesheet ) {
- global $wp_theme_directories, $sidebars_widgets;
+ global $wp_theme_directories, $wp_customize, $sidebars_widgets;
- if ( is_array( $sidebars_widgets ) )
- set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $sidebars_widgets ) );
+ $_sidebars_widgets = null;
+ if ( 'wp_ajax_customize_save' === current_action() ) {
+ $_sidebars_widgets = $wp_customize->post_value( $wp_customize->get_setting( 'old_sidebars_widgets_data' ) );
+ } elseif ( is_array( $sidebars_widgets ) ) {
+ $_sidebars_widgets = $sidebars_widgets;
+ }
+
+ if ( is_array( $_sidebars_widgets ) ) {
+ set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $_sidebars_widgets ) );
+ }
$old_theme = wp_get_theme();
$new_theme = wp_get_theme( $stylesheet );
@@ -700,12 +797,30 @@
update_option( 'current_theme', $new_name );
+ // Migrate from the old mods_{name} option to theme_mods_{slug}.
if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
$default_theme_mods = (array) get_option( 'mods_' . $new_name );
add_option( "theme_mods_$stylesheet", $default_theme_mods );
+ } else {
+ /*
+ * Since retrieve_widgets() is called when initializing a theme in the Customizer,
+ * we need to to remove the theme mods to avoid overwriting changes made via
+ * the Customizer when accessing wp-admin/widgets.php.
+ */
+ if ( 'wp_ajax_customize_save' === current_action() ) {
+ remove_theme_mod( 'sidebars_widgets' );
+ }
}
update_option( 'theme_switched', $old_theme->get_stylesheet() );
+ /**
+ * Fires after the theme is switched.
+ *
+ * @since 1.5.0
+ *
+ * @param string $new_name Name of the new theme.
+ * @param WP_Theme $new_theme WP_Theme instance of the new theme.
+ */
do_action( 'switch_theme', $new_name, $new_theme );
}
@@ -723,8 +838,14 @@
* @return bool
*/
function validate_current_theme() {
- // Don't validate during an install/upgrade.
- if ( defined('WP_INSTALLING') || !apply_filters( 'validate_current_theme', true ) )
+ /**
+ * Filter whether to validate the current theme.
+ *
+ * @since 2.7.0
+ *
+ * @param bool true Validation flag to check the current theme.
+ */
+ if ( defined('WP_INSTALLING') || ! apply_filters( 'validate_current_theme', true ) )
return true;
if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
@@ -750,7 +871,7 @@
*
* @since 3.1.0
*
- * @return array Theme modifications.
+ * @return array|null Theme modifications.
*/
function get_theme_mods() {
$theme_slug = get_option( 'stylesheet' );
@@ -776,7 +897,6 @@
* directory URI.
*
* @since 2.1.0
- * @uses apply_filters() Calls 'theme_mod_$name' filter on the value.
*
* @param string $name Theme modification name.
* @param bool|string $default
@@ -785,13 +905,27 @@
function get_theme_mod( $name, $default = false ) {
$mods = get_theme_mods();
- if ( isset( $mods[ $name ] ) )
- return apply_filters( "theme_mod_$name", $mods[ $name ] );
+ if ( isset( $mods[$name] ) ) {
+ /**
+ * Filter the theme modification, or 'theme_mod', value.
+ *
+ * The dynamic portion of the hook name, `$name`, refers to
+ * the key name of the modification array. For example,
+ * 'header_textcolor', 'header_image', and so on depending
+ * on the theme options.
+ *
+ * @since 2.2.0
+ *
+ * @param string $current_mod The value of the current theme modification.
+ */
+ return apply_filters( "theme_mod_{$name}", $mods[$name] );
+ }
if ( is_string( $default ) )
$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
- return apply_filters( "theme_mod_$name", $default );
+ /** This filter is documented in wp-includes/theme.php */
+ return apply_filters( "theme_mod_{$name}", $default );
}
/**
@@ -800,12 +934,25 @@
* @since 2.1.0
*
* @param string $name Theme modification name.
- * @param string $value theme modification value.
+ * @param mixed $value theme modification value.
*/
function set_theme_mod( $name, $value ) {
$mods = get_theme_mods();
+ $old_value = isset( $mods[ $name ] ) ? $mods[ $name ] : false;
- $mods[ $name ] = $value;
+ /**
+ * Filter the theme mod value on save.
+ *
+ * The dynamic portion of the hook name, `$name`, refers to the key name of
+ * the modification array. For example, 'header_textcolor', 'header_image',
+ * and so on depending on the theme options.
+ *
+ * @since 3.9.0
+ *
+ * @param string $value The new value of the theme mod.
+ * @param string $old_value The current value of the theme mod.
+ */
+ $mods[ $name ] = apply_filters( "pre_set_theme_mod_$name", $value, $old_value );
$theme = get_option( 'stylesheet' );
update_option( "theme_mods_$theme", $mods );
@@ -888,11 +1035,24 @@
}
/**
+ * Check whether a header image is set or not.
+ *
+ * @since 4.2.0
+ *
+ * @see get_header_image()
+ *
+ * @return bool Whether a header image is set or not.
+ */
+function has_header_image() {
+ return (bool) get_header_image();
+}
+
+/**
* Retrieve header image for custom header.
*
* @since 2.1.0
*
- * @return string
+ * @return string|false
*/
function get_header_image() {
$url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
@@ -995,7 +1155,10 @@
* @since 2.1.0
*/
function header_image() {
- echo esc_url( get_header_image() );
+ $image = get_header_image();
+ if ( $image ) {
+ echo esc_url( $image );
+ }
}
/**
@@ -1015,7 +1178,7 @@
return array();
foreach ( (array) $headers as $header ) {
- $url = esc_url_raw( $header->guid );
+ $url = esc_url_raw( wp_get_attachment_url( $header->ID ) );
$header_data = wp_get_attachment_metadata( $header->ID );
$header_index = basename($url);
$header_images[$header_index] = array();
@@ -1095,7 +1258,8 @@
* @since 3.0.0
*
* @param string|array $header The header string id (key of array) to remove, or an array thereof.
- * @return True on success, false on failure.
+ * @return bool|void A single header returns true on success, false on failure.
+ * There is currently no return value for multiple headers.
*/
function unregister_default_headers( $header ) {
global $_wp_default_headers;
@@ -1161,7 +1325,11 @@
// $color is the saved custom color.
// A default has to be specified in style.css. It will not be printed here.
- $color = get_theme_mod( 'background_color' );
+ $color = get_background_color();
+
+ if ( $color === get_theme_support( 'custom-background', 'default-color' ) ) {
+ $color = false;
+ }
if ( ! $background && ! $color )
return;
@@ -1171,17 +1339,17 @@
if ( $background ) {
$image = " background-image: url('$background');";
- $repeat = get_theme_mod( 'background_repeat', 'repeat' );
+ $repeat = get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) );
if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
$repeat = 'repeat';
$repeat = " background-repeat: $repeat;";
- $position = get_theme_mod( 'background_position_x', 'left' );
+ $position = get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
$position = 'left';
$position = " background-position: top $position;";
- $attachment = get_theme_mod( 'background_attachment', 'scroll' );
+ $attachment = get_theme_mod( 'background_attachment', get_theme_support( 'custom-background', 'default-attachment' ) );
if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
$attachment = 'scroll';
$attachment = " background-attachment: $attachment;";
@@ -1212,7 +1380,7 @@
*
* @since 3.0.0
*
- * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
+ * @param array|string $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
* Defaults to 'editor-style.css'
*/
function add_editor_style( $stylesheet = 'editor-style.css' ) {
@@ -1250,6 +1418,54 @@
}
/**
+ * Retrieve any registered editor stylesheets
+ *
+ * @since 4.0.0
+ *
+ * @global $editor_styles Registered editor stylesheets
+ *
+ * @return array If registered, a list of editor stylesheet URLs.
+ */
+function get_editor_stylesheets() {
+ $stylesheets = array();
+ // load editor_style.css if the current theme supports it
+ if ( ! empty( $GLOBALS['editor_styles'] ) && is_array( $GLOBALS['editor_styles'] ) ) {
+ $editor_styles = $GLOBALS['editor_styles'];
+
+ $editor_styles = array_unique( array_filter( $editor_styles ) );
+ $style_uri = get_stylesheet_directory_uri();
+ $style_dir = get_stylesheet_directory();
+
+ // Support externally referenced styles (like, say, fonts).
+ foreach ( $editor_styles as $key => $file ) {
+ if ( preg_match( '~^(https?:)?//~', $file ) ) {
+ $stylesheets[] = esc_url_raw( $file );
+ unset( $editor_styles[ $key ] );
+ }
+ }
+
+ // Look in a parent theme first, that way child theme CSS overrides.
+ if ( is_child_theme() ) {
+ $template_uri = get_template_directory_uri();
+ $template_dir = get_template_directory();
+
+ foreach ( $editor_styles as $key => $file ) {
+ if ( $file && file_exists( "$template_dir/$file" ) ) {
+ $stylesheets[] = "$template_uri/$file";
+ }
+ }
+ }
+
+ foreach ( $editor_styles as $file ) {
+ if ( $file && file_exists( "$style_dir/$file" ) ) {
+ $stylesheets[] = "$style_uri/$file";
+ }
+ }
+ }
+ return $stylesheets;
+}
+
+/**
* Allows a theme to register its support of a certain feature
*
* Must be called in the theme's functions.php file to work.
@@ -1257,7 +1473,9 @@
* The init hook may be too late for some features.
*
* @since 2.9.0
- * @param string $feature the feature being added
+ *
+ * @param string $feature The feature being added.
+ * @return void|bool False on failure, void otherwise.
*/
function add_theme_support( $feature ) {
global $_wp_theme_features;
@@ -1269,16 +1487,21 @@
switch ( $feature ) {
case 'post-formats' :
- if ( is_array( $args[0] ) )
- $args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) );
+ if ( is_array( $args[0] ) ) {
+ $post_formats = get_post_format_slugs();
+ unset( $post_formats['standard'] );
+
+ $args[0] = array_intersect( $args[0], array_keys( $post_formats ) );
+ }
break;
case 'html5' :
// You can't just pass 'html5', you need to pass an array of types.
if ( empty( $args[0] ) ) {
+ // Build an array of types for back-compat.
$args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
} elseif ( ! is_array( $args[0] ) ) {
- _doing_it_wrong( "add_theme_support( 'html5' )", 'You need to pass an array of types.', '3.6.1' );
+ _doing_it_wrong( "add_theme_support( 'html5' )", __( 'You need to pass an array of types.' ), '3.6.1' );
return false;
}
@@ -1289,7 +1512,6 @@
case 'custom-header-uploads' :
return add_theme_support( 'custom-header', array( 'uploads' => true ) );
- break;
case 'custom-header' :
if ( ! is_array( $args ) )
@@ -1373,10 +1595,13 @@
$args = array( 0 => array() );
$defaults = array(
- 'default-image' => '',
- 'default-color' => '',
- 'wp-head-callback' => '_custom_background_cb',
- 'admin-head-callback' => '',
+ 'default-image' => '',
+ 'default-repeat' => 'repeat',
+ 'default-position-x' => 'left',
+ 'default-attachment' => 'scroll',
+ 'default-color' => '',
+ 'wp-head-callback' => '_custom_background_cb',
+ 'admin-head-callback' => '',
'admin-preview-callback' => '',
);
@@ -1401,6 +1626,17 @@
define( 'BACKGROUND_IMAGE', $args[0]['default-image'] );
break;
+
+ // Ensure that 'title-tag' is accessible in the admin.
+ case 'title-tag' :
+ // Can be called in functions.php but must happen before wp_loaded, i.e. not in header.php.
+ if ( did_action( 'wp_loaded' ) ) {
+ /* translators: 1: Theme support 2: hook name */
+ _doing_it_wrong( "add_theme_support( 'title-tag' )", sprintf( __( 'Theme support for %1$s should be registered before the %2$s hook.' ),
+ '<code>title-tag</code>', '<code>wp_loaded</code>' ), '4.1' );
+
+ return false;
+ }
}
$_wp_theme_features[ $feature ] = $args;
@@ -1442,14 +1678,14 @@
}
}
}
-add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
/**
* Gets the theme support arguments passed when registering that support
*
- * @since 3.1
+ * @since 3.1.0
+ *
* @param string $feature the feature to check
- * @return array The array of extra arguments
+ * @return mixed The array of extra arguments or the value for the registered feature.
*/
function get_theme_support( $feature ) {
global $_wp_theme_features;
@@ -1466,10 +1702,9 @@
if ( isset( $_wp_theme_features[ $feature ][0][ $args[0] ] ) )
return $_wp_theme_features[ $feature ][0][ $args[0] ];
return false;
- break;
+
default :
return $_wp_theme_features[ $feature ];
- break;
}
}
@@ -1482,7 +1717,7 @@
* @since 3.0.0
* @see add_theme_support()
* @param string $feature the feature being added
- * @return bool Whether feature was removed.
+ * @return null|bool Whether feature was removed.
*/
function remove_theme_support( $feature ) {
// Blacklist: for internal registrations not used directly by themes.
@@ -1497,6 +1732,7 @@
*
* @access private
* @since 3.1.0
+ * @param string $feature
*/
function _remove_theme_support( $feature ) {
global $_wp_theme_features;
@@ -1553,6 +1789,14 @@
if ( !isset( $_wp_theme_features[$feature] ) )
return false;
+ if ( 'title-tag' == $feature ) {
+ // Don't confirm support unless called internally.
+ $trace = debug_backtrace();
+ if ( ! in_array( $trace[1]['function'], array( '_wp_render_title_tag', 'wp_title' ) ) ) {
+ return false;
+ }
+ }
+
// If no args passed then no extra checks need be performed
if ( func_num_args() <= 1 )
return true;
@@ -1568,7 +1812,6 @@
return true;
$content_type = $args[0];
return in_array( $content_type, $_wp_theme_features[$feature][0] );
- break;
case 'html5':
case 'post-formats':
@@ -1579,7 +1822,6 @@
$type = $args[0];
return in_array( $type, $_wp_theme_features[$feature][0] );
- break;
case 'custom-header':
case 'custom-background' :
@@ -1587,22 +1829,39 @@
// an array to add_theme_support()
$header_support = $args[0];
return ( isset( $_wp_theme_features[$feature][0][$header_support] ) && $_wp_theme_features[$feature][0][$header_support] );
- break;
}
- return apply_filters('current_theme_supports-' . $feature, true, $args, $_wp_theme_features[$feature]);
+ /**
+ * Filter whether the current theme supports a specific feature.
+ *
+ * The dynamic portion of the hook name, `$feature`, refers to the specific theme
+ * feature. Possible values include 'post-formats', 'post-thumbnails', 'custom-background',
+ * 'custom-header', 'menus', 'automatic-feed-links', and 'html5'.
+ *
+ * @since 3.4.0
+ *
+ * @param bool true Whether the current theme supports the given feature. Default true.
+ * @param array $args Array of arguments for the feature.
+ * @param string $feature The theme feature.
+ */
+ return apply_filters( "current_theme_supports-{$feature}", true, $args, $_wp_theme_features[$feature] );
}
/**
* Checks a theme's support for a given feature before loading the functions which implement it.
*
* @since 2.9.0
- * @param string $feature the feature being checked
- * @param string $include the file containing the functions that implement the feature
+ *
+ * @param string $feature The feature being checked.
+ * @param string $include Path to the file.
+ * @return bool True if the current theme supports the supplied feature, false otherwise.
*/
-function require_if_theme_supports( $feature, $include) {
- if ( current_theme_supports( $feature ) )
+function require_if_theme_supports( $feature, $include ) {
+ if ( current_theme_supports( $feature ) ) {
require ( $include );
+ return true;
+ }
+ return false;
}
/**
@@ -1627,8 +1886,6 @@
remove_theme_mod( 'background_image' );
}
-add_action( 'delete_attachment', '_delete_attachment_theme_mod' );
-
/**
* Checks if a theme has been changed and runs 'after_switch_theme' hook on the next WP load
*
@@ -1638,10 +1895,31 @@
if ( $stylesheet = get_option( 'theme_switched' ) ) {
$old_theme = wp_get_theme( $stylesheet );
- if ( $old_theme->exists() )
- do_action( 'after_switch_theme', $old_theme->get('Name'), $old_theme );
- else
+ // Prevent retrieve_widgets() from running since Customizer already called it up front
+ if ( get_option( 'theme_switched_via_customizer' ) ) {
+ remove_action( 'after_switch_theme', '_wp_sidebars_changed' );
+ update_option( 'theme_switched_via_customizer', false );
+ }
+
+ if ( $old_theme->exists() ) {
+ /**
+ * Fires on the first WP load after a theme switch if the old theme still exists.
+ *
+ * This action fires multiple times and the parameters differs
+ * according to the context, if the old theme exists or not.
+ * If the old theme is missing, the parameter will be the slug
+ * of the old theme.
+ *
+ * @since 3.3.0
+ *
+ * @param string $old_name Old theme name.
+ * @param WP_Theme $old_theme WP_Theme instance of the old theme.
+ */
+ do_action( 'after_switch_theme', $old_theme->get( 'Name' ), $old_theme );
+ } else {
+ /** This action is documented in wp-includes/theme.php */
do_action( 'after_switch_theme', $stylesheet );
+ }
update_option( 'theme_switched', false );
}
@@ -1664,7 +1942,6 @@
// Init Customize class
$GLOBALS['wp_customize'] = new WP_Customize_Manager;
}
-add_action( 'plugins_loaded', '_wp_customize_include' );
/**
* Adds settings for the customize-loader script.
@@ -1687,9 +1964,13 @@
'url' => esc_url( admin_url( 'customize.php' ) ),
'isCrossDomain' => $cross_domain,
'browser' => $browser,
+ 'l10n' => array(
+ 'saveAlert' => __( 'The changes you made will be lost if you navigate away from this page.' ),
+ 'mainIframeTitle' => __( 'Customizer' ),
+ ),
);
- $script = 'var _wpCustomizeLoaderSettings = ' . json_encode( $settings ) . ';';
+ $script = 'var _wpCustomizeLoaderSettings = ' . wp_json_encode( $settings ) . ';';
$data = $wp_scripts->get_data( 'customize-loader', 'data' );
if ( $data )
@@ -1697,10 +1978,9 @@
$wp_scripts->add_data( 'customize-loader', 'data', $script );
}
-add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
/**
- * Returns a URL to load the theme customizer.
+ * Returns a URL to load the Customizer.
*
* @since 3.4.0
*
@@ -1715,7 +1995,7 @@
}
/**
- * Prints a script to check whether or not the customizer is supported,
+ * Prints a script to check whether or not the Customizer is supported,
* and apply either the no-customize-support or customize-support class
* to the body.
*
@@ -1750,4 +2030,19 @@
}());
</script>
<?php
-}
\ No newline at end of file
+}
+
+/**
+ * Whether the site is being previewed in the Customizer.
+ *
+ * @since 4.0.0
+ *
+ * @global WP_Customize_Manager $wp_customize Customizer instance.
+ *
+ * @return bool True if the site is being previewed in the Customizer, false otherwise.
+ */
+function is_customize_preview() {
+ global $wp_customize;
+
+ return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+}