Changeset 5010 for branches/2.0/wp-includes/template-functions-general.php

Timestamp:

03/09/2007 08:58:05 PM (19 years ago)

Author:

ryan

Message:

Use get_query_var()

File:

• branches/2.0/wp-includes/template-functions-general.php (modified) (5 diffs)

branches/2.0/wp-includes/template-functions-general.php

@@ -138 +138 @@
 
 function wp_title($sep = '»', $display = true) {
-    global $wpdb;
-    global $m, $year, $monthnum, $day, $category_name, $month, $posts;
+    global $wpdb, $month;
 
     $cat = get_query_var('cat');
@@ -147 +146 @@
     $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 = '';
 
     // If there's a category
@@ -152 +156 @@
             // category exclusion
             if ( !stristr($cat,'-') )
-                $title = get_the_category_by_ID($cat);
-    }
-    if ( !empty($category_name) ) {
+                $title = apply_filters('single_cat_title', get_the_category_by_ID($cat));
+    } elseif ( !empty($category_name) ) {
         if ( stristr($category_name,'/') ) {
                 $category_name = explode('/',$category_name);
@@ -163 +166 @@
         }
         $title = $wpdb->get_var("SELECT cat_name FROM $wpdb->categories WHERE category_nicename = '$category_name'");
+        $title = apply_filters('single_cat_title', $title);
     }
 
@@ -245 +249 @@
 
 function single_month_title($prefix = '', $display = true ) {
-    global $m, $monthnum, $month, $year;
+    global $month;
+
+    $m = get_query_var('m');
+    $year = get_query_var('year');
+    $monthnum = get_query_var('monthnum');
+
     if ( !empty($monthnum) && !empty($year) ) {
         $my_year = $year;