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

if alias is negative and has multiple tags, make sure each tag becomes negative

Browse Source
This commit is contained in:
Daku 2015-08-12 06:11:21 +01:00
parent ebfcf9389e
commit ef6a7289bb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/imageboard.pack.php
View File

@ -1168,6 +1168,7 @@ class Tag {
*/ */
public static function resolve_alias($tag) { public static function resolve_alias($tag) {
assert('is_string($tag)'); assert('is_string($tag)');
global $database;
$negative = false; $negative = false;
if(!empty($tag) && ($tag[0] == '-')) { if(!empty($tag) && ($tag[0] == '-')) {
@ -1175,14 +1176,18 @@ class Tag {
$tag = substr($tag, 1); $tag = substr($tag, 1);
} }
global $database;
$newtag = $database->get_one( $newtag = $database->get_one(
$database->scoreql_to_sql("SELECT newtag FROM aliases WHERE SCORE_STRNORM(oldtag)=SCORE_STRNORM(:tag)"), $database->scoreql_to_sql("SELECT newtag FROM aliases WHERE SCORE_STRNORM(oldtag)=SCORE_STRNORM(:tag)"),
array("tag"=>$tag)); array("tag"=>$tag)
);
if(empty($newtag)) { if(empty($newtag)) {
//tag has no alias, use old tag
$newtag = $tag; $newtag = $tag;
} }
return $negative ? "-$newtag" : $newtag;
return !$negative ? $newtag : preg_replace("/(\S+)/", "-$1", $newtag);
} }
/** /**