Fix error in paginatorhelper that prevented URL generation.

Fix errors in URL generation where page numbers were always broken.
cakephp · Nov 21, 2013 · 7cedb26 · 7cedb26
1 parent 26b69b4
commit 7cedb26
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php b/Cake/Test/TestCase/View/Helper/PaginatorHelperTest.php
@@ -700,12 +700,12 @@ public function testPassedArgsMergingWithUrlOptions() {
 		);
 
 		$this->Paginator->request->params['pass'] = array(2);
-		$this->Paginator->request->query = array('foo' => 'bar', 'x' => 'y');
+		$this->Paginator->request->query = array('page' => 1, 'foo' => 'bar', 'x' => 'y');
 		$this->Paginator->beforeRender(null, 'posts/index');
 
 		$result = $this->Paginator->sort('title');
 		$expected = array(
-			'a' => array('href' => '/articles/index/2?sort=title&amp;direction=asc&amp;foo=bar&amp;x=y'),
+			'a' => array('href' => '/articles/index/2?foo=bar&amp;x=y&amp;sort=title&amp;direction=asc'),
 			'Title',
 			'/a'
 		);

diff --git a/Cake/View/Helper/PaginatorHelper.php b/Cake/View/Helper/PaginatorHelper.php
@@ -113,10 +113,7 @@ public function templates($templates = null) {
  * @return void
  */
 	public function beforeRender($event, $viewFile) {
-		$this->options['url'] = array_merge($this->request->params['pass']);
-		if (!empty($this->request->query)) {
-			$this->options['url']['?'] = $this->request->query;
-		}
+		$this->options['url'] = array_merge($this->request->params['pass'], $this->request->query);
 	}
 
 /**