X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/41578db67d72562346e4dbb2a14889b23d522813..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-includes/theme.php diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 00b3c39d..823d2ca4 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -14,6 +14,9 @@ * * @since 3.4.0 * + * @global array $wp_theme_directories + * @staticvar array $_themes + * * @param array $args The search arguments. Optional. * - errors mixed True to return themes with errors, false to return themes without errors, null * to return all themes. Defaults to false. @@ -22,7 +25,7 @@ * to return only network-allowed themes. Null to return all themes. Defaults to null. * - blog_id int (Multisite) The blog ID used to calculate which themes are allowed. Defaults to 0, * synonymous for the current blog. - * @return Array of WP_Theme objects. + * @return array Array of WP_Theme objects. */ function wp_get_themes( $args = array() ) { global $wp_theme_directories; @@ -84,9 +87,11 @@ function wp_get_themes( $args = array() ) { * * @since 3.4.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet Directory name for the theme. Optional. Defaults to current theme. * @param string $theme_root Absolute path of the theme root to look in. Optional. If not specified, get_raw_theme_root() - * is used to calculate the theme root for the $stylesheet provided (or current theme). + * is used to calculate the theme root for the $stylesheet provided (or current theme). * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence. */ function wp_get_theme( $stylesheet = null, $theme_root = null ) { @@ -137,7 +142,7 @@ function is_child_theme() { * 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 @@ -243,6 +248,8 @@ function get_stylesheet_uri() { * * @since 2.1.0 * + * @global WP_Locale $wp_locale + * * @return string */ function get_locale_stylesheet_uri() { @@ -271,7 +278,6 @@ function get_locale_stylesheet_uri() { * Retrieve name of the current theme. * * @since 1.5.0 - * @uses apply_filters() Calls 'template' filter on template option. * * @return string Template name. */ @@ -339,6 +345,8 @@ function get_template_directory_uri() { * * @since 2.9.0 * + * @global array $wp_theme_directories + * * @return array|string An array of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root. */ function get_theme_roots() { @@ -360,6 +368,8 @@ function get_theme_roots() { * * @since 2.9.0 * + * @global array $wp_theme_directories + * * @param string $directory Either the full filesystem path to a theme folder or a folder within WP_CONTENT_DIR * @return bool */ @@ -370,11 +380,19 @@ function register_theme_directory( $directory ) { // 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; } @@ -384,21 +402,26 @@ function register_theme_directory( $directory ) { * * @since 2.9.0 * + * @global array $wp_theme_directories + * @staticvar array $found_themes + * * @param bool $force Optional. Whether to force a new directory scan. Defaults to false. - * @return array Valid themes found + * @return array|false Valid themes found */ function search_theme_directories( $force = false ) { global $wp_theme_directories; + static $found_themes = null; + if ( empty( $wp_theme_directories ) ) return false; - static $found_themes; if ( ! $force && isset( $found_themes ) ) return $found_themes; $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 @@ -510,6 +533,8 @@ function search_theme_directories( $force = false ) { * * @since 1.5.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet_or_template The stylesheet or template name of the theme * @return string Theme path. */ @@ -542,10 +567,12 @@ function get_theme_root( $stylesheet_or_template = false ) { * * @since 1.5.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme. - * Default is to leverage the main theme root. - * @param string $theme_root Optional. The theme root for which calculations will be based, preventing - * the need for a get_raw_theme_root() call. + * Default is to leverage the main theme root. + * @param string $theme_root Optional. The theme root for which calculations will be based, preventing + * the need for a get_raw_theme_root() call. * @return string Themes URI. */ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) { @@ -589,8 +616,11 @@ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = fals * * @since 3.1.0 * + * @global array $wp_theme_directories + * * @param string $stylesheet_or_template The stylesheet or template name of the theme - * @param bool $skip_cache Optional. Whether to skip the cache. Defaults to false, meaning the cache is used. + * @param bool $skip_cache Optional. Whether to skip the cache. + * Defaults to false, meaning the cache is used. * @return string Theme root */ function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) { @@ -630,117 +660,6 @@ function locale_stylesheet() { echo ''; } -/** - * Start preview theme output buffer. - * - * Will only perform task if the user has permissions and template and preview - * query variables exist. - * - * @since 2.6.0 - */ -function preview_theme() { - if ( ! (isset($_GET['template']) && isset($_GET['preview'])) ) - return; - - if ( !current_user_can( 'switch_themes' ) ) - return; - - // Admin Thickbox requests - if ( isset( $_GET['preview_iframe'] ) ) - show_admin_bar( false ); - - $_GET['template'] = preg_replace('|[^a-z0-9_./-]|i', '', $_GET['template']); - - if ( validate_file($_GET['template']) ) - return; - - add_filter( 'template', '_preview_theme_template_filter' ); - - if ( isset($_GET['stylesheet']) ) { - $_GET['stylesheet'] = preg_replace('|[^a-z0-9_./-]|i', '', $_GET['stylesheet']); - if ( validate_file($_GET['stylesheet']) ) - return; - add_filter( 'stylesheet', '_preview_theme_stylesheet_filter' ); - } - - // Prevent theme mods to current theme being used on theme being previewed - add_filter( 'pre_option_theme_mods_' . get_option( 'stylesheet' ), '__return_empty_array' ); - - ob_start( 'preview_theme_ob_filter' ); -} -add_action('setup_theme', 'preview_theme'); - -/** - * Private function to modify the current template when previewing a theme - * - * @since 2.9.0 - * @access private - * - * @return string - */ -function _preview_theme_template_filter() { - return isset($_GET['template']) ? $_GET['template'] : ''; -} - -/** - * Private function to modify the current stylesheet when previewing a theme - * - * @since 2.9.0 - * @access private - * - * @return string - */ -function _preview_theme_stylesheet_filter() { - return isset($_GET['stylesheet']) ? $_GET['stylesheet'] : ''; -} - -/** - * Callback function for ob_start() to capture all links in the theme. - * - * @since 2.6.0 - * @access private - * - * @param string $content - * @return string - */ -function preview_theme_ob_filter( $content ) { - return preg_replace_callback( "|()|", 'preview_theme_ob_filter_callback', $content ); -} - -/** - * Manipulates preview theme links in order to control and maintain location. - * - * Callback function for preg_replace_callback() to accept and filter matches. - * - * @since 2.6.0 - * @access private - * - * @param array $matches - * @return string - */ -function preview_theme_ob_filter_callback( $matches ) { - if ( strpos($matches[4], 'onclick') !== false ) - $matches[4] = preg_replace('#onclick=([\'"]).*?(?. (? 1, 'template' => $template, 'stylesheet' => $stylesheet, 'preview_iframe' => 1 ), $matches[3] ); - if ( 0 === strpos($link, 'preview=1') ) - $link = "?$link"; - return $matches[1] . esc_attr( $link ) . $matches[4]; -} - /** * Switches the theme. * @@ -749,6 +668,10 @@ function preview_theme_ob_filter_callback( $matches ) { * * @since 2.5.0 * + * @global array $wp_theme_directories + * @global WP_Customize_Manager $wp_customize + * @global array $sidebars_widgets + * * @param string $stylesheet Stylesheet name */ function switch_theme( $stylesheet ) { @@ -796,9 +719,9 @@ function switch_theme( $stylesheet ) { add_option( "theme_mods_$stylesheet", $default_theme_mods ); } else { /* - * Since retrieve_widgets() is called when initializing the customizer theme, + * 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 widget customizer when accessing wp-admin/widgets.php. + * the Customizer when accessing wp-admin/widgets.php. */ if ( 'wp_ajax_customize_save' === current_action() ) { remove_theme_mod( 'sidebars_widgets' ); @@ -864,11 +787,12 @@ function validate_current_theme() { * * @since 3.1.0 * - * @return array Theme modifications. + * @return array|void Theme modifications. */ function get_theme_mods() { $theme_slug = get_option( 'stylesheet' ); - if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) { + $mods = get_option( "theme_mods_$theme_slug" ); + if ( false === $mods ) { $theme_name = get_option( 'current_theme' ); if ( false === $theme_name ) $theme_name = wp_get_theme()->get('Name'); @@ -891,7 +815,7 @@ function get_theme_mods() { * * @since 2.1.0 * - * @param string $name Theme modification name. + * @param string $name Theme modification name. * @param bool|string $default * @return string */ @@ -902,7 +826,7 @@ function get_theme_mod( $name, $default = false ) { /** * Filter the theme modification, or 'theme_mod', value. * - * The dynamic portion of the hook name, $name, refers to + * 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. @@ -926,8 +850,8 @@ function get_theme_mod( $name, $default = false ) { * * @since 2.1.0 * - * @param string $name Theme modification name. - * @param string $value theme modification value. + * @param string $name Theme modification name. + * @param mixed $value Theme modification value. */ function set_theme_mod( $name, $value ) { $mods = get_theme_mods(); @@ -936,7 +860,7 @@ function set_theme_mod( $name, $value ) { /** * Filter the theme mod value on save. * - * The dynamic portion of the hook name, $name, refers to the key name of + * 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. * @@ -960,7 +884,6 @@ function set_theme_mod( $name, $value ) { * @since 2.1.0 * * @param string $name Theme modification name. - * @return null */ function remove_theme_mod( $name ) { $mods = get_theme_mods(); @@ -970,9 +893,10 @@ function remove_theme_mod( $name ) { unset( $mods[ $name ] ); - if ( empty( $mods ) ) - return remove_theme_mods(); - + if ( empty( $mods ) ) { + remove_theme_mods(); + return; + } $theme = get_option( 'stylesheet' ); update_option( "theme_mods_$theme", $mods ); } @@ -1024,7 +948,20 @@ function display_header_text() { return false; $text_color = get_theme_mod( 'header_textcolor', get_theme_support( 'custom-header', 'default-text-color' ) ); - return 'blank' != $text_color; + return 'blank' !== $text_color; +} + +/** + * 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(); } /** @@ -1032,7 +969,7 @@ function display_header_text() { * * @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' ) ); @@ -1053,11 +990,13 @@ function get_header_image() { * * @access private * - * @return string Path to header image + * @global array $_wp_default_headers + * @staticvar object $_wp_random_header + * + * @return object */ - function _get_random_header_data() { - static $_wp_random_header; + static $_wp_random_header = null; if ( empty( $_wp_random_header ) ) { global $_wp_default_headers; @@ -1093,7 +1032,6 @@ function _get_random_header_data() { * * @return string Path to header image */ - function get_random_header_image() { $random_image = _get_random_header_data(); if ( empty( $random_image->url ) ) @@ -1111,7 +1049,7 @@ function get_random_header_image() { * @since 3.2.0 * * @param string $type The random pool to use. any|default|uploaded - * @return boolean + * @return bool */ function is_random_header_image( $type = 'any' ) { $header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) ); @@ -1135,7 +1073,10 @@ function is_random_header_image( $type = 'any' ) { * @since 2.1.0 */ function header_image() { - echo esc_url( get_header_image() ); + $image = get_header_image(); + if ( $image ) { + echo esc_url( $image ); + } } /** @@ -1158,10 +1099,13 @@ function get_uploaded_header_images() { $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(); - $header_images[$header_index]['attachment_id'] = $header->ID; + $header_images[$header_index]['attachment_id'] = $header->ID; $header_images[$header_index]['url'] = $url; - $header_images[$header_index]['thumbnail_url'] = $url; + $header_images[$header_index]['thumbnail_url'] = $url; + $header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true ); + if ( isset( $header_data['width'] ) ) $header_images[$header_index]['width'] = $header_data['width']; if ( isset( $header_data['height'] ) ) @@ -1176,6 +1120,8 @@ function get_uploaded_header_images() { * * @since 3.4.0 * + * @global array $_wp_default_headers + * * @return object */ function get_custom_header() { @@ -1217,6 +1163,8 @@ function get_custom_header() { * * @since 3.0.0 * + * @global array $_wp_default_headers + * * @param array $headers Array of headers keyed by a string id. The ids point to arrays containing 'url', 'thumbnail_url', and 'description' keys. */ function register_default_headers( $headers ) { @@ -1234,6 +1182,8 @@ function register_default_headers( $headers ) { * @see register_default_headers() * @since 3.0.0 * + * @global array $_wp_default_headers + * * @param string|array $header The header string id (key of array) to remove, or an array thereof. * @return bool|void A single header returns true on success, false on failure. * There is currently no return value for multiple headers. @@ -1357,11 +1307,12 @@ body.custom-background { } * * @since 3.0.0 * - * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root. - * Defaults to 'editor-style.css' + * @global array $editor_styles + * + * @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' ) { - add_theme_support( 'editor-style' ); if ( ! is_admin() ) @@ -1383,6 +1334,8 @@ function add_editor_style( $stylesheet = 'editor-style.css' ) { * * @since 3.1.0 * + * @global array $editor_styles + * * @return bool True on success, false if there were no stylesheets to remove. */ function remove_editor_styles() { @@ -1394,6 +1347,62 @@ function remove_editor_styles() { return true; } +/** + * Retrieve any registered editor stylesheets + * + * @since 4.0.0 + * + * @global array $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"; + } + } + } + + /** + * Filter the array of stylesheets applied to the editor. + * + * @since 4.3.0 + * + * @param array $stylesheets Array of stylesheets to be applied to the editor. + */ + return apply_filters( 'editor_stylesheets', $stylesheets ); +} + /** * Allows a theme to register its support of a certain feature * @@ -1403,6 +1412,8 @@ function remove_editor_styles() { * * @since 2.9.0 * + * @global array $_wp_theme_features + * * @param string $feature The feature being added. * @return void|bool False on failure, void otherwise. */ @@ -1416,8 +1427,12 @@ function add_theme_support( $feature ) { 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' : @@ -1426,7 +1441,7 @@ function add_theme_support( $feature ) { // 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; } @@ -1437,7 +1452,6 @@ function add_theme_support( $feature ) { case 'custom-header-uploads' : return add_theme_support( 'custom-header', array( 'uploads' => true ) ); - break; case 'custom-header' : if ( ! is_array( $args ) ) @@ -1552,6 +1566,17 @@ function add_theme_support( $feature ) { 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.' ), + 'title-tag', 'wp_loaded' ), '4.1' ); + + return false; + } } $_wp_theme_features[ $feature ] = $args; @@ -1562,6 +1587,9 @@ function add_theme_support( $feature ) { * * @since 3.4.0 * @access private + * + * @global Custom_Image_Header $custom_image_header + * @global Custom_Background $custom_background */ function _custom_header_background_just_in_time() { global $custom_image_header, $custom_background; @@ -1593,15 +1621,16 @@ function _custom_header_background_just_in_time() { } } } -add_action( 'wp_loaded', '_custom_header_background_just_in_time' ); /** * Gets the theme support arguments passed when registering that support * * @since 3.1.0 * + * @global array $_wp_theme_features + * * @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; @@ -1618,10 +1647,9 @@ function get_theme_support( $feature ) { 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; } } @@ -1634,7 +1662,7 @@ function get_theme_support( $feature ) { * @since 3.0.0 * @see add_theme_support() * @param string $feature the feature being added - * @return bool Whether feature was removed. + * @return bool|void Whether feature was removed. */ function remove_theme_support( $feature ) { // Blacklist: for internal registrations not used directly by themes. @@ -1649,6 +1677,12 @@ function remove_theme_support( $feature ) { * * @access private * @since 3.1.0 + * + * @global array $_wp_theme_features + * @global Custom_Image_Header $custom_image_header + * @global Custom_Background $custom_background + * + * @param string $feature */ function _remove_theme_support( $feature ) { global $_wp_theme_features; @@ -1693,8 +1727,11 @@ function _remove_theme_support( $feature ) { * Checks a theme's support for a given feature * * @since 2.9.0 + * + * @global array $_wp_theme_features + * * @param string $feature the feature being checked - * @return boolean + * @return bool */ function current_theme_supports( $feature ) { global $_wp_theme_features; @@ -1705,6 +1742,14 @@ function current_theme_supports( $feature ) { 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; @@ -1720,7 +1765,6 @@ function current_theme_supports( $feature ) { return true; $content_type = $args[0]; return in_array( $content_type, $_wp_theme_features[$feature][0] ); - break; case 'html5': case 'post-formats': @@ -1731,7 +1775,6 @@ function current_theme_supports( $feature ) { $type = $args[0]; return in_array( $type, $_wp_theme_features[$feature][0] ); - break; case 'custom-header': case 'custom-background' : @@ -1739,16 +1782,14 @@ function current_theme_supports( $feature ) { // 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; } /** * 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'. + * 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 * @@ -1780,26 +1821,29 @@ function require_if_theme_supports( $feature, $include ) { * Checks an attachment being deleted to see if it's a header or background image. * * If true it removes the theme modification which would be pointing at the deleted - * attachment + * attachment. * * @access private * @since 3.0.0 - * @param int $id the attachment id + * @since 4.3.0 Also removes `header_image_data`. + * + * @param int $id The attachment id. */ function _delete_attachment_theme_mod( $id ) { $attachment_image = wp_get_attachment_url( $id ); - $header_image = get_header_image(); + $header_image = get_header_image(); $background_image = get_background_image(); - if ( $header_image && $header_image == $attachment_image ) + if ( $header_image && $header_image == $attachment_image ) { remove_theme_mod( 'header_image' ); + remove_theme_mod( 'header_image_data' ); + } - if ( $background_image && $background_image == $attachment_image ) + if ( $background_image && $background_image == $attachment_image ) { 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 * @@ -1845,6 +1889,8 @@ function check_theme_switched() { * Fires when ?wp_customize=on or on wp-admin/customize.php. * * @since 3.4.0 + * + * @global WP_Customize_Manager $wp_customize */ function _wp_customize_include() { if ( ! ( ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] ) @@ -1852,11 +1898,9 @@ function _wp_customize_include() { ) ) return; - require( ABSPATH . WPINC . '/class-wp-customize-manager.php' ); - // Init Customize class - $GLOBALS['wp_customize'] = new WP_Customize_Manager; + require_once ABSPATH . WPINC . '/class-wp-customize-manager.php'; + $GLOBALS['wp_customize'] = new WP_Customize_Manager(); } -add_action( 'plugins_loaded', '_wp_customize_include' ); /** * Adds settings for the customize-loader script. @@ -1864,8 +1908,6 @@ add_action( 'plugins_loaded', '_wp_customize_include' ); * @since 3.4.0 */ function _wp_customize_loader_settings() { - global $wp_scripts; - $admin_origin = parse_url( admin_url() ); $home_origin = parse_url( home_url() ); $cross_domain = ( strtolower( $admin_origin[ 'host' ] ) != strtolower( $home_origin[ 'host' ] ) ); @@ -1879,25 +1921,30 @@ function _wp_customize_loader_settings() { '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 ) . ';'; + $wp_scripts = wp_scripts(); $data = $wp_scripts->get_data( 'customize-loader', 'data' ); if ( $data ) $script = "$data\n$script"; $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 * * @param string $stylesheet Optional. Theme to customize. Defaults to current theme. - * The theme's stylesheet will be urlencoded if necessary. + * The theme's stylesheet will be urlencoded if necessary. + * @return string */ function wp_customize_url( $stylesheet = null ) { $url = admin_url( 'customize.php' ); @@ -1907,7 +1954,7 @@ function wp_customize_url( $stylesheet = null ) { } /** - * 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. * @@ -1943,3 +1990,18 @@ function wp_customize_support_script() { is_preview(); +}