FIX: Modified fix for #2389 to ensure existing tests pass.

silverstripe · Sep 5, 2013 · abcb2ef · abcb2ef
1 parent 128c33b
commit abcb2ef
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/forms/gridfield/GridFieldAddExistingAutocompleter.php b/forms/gridfield/GridFieldAddExistingAutocompleter.php
@@ -232,10 +232,11 @@ public function doSearch($gridField, $request) {
 		$json = array();
 		foreach($results as $result) {
 			// Prevent a circular reference and associated error in CMS/admin
-			$showInSearch = ($result->ID != $gridField->getForm()->getRecord()->ID);
-			if($showInSearch) {
-				$json[$result->ID] = SSViewer::fromString($this->resultsFormat)->process($result);
+			$hideFromSearch = ($gridField->getForm()->getRecord() && ($result->ID == $gridField->getForm()->getRecord()->ID));
+			if($hideFromSearch) {
+				continue;
 			}
+			$json[$result->ID] = SSViewer::fromString($this->resultsFormat)->process($result);
 		}
 		return Convert::array2json($json);
 	}