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

Refactoring Controller::paginate() to remove duplicate code.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4698 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-03-28 16:31:16 +00:00
parent 8b7f46acaa
commit 1f0d3d7145
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -978,7 +978,6 @@ class Controller extends Object {
// Error: can't find object
return array();
}
$options = am($this->params, $this->params['url'], $this->passedArgs);
if (isset($this->paginate[$object->name])) {
$defaults = $this->paginate[$object->name];
@ -1020,17 +1019,11 @@ class Controller extends Object {
}
$conditions = $fields = $order = $limit = $page = $recursive = null;
$options = am($defaults, $options);
if (isset($this->paginate[$object->name])) {
$defaults = $this->paginate[$object->name];
} else {
$defaults = $this->paginate;
}
if (!isset($defaults['conditions'])) {
$defaults['conditions'] = array();
}
extract(am(array('page' => 1, 'limit' => 20), $defaults, $options));
extract($options = am(array('page' => 1, 'limit' => 20), $defaults, $options));
if (is_array($scope) && !empty($scope)) {
$conditions = am($conditions, $scope);
} elseif (is_string($scope)) {
@ -1043,6 +1036,7 @@ class Controller extends Object {
if($page == 'last') {
$options['page'] = $page = $pageCount;
}
$results = $object->findAll($conditions, $fields, $order, $limit, $page, $recursive);
$paging = array(
'page' => $page,
@ -1052,7 +1046,8 @@ class Controller extends Object {
'nextPage' => ($count > ($page * $limit)),
'pageCount' => $pageCount,
'defaults' => am(array('limit' => 20, 'step' => 1), $defaults),
'options' => $options);
'options' => $options
);
$this->params['paging'][$object->name] = $paging;