summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/libraries/ORM_MPTT.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index c660b119..ed77cac9 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -197,7 +197,7 @@ class ORM_MPTT_Core extends ORM {
*/
function descendants($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) {
return $this
- ->merge_where($where);
+ ->merge_where($where)
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->order_by($order_by)
@@ -212,7 +212,7 @@ class ORM_MPTT_Core extends ORM {
*/
function descendants_count($where=null) {
return $this
- ->merge_where($where);
+ ->merge_where($where)
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->count_all();