Merge pull request #502 from unclecheese/patch-2

If a DataObject has a many_many to a SiteTree subclass...
This commit is contained in:
Sam Minnée 2012-06-04 15:38:58 -07:00
commit 64aa2ad170

View File

@ -142,7 +142,7 @@ abstract class SearchFilter extends Object {
// Todo: move to somewhere more appropriate, such as DataMapper, the magical class-to-be?
$candidateClass = $this->model;
while($candidateClass != 'DataObject') {
if(singleton($candidateClass)->hasOwnTableDatabaseField($this->name)) break;
if(DataObject::has_own_table($candidateClass) && singleton($candidateClass)->hasOwnTableDatabaseField($this->name)) break;
$candidateClass = get_parent_class($candidateClass);
}
if($candidateClass == 'DataObject') user_error("Couldn't find field $this->name in any of $this->model's tables.", E_USER_ERROR);