james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a little extra error checking

Browse Source
This commit is contained in:
Shish 2012-06-24 01:11:07 +01:00
parent 38f7555d98
commit a640de5283
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/tag_list/main.php
View File

@ -390,14 +390,15 @@ class TagList extends Extension {
} }
} }
private function add_refine_block(Page $page, /*string*/ $search) { private function add_refine_block(Page $page, /*array(string)*/ $search) {
global $database; global $database;
global $config; global $config;
$related_tags = $database->cache->get("related_tags:$search"); $wild_tags = Tag::explode($search);
$str_search = Tag::implode($search);
$related_tags = $database->cache->get("related_tags:$str_search");
if(empty($related_tags)) { if(empty($related_tags)) {
$wild_tags = Tag::explode($search);
// $search_tags = array(); // $search_tags = array();
$tag_id_array = array(); $tag_id_array = array();
@ -434,7 +435,7 @@ class TagList extends Extension {
$args = array("limit"=>$config->get_int('tag_list_length')); $args = array("limit"=>$config->get_int('tag_list_length'));
$related_tags = $database->get_all($query, $args); $related_tags = $database->get_all($query, $args);
$database->cache->set("related_tags:$search", $related_tags, 60*60); $database->cache->set("related_tags:$str_search", $related_tags, 60*60);
} }
} }

4
ext/tag_list/theme.php
View File

@ -135,7 +135,9 @@ class TagListTheme extends Themelet {
$page->add_block(new Block("Refine Search", $html, "left", 60)); $page->add_block(new Block("Refine Search", $html, "left", 60));
} }
protected function ars($tag, $tags) { protected function ars(/*string*/ $tag, /*array(string)*/ $tags) {
assert(is_array($tags));
// FIXME: a better fix would be to make sure the inputs are correct // FIXME: a better fix would be to make sure the inputs are correct
$tag = strtolower($tag); $tag = strtolower($tag);
$tags = array_map("strtolower", $tags); $tags = array_map("strtolower", $tags);