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

Fixing errors caused by accessing things that don't exist.

Browse source
This commit is contained in:
mark_story 2010-11-13 23:55:24 -05:00
parent 6c8c7ca4a5
commit 6073ac5dfa
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1039,7 +1039,7 @@ class Controller extends Object {
), E_USER_WARNING);
return array();
}
$options = array_merge($this->request->params, $this->request->params['url'], $this->passedArgs);
$options = array_merge($this->request->params, $this->request->query, $this->passedArgs);
if (isset($this->paginate[$object->alias])) {
$defaults = $this->paginate[$object->alias];

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

@ -757,9 +757,9 @@ class ControllerTest extends CakeTestCase {
* @access public
*/
function testPaginateFieldsDouble(){
$Controller = new Controller();
$Controller = new Controller($this->getMock('CakeRequest'));
$Controller->uses = array('ControllerPost');
$Controller->request->params['url'] = array();
$Controller->request->query = array();
$Controller->constructClasses();
$Controller->paginate = array(