diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-28 12:13:39 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-28 12:13:39 +0000 |
commit | c897a0ba270f217512e37f8bd520dd24b35b058d (patch) | |
tree | ab5683db986751fe3d79c9aeddcbbafa708870c7 /wp-includes/theme.php | |
parent | 8399b696d7660728535b85dbd90466f0e82e6fc8 (diff) | |
download | wordpress-mu-c897a0ba270f217512e37f8bd520dd24b35b058d.tar.gz wordpress-mu-c897a0ba270f217512e37f8bd520dd24b35b058d.tar.xz wordpress-mu-c897a0ba270f217512e37f8bd520dd24b35b058d.zip |
WP Merge to rev 4956
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@904 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/theme.php')
-rw-r--r-- | wp-includes/theme.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/theme.php b/wp-includes/theme.php index 8c60a9c..633412c 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -186,7 +186,7 @@ function get_themes() { if ( !file_exists("$theme_root/$template/index.php") ) { $parent_dir = dirname(dirname($theme_file)); if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) { - $template = "$parent_dir/$template"; + $template = "$parent_dir/$template"; } else { $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); continue; @@ -484,7 +484,7 @@ function get_header_textcolor() { } function header_textcolor() { - echo get_header_textcolor(); + echo get_header_textcolor(); } function get_header_image() { @@ -492,7 +492,7 @@ function get_header_image() { } function header_image() { - echo get_header_image(); + echo get_header_image(); } function add_custom_image_header($header_callback, $admin_header_callback) { |