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:
nate 2007-01-07 20:09:45 +00:00
parent a1f632c905
commit 914dffcc14

View file

@ -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';