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

Merge pull request #434 from DakuTree/patch-tagfix

Browse Source 
Fix for tags exceeding char limit returning error + Bumped tag char limit to 255.
This commit is contained in:
Shish 2014-08-02 17:47:14 +01:00
commit b1d634a8de
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/imageboard.pack.php
View File

@ -534,6 +534,11 @@ class Image {
continue; continue;
} }
if(mb_strlen($tag, 'UTF-8') > 255){
flash_message("The tag below is longer than 255 characters, please use a shorter tag.\n$tag\n");
continue;
}
$id = $database->get_one( $id = $database->get_one(
$database->scoreql_to_sql( $database->scoreql_to_sql(
"SELECT id FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)" "SELECT id FROM tags WHERE SCORE_STRNORM(tag) = SCORE_STRNORM(:tag)"
@ -562,7 +567,7 @@ class Image {
array("tag"=>$tag)); array("tag"=>$tag));
} }
log_info("core_image", "Tags for Image #{$this->id} set to: ".implode(" ", $tags), false, array("image_id" => $this->id)); log_info("core_image", "Tags for Image #{$this->id} set to: ".implode(" ", $tags), null, array("image_id" => $this->id));
$database->cache->delete("image-{$this->id}-tags"); $database->cache->delete("image-{$this->id}-tags");
} }
} }

20
ext/upgrade/main.php
View File

@ -107,6 +107,26 @@ class Upgrade extends Extension {
log_info("upgrade", "Database at version 13"); log_info("upgrade", "Database at version 13");
$config->set_bool("in_upgrade", false); $config->set_bool("in_upgrade", false);
} }
if($config->get_int("db_version") < 14) {
$config->set_bool("in_upgrade", true);
$config->set_int("db_version", 14);
log_info("upgrade", "Changing tag column to VARCHAR(255)");
if($database->get_driver_name() == 'pgsql') {
$database->execute('ALTER TABLE tags ALTER COLUMN tag SET DATA TYPE VARCHAR(255)');
$database->execute('ALTER TABLE aliases ALTER COLUMN oldtag SET DATA TYPE VARCHAR(255)');
$database->execute('ALTER TABLE aliases ALTER COLUMN newtag SET DATA TYPE VARCHAR(255)');
}
else if($database->get_driver_name() == 'mysql') {
$database->execute('ALTER TABLE tags MODIFY COLUMN tag VARCHAR(255) NOT NULL');
$database->execute('ALTER TABLE aliases MODIFY COLUMN oldtag VARCHAR(255) NOT NULL');
$database->execute('ALTER TABLE aliases MODIFY COLUMN newtag VARCHAR(255) NOT NULL');
}
log_info("upgrade", "Database at version 14");
$config->set_bool("in_upgrade", false);
}
} }
public function get_priority() {return 5;} public function get_priority() {return 5;}