From 54be15191b983e72b4643f3559303b35b7c48795 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 26 Nov 2009 18:47:40 -0800
Subject: Overload Database_Builder to add merge_where() which takes predefined
 where clauses and adds them to the existing query.  Update all existing
 queries that take an additional where clause to use it.

---
 modules/gallery/libraries/ORM_MPTT.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/libraries/ORM_MPTT.php')

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index 01b2d7b7..90b9d38a 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -152,7 +152,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
@@ -170,7 +170,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function children_count($where=null) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
@@ -189,7 +189,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function descendants($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
@@ -207,7 +207,7 @@ class ORM_MPTT_Core extends ORM {
    */
   function descendants_count($where=null) {
     if ($where) {
-      $this->where($where);
+      $this->merge_where($where);
     }
 
     return $this
-- 
cgit v1.2.3