tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2411 from simonwelsh/circ_ref

Browse Source 
Revert "Merge pull request #2390 from phptek/2389"
This commit is contained in:
Simon Welsh 2013-10-28 14:05:13 -07:00
commit 60bb9d81c5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forms/gridfield/GridFieldAddExistingAutocompleter.php
View File

@ -230,11 +230,6 @@ class GridFieldAddExistingAutocompleter
$json = array(); $json = array();
foreach($results as $result) { foreach($results as $result) {
// Prevent a circular reference and associated error in CMS/admin
$hideFromSearch = ($gridField->getForm()->getRecord() && ($result->ID == $gridField->getForm()->getRecord()->ID));
if($hideFromSearch) {
continue;
}
$json[$result->ID] = SSViewer::fromString($this->resultsFormat)->process($result); $json[$result->ID] = SSViewer::fromString($this->resultsFormat)->process($result);
} }
return Convert::array2json($json); return Convert::array2json($json);