diff options
| -rw-r--r-- | modules/gallery/libraries/ORM_MPTT.php | 2 | ||||
| -rw-r--r-- | modules/gallery/models/item.php | 2 | ||||
| -rw-r--r-- | modules/organize/views/organize_tree.html.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php index 90b9d38a..a67f05be 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 order_by * @return array ORM */ - function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) { + function children($limit=null, $offset=null, $where=null, $order_by=array("id" => "ASC")) { if ($where) { $this->merge_where($where); } diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index acc4e96f..16c57dbc 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -597,7 +597,7 @@ class Item_Model extends ORM_MPTT { * @param array order_by * @return array ORM */ - function children($limit=null, $offset=0, $where=array(), $order_by=null) { + function children($limit=null, $offset=null, $where=array(), $order_by=null) { if (empty($order_by)) { $order_by = array($this->sort_column => $this->sort_order); // Use id as a tie breaker diff --git a/modules/organize/views/organize_tree.html.php b/modules/organize/views/organize_tree.html.php index 1ccb942c..c5257956 100644 --- a/modules/organize/views/organize_tree.html.php +++ b/modules/organize/views/organize_tree.html.php @@ -8,7 +8,7 @@ <?= html::clean($album->title) ?> </span> <ul> - <? foreach ($album->children(null, 0, array(array("type", "=", "album"))) as $child): ?> + <? foreach ($album->children(null, null, array(array("type", "=", "album"))) as $child): ?> <? if ($selected && $child->contains($selected)): ?> <?= View::factory("organize_tree.html", array("selected" => $selected, "album" => $child)); ?> <? else: ?> |