return new WP_Theme( $stylesheet, $theme_root );
}
+/**
+ * Clears the cache held by get_theme_roots() and WP_Theme.
+ *
+ * @since 3.5.0
+ * @param bool $clear_update_cache Whether to clear the Theme updates cache
+ */
+function wp_clean_themes_cache( $clear_update_cache = true ) {
+ if ( $clear_update_cache )
+ delete_site_transient( 'update_themes' );
+ search_theme_directories( true );
+ foreach ( wp_get_themes( array( 'errors' => null ) ) as $theme )
+ $theme->cache_delete();
+}
+
/**
* Whether a child theme is in use.
*
// Set up maybe-relative, maybe-absolute array of theme directories.
// We always want to return absolute, but we need to cache relative
- // use in for get_theme_root().
+ // to use in get_theme_root().
foreach ( $wp_theme_directories as $theme_root ) {
if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) )
$relative_theme_roots[ str_replace( WP_CONTENT_DIR, '', $theme_root ) ] = $theme_root;
// Start with directories in the root of the current theme directory.
$dirs = @ scandir( $theme_root );
- if ( ! $dirs )
- return false;
+ if ( ! $dirs ) {
+ trigger_error( "$theme_root is not readable", E_USER_NOTICE );
+ continue;
+ }
foreach ( $dirs as $dir ) {
if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' )
continue;
// wp-content/themes/a-folder-of-themes/*
// wp-content/themes is $theme_root, a-folder-of-themes is $dir, then themes are $sub_dirs
$sub_dirs = @ scandir( $theme_root . '/' . $dir );
- if ( ! $sub_dirs )
- return false;
+ if ( ! $sub_dirs ) {
+ trigger_error( "$theme_root/$dir is not readable", E_USER_NOTICE );
+ continue;
+ }
foreach ( $sub_dirs as $sub_dir ) {
if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' )
continue;
/**
* Start preview theme output buffer.
*
- * Will only preform task if the user has permissions and template and preview
+ * Will only perform task if the user has permissions and template and preview
* query variables exist.
*
* @since 2.6.0
*/
function preview_theme_ob_filter_callback( $matches ) {
if ( strpos($matches[4], 'onclick') !== false )
- $matches[4] = preg_replace('#onclick=([\'"]).*?(?<!\\\)\\1#i', '', $matches[4]); //Strip out any onclicks from rest of <a>. (?<!\\\) means to ignore the '" if its escaped by \ to prevent breaking mid-attribute.
+ $matches[4] = preg_replace('#onclick=([\'"]).*?(?<!\\\)\\1#i', '', $matches[4]); //Strip out any onclicks from rest of <a>. (?<!\\\) means to ignore the '" if it's escaped by \ to prevent breaking mid-attribute.
if (
( false !== strpos($matches[3], '/wp-admin/') )
||
)
return $matches[1] . "#$matches[2] onclick=$matches[2]return false;" . $matches[4];
- $link = add_query_arg( array( 'preview' => 1, 'template' => $_GET['template'], 'stylesheet' => @$_GET['stylesheet'], 'preview_iframe' => 1 ), $matches[3] );
+ $stylesheet = isset( $_GET['stylesheet'] ) ? $_GET['stylesheet'] : '';
+ $template = isset( $_GET['template'] ) ? $_GET['template'] : '';
+
+ $link = add_query_arg( array( 'preview' => 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 current theme to new template and stylesheet names.
+ * Switches the theme.
+ *
+ * Accepts one argument: $stylesheet of the theme. It also accepts an additional function signature
+ * 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 $template Template name
- * @param string $stylesheet Stylesheet name.
+ * @param string $stylesheet Stylesheet name
*/
-function switch_theme( $template, $stylesheet ) {
+function switch_theme( $stylesheet ) {
global $wp_theme_directories, $sidebars_widgets;
if ( is_array( $sidebars_widgets ) )
$old_theme = wp_get_theme();
$new_theme = wp_get_theme( $stylesheet );
- $new_name = $new_theme->get('Name');
+
+ if ( func_num_args() > 1 ) {
+ $template = $stylesheet;
+ $stylesheet = func_get_arg( 1 );
+ } else {
+ $template = $new_theme->get_template();
+ }
update_option( 'template', $template );
update_option( 'stylesheet', $stylesheet );
if ( count( $wp_theme_directories ) > 1 ) {
update_option( 'template_root', get_raw_theme_root( $template, true ) );
update_option( 'stylesheet_root', get_raw_theme_root( $stylesheet, true ) );
+ } else {
+ delete_option( 'template_root' );
+ delete_option( 'stylesheet_root' );
}
+ $new_name = $new_theme->get('Name');
+
update_option( 'current_theme', $new_name );
if ( is_admin() && false === get_option( 'theme_mods_' . $stylesheet ) ) {
return true;
if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
- switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+ switch_theme( WP_DEFAULT_THEME );
return false;
}
if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) {
- switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+ switch_theme( WP_DEFAULT_THEME );
return false;
}
if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
- switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+ switch_theme( WP_DEFAULT_THEME );
return false;
}
if ( is_random_header_image() )
$url = get_random_header_image();
- if ( is_ssl() )
- $url = str_replace( 'http://', 'https://', $url );
- else
- $url = str_replace( 'https://', 'http://', $url );
-
- return esc_url_raw( $url );
+ return esc_url_raw( set_url_scheme( $url ) );
}
/**
}
/**
- * Display header image path.
+ * Display header image URL.
*
* @since 2.1.0
*/
function header_image() {
- echo get_header_image();
+ echo esc_url( get_header_image() );
}
/**
$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]['width'] = $header_data['width'];
- $header_images[$header_index]['height'] = $header_data['height'];
+ if ( isset( $header_data['width'] ) )
+ $header_images[$header_index]['width'] = $header_data['width'];
+ if ( isset( $header_data['height'] ) )
+ $header_images[$header_index]['height'] = $header_data['height'];
}
return $header_images;
* @return object
*/
function get_custom_header() {
- $data = is_random_header_image()? _get_random_header_data() : get_theme_mod( 'header_image_data' );
+ global $_wp_default_headers;
+
+ if ( is_random_header_image() ) {
+ $data = _get_random_header_data();
+ } else {
+ $data = get_theme_mod( 'header_image_data' );
+ if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
+ $directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
+ $data = array();
+ $data['url'] = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
+ if ( ! empty( $_wp_default_headers ) ) {
+ foreach ( (array) $_wp_default_headers as $default_header ) {
+ $url = vsprintf( $default_header['url'], $directory_args );
+ if ( $data['url'] == $url ) {
+ $data = $default_header;
+ $data['url'] = $url;
+ $data['thumbnail_url'] = vsprintf( $data['thumbnail_url'], $directory_args );
+ break;
+ }
+ }
+ }
+ }
+ }
+
$default = array(
'url' => '',
'thumbnail_url' => '',
*/
function _custom_background_cb() {
// $background is the saved custom image, or the default image.
- $background = get_background_image();
+ $background = set_url_scheme( get_background_image() );
// $color is the saved custom color.
// A default has to be specified in style.css. It will not be printed here.
$args[0] = array_intersect( $args[0], array_keys( get_post_format_slugs() ) );
break;
+ case 'html5' :
+ // You can't just pass 'html5', you need to pass an array of types.
+ if ( empty( $args[0] ) ) {
+ $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' );
+ return false;
+ }
+
+ // Calling 'html5' again merges, rather than overwrites.
+ if ( isset( $_wp_theme_features['html5'] ) )
+ $args[0] = array_merge( $_wp_theme_features['html5'][0], $args[0] );
+ break;
+
case 'custom-header-uploads' :
return add_theme_support( 'custom-header', array( 'uploads' => true ) );
break;
switch ( $feature ) {
case 'custom-header' :
+ if ( ! did_action( 'wp_loaded' ) )
+ break;
$support = get_theme_support( 'custom-header' );
if ( $support[0]['wp-head-callback'] )
remove_action( 'wp_head', $support[0]['wp-head-callback'] );
break;
case 'custom-background' :
+ if ( ! did_action( 'wp_loaded' ) )
+ break;
$support = get_theme_support( 'custom-background' );
remove_action( 'wp_head', $support[0]['wp-head-callback'] );
remove_action( 'admin_menu', array( $GLOBALS['custom_background'], 'init' ) );
return in_array( $content_type, $_wp_theme_features[$feature][0] );
break;
+ case 'html5':
case 'post-formats':
// specific post formats can be registered by passing an array of types to
// add_theme_support()
- $post_format = $args[0];
- return in_array( $post_format, $_wp_theme_features[$feature][0] );
+
+ // Specific areas of HTML5 support *must* be passed via an array to add_theme_support()
+
+ $type = $args[0];
+ return in_array( $type, $_wp_theme_features[$feature][0] );
break;
case 'custom-header':
request = true;
<?php endif; ?>
- b[c] = b[c].replace( rcs, '' );
+ b[c] = b[c].replace( rcs, ' ' );
b[c] += ( window.postMessage && request ? ' ' : ' no-' ) + cs;
}());
</script>
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff