Use own method instead.

cakephp · Sep 21, 2014 · afb36ee · afb36ee
1 parent 1f8c083
commit afb36ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/View/Helper/PaginatorHelper.php b/src/View/Helper/PaginatorHelper.php
@@ -85,6 +85,15 @@ 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)

diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php
@@ -739,7 +739,7 @@ public function testPassedArgsMergingWithUrlOptions() {
 
 		$this->Paginator->request->params['pass'] = array(2);
 		$this->Paginator->request->query = array('page' => 1, 'foo' => 'bar', 'x' => 'y');
-		$this->Paginator->__construct($this->View);
+		$this->Paginator->setUpUrl();
 
 		$result = $this->Paginator->sort('title');
 		$expected = array(