Fix paginator options when disabled.

cakephp · Dec 9, 2014 · dc41a1f · dc41a1f
1 parent 0c788d1
commit dc41a1f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php b/lib/Cake/Test/Case/View/Helper/PaginatorHelperTest.php
@@ -1006,6 +1006,17 @@ public function testPagingLinks() {
 			)
 		);
 
+		$result = $this->Paginator->prev('<i class="fa fa-angle-left"></i>', array('escape' => false), null, array('class' => 'prev disabled'));
+		$expected = array(
+			'span' => array('class' => 'prev disabled'),
+			'a' => array('href' => '/', 'rel' => 'prev'),
+			'i' => array('class' => 'fa fa-angle-left'),
+			'/i',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
 		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>');
 		$expected = array(
 			'span' => array('class' => 'prev'),

diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php
@@ -499,7 +499,7 @@ protected function _pagingLink($which, $title = null, $options = array(), $disab
 			if (!empty($disabledTitle) && $disabledTitle !== true) {
 				$title = $disabledTitle;
 			}
-			$options = (array)$disabledOptions + $_defaults;
+			$options = (array)$disabledOptions + $options + $_defaults;
 		} elseif (!$this->{$check}($options['model'])) {
 			return '';
 		}