Changeset 5568
- Timestamp:
- 03/08/08 23:04:03 (10 months ago)
- Files:
-
- 1 modified
-
trunk/lib/model/blog.tag.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/model/blog.tag.php
r5557 r5568 42 42 if ($skinSetting['tagboxAlign'] == 1) { // order by count 43 43 if (doesHaveOwnership()) 44 $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, `id`FROM `{$database['prefix']}Tags` t44 $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, id FROM `{$database['prefix']}Tags` t 45 45 INNER JOIN `{$database['prefix']}TagRelations` r ON r.blogid = $blogid AND r.tag = t.id 46 46 GROUP BY r.tag 47 47 ORDER BY cnt DESC $aux"); 48 48 else 49 $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, `id`FROM `{$database['prefix']}Tags` t,49 $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, t.id FROM `{$database['prefix']}Tags` t, 50 50 `{$database['prefix']}TagRelations` r, 51 51 `{$database['prefix']}Entries` e … … 55 55 } else if ($skinSetting['tagboxAlign'] == 2) { // order by name 56 56 if (doesHaveOwnership()) 57 $tags = POD::queryAll("SELECT DISTINCT name, count(*) 'cnt', `id`FROM `{$database['prefix']}Tags` t,57 $tags = POD::queryAll("SELECT DISTINCT name, count(*) cnt, t.id FROM `{$database['prefix']}Tags` t, 58 58 `{$database['prefix']}TagRelations` r 59 59 WHERE t.id = r.tag AND r.blogid = $blogid … … 61 61 ORDER BY t.name $aux"); 62 62 else 63 $tags = POD::queryAll("SELECT DISTINCT name, count(*) `cnt`, `id`FROM `{$database['prefix']}Tags` t,63 $tags = POD::queryAll("SELECT DISTINCT name, count(*) cnt, t.id FROM `{$database['prefix']}Tags` t, 64 64 `{$database['prefix']}TagRelations` r, 65 65 `{$database['prefix']}Entries` e … … 69 69 } else { // random 70 70 if (doesHaveOwnership()) 71 $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, `id`FROM `{$database['prefix']}Tags` t,71 $tags = POD::queryAll("SELECT name, count(*) cnt, t.id FROM `{$database['prefix']}Tags` t, 72 72 `{$database['prefix']}TagRelations` r 73 73 WHERE t.id = r.tag AND r.blogid = $blogid 74 74 GROUP BY r.tag ORDER BY RAND() $aux"); 75 75 else 76 $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, `id`FROM `{$database['prefix']}Tags` t,76 $tags = POD::queryAll("SELECT name, count(*) cnt, t.id FROM `{$database['prefix']}Tags` t, 77 77 `{$database['prefix']}TagRelations` r, 78 78 `{$database['prefix']}Entries` e … … 87 87 global $database; 88 88 if (doesHaveOwnership()) 89 $names = POD::queryAll("SELECT `id`,`name`FROM `{$database['prefix']}Tags` t,89 $names = POD::queryAll("SELECT t.id,name FROM `{$database['prefix']}Tags` t, 90 90 `{$database['prefix']}TagRelations` r 91 91 WHERE t.id = r.tag AND r.blogid = $blogid … … 94 94 LIMIT 2000"); 95 95 else 96 $names = POD::queryAll("SELECT `id`,`name`FROM `{$database['prefix']}Tags` t,96 $names = POD::queryAll("SELECT t.id,name FROM `{$database['prefix']}Tags` t, 97 97 `{$database['prefix']}TagRelations` r, 98 98 `{$database['prefix']}Entries` e
