summaryrefslogtreecommitdiffstats
path: root/wp-includes/theme.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-22 11:44:06 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-22 11:44:06 +0000
commitb2f9804dae80c5f6c70c70e92a3bbde67e2615c5 (patch)
tree7615f215a90e4c797702547dab832d30887a0a54 /wp-includes/theme.php
parent4e71faf4fa1a98517df1c83be342dd3714f504d2 (diff)
downloadwordpress-mu-b2f9804dae80c5f6c70c70e92a3bbde67e2615c5.tar.gz
wordpress-mu-b2f9804dae80c5f6c70c70e92a3bbde67e2615c5.tar.xz
wordpress-mu-b2f9804dae80c5f6c70c70e92a3bbde67e2615c5.zip
WP Merge to 4780
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@854 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/theme.php')
-rw-r--r--wp-includes/theme.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index f527b42..8c60a9c 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -399,7 +399,8 @@ function load_template($_template_file) {
global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query,
$wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment;
- extract($wp_query->query_vars, EXTR_SKIP);
+ if ( is_array($wp_query->query_vars) )
+ extract($wp_query->query_vars, EXTR_SKIP);
require_once($_template_file);
}