adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only merge the _defaults keys.

Browse source
This commit is contained in:
euromark 2014-11-05 03:04:48 +01:00
parent dc41a1ff56
commit dc70da9d14
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Cake/View/Helper/PaginatorHelper.php
View file

@ -499,7 +499,8 @@ class PaginatorHelper extends AppHelper {
if (!empty($disabledTitle) && $disabledTitle !== true) { if (!empty($disabledTitle) && $disabledTitle !== true) {
$title = $disabledTitle; $title = $disabledTitle;
} }
$options = (array)$disabledOptions + $options + $_defaults;
$options = (array)$disabledOptions + array_intersect_key($options, array_keys($_defaults)) + $_defaults;
} elseif (!$this->{$check}($options['model'])) { } elseif (!$this->{$check}($options['model'])) {
return ''; return '';
} }