From 5600e00de9061f91141e6c30f378e446a9ac9710 Mon Sep 17 00:00:00 2001
From: Shish <webmaster@shishnet.org>
Date: Sat, 24 Jan 2009 10:59:00 -0800
Subject: [PATCH] fixes

---
 core/imageboard.pack.php | 2 +-
 ext/tag_list/main.php    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index 371380a6..e1b58dae 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -489,7 +489,7 @@ class Tag {
 			// do nothing
 		}
 		else {
-			die("tag_explode only takes strings or arrays");
+			die("Tag::explode() only takes strings or arrays");
 		}
 
 		$tags = array_map("trim", $tags);
diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php
index bb7f138b..47699966 100644
--- a/ext/tag_list/main.php
+++ b/ext/tag_list/main.php
@@ -242,11 +242,11 @@ class TagList implements Extension {
 		global $config;
 
 		$query = "
-			SELECT tags.tag, tags.count
+			SELECT tags.tag, tags.count as calc_count
 			FROM tags, image_tags
 			WHERE tags.id = image_tags.tag_id
 			AND image_tags.image_id = ?
-			ORDER BY count DESC
+			ORDER BY calc_count DESC
 			LIMIT ?
 		";
 		$args = array($image->id, $config->get_int('tag_list_length'));
@@ -280,7 +280,7 @@ class TagList implements Extension {
 		global $database;
 		global $config;
 
-		$wild_tags = tag_explode($search);
+		$wild_tags = Tag::explode($search);
 		// $search_tags = array();
 
 		$tag_id_array = array();