golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use $wp_query->get_queried_object(). Also move wp_head() to end of <head>, see #9015. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-02-14 11:52:27 +00:00
parent 03e3247608
commit 9141add802
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-content/themes/twentyten/functions.php
View File

@ -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 ) {

4
wp-content/themes/twentyten/header.php
View File

@ -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(); ?>>