Changeset 3701
- Timestamp:
- 07/18/07 21:42:48 (3 years ago)
- Files:
-
- 1 modified
-
trunk/lib/model/blog.tag.php (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/model/blog.tag.php
r3604 r3701 40 40 if ($skinSetting['tagboxAlign'] == 1) { // order by count 41 41 if (doesHaveOwnership()) 42 $ result = DBQuery::query("SELECT `name`, count(*) `cnt` FROM `{$database['prefix']}Tags` t,42 $tags = DBQuery::queryColumn("SELECT `name`, count(*) `cnt` FROM `{$database['prefix']}Tags` t, 43 43 `{$database['prefix']}TagRelations` r 44 44 WHERE t.id = r.tag and r.blogid = $blogid … … 46 46 ORDER BY cnt DESC $aux"); 47 47 else 48 $ result = DBQuery::query("SELECT `name`, count(*) `cnt` FROM `{$database['prefix']}Tags` t,48 $tags = DBQuery::queryColumn("SELECT `name`, count(*) `cnt` FROM `{$database['prefix']}Tags` t, 49 49 `{$database['prefix']}TagRelations` r, 50 50 `{$database['prefix']}Entries` e … … 54 54 } else if ($skinSetting['tagboxAlign'] == 2) { // order by name 55 55 if (doesHaveOwnership()) 56 $ result = DBQuery::query("SELECT DISTINCT name FROM `{$database['prefix']}Tags` t,56 $tags = DBQuery::queryColumn("SELECT DISTINCT name FROM `{$database['prefix']}Tags` t, 57 57 `{$database['prefix']}TagRelations` r 58 58 WHERE t.id = r.tag AND r.blogid = $blogid … … 60 60 ORDER BY t.name $aux"); 61 61 else 62 $ result = DBQuery::query("SELECT DISTINCT name FROM `{$database['prefix']}Tags` t,62 $tags = DBQuery::queryColumn("SELECT DISTINCT name FROM `{$database['prefix']}Tags` t, 63 63 `{$database['prefix']}TagRelations` r, 64 64 `{$database['prefix']}Entries` e … … 68 68 } else { // random 69 69 if (doesHaveOwnership()) 70 $ result = DBQuery::query("SELECT `name` FROM `{$database['prefix']}Tags` t,70 $tags = DBQuery::queryColumn("SELECT `name` FROM `{$database['prefix']}Tags` t, 71 71 `{$database['prefix']}TagRelations` r 72 72 WHERE t.id = r.tag AND r.blogid = $blogid 73 73 GROUP BY r.tag ORDER BY RAND() $aux"); 74 74 else 75 $ result = DBQuery::query("SELECT `name` FROM `{$database['prefix']}Tags` t,75 $tags = DBQuery::queryColumn("SELECT `name` FROM `{$database['prefix']}Tags` t, 76 76 `{$database['prefix']}TagRelations` r, 77 77 `{$database['prefix']}Entries` e … … 79 79 GROUP BY r.tag 80 80 ORDER BY RAND() $aux"); 81 }82 if ($result) {83 while (list($tag) = mysql_fetch_row($result))84 array_push($tags, $tag);85 81 } 86 82 return $tags; … … 117 113 $max = $min = 0; 118 114 if (doesHaveOwnership()) 119 $ result = DBQuery::query("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r115 $max = DBQuery::queryCell("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r 120 116 WHERE r.blogid = $blogid 121 117 GROUP BY r.tag … … 123 119 DESC LIMIT 1"); 124 120 else 125 $ result = DBQuery::query("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r,121 $max = DBQuery::queryCell("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r, 126 122 `{$database['prefix']}Entries` e 127 123 WHERE r.entry = e.id AND e.visibility > 0 AND r.blogid = $blogid … … 129 125 ORDER BY `cnt` 130 126 DESC LIMIT 1"); 131 if ($result) { 132 if (list($count) = mysql_fetch_array($result)) 133 $max = $count; 134 } 135 if (doesHaveOwnership()) 136 $result = DBQuery::query("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r 127 if (doesHaveOwnership()) 128 $min = DBQuery::query("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r 137 129 WHERE r.blogid = $blogid 138 130 GROUP BY r.tag … … 140 132 LIMIT 1"); 141 133 else 142 $ result= DBQuery::query("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r,134 $min = DBQuery::query("SELECT count(r.entry) `cnt` FROM `{$database['prefix']}TagRelations` r, 143 135 `{$database['prefix']}Entries` e 144 136 WHERE r.entry = e.id AND e.visibility > 0 AND r.blogid = $blogid … … 146 138 ORDER BY `cnt` 147 139 LIMIT 1"); 148 if ($result) { 149 if (list($count) = mysql_fetch_array($result)) 150 $min = $count; 151 } 140 $max = $max == null ? 0 : $max; 141 $min = $min == null ? 0 : $min; 152 142 return array($max, $min); 153 143 }
