diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-08-05 17:47:33 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-08-05 17:47:33 -0700 |
| commit | a6fb9a69a0cf8bfc6de73ce5a86c38da4d5859a4 (patch) | |
| tree | 359336c31dd8717b849db65f25b56f79dee942ce | |
| parent | a03f8b1003093b385e9c839c1e5e2e4f80f0cd0b (diff) | |
| parent | b394b0b2c67d680fad61880a01885e8b2c750ce5 (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
| -rw-r--r-- | modules/gallery/libraries/ORM_MPTT.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php index 9d716d8b..a7defba9 100644 --- a/modules/gallery/libraries/ORM_MPTT.php +++ b/modules/gallery/libraries/ORM_MPTT.php @@ -150,7 +150,7 @@ class ORM_MPTT_Core extends ORM { * @param array orderby * @return array ORM */ - function children($limit=null, $offset=0, $where=array(), $orderby=array("id", "ASC")) { + function children($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) { return $this ->where("parent_id", $this->id) ->where($where) @@ -181,7 +181,7 @@ class ORM_MPTT_Core extends ORM { * @param array orderby * @return object ORM_Iterator */ - function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id", "ASC")) { + function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) { return $this ->where("left_ptr >", $this->left_ptr) ->where("right_ptr <=", $this->right_ptr) |