From c4150c15ce02dbab8d01888c8ae4d08d6f726703 Mon Sep 17 00:00:00 2001 From: Daku Date: Mon, 3 Feb 2014 16:04:34 +0000 Subject: [PATCH] make sure source/parent isn't set twice if metatag is used --- ext/relatationships/main.php | 8 ++++++-- ext/tag_edit/main.php | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ext/relatationships/main.php b/ext/relatationships/main.php index 4bbc17cf..b1be3c36 100644 --- a/ext/relatationships/main.php +++ b/ext/relatationships/main.php @@ -22,8 +22,12 @@ class Relationships extends Extension { public function onImageInfoSet(ImageInfoSetEvent $event) { global $user; - if (isset($_POST["tag_edit__parent"]) ? ctype_digit($_POST["tag_edit__parent"]) : FALSE) { - $this->set_parent($event->image->id, (int) $_POST["tag_edit__parent"]); + if(isset($_POST['tag_edit__tags']) ? !preg_match('/parent[=|:]/', $_POST["tag_edit__tags"]) : TRUE) { //Ignore tag_edit__parent if tags contain parent metatag + if (isset($_POST["tag_edit__parent"]) ? ctype_digit($_POST["tag_edit__parent"]) : FALSE) { + $this->set_parent($event->image->id, (int) $_POST["tag_edit__parent"]); + }else{ + $this->remove_parent($event->image->id); + } } } diff --git a/ext/tag_edit/main.php b/ext/tag_edit/main.php index a710c6ed..9cd2ada6 100644 --- a/ext/tag_edit/main.php +++ b/ext/tag_edit/main.php @@ -131,7 +131,9 @@ class TagEdit extends Extension { send_event(new TagSetEvent($event->image, $_POST['tag_edit__tags'])); } if($this->can_source($event->image) && isset($_POST['tag_edit__source'])) { - send_event(new SourceSetEvent($event->image, $_POST['tag_edit__source'])); + if(isset($_POST['tag_edit__tags']) ? !preg_match('/source[=|:]/', $_POST["tag_edit__tags"]) : TRUE){ + send_event(new SourceSetEvent($event->image, $_POST['tag_edit__source'])); + } } if($user->can("edit_image_lock")) { $locked = isset($_POST['tag_edit__locked']) && $_POST['tag_edit__locked']=="on";