Merge from 19_STABLE

This commit is contained in:
scyrma 2008-02-06 03:37:30 +00:00
parent 51edc06ea1
commit 67ab5a01a9
2 changed files with 2 additions and 2 deletions

View File

@ -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');

View File

@ -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}')