Changeset 3355

Show
Ignore:
Timestamp:
08/22/2008 02:56:31 PM (3 months ago)
Author:
Shadowhand
Message:

Merged r3353 into tags/2.2.1

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • tags/2.2.1/system/libraries/ORM_Tree.php

    r3122 r3355  
    3737                                { 
    3838                                        // Find children of this parent 
    39                                         $model->where($this->parent_key, $this->object[$this->parent_key])->find(); 
     39                                        $model->where($model->primary_key, $this->object[$this->parent_key])->find(); 
    4040                                } 
    4141