adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applying patch from 'SkieDr' to fix custom find type pagination. Removes parameters from exiting paginate(). Test case added.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8137 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mark_story 2009-04-07 14:56:30 +00:00
parent 5f4cdf91ac
commit 9491e4632d
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1030,6 +1030,14 @@ class Controller extends Object {
if (!isset($defaults['conditions'])) { if (!isset($defaults['conditions'])) {
$defaults['conditions'] = array(); $defaults['conditions'] = array();
} }
$type = 'all';
if (isset($defaults[0])) {
$type = $defaults[0];
unset($defaults[0]);
}
extract($options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options)); extract($options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options));
if (is_array($scope) && !empty($scope)) { if (is_array($scope) && !empty($scope)) {
@ -1040,12 +1048,7 @@ class Controller extends Object {
if ($recursive === null) { if ($recursive === null) {
$recursive = $object->recursive; $recursive = $object->recursive;
} }
$type = 'all';
if (isset($defaults[0])) {
$type = $defaults[0];
unset($defaults[0]);
}
$extra = array_diff_key($defaults, compact( $extra = array_diff_key($defaults, compact(
'conditions', 'fields', 'order', 'limit', 'page', 'recursive' 'conditions', 'fields', 'order', 'limit', 'page', 'recursive'
)); ));

20
cake/tests/cases/libs/controller/controller.test.php
View file

@ -604,6 +604,26 @@ class ControllerTest extends CakeTestCase {
); );
$this->assertEqual($Controller->params['paging']['ControllerPost']['options'],$expected); $this->assertEqual($Controller->params['paging']['ControllerPost']['options'],$expected);
} }
/**
* Test that special paginate types are called and that the type param doesn't leak out into defaults or options.
*
* @return void
**/
function testPaginateSpecialType() {
$Controller =& new Controller();
$Controller->uses = array('ControllerPost', 'ControllerComment');
$Controller->passedArgs[] = '1';
$Controller->params['url'] = array();
$Controller->constructClasses();
$Controller->paginate = array('ControllerPost' => array('popular', 'fields' => array('id', 'title')));
$result = $Controller->paginate('ControllerPost');
$this->assertEqual(Set::extract($result, '{n}.ControllerPost.id'), array(2, 3));
$this->assertEqual($Controller->ControllerPost->lastQuery['conditions'], array('ControllerPost.id > ' => '1'));
$this->assertFalse(isset($Controller->params['paging']['ControllerPost']['defaults'][0]));
$this->assertFalse(isset($Controller->params['paging']['ControllerPost']['options'][0]));
}
/** /**
* testDefaultPaginateParams method * testDefaultPaginateParams method
* *