Only merge the _defaults keys.

cakephp · Dec 9, 2014 · dc70da9 · dc70da9
1 parent dc41a1f
commit dc70da9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php
@@ -499,7 +499,8 @@ protected function _pagingLink($which, $title = null, $options = array(), $disab
 			if (!empty($disabledTitle) && $disabledTitle !== true) {
 				$title = $disabledTitle;
 			}
-			$options = (array)$disabledOptions + $options + $_defaults;
+
+			$options = (array)$disabledOptions + array_intersect_key($options, array_keys($_defaults)) + $_defaults;
 		} elseif (!$this->{$check}($options['model'])) {
 			return '';
 		}