TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Still allow newQuery() on Cms objects

This commit is contained in:
Sam Georges 2014-05-24 13:50:52 +10:00
parent cd58891723
commit a747b18f0e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/cms/classes/CmsObject.php
View File

@ -62,7 +62,7 @@ class CmsObject implements ArrayAccess
/**
* Creates an instance of the object and associates it with a CMS theme.
* @param \Cms\Classes\Theme $theme Specifies the theme the object belongs to.
* If the theme is specified as NULL, then a query can be performed on the object.
* If the theme is specified as NULL, then a query can be performed on the object directly.
*/
public function __construct(Theme $theme = null)
{
@ -492,7 +492,7 @@ class CmsObject implements ArrayAccess
*/
public function newQuery()
{
$query = new CmsObjectQuery($this);
$query = new CmsObjectQuery($this, $this->theme);
return $query;
}
@ -504,8 +504,8 @@ class CmsObject implements ArrayAccess
*/
public function __call($method, $parameters)
{
// If this object is populated with a theme, then a query
// cannot be performed on it to reduce overhead.
// If this object is populated with a theme, then a query
// cannot be performed on it to reduce overhead on populated objects.
if (!$this->theme) {
$query = $this->newQuery();
return call_user_func_array(array($query, $method), $parameters);

3
modules/cms/classes/CmsObjectQuery.php
View File

@ -17,9 +17,10 @@ class CmsObjectQuery
protected $theme;
public function __construct($cmsObject)
public function __construct($cmsObject, $theme = null)
{
$this->cmsObject = $cmsObject;
$this->theme = $theme;
}
/**