mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 02:56:15 +00:00
Fixing $options array merge order in PaginatorHelper::link()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4268 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
a1f632c905
commit
914dffcc14
1 changed files with 1 additions and 1 deletions
|
@ -213,7 +213,7 @@ class PaginatorHelper extends AppHelper {
|
|||
$url = am($url, compact('sort', 'direction'));
|
||||
}
|
||||
if(!empty($this->options)) {
|
||||
$options = am($options, $this->options);
|
||||
$options = am($this->options, $options);
|
||||
}
|
||||
|
||||
$obj = isset($options['update']) ? 'Ajax' : 'Html';
|
||||
|
|
Loading…
Add table
Reference in a new issue