adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Expanding model support for Controller::paginate()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5519 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-08-14 18:46:22 +00:00
parent 1911b1d7a5
commit 9d799ec7ca
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cake/libs/controller/controller.php
View file

@ -637,6 +637,10 @@ class Controller extends Object {
}
$this->params['models'] = $this->modelNames;
if (Configure::read() > 2) {
$this->set('cakeDebug', $this);
}
$this->__viewClass =& new $viewClass($this);
if (!empty($this->modelNames)) {
$models = array();
@ -1005,8 +1009,9 @@ class Controller extends Object {
$scope = $object;
$object = null;
}
$assoc = null;
if (is_string($object)) {
if (is_string($object) && !strpos($object, '.')) {
if (isset($this->{$object})) {
$object = $this->{$object};
} elseif (isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object})) {
@ -1020,6 +1025,11 @@ class Controller extends Object {
}
}
}
} elseif (is_string($object)) {
list($object, $assoc) = explode('.', $object);
if (isset($this->{$object})) {
$object = $this->{$object};
}
} elseif (empty($object) || $object == null) {
if (isset($this->{$this->modelClass})) {
$object = $this->{$this->modelClass};
@ -1029,7 +1039,7 @@ class Controller extends Object {
}
if (!is_object($object)) {
// Error: can't find object
trigger_error(sprintf(__("Controller::paginate() - can't find model %s in controller %sController", true), $object, $this->name), E_USER_WARNING);
return array();
}
$options = am($this->params, $this->params['url'], $this->passedArgs);