From f67f4d74056012899f8b61fc17b90702bdb46707 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Sun, 14 Feb 2010 11:52:27 +0000
Subject: [PATCH] Use $wp_query->get_queried_object(). Also move wp_head() to
end of <head>, see #9015.
git-svn-id: https://develop.svn.wordpress.org/trunk@13152 602fd350-edb4-49c9-b593-d223f7449a82
---
wp-content/themes/twentyten/functions.php | 2 +-
wp-content/themes/twentyten/header.php | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 7708b22131..4c22741fee 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -126,7 +126,7 @@ function twentyten_tag_list() {
}
function twentyten_term_list($taxonomy, $glue = ', ', $text = '', $also_text = '') {
global $wp_query, $post;
- $current_term = $wp_query->queried_object;
+ $current_term = $wp_query->get_queried_object();
$terms = wp_get_object_terms($post->ID, $taxonomy);
// If we're viewing a Taxonomy page..
if ( isset($current_term->taxonomy) && $taxonomy == $current_term->taxonomy ) {
diff --git a/wp-content/themes/twentyten/header.php b/wp-content/themes/twentyten/header.php
index 9342adf4f1..366c91f54d 100644
--- a/wp-content/themes/twentyten/header.php
+++ b/wp-content/themes/twentyten/header.php
@@ -24,10 +24,8 @@
<link rel="stylesheet" type="text/css" media="print" href="<?php bloginfo('stylesheet_directory'); ?>/print.css" />
<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
-
- <?php wp_head(); ?>
-
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+ <?php wp_head(); ?>
</head>
<body <?php body_class(); ?>>