Changeset 129

Timestamp:

06/07/2005 05:38:11 PM (21 years ago)

Author:

mdawaffe

Message:

Use get_tag_link for tag renaming and merging. Thanks tompruess. Fixes #75.

Location:

trunk

Files:

• bb-admin/tag-merge.php (modified) (2 diffs)
• bb-admin/tag-rename.php (modified) (1 diff)
• bb-includes/functions.php (modified) (1 diff)

trunk/bb-admin/tag-merge.php

@@ -9 +9 @@
 $old_id = (int) $_POST['id' ];
 $tag = $_POST['tag'];
-if ( ! $new_tag = get_tag_by_name( $tag ) )
+if ( ! $tag = get_tag_by_name( $tag ) )
     die('Tag specified not found.');
 
@@ -15 +15 @@
     die('Tag to be merged not found.');
 
-if ( $merged = merge_tags( $old_id, $new_tag->tag_id ) ) {
+if ( $merged = merge_tags( $old_id, $tag->tag_id ) ) {
     echo 'Number of topics from which the old tag was removed: ' . $merged['old_count'] . "<br />\n";
     echo 'Number of topics to which the new tag was added: ' . $merged['diff_count'] . "<br />\n";
     echo 'Number of rows deleted from tags table: ' . $merged['destroyed']['tags'] ."<br />\n";
-    echo '<a href="' . $bb->tagpath . "tags/$new_tag->raw_tag" . '">New Tag</a>';
+    echo '<a href="' . get_tag_link() . '">New Tag</a>';
 } else {
     die("Something odd happened when attempting to merge those tags.<br />\n<a href=\"" . $_SERVER['HTTP_REFERER'] . '">Try Again?</a>');

trunk/bb-admin/tag-rename.php

@@ -15 +15 @@
 
 if ( $tag = rename_tag( $tag_id, $tag ) )
-    header('Location: ' . $bb->tagpath . "tags/$tag" );
+    header('Location: ' . get_tag_link() );
 else
     die('There already exists a tag by that name or the name is invalid.  <a href="' . $_SERVER['HTTP_REFERER'] . '">Try Again</a>');

trunk/bb-includes/functions.php

@@ -684 +684 @@
 
     if ( $bbdb->query("UPDATE $bbdb->tags SET tag = '$tag', raw_tag = '$raw_tag' WHERE tag_id = '$tag_id'") )
-        return $tag;
+        return get_tag_by_name( $tag );
     return false;
 }