Changeset 5009 for branches/2.1/wp-includes/general-template.php

Timestamp:

03/09/2007 08:47:52 PM (16 years ago)

Author:

ryan

Message:

Use get_query_var() in wp_title() and single_month_title().

File:

• branches/2.1/wp-includes/general-template.php (modified) (4 diffs)

branches/2.1/wp-includes/general-template.php

@@ -148 +148 @@
 
 function wp_title($sep = '»', $display = true) {
-    global $wpdb;
-    global $m, $year, $monthnum, $day, $category_name, $wp_locale, $posts;
+    global $wpdb, $wp_locale, $wp_query;
 
     $cat = get_query_var('cat');
@@ -157 +156 @@
     $author = get_query_var('author');
     $author_name = get_query_var('author_name');
+    $m = get_query_var('m');
+    $year = get_query_var('year');
+    $monthnum = get_query_var('monthnum');
+    $day = get_query_var('day');
     $title = '';
 
@@ -197 +200 @@
         $title = $year;
         if ( !empty($monthnum) )
-            $title .= " $sep ".$wp_locale->get_month($monthnum);
+            $title .= " $sep " . $wp_locale->get_month($monthnum);
         if ( !empty($day) )
-            $title .= " $sep ".zeroise($day, 2);
+            $title .= " $sep " . zeroise($day, 2);
     }
 
     // If there is a post
     if ( is_single() || is_page() ) {
-        $title = strip_tags($posts[0]->post_title);
+        $title = strip_tags($wp_query->get_queried_object()->post_title);
         $title = apply_filters('single_post_title', $title);
     }
@@ -257 +260 @@
 
 function single_month_title($prefix = '', $display = true ) {
-    global $m, $monthnum, $wp_locale, $year;
+    global $wp_locale;
+
+    $m = get_query_var('m');
+    $year = get_query_var('year');
+    $monthnum = get_query_var('monthnum');
+
     if ( !empty($monthnum) && !empty($year) ) {
         $my_year = $year;