Changeset 551

Timestamp:

11/16/2006 11:58:02 PM (19 years ago)

Author:

mdawaffe

Message:

Don't globalize , just look there if needed

Location:

trunk/bb-includes

Files:

• functions.php (modified) (1 diff)
• template-functions.php (modified) (4 diffs)

trunk/bb-includes/functions.php

@@ -1372 +1372 @@
             $permalink = get_tag_page_link();
         else {
-            global $tag_name;
+            global $tag, $tag_name;
             $tag_name = $permalink;
-            $permalink = get_tag_link( $permalink, $page );
+            $tag = get_tag_by_name( $tag_name );
+            $permalink = get_tag_link( 0, $page ); // 0 => grabs $tag from global.
         }
     } elseif ( is_view() ) { // Not an integer

trunk/bb-includes/template-functions.php

@@ -1124 +1124 @@
     global $tag;
     if ( $tag_name )
-        $tag = get_tag_by_name( $tag_name );
+        $_tag = get_tag_by_name( $tag_name );
+    else
+        $_tag =& $tag;
     if ( bb_get_option('mod_rewrite') )
-        return bb_get_option('domain') . bb_get_option( 'tagpath' ) . "tags/$tag->tag" . ( 1 < $page ? "/page/$page" : '' );
-    else
-        return bb_get_option('domain') . bb_get_option( 'tagpath' ) . "tags.php?tag=$tag->tag" . ( 1 < $page ? "&page=$page" : '' );
+        return bb_get_option('domain') . bb_get_option( 'tagpath' ) . "tags/$_tag->tag" . ( 1 < $page ? "/page/$page" : '' );
+    else
+        return bb_get_option('domain') . bb_get_option( 'tagpath' ) . "tags.php?tag=$_tag->tag" . ( 1 < $page ? "&page=$page" : '' );
 }
 
@@ -1148 +1150 @@
 function get_tag_name( $id = 0 ) {
     global $tag;
-    return $tag->raw_tag;
+    $id = (int) $id;
+    if ( $id )
+        $_tag = get_tag( $id );
+    else
+        $_tag =& $tag;
+    return $_tag->raw_tag;
 }
 
@@ -1157 +1164 @@
 function get_tag_rss_link( $tag_id = 0 ) {
     global $tag;
+    $tag_id = (int) $tag_id;
     if ( $tag_id )
-        $tag = get_tag( $tag_id );
+        $_tag = get_tag( $tag_id );
+    else
+        $_tag =& $tag;
 
     if ( bb_get_option('mod_rewrite') )
-        $link = bb_get_option('uri') . "rss/tags/$tag->tag";
-    else
-        $link = bb_get_option('uri') . "rss.php?tag=$tag->tag";
+        $link = bb_get_option('uri') . "rss/tags/$_tag->tag";
+    else
+        $link = bb_get_option('uri') . "rss.php?tag=$_tag->tag";
 
     return apply_filters( 'get_tag_rss_link', $link, $tag_id );
@@ -1233 +1243 @@
     foreach ( $tags as $tag ) {
         $counts{$tag->raw_tag} = $tag->tag_count;
-        $taglinks{$tag->raw_tag} = get_tag_link();
+        $taglinks{$tag->raw_tag} = get_tag_link( $tag->tag );
     }