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

pull bulk tag replace fixes into stable

Browse Source 
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@595 7f39781d-f577-437e-ae19-be835c7a54ca
This commit is contained in:
shish 2007-10-28 17:42:10 +00:00
parent 74ac306040
commit fe566b1b8a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ext/tag_edit/main.php
View File

@ -25,10 +25,18 @@ class TagEdit extends Extension {
else if($event->get_arg(0) == "replace") { else if($event->get_arg(0) == "replace") {
global $user; global $user;
if($user->is_admin() && isset($_POST['search']) && isset($_POST['replace'])) { if($user->is_admin() && isset($_POST['search']) && isset($_POST['replace'])) {
$search = $_POST['search'];
$replace = $_POST['replace'];
global $page; global $page;
$this->mass_tag_edit($_POST['search'], $_POST['replace']); if(strpos($search, " ") === false && strpos($replace, " ") === false) {
$page->set_mode("redirect"); $this->mass_tag_edit($search, $replace);
$page->set_redirect(make_link("admin")); $page->set_mode("redirect");
$page->set_redirect(make_link("admin"));
}
else {
$this->theme->display_error($page, "Search & Replace Error",
"Bulk replace can only do single tags -- don't use spaces!");
}
} }
} }
} }
@ -76,7 +84,8 @@ class TagEdit extends Extension {
$replace_id = $database->db->GetOne("SELECT id FROM tags WHERE tag=?", array($replace)); $replace_id = $database->db->GetOne("SELECT id FROM tags WHERE tag=?", array($replace));
if($search_id && $replace_id) { if($search_id && $replace_id) {
// FIXME: what if the (image_id,tag_id) pair already exists? // FIXME: what if the (image_id,tag_id) pair already exists?
$database->Execute("UPDATE image_tags SET tag_id=? WHERE tag_id=?", Array($replace_id, $search_id)); $database->Execute("UPDATE IGNORE image_tags SET tag_id=? WHERE tag_id=?", Array($replace_id, $search_id));
$database->Execute("DELETE FROM image_tags WHERE tag_id=?", Array($search_id));
} }
else if($search_id) { else if($search_id) {
$database->Execute("UPDATE tags SET tag=? WHERE tag=?", Array($replace, $search)); $database->Execute("UPDATE tags SET tag=? WHERE tag=?", Array($replace, $search));