joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Added cache object to Model and cleaned up some variable names.

Browse source
This commit is contained in:
Josh Sherman 2011-10-30 19:24:23 -04:00
parent 02c0eef632
commit 4b96d28bb7
3 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
classes/Model.php
View file

@ -34,6 +34,14 @@ class Model extends Object
*/
protected $db = null;
/**
* Cache Object
*
* @access protected
* @var object
*/
protected $cache = null;
/**
* SQL Array
*
@ -240,8 +248,9 @@ class Model extends Object
// Runs the parent constructor so we have the config
parent::__construct();
// Gets an instance of the database
$this->db = Database::getInstance($this->datasource != '' ? $this->datasource : null);
// Gets an instance of the cache and database
$this->db = Database::getInstance($this->datasource != '' ? $this->datasource : null);
$this->cache = Cache::getInstance();
// Builds out the query
if ($type_or_parameters != null)

16
classes/Module.php
View file

@ -28,7 +28,7 @@
class Module extends Object
{
/**
* Cache object
* Cache Object
*
* @access protected
* @var object
@ -36,7 +36,7 @@ class Module extends Object
protected $cache = null;
/**
* Database object
* Database Object
*
* @access protected
* @var object
@ -44,7 +44,7 @@ class Module extends Object
protected $db = null;
/**
* Page title
* Page Title
*
* @access protected
* @var string, null by default
@ -52,7 +52,7 @@ class Module extends Object
protected $title = null;
/**
* Meta description
* Meta Description
*
* @access protected
* @var string, null by default
@ -60,7 +60,7 @@ class Module extends Object
protected $description = null;
/**
* Meta keywords (comma separated)
* Meta Keywords (comma separated)
*
* @access protected
* @var string, null by default
@ -88,7 +88,7 @@ class Module extends Object
protected $private = false;
/**
* Security settings of the page
* Security Settings
*
* @access protected
* @var boolean, null by default
@ -128,7 +128,7 @@ class Module extends Object
protected $hash = null;
/**
* Default display engine
* Default Display Engine
*
* Defaults to PHP but could be set to JSON, XML or RSS. Value is
* overwritten by the config value if not set by the module.
@ -139,7 +139,7 @@ class Module extends Object
protected $engine = DISPLAY_PHP;
/**
* Default template
* Default Template
*
* Defaults to null but could be set to any valid template basename. The
* value is overwritten by the config value if not set by the module. The

29
jar.php
View file

@ -4051,6 +4051,14 @@ class Model extends Object
*/
protected $db = null;
/**
* Cache Object
*
* @access protected
* @var object
*/
protected $cache = null;
/**
* SQL Array
*
@ -4257,8 +4265,9 @@ class Model extends Object
// Runs the parent constructor so we have the config
parent::__construct();
// Gets an instance of the database
$this->db = Database::getInstance($this->datasource != '' ? $this->datasource : null);
// Gets an instance of the cache and database
$this->db = Database::getInstance($this->datasource != '' ? $this->datasource : null);
$this->cache = Cache::getInstance();
// Builds out the query
if ($type_or_parameters != null)
@ -5046,7 +5055,7 @@ class Model extends Object
class Module extends Object
{
/**
* Cache object
* Cache Object
*
* @access protected
* @var object
@ -5054,7 +5063,7 @@ class Module extends Object
protected $cache = null;
/**
* Database object
* Database Object
*
* @access protected
* @var object
@ -5062,7 +5071,7 @@ class Module extends Object
protected $db = null;
/**
* Page title
* Page Title
*
* @access protected
* @var string, null by default
@ -5070,7 +5079,7 @@ class Module extends Object
protected $title = null;
/**
* Meta description
* Meta Description
*
* @access protected
* @var string, null by default
@ -5078,7 +5087,7 @@ class Module extends Object
protected $description = null;
/**
* Meta keywords (comma separated)
* Meta Keywords (comma separated)
*
* @access protected
* @var string, null by default
@ -5106,7 +5115,7 @@ class Module extends Object
protected $private = false;
/**
* Security settings of the page
* Security Settings
*
* @access protected
* @var boolean, null by default
@ -5146,7 +5155,7 @@ class Module extends Object
protected $hash = null;
/**
* Default display engine
* Default Display Engine
*
* Defaults to PHP but could be set to JSON, XML or RSS. Value is
* overwritten by the config value if not set by the module.
@ -5157,7 +5166,7 @@ class Module extends Object
protected $engine = DISPLAY_PHP;
/**
* Default template
* Default Template
*
* Defaults to null but could be set to any valid template basename. The
* value is overwritten by the config value if not set by the module. The