FIX, #12 and #10.

nglasl · Feb 17, 2017 · 9052cc6 · 9052cc6
1 parent 4a9bc01
commit 9052cc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/extensions/FusionExtension.php b/code/extensions/FusionExtension.php
@@ -51,7 +51,7 @@ public function validate(ValidationResult $result) {
 			$result->error("\"{$validate}\" required!");
 		}
 		else if($result->valid() && $class::get_one($class, array(
-			'ID != ?' => $this->owner->ID,
+			"{$class}.ID != ?" => $this->owner->ID,
 			"LOWER({$validate}) = ?" => strtolower($this->owner->$validate)
 		))) {
 			$result->error('Tag already exists!');

diff --git a/code/extensions/TaggingExtension.php b/code/extensions/TaggingExtension.php
@@ -38,7 +38,7 @@ public function updateSearchableFields(&$fields) {
 					'Tagging',
 					'Tags',
 					FusionTag::get()->map('Title', 'Title')->toArray(),
-					(($filtering = Controller::curr()->getRequest()->getVar('q')) && isset($filtering['Tagging'])) ? $filtering['Tagging'] : array(),
+					(Controller::has_curr() && ($filtering = Controller::curr()->getRequest()->getVar('q')) && isset($filtering['Tagging'])) ? $filtering['Tagging'] : array(),
 					null,
 					true
 				),