From dc70da9d14664047375a2668a382e68581494296 Mon Sep 17 00:00:00 2001 From: euromark Date: Wed, 5 Nov 2014 03:04:48 +0100 Subject: [PATCH] Only merge the _defaults keys. --- lib/Cake/View/Helper/PaginatorHelper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php index 9edcca43f..d23799304 100644 --- a/lib/Cake/View/Helper/PaginatorHelper.php +++ b/lib/Cake/View/Helper/PaginatorHelper.php @@ -499,7 +499,8 @@ class PaginatorHelper extends AppHelper { 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 ''; }