Sorry, results of a messed up conflict merge probably. Will fix it up
tomorrow. Thanks for the review
On Mar 17, 2014 7:20 PM, "Simon Welsh" <notifications@github.com> wrote:

> In model/DataObject.php:
>
> >  		
> > -		// look for remote has_one joins on this class or any parent classes
> > -		foreach(array_reverse(ClassInfo::ancestry($this)) as $class) {
> > -			if(array_key_exists($class, $remoteRelations)) return $remoteRelations[$class] . 'ID';
> > +		// Default to 'ParentID' if no field found
>
> This comment doesn't make sense any more.
>
> --
> Reply to this email directly or view it on GitHub<https://github.com/silverstripe/silverstripe-framework/pull/2206/files#r10646560>
> .
>