tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14 from silverstripe-big-o/pull/instance-of-sslist 

BUG Check for instanceof SS_List rather than deprecated DataObjectSet
This commit is contained in:
Hamish Friedlander 2012-11-01 14:33:28 -07:00
parent b10c263784 0f557915e1
commit 5036f9e93c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/search/SearchIndex.php
View File

@ -366,8 +366,8 @@ abstract class SearchIndex extends ViewableData {
// Just fail if we've fallen off the end of the chain
if (!$object) return null;
// If we're looking up this step on an array or DataObjectSet, do the step on every item, merge result
if (is_array($object) || $object instanceof DataObjectSet) {
// If we're looking up this step on an array or SS_List, do the step on every item, merge result
if (is_array($object) || $object instanceof SS_List) {
$next = array();
foreach ($object as $item) {
@ -380,7 +380,7 @@ abstract class SearchIndex extends ViewableData {
$item = $item->$property;
}
if ($item instanceof DataObjectSet) $next = array_merge($next, $item->toArray());
if ($item instanceof SS_List) $next = array_merge($next, $item->toArray());
elseif (is_array($item)) $next = array_merge($next, $item);
else $next[] = $item;
}