X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..9c2096d803812dacbdf6cf8efe90053e39f00b96:/wp-includes/theme.php

diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 6268f452..b132364b 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -79,7 +79,7 @@ function get_stylesheet_directory_uri() {
  */
 function get_stylesheet_uri() {
 	$stylesheet_dir_uri = get_stylesheet_directory_uri();
-	$stylesheet_uri = $stylesheet_dir_uri . "/style.css";
+	$stylesheet_uri = $stylesheet_dir_uri . '/style.css';
 	return apply_filters('stylesheet_uri', $stylesheet_uri, $stylesheet_dir_uri);
 }
 
@@ -166,7 +166,7 @@ function get_template_directory_uri() {
  * The description will have the tags filtered with the following HTML elements
  * whitelisted. The <b>'a'</b> element with the <em>href</em> and <em>title</em>
  * attributes. The <b>abbr</b> element with the <em>title</em> attribute. The
- * <b>acronym<b> element with the <em>title</em> attribute allowed. The
+ * <b>acronym</b> element with the <em>title</em> attribute allowed. The
  * <b>code</b>, <b>em</b>, and <b>strong</b> elements also allowed.
  *
  * The style.css file must contain theme name, theme URI, and description. The
@@ -239,7 +239,7 @@ function get_theme_data( $theme_file ) {
 		if ( empty( $theme_data['AuthorURI'] ) ) {
 			$theme_data['Author'] = $theme_data['AuthorName'];
 		} else {
-			$theme_data['Author'] = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $theme_data['AuthorURI'], __( 'Visit author homepage' ), $theme_data['AuthorName'] );
+			$theme_data['Author'] = sprintf( '<a href="%1$s" title="%2$s">%3$s</a>', $theme_data['AuthorURI'], esc_attr__( 'Visit author homepage' ), $theme_data['AuthorName'] );
 		}
 	}
 
@@ -267,9 +267,6 @@ function get_themes() {
 	if ( isset($wp_themes) )
 		return $wp_themes;
 
-	/* Register the default root as a theme directory */
-	register_theme_directory( get_theme_root() );
-
 	if ( !$theme_files = search_theme_directories() )
 		return false;
 
@@ -388,8 +385,8 @@ function get_themes() {
 		$template_files = array_unique($template_files);
 		$stylesheet_files = array_unique($stylesheet_files);
 
-		$template_dir = dirname($template_files[0]);
-		$stylesheet_dir = dirname($stylesheet_files[0]);
+		$template_dir = $template_directory;
+		$stylesheet_dir = $theme_root . '/' . $stylesheet;
 
 		if ( empty($template_dir) )
 			$template_dir = '/';
@@ -399,10 +396,16 @@ function get_themes() {
 		// Check for theme name collision.  This occurs if a theme is copied to
 		// a new theme directory and the theme header is not updated.  Whichever
 		// theme is first keeps the name.  Subsequent themes get a suffix applied.
-		// The Default and Classic themes always trump their pretenders.
+		// The Twenty Eleven, Twenty Ten, Default and Classic themes always trump
+		// their pretenders.
 		if ( isset($wp_themes[$name]) ) {
-			if ( ('WordPress Default' == $name || 'WordPress Classic' == $name) &&
-					 ('default' == $stylesheet || 'classic' == $stylesheet) ) {
+			$trump_cards = array(
+				'classic'      => 'WordPress Classic',
+				'default'      => 'WordPress Default',
+				'twentyten'    => 'Twenty Ten',
+				'twentyeleven' => 'Twenty Eleven',
+			);
+			if ( isset( $trump_cards[ $stylesheet ] ) && $name == $trump_cards[ $stylesheet ] ) {
 				// If another theme has claimed to be one of our default themes, move
 				// them aside.
 				$suffix = $wp_themes[$name]['Stylesheet'];
@@ -466,9 +469,14 @@ function get_themes() {
  *
  * @since 2.9.0
  *
- * @return array Theme roots
+ * @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() {
+	global $wp_theme_directories;
+
+	if ( count($wp_theme_directories) <= 1 )
+		return '/themes';
+
 	$theme_roots = get_site_transient( 'theme_roots' );
 	if ( false === $theme_roots ) {
 		get_themes();
@@ -488,7 +496,7 @@ function get_theme_roots() {
 function get_theme($theme) {
 	$themes = get_themes();
 
-	if ( array_key_exists($theme, $themes) )
+	if ( is_array( $themes ) && array_key_exists( $theme, $themes ) )
 		return $themes[$theme];
 
 	return null;
@@ -510,12 +518,13 @@ function get_current_theme() {
 		return $theme;
 
 	$themes = get_themes();
-	$theme_names = array_keys($themes);
-	$current_template = get_option('template');
-	$current_stylesheet = get_option('stylesheet');
-	$current_theme = 'WordPress Default';
+	$current_theme = 'Twenty Eleven';
 
 	if ( $themes ) {
+		$theme_names = array_keys( $themes );
+		$current_template = get_option( 'template' );
+		$current_stylesheet = get_option( 'stylesheet' );
+
 		foreach ( (array) $theme_names as $theme_name ) {
 			if ( $themes[$theme_name]['Stylesheet'] == $current_stylesheet &&
 					$themes[$theme_name]['Template'] == $current_template ) {
@@ -588,7 +597,7 @@ function search_theme_directories() {
 
 		while ( ($theme_dir = readdir($themes_dir)) !== false ) {
 			if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) {
-				if ( $theme_dir{0} == '.' || $theme_dir == 'CVS' )
+				if ( $theme_dir[0] == '.' || $theme_dir == 'CVS' )
 					continue;
 
 				$stylish_dir = @opendir($theme_root . '/' . $theme_dir);
@@ -611,7 +620,7 @@ function search_theme_directories() {
 					$found_subdir_themes = false;
 					while ( ($theme_subdir = readdir($theme_subdirs)) !== false ) {
 						if ( is_dir( $subdir . '/' . $theme_subdir) && is_readable($subdir . '/' . $theme_subdir) ) {
-							if ( $theme_subdir{0} == '.' || $theme_subdir == 'CVS' )
+							if ( $theme_subdir[0] == '.' || $theme_subdir == 'CVS' )
 								continue;
 
 							$stylish_dir = @opendir($subdir . '/' . $theme_subdir);
@@ -645,17 +654,15 @@ function search_theme_directories() {
  * Does not have trailing slash.
  *
  * @since 1.5.0
- * @param $stylesheet_or_template The stylesheet or template name of the theme
  * @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.
  */
 function get_theme_root( $stylesheet_or_template = false ) {
-	if ($stylesheet_or_template) {
-		$theme_roots = get_theme_roots();
-
-		if ( ! empty( $theme_roots[$stylesheet_or_template] ) )
-			$theme_root = WP_CONTENT_DIR . $theme_roots[$stylesheet_or_template];
+	if ( $stylesheet_or_template ) {
+		if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
+			$theme_root = WP_CONTENT_DIR . $theme_root;
 		else
 			$theme_root = WP_CONTENT_DIR . '/themes';
 	} else {
@@ -671,48 +678,77 @@ function get_theme_root( $stylesheet_or_template = false ) {
  * Does not have trailing slash.
  *
  * @since 1.5.0
- * @param $stylesheet_or_template The stylesheet or template name of the theme
  *
+ * @param string $stylesheet_or_template The stylesheet or template name of the theme
  * @return string Themes URI.
  */
 function get_theme_root_uri( $stylesheet_or_template = false ) {
-	$theme_roots = get_theme_roots();
-
-	if ( isset( $theme_roots[$stylesheet_or_template] ) && $theme_roots[$stylesheet_or_template] )
-		$theme_root_uri = content_url( $theme_roots[$stylesheet_or_template] );
-	else
+	if ( $stylesheet_or_template ) {
+		if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
+			$theme_root_uri = content_url( $theme_root );
+		else
+			$theme_root_uri = content_url( 'themes' );
+	} else {
 		$theme_root_uri = content_url( 'themes' );
+	}
 
 	return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template );
 }
 
 /**
- * Retrieve path to file without the use of extension.
+ * Get the raw theme root relative to the content directory with no filters applied.
  *
- * Used to quickly retrieve the path of file without including the file
- * extension. It will also check the parent template, if the file exists, with
- * the use of {@link locate_template()}. Allows for more generic file location
- * without the use of the other get_*_template() functions.
+ * @since 3.1.0
  *
- * Can be used with include() or require() to retrieve path.
- * <code>
- * if( '' != get_query_template( '404' ) )
- *     include( get_query_template( '404' ) );
- * </code>
- * or the same can be accomplished with
- * <code>
- * if( '' != get_404_template() )
- *     include( get_404_template() );
- * </code>
+ * @param string $stylesheet_or_template The stylesheet or template name of the theme
+ * @return string Theme root
+ */
+function get_raw_theme_root( $stylesheet_or_template, $no_cache = false ) {
+	global $wp_theme_directories;
+
+	if ( count($wp_theme_directories) <= 1 )
+		return '/themes';
+
+	$theme_root = false;
+
+	// If requesting the root for the current theme, consult options to avoid calling get_theme_roots()
+	if ( !$no_cache ) {
+		if ( get_option('stylesheet') == $stylesheet_or_template )
+			$theme_root = get_option('stylesheet_root');
+		elseif ( get_option('template') == $stylesheet_or_template )
+			$theme_root = get_option('template_root');
+	}
+
+	if ( empty($theme_root) ) {
+		$theme_roots = get_theme_roots();
+		if ( !empty($theme_roots[$stylesheet_or_template]) )
+			$theme_root = $theme_roots[$stylesheet_or_template];
+	}
+
+	return $theme_root;
+}
+
+/**
+ * Retrieve path to a template
+ *
+ * Used to quickly retrieve the path of a template without including the file
+ * extension. It will also check the parent theme, if the file exists, with
+ * the use of {@link locate_template()}. Allows for more generic template location
+ * without the use of the other get_*_template() functions.
  *
  * @since 1.5.0
  *
  * @param string $type Filename without extension.
+ * @param array $templates An optional list of template candidates
  * @return string Full path to file.
  */
-function get_query_template($type) {
+function get_query_template( $type, $templates = array() ) {
 	$type = preg_replace( '|[^a-z0-9-]+|', '', $type );
-	return apply_filters("{$type}_template", locate_template(array("{$type}.php")));
+
+	if ( empty( $templates ) )
+		$templates = array("{$type}.php");
+
+	return apply_filters( "{$type}_template", locate_template( $templates ) );
 }
 
 /**
@@ -745,7 +781,15 @@ function get_404_template() {
  * @return string
  */
 function get_archive_template() {
-	return get_query_template('archive');
+	$post_type = get_query_var( 'post_type' );
+
+	$templates = array();
+
+	if ( $post_type )
+		$templates[] = "archive-{$post_type}.php";
+	$templates[] = 'archive.php';
+
+	return get_query_template( 'archive', $templates );
 }
 
 /**
@@ -756,20 +800,15 @@ function get_archive_template() {
  * @return string
  */
 function get_author_template() {
-	$author_id = absint( get_query_var( 'author' ) );
-	$author = get_user_by( 'id', $author_id );
-	$author = $author->user_nicename;
+	$author = get_queried_object();
 
 	$templates = array();
 
-	if ( $author )
-		$templates[] = "author-{$author}.php";
-	if ( $author_id )
-		$templates[] = "author-{$author_id}.php";
+	$templates[] = "author-{$author->user_nicename}.php";
+	$templates[] = "author-{$author->ID}.php";
 	$templates[] = 'author.php';
 
-	$template = locate_template( $templates );
-	return apply_filters( 'author_template', $template );
+	return get_query_template( 'author', $templates );
 }
 
 /**
@@ -785,19 +824,15 @@ function get_author_template() {
  * @return string
  */
 function get_category_template() {
-	$cat_ID = absint( get_query_var('cat') );
-	$category = get_category( $cat_ID );
+	$category = get_queried_object();
 
 	$templates = array();
 
-	if ( !is_wp_error($category) )
-		$templates[] = "category-{$category->slug}.php";
+	$templates[] = "category-{$category->slug}.php";
+	$templates[] = "category-{$category->term_id}.php";
+	$templates[] = 'category.php';
 
-	$templates[] = "category-$cat_ID.php";
-	$templates[] = "category.php";
-
-	$template = locate_template($templates);
-	return apply_filters('category_template', $template);
+	return get_query_template( 'category', $templates );
 }
 
 /**
@@ -813,19 +848,15 @@ function get_category_template() {
  * @return string
  */
 function get_tag_template() {
-	$tag_id = absint( get_query_var('tag_id') );
-	$tag_name = get_query_var('tag');
+	$tag = get_queried_object();
 
 	$templates = array();
 
-	if ( $tag_name )
-		$templates[] = "tag-$tag_name.php";
-	if ( $tag_id )
-		$templates[] = "tag-$tag_id.php";
-	$templates[] = "tag.php";
+	$templates[] = "tag-{$tag->slug}.php";
+	$templates[] = "tag-{$tag->term_id}.php";
+	$templates[] = 'tag.php';
 
-	$template = locate_template($templates);
-	return apply_filters('tag_template', $template);
+	return get_query_template( 'tag', $templates );
 }
 
 /**
@@ -840,25 +871,22 @@ function get_tag_template() {
  * template is used. If none of the files exist, then it will fall back on to
  * index.php.
  *
- * @since unknown (2.6.0 most likely)
+ * @since 2.5.0
  * @uses apply_filters() Calls 'taxonomy_template' filter on found path.
  *
  * @return string
  */
 function get_taxonomy_template() {
-	$taxonomy = get_query_var('taxonomy');
-	$term = get_query_var('term');
+	$term = get_queried_object();
+	$taxonomy = $term->taxonomy;
 
 	$templates = array();
-	if ( $taxonomy && $term )
-		$templates[] = "taxonomy-$taxonomy-$term.php";
-	if ( $taxonomy )
-		$templates[] = "taxonomy-$taxonomy.php";
 
-	$templates[] = "taxonomy.php";
+	$templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
+	$templates[] = "taxonomy-$taxonomy.php";
+	$templates[] = 'taxonomy.php';
 
-	$template = locate_template($templates);
-	return apply_filters('taxonomy_template', $template);
+	return get_query_template( 'taxonomy', $templates );
 }
 
 /**
@@ -885,8 +913,9 @@ function get_date_template() {
  * @return string
  */
 function get_home_template() {
-	$template = locate_template(array('home.php', 'index.php'));
-	return apply_filters('home_template', $template);
+	$templates = array( 'home.php', 'index.php' );
+
+	return get_query_template( 'home', $templates );
 }
 
 /**
@@ -900,7 +929,9 @@ function get_home_template() {
  * @return string
  */
 function get_front_page_template() {
-	return apply_filters( 'front_page_template', locate_template( array('front-page.php') ) );
+	$templates = array('front-page.php');
+
+	return get_query_template( 'front_page', $templates );
 }
 
 /**
@@ -915,15 +946,13 @@ function get_front_page_template() {
  * @return string
  */
 function get_page_template() {
-	global $wp_query;
-
-	$id = (int) $wp_query->get_queried_object_id();
+	$id = get_queried_object_id();
 	$template = get_post_meta($id, '_wp_page_template', true);
 	$pagename = get_query_var('pagename');
 
 	if ( !$pagename && $id > 0 ) {
 		// If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
-		$post = $wp_query->get_queried_object();
+		$post = get_queried_object();
 		$pagename = $post->post_name;
 	}
 
@@ -937,9 +966,9 @@ function get_page_template() {
 		$templates[] = "page-$pagename.php";
 	if ( $id )
 		$templates[] = "page-$id.php";
-	$templates[] = "page.php";
+	$templates[] = 'page.php';
 
-	return apply_filters('page_template', locate_template($templates));
+	return get_query_template( 'page', $templates );
 }
 
 /**
@@ -972,11 +1001,14 @@ function get_search_template() {
  * @return string
  */
 function get_single_template() {
-	global $wp_query;
+	$object = get_queried_object();
+
+	$templates = array();
 
-	$object = $wp_query->get_queried_object();
-	$templates = array('single-' . $object->post_type . '.php', 'single.php');
-	return apply_filters('single_template', locate_template($templates));
+	$templates[] = "single-{$object->post_type}.php";
+	$templates[] = "single.php";
+
+	return get_query_template( 'single', $templates );
 }
 
 /**
@@ -1019,13 +1051,13 @@ function get_attachment_template() {
  * @return string
  */
 function get_comments_popup_template() {
-	$template = locate_template(array("comments-popup.php"));
+	$template = get_query_template( 'comments_popup', array( 'comments-popup.php' ) );
 
 	// Backward compat code will be removed in a future release
 	if ('' == $template)
-		$template = WPINC . '/theme-compat/comments-popup.php';
+		$template = ABSPATH . WPINC . '/theme-compat/comments-popup.php';
 
-	return apply_filters('comments_popup_template', $template);
+	return $template;
 }
 
 /**
@@ -1036,17 +1068,14 @@ function get_comments_popup_template() {
  *
  * @since 2.7.0
  *
- * @param array $template_names Array of template files to search for in priority order.
+ * @param string|array $template_names Template file(s) to search for, in order.
  * @param bool $load If true the template file will be loaded if it is found.
  * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
  * @return string The template filename if one is located.
  */
 function locate_template($template_names, $load = false, $require_once = true ) {
-	if ( !is_array($template_names) )
-		return '';
-
 	$located = '';
-	foreach ( $template_names as $template_name ) {
+	foreach ( (array) $template_names as $template_name ) {
 		if ( !$template_name )
 			continue;
 		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
@@ -1115,6 +1144,10 @@ function preview_theme() {
 	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']) )
@@ -1207,18 +1240,38 @@ function preview_theme_ob_filter_callback( $matches ) {
 /**
  * Switches current theme to new template and stylesheet names.
  *
- * @since unknown
+ * @since 2.5.0
  * @uses do_action() Calls 'switch_theme' action on updated theme display name.
  *
  * @param string $template Template name
  * @param string $stylesheet Stylesheet name.
  */
 function switch_theme($template, $stylesheet) {
+	global $wp_theme_directories, $sidebars_widgets;
+
+	if ( is_array( $sidebars_widgets ) )
+		set_theme_mod( 'sidebars_widgets', array( 'time' => time(), 'data' => $sidebars_widgets ) );
+
+	$old_theme = get_current_theme();
+
 	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));
+	}
+
 	delete_option('current_theme');
 	$theme = get_current_theme();
-	do_action('switch_theme', $theme);
+
+	if ( is_admin() && false === get_option( "theme_mods_$stylesheet" ) ) {
+		$default_theme_mods = (array) get_option( "mods_$theme" );
+		add_option( "theme_mods_$stylesheet", $default_theme_mods );
+	}
+
+	update_option( 'theme_switched', $old_theme );
+	do_action( 'switch_theme', $theme );
 }
 
 /**
@@ -1249,9 +1302,34 @@ function validate_current_theme() {
 		return false;
 	}
 
+	if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
+		switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+		return false;
+	}
+
 	return true;
 }
 
+/**
+ * Retrieve all theme modifications.
+ *
+ * @since 3.1.0
+ *
+ * @return array Theme modifications.
+ */
+function get_theme_mods() {
+	$theme_slug = get_option( 'stylesheet' );
+	if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
+		$theme_name = get_current_theme();
+		$mods = get_option( "mods_$theme_name" ); // Deprecated location.
+		if ( is_admin() && false !== $mods ) {
+			update_option( "theme_mods_$theme_slug", $mods );
+			delete_option( "mods_$theme_name" );
+		}
+	}
+	return $mods;
+}
+
 /**
  * Retrieve theme modification value for the current theme.
  *
@@ -1267,15 +1345,13 @@ function validate_current_theme() {
  * @param bool|string $default
  * @return string
  */
-function get_theme_mod($name, $default = false) {
-	$theme = get_current_theme();
+function get_theme_mod( $name, $default = false ) {
+	$mods = get_theme_mods();
 
-	$mods = get_option( "mods_$theme" );
+	if ( isset( $mods[ $name ] ) )
+		return apply_filters( "theme_mod_$name", $mods[ $name ] );
 
-	if ( isset($mods[$name]) )
-		return apply_filters( "theme_mod_$name", $mods[$name] );
-
-	return apply_filters( "theme_mod_$name", sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri()) );
+	return apply_filters( "theme_mod_$name", sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() ) );
 }
 
 /**
@@ -1286,15 +1362,13 @@ function get_theme_mod($name, $default = false) {
  * @param string $name Theme modification name.
  * @param string $value theme modification value.
  */
-function set_theme_mod($name, $value) {
-	$theme = get_current_theme();
+function set_theme_mod( $name, $value ) {
+	$mods = get_theme_mods();
 
-	$mods = get_option("mods_$theme");
+	$mods[ $name ] = $value;
 
-	$mods[$name] = $value;
-
-	update_option("mods_$theme", $mods);
-	wp_cache_delete("mods_$theme", 'options');
+	$theme = get_option( 'stylesheet' );
+	update_option( "theme_mods_$theme", $mods );
 }
 
 /**
@@ -1309,20 +1383,18 @@ function set_theme_mod($name, $value) {
  * @return null
  */
 function remove_theme_mod( $name ) {
-	$theme = get_current_theme();
-
-	$mods = get_option("mods_$theme");
+	$mods = get_theme_mods();
 
-	if ( !isset($mods[$name]) )
+	if ( ! isset( $mods[ $name ] ) )
 		return;
 
-	unset($mods[$name]);
+	unset( $mods[ $name ] );
 
-	if ( empty($mods) )
+	if ( empty( $mods ) )
 		return remove_theme_mods();
 
-	update_option("mods_$theme", $mods);
-	wp_cache_delete("mods_$theme", 'options');
+	$theme = get_option( 'stylesheet' );
+	update_option( "theme_mods_$theme", $mods );
 }
 
 /**
@@ -1331,9 +1403,8 @@ function remove_theme_mod( $name ) {
  * @since 2.1.0
  */
 function remove_theme_mods() {
-	$theme = get_current_theme();
-
-	delete_option("mods_$theme");
+	delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+	delete_option( 'mods_' . get_current_theme() );
 }
 
 /**
@@ -1368,9 +1439,85 @@ function header_textcolor() {
  * @return string
  */
 function get_header_image() {
-	$default = defined('HEADER_IMAGE') ? HEADER_IMAGE : '';
+	$default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
+	$url = get_theme_mod( 'header_image', $default );
 
-	return get_theme_mod('header_image', $default);
+	if ( 'remove-header' == $url )
+		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 );
+}
+
+/**
+ * Get random header image from registered images in theme.
+ *
+ * @since 3.2.0
+ *
+ * @return string Path to header image
+ */
+function get_random_header_image() {
+	global $_wp_default_headers;
+
+	$header_image_mod = get_theme_mod( 'header_image', '' );
+	$headers = array();
+
+	if ( 'random-uploaded-image' == $header_image_mod )
+		$headers = get_uploaded_header_images();
+	elseif ( ! empty( $_wp_default_headers ) ) {
+		if ( 'random-default-image' == $header_image_mod ) {
+			$headers = $_wp_default_headers;
+		} else {
+			$is_random = get_theme_support( 'custom-header' );
+			if ( isset( $is_random[ 0 ] ) && !empty( $is_random[ 0 ][ 'random-default' ] ) )
+				$headers = $_wp_default_headers;
+		}
+	}
+
+	if ( empty( $headers ) )
+		return '';
+
+	$random_image = array_rand( $headers );
+	$header_url = sprintf( $headers[$random_image]['url'], get_template_directory_uri(), get_stylesheet_directory_uri() );
+
+	return $header_url;
+}
+
+/**
+ * Check if random header image is in use.
+ *
+ * Always true if user expressly chooses the option in Appearance > Header.
+ * Also true if theme has multiple header images registered, no specific header image
+ * is chosen, and theme turns on random headers with add_theme_support().
+ *
+ * @since 3.2.0
+ * @uses HEADER_IMAGE
+ *
+ * @param string $type The random pool to use. any|default|uploaded
+ * @return boolean
+ */
+function is_random_header_image( $type = 'any' ) {
+	$default = defined( 'HEADER_IMAGE' ) ? HEADER_IMAGE : '';
+	$header_image_mod = get_theme_mod( 'header_image', $default );
+
+	if ( 'any' == $type ) {
+		if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) )
+			return true;
+	} else {
+		if ( "random-$type-image" == $header_image_mod )
+			return true;
+		elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() )
+			return true;
+	}
+
+	return false;
 }
 
 /**
@@ -1382,6 +1529,34 @@ function header_image() {
 	echo get_header_image();
 }
 
+/**
+ * Get the header images uploaded for the current theme.
+ *
+ * @since 3.2.0
+ *
+ * @return array
+ */
+function get_uploaded_header_images() {
+	$header_images = array();
+
+	// @todo caching
+	$headers = get_posts( array( 'post_type' => 'attachment', 'meta_key' => '_wp_attachment_is_custom_header', 'meta_value' => get_option('stylesheet'), 'orderby' => 'none', 'nopaging' => true ) );
+
+	if ( empty( $headers ) )
+		return array();
+
+	foreach ( (array) $headers as $header ) {
+		$url = esc_url_raw( $header->guid );
+		$header = basename($url);
+		$header_images[$header] = array();
+		$header_images[$header]['url'] =  $url;
+		$header_images[$header]['thumbnail_url'] =  $url;
+		$header_images[$header]['uploaded'] = true;
+	}
+
+	return $header_images;
+}
+
 /**
  * Add callbacks for image header display.
  *
@@ -1397,17 +1572,50 @@ function header_image() {
  * @param callback $admin_header_callback Call on custom header administration screen.
  * @param callback $admin_image_div_callback Output a custom header image div on the custom header administration screen. Optional.
  */
-function add_custom_image_header($header_callback, $admin_header_callback, $admin_image_div_callback = '') {
-	if ( ! empty($header_callback) )
+function add_custom_image_header( $header_callback, $admin_header_callback, $admin_image_div_callback = '' ) {
+	if ( ! empty( $header_callback ) )
 		add_action('wp_head', $header_callback);
 
-	add_theme_support( 'custom-header' );
+	$support = array( 'callback' => $header_callback );
+	$theme_support = get_theme_support( 'custom-header' );
+	if ( ! empty( $theme_support ) && is_array( $theme_support[ 0 ] ) )
+		$support = array_merge( $theme_support[ 0 ], $support );
+	add_theme_support( 'custom-header',  $support );
+	add_theme_support( 'custom-header-uploads' );
 
 	if ( ! is_admin() )
 		return;
-	require_once(ABSPATH . 'wp-admin/custom-header.php');
-	$GLOBALS['custom_image_header'] =& new Custom_Image_Header($admin_header_callback, $admin_image_div_callback);
-	add_action('admin_menu', array(&$GLOBALS['custom_image_header'], 'init'));
+
+	global $custom_image_header;
+
+	require_once( ABSPATH . 'wp-admin/custom-header.php' );
+	$custom_image_header = new Custom_Image_Header( $admin_header_callback, $admin_image_div_callback );
+	add_action( 'admin_menu', array( &$custom_image_header, 'init' ) );
+}
+
+/**
+ * Remove image header support.
+ *
+ * @since 3.1.0
+ * @see add_custom_image_header()
+ *
+ * @return bool Whether support was removed.
+ */
+function remove_custom_image_header() {
+	if ( ! current_theme_supports( 'custom-header' ) )
+		return false;
+
+	$callback = get_theme_support( 'custom-header' );
+	remove_action( 'wp_head', $callback[0]['callback'] );
+	_remove_theme_support( 'custom-header' );
+	remove_theme_support( 'custom-header-uploads' );
+
+	if ( is_admin() ) {
+		remove_action( 'admin_menu', array( &$GLOBALS['custom_image_header'], 'init' ) );
+		unset( $GLOBALS['custom_image_header'] );
+	}
+
+	return true;
 }
 
 /**
@@ -1432,7 +1640,7 @@ function register_default_headers( $headers ) {
  * @see register_default_headers()
  * @since 3.0.0
  *
- * @param string|array The header string id (key of array) to remove, or an array thereof.
+ * @param string|array $header The header string id (key of array) to remove, or an array thereof.
  * @return True on success, false on failure.
  */
 function unregister_default_headers( $header ) {
@@ -1507,22 +1715,46 @@ function background_color() {
  * @param callback $admin_header_callback Call on custom background administration screen.
  * @param callback $admin_image_div_callback Output a custom background image div on the custom background administration screen. Optional.
  */
-function add_custom_background($header_callback = '', $admin_header_callback = '', $admin_image_div_callback = '') {
-	if ( isset($GLOBALS['custom_background']) )
+function add_custom_background( $header_callback = '', $admin_header_callback = '', $admin_image_div_callback = '' ) {
+	if ( isset( $GLOBALS['custom_background'] ) )
 		return;
 
-	if ( empty($header_callback) )
+	if ( empty( $header_callback ) )
 		$header_callback = '_custom_background_cb';
 
-	add_action('wp_head', $header_callback);
+	add_action( 'wp_head', $header_callback );
 
-	add_theme_support( 'custom-background' );
+	add_theme_support( 'custom-background', array( 'callback' => $header_callback ) );
 
 	if ( ! is_admin() )
 		return;
-	require_once(ABSPATH . 'wp-admin/custom-background.php');
-	$GLOBALS['custom_background'] =& new Custom_Background($admin_header_callback, $admin_image_div_callback);
-	add_action('admin_menu', array(&$GLOBALS['custom_background'], 'init'));
+	require_once( ABSPATH . 'wp-admin/custom-background.php' );
+	$GLOBALS['custom_background'] = new Custom_Background( $admin_header_callback, $admin_image_div_callback );
+	add_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
+}
+
+/**
+ * Remove custom background support.
+ *
+ * @since 3.1.0
+ * @see add_custom_background()
+ *
+ * @return bool Whether support was removed.
+ */
+function remove_custom_background() {
+	if ( ! current_theme_supports( 'custom-background' ) )
+		return false;
+
+	$callback = get_theme_support( 'custom-background' );
+	remove_action( 'wp_head', $callback[0]['callback'] );
+	_remove_theme_support( 'custom-background' );
+
+	if ( is_admin() ) {
+		remove_action( 'admin_menu', array( &$GLOBALS['custom_background'], 'init' ) );
+		unset( $GLOBALS['custom_background'] );
+	}
+
+	return true;
 }
 
 /**
@@ -1562,7 +1794,7 @@ function _custom_background_cb() {
 	}
 ?>
 <style type="text/css">
-body { <?php echo trim( $style ); ?> }
+body.custom-background { <?php echo trim( $style ); ?> }
 </style>
 <?php
 }
@@ -1574,6 +1806,10 @@ body { <?php echo trim( $style ); ?> }
  * the theme root. It also accepts an array of stylesheets.
  * It is optional and defaults to 'editor-style.css'.
  *
+ * Supports RTL stylesheets automatically by searching for the -rtl prefix, e.g.
+ * editor-style-rtl.css. If an array of stylesheets is passed to add_editor_style(),
+ * RTL is only added for the first stylesheet.
+ *
  * @since 3.0.0
  *
  * @param mixed $stylesheet Optional. Stylesheet name or array thereof, relative to theme root.
@@ -1597,6 +1833,22 @@ function add_editor_style( $stylesheet = 'editor-style.css' ) {
 	$editor_styles = array_merge( $editor_styles, $stylesheet );
 }
 
+/**
+ * Removes all visual editor stylesheets.
+ *
+ * @since 3.1.0
+ *
+ * @return bool True on success, false if there were no stylesheets to remove.
+ */
+function remove_editor_styles() {
+	if ( ! current_theme_supports( 'editor-style' ) )
+		return false;
+	_remove_theme_support( 'editor-style' );
+	if ( is_admin() )
+		$GLOBALS['editor_styles'] = array();
+	return true;
+}
+
 /**
  * Allows a theme to register its support of a certain feature
  *
@@ -1614,6 +1866,24 @@ function add_theme_support( $feature ) {
 		$_wp_theme_features[$feature] = true;
 	else
 		$_wp_theme_features[$feature] = array_slice( func_get_args(), 1 );
+
+	if ( $feature == 'post-formats' && is_array( $_wp_theme_features[$feature][0] ) )
+		$_wp_theme_features[$feature][0] = array_intersect( $_wp_theme_features[$feature][0], array_keys( get_post_format_slugs() ) );
+}
+
+/**
+ * Gets the theme support arguments passed when registering that support
+ *
+ * @since 3.1
+ * @param string $feature the feature to check
+ * @return array The array of extra arguments
+ */
+function get_theme_support( $feature ) {
+	global $_wp_theme_features;
+	if ( !isset( $_wp_theme_features[$feature] ) )
+		return false;
+	else
+		return $_wp_theme_features[$feature];
 }
 
 /**
@@ -1629,9 +1899,18 @@ function add_theme_support( $feature ) {
  */
 function remove_theme_support( $feature ) {
 	// Blacklist: for internal registrations not used directly by themes.
-	if ( in_array( $feature, array( 'custom-background', 'custom-header', 'editor-style', 'widgets' ) ) )
+	if ( in_array( $feature, array( 'custom-background', 'custom-header', 'editor-style', 'widgets', 'menus' ) ) )
 		return false;
+	return _remove_theme_support( $feature );
+}
 
+/**
+ * Do not use. Removes theme support internally, ignorant of the blacklist.
+ *
+ * @access private
+ * @since 3.1.0
+ */
+function _remove_theme_support( $feature ) {
 	global $_wp_theme_features;
 
 	if ( ! isset( $_wp_theme_features[$feature] ) )
@@ -1668,10 +1947,14 @@ function current_theme_supports( $feature ) {
 			if ( true === $_wp_theme_features[$feature] )  // Registered for all types
 				return true;
 			$content_type = $args[0];
-			if ( in_array($content_type, $_wp_theme_features[$feature][0]) )
-				return true;
-			else
-				return false;
+			return in_array( $content_type, $_wp_theme_features[$feature][0] );
+			break;
+
+		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] );
 			break;
 	}
 
@@ -1714,4 +1997,14 @@ function _delete_attachment_theme_mod( $id ) {
 
 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
+ *
+ * @since 3.3
+ */
+function check_theme_switched() {
+	if ( false !== ( $old_theme = get_option( 'theme_switched' ) ) && !empty( $old_theme ) ) {
+		do_action( 'after_switch_theme', $old_theme );
+		update_option( 'theme_switched', false );
+	}
+}