stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-02 17:59:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preliminary work to cut over to Kohana 2.4

Browse Source 
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
This commit is contained in:
Bharat Mediratta
2009-11-25 13:22:24 -08:00
parent e201536d82
commit 2e420522ec
63 changed files with 257 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
modules/gallery/libraries/ORM_MPTT.php
View File

@@ -133,10 +133,10 @@ class ORM_MPTT_Core extends ORM {
*/
function parents() {
return $this
->where("`left_ptr` <= {$this->left_ptr}")
->where("`right_ptr` >= {$this->right_ptr}")
->where("id <> {$this->id}")
->orderby("left_ptr", "ASC")
->where("left_ptr", "<=", $this->left_ptr)
->where("right_ptr", ">=", $this->right_ptr)
->where("id", "<>", $this->id)
->order_by("left_ptr", "ASC")
->find_all();
}
@@ -147,14 +147,17 @@ class ORM_MPTT_Core extends ORM {
* @param integer SQL limit
* @param integer SQL offset
* @param array additional where clauses
* @param array orderby
* @param array order_by
* @return array ORM
*/
function children($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
function children($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
if ($where) {
$this->where($where);
}
return $this
->where("parent_id", $this->id)
->where($where)
->orderby($orderby)
->where("parent_id", "=", $this->id)
->order_by($order_by)
->find_all($limit, $offset);
}
@@ -165,10 +168,13 @@ class ORM_MPTT_Core extends ORM {
* @param array additional where clauses
* @return array ORM
*/
function children_count($where=array()) {
function children_count($where=null) {
if ($where) {
$this->where($where);
}
return $this
->where($where)
->where("parent_id", $this->id)
->where("parent_id", "=", $this->id)
->count_all();
}
@@ -178,15 +184,18 @@ class ORM_MPTT_Core extends ORM {
* @param integer SQL limit
* @param integer SQL offset
* @param array additional where clauses
* @param array orderby
* @param array order_by
* @return object ORM_Iterator
*/
function descendants($limit=null, $offset=0, $where=array(), $orderby=array("id" => "ASC")) {
function descendants($limit=null, $offset=0, $where=null, $order_by=array("id" => "ASC")) {
if ($where) {
$this->where($where);
}
return $this
->where("left_ptr >", $this->left_ptr)
->where("right_ptr <=", $this->right_ptr)
->where($where)
->orderby($orderby)
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->order_by($order_by)
->find_all($limit, $offset);
}
@@ -196,11 +205,14 @@ class ORM_MPTT_Core extends ORM {
* @param array additional where clauses
* @return integer child count
*/
function descendants_count($where=array()) {
function descendants_count($where=null) {
if ($where) {
$this->where($where);
}
return $this
->where("left_ptr >", $this->left_ptr)
->where("right_ptr <=", $this->right_ptr)
->where($where)
->where("left_ptr", ">", $this->left_ptr)
->where("right_ptr", "<=", $this->right_ptr)
->count_all();
}