From 67ab5a01a9db9f648fdcca518fe69d1c2e95a6e8 Mon Sep 17 00:00:00 2001
From: scyrma <scyrma>
Date: Wed, 6 Feb 2008 03:37:30 +0000
Subject: [PATCH] Merge from 19_STABLE

---
 blog/lib.php | 2 +-
 tag/lib.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blog/lib.php b/blog/lib.php
index 735b0336a0..5a8ba603a2 100755
--- a/blog/lib.php
+++ b/blog/lib.php
@@ -227,7 +227,7 @@
                                      WHERE t.id = ti.tagid
                                      AND ti.entryid = '.$blogEntry->id)) {
         */
-        if (!empty($CFG->usetags) && ($blogtags = get_item_tags('blog', $blogEntry->id))) {
+        if (!empty($CFG->usetags) && ($blogtags = get_item_tags('post', $blogEntry->id))) {
             echo '<div class="tags">';
             if ($blogtags) {
                 print_string('tags');
diff --git a/tag/lib.php b/tag/lib.php
index 272e158f08..788c49e25a 100644
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -907,7 +907,7 @@ function tag_instance_table_cleanup() {
                 FROM
                     (SELECT sq2.*
                      FROM {$CFG->prefix}tag_instance sq2
-                     LEFT JOIN {$CFG->prefix}tag item
+                     LEFT JOIN {$CFG->prefix}{$type->itemtype} item
                      ON sq2.itemid = item.id
                      WHERE item.id IS NULL
                      AND sq2.itemtype = '{$type->itemtype}')
-- 
2.39.5