Skip to content
Permalink
Browse files

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

  • Loading branch information...
markstory committed Nov 14, 2010
1 parent 6c8c7ca commit 6073ac5dfa72b66747ebf7f1e8f3c9452b7d493d
Showing with 3 additions and 3 deletions.
  1. +1 −1 cake/libs/controller/controller.php
  2. +2 −2 cake/tests/cases/libs/controller/controller.test.php
@@ -1039,7 +1039,7 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
), 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];
@@ -757,9 +757,9 @@ function testPaginateExtraParams() {
* @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(

0 comments on commit 6073ac5

Please sign in to comment.
You can’t perform that action at this time.