Skip to content
Permalink
Browse files

Revert

  • Loading branch information...
dereuromark committed Sep 21, 2014
1 parent afb36ee commit 65c23110b789529179ebfa8fe825d0ce769cab8f
Showing with 2 additions and 11 deletions.
  1. +0 −9 src/View/Helper/PaginatorHelper.php
  2. +2 −2 tests/TestCase/View/Helper/PaginatorHelperTest.php
@@ -85,15 +85,6 @@ class PaginatorHelper extends Helper {
public function __construct(View $View, array $config = array()) {
parent::__construct($View, $config);
$this->setUpUrl();
}
/**
* Merges passed args with URL options.
*
* @return void
*/
public function setUpUrl() {
$this->config(
'options.url',
array_merge($this->request->params['pass'], $this->request->query)
@@ -15,7 +15,6 @@
namespace Cake\Test\TestCase\View\Helper;
use Cake\Core\Configure;
use Cake\Event\Event;
use Cake\Network\Request;
use Cake\Routing\Router;
use Cake\TestSuite\TestCase;
@@ -739,7 +738,8 @@ public function testPassedArgsMergingWithUrlOptions() {
$this->Paginator->request->params['pass'] = array(2);
$this->Paginator->request->query = array('page' => 1, 'foo' => 'bar', 'x' => 'y');
$this->Paginator->setUpUrl();
$this->View->request = $this->Paginator->request;
$this->Paginator = new PaginatorHelper($this->View);
$result = $this->Paginator->sort('title');
$expected = array(

0 comments on commit 65c2311

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