adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7296 from cakephp/2.8-cleanup

Browse source 
Fix merge to + operator.
This commit is contained in:
Mark Story 2015-08-24 12:15:23 -04:00
commit ec48019d8e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Utility/CakeTime.php
View file

@ -1090,12 +1090,13 @@ class CakeTime {
'group' => $options,
);
}
$options = array_merge(array(
$defaults = array(
'group' => true,
'abbr' => false,
'before' => ' - ',
'after' => null,
), $options);
);
$options += $defaults;
$group = $options['group'];
$regex = null;