badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/shish/shimmie2 into develop

Browse source
This commit is contained in:
Shish 2017-09-21 14:08:14 +01:00
commit c2b4210777
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/imageboard.pack.php
View file

@ -232,20 +232,21 @@ class Image {
if($tag_count === 0) { if($tag_count === 0) {
$total = $database->cache->get("image-count"); $total = $database->cache->get("image-count");
if(!$total) { if(!$total) {
$total = $database->get_one("SELECT COUNT(*) FROM images") || 0; $total = $database->get_one("SELECT COUNT(*) FROM images");
$database->cache->set("image-count", $total, 600); $database->cache->set("image-count", $total, 600);
} }
return $total;
} }
else if($tag_count === 1 && !preg_match("/[:=><\*\?]/", $tags[0])) { else if($tag_count === 1 && !preg_match("/[:=><\*\?]/", $tags[0])) {
return $database->get_one( $total = $database->get_one(
$database->scoreql_to_sql("SELECT count FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"), $database->scoreql_to_sql("SELECT count FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"),
array("tag"=>$tags[0])) || 0; array("tag"=>$tags[0]));
} }
else { else {
$querylet = Image::build_search_querylet($tags); $querylet = Image::build_search_querylet($tags);
return $database->get_one("SELECT COUNT(*) AS cnt FROM ($querylet->sql) AS tbl", $querylet->variables) || 0; $total = $database->get_one("SELECT COUNT(*) AS cnt FROM ($querylet->sql) AS tbl", $querylet->variables);
} }
if(is_null($total)) return 0;
return $total;
} }
/** /**
@ -740,7 +741,8 @@ class Image {
} }
} }
$choice = $flexihash->lookup($pre.$post); // $choice = $flexihash->lookup($pre.$post);
$choice = $flexihash->lookup($this->hash); // doesn't change
$tmpl = $pre.$choice.$post; $tmpl = $pre.$choice.$post;
} }