stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-31 04:00:56 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expect merge_where and merge_or_where to handle empty tuples.

Browse Source
This commit is contained in:
Bharat Mediratta
2010-01-08 11:49:01 -08:00
parent 2d8843ba4d
commit 3fc6dab7ac
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/libraries/ORM_MPTT.php
+4 -16
View File
@@ -165,11 +165,8 @@ class ORM_MPTT_Core extends ORM {
* @return array ORM
*/
function children($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) {
if ($where) {
$this->merge_where($where);
}
return $this
->merge_where($where)
->where("parent_id", "=", $this->id)
->order_by($order_by)
->find_all($limit, $offset);
@@ -183,11 +180,8 @@ class ORM_MPTT_Core extends ORM {
* @return array ORM
*/
function children_count($where=null) {
if ($where) {
$this->merge_where($where);
}
return $this
->merge_where($where)
->where("parent_id", "=", $this->id)
->count_all();
}
@@ -202,11 +196,8 @@ class ORM_MPTT_Core extends ORM {
* @return object ORM_Iterator
*/
function descendants($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) {
if ($where) {
$this->merge_where($where);
}
return $this
->merge_where($where);
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->order_by($order_by)
@@ -220,11 +211,8 @@ class ORM_MPTT_Core extends ORM {
* @return integer child count
*/
function descendants_count($where=null) {
if ($where) {
$this->merge_where($where);
}
return $this
->merge_where($where);
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->count_all();