WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't fetch theme_roots transient on every page load. Avoid it altogether if there is only one theme dir. fixes #14911 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-09-21 19:41:35 +00:00
parent 669b7b3e87
commit f3d45472d2
1 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
wp-includes/theme.php
View File

@ -466,9 +466,14 @@ function get_themes() {
* *
* @since 2.9.0 * @since 2.9.0
* *
* @return array Theme roots * @return array|string An arry of theme roots keyed by template/stylesheet or a single theme root if all themes have the same root.
*/ */
function get_theme_roots() { function get_theme_roots() {
global $wp_theme_directories;
if ( count($wp_theme_directories <= 1) )
return '/themes';
$theme_roots = get_site_transient( 'theme_roots' ); $theme_roots = get_site_transient( 'theme_roots' );
if ( false === $theme_roots ) { if ( false === $theme_roots ) {
get_themes(); get_themes();
@ -651,11 +656,9 @@ function search_theme_directories() {
* @return string Theme path. * @return string Theme path.
*/ */
function get_theme_root( $stylesheet_or_template = false ) { function get_theme_root( $stylesheet_or_template = false ) {
if ($stylesheet_or_template) { if ( $stylesheet_or_template ) {
$theme_roots = get_theme_roots(); if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
$theme_root = WP_CONTENT_DIR . $theme_root;
if ( ! empty( $theme_roots[$stylesheet_or_template] ) )
$theme_root = WP_CONTENT_DIR . $theme_roots[$stylesheet_or_template];
else else
$theme_root = WP_CONTENT_DIR . '/themes'; $theme_root = WP_CONTENT_DIR . '/themes';
} else { } else {
@ -676,16 +679,49 @@ function get_theme_root( $stylesheet_or_template = false ) {
* @return string Themes URI. * @return string Themes URI.
*/ */
function get_theme_root_uri( $stylesheet_or_template = false ) { function get_theme_root_uri( $stylesheet_or_template = false ) {
$theme_roots = get_theme_roots(); if ( $stylesheet_or_template ) {
if ( $theme_root = get_raw_theme_root($stylesheet_or_template) )
if ( isset( $theme_roots[$stylesheet_or_template] ) && $theme_roots[$stylesheet_or_template] ) $theme_root_uri = content_url( $theme_root );
$theme_root_uri = content_url( $theme_roots[$stylesheet_or_template] ); else
else $theme_root_uri = content_url( 'themes' );
} else {
$theme_root_uri = content_url( 'themes' ); $theme_root_uri = content_url( 'themes' );
}
return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template ); return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template );
} }
/**
* Get the raw theme root relative to the content directory with no filters applied.
*
* @since 3.1.0
*
* @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 ) {
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 ( 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 * Retrieve path to a template
* *
@ -1213,8 +1249,14 @@ function preview_theme_ob_filter_callback( $matches ) {
* @param string $stylesheet Stylesheet name. * @param string $stylesheet Stylesheet name.
*/ */
function switch_theme($template, $stylesheet) { function switch_theme($template, $stylesheet) {
global $wp_theme_directories;
update_option('template', $template); update_option('template', $template);
update_option('stylesheet', $stylesheet); update_option('stylesheet', $stylesheet);
if ( count($wp_theme_directories) > 1 ) {
update_option('template_root', get_raw_theme_root($template));
update_option('stylesheet_root', get_raw_theme_root($stylesheet));
}
delete_option('current_theme'); delete_option('current_theme');
$theme = get_current_theme(); $theme = get_current_theme();
do_action('switch_theme', $theme); do_action('switch_theme', $theme);