From 914dffcc141b903dc4f66d0fc92f08fc62212d65 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Sun, 7 Jan 2007 20:09:45 +0000
Subject: [PATCH] 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
---
 cake/libs/view/helpers/paginator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cake/libs/view/helpers/paginator.php b/cake/libs/view/helpers/paginator.php
index a41ec14ea..2d97e0def 100644
--- a/cake/libs/view/helpers/paginator.php
+++ b/cake/libs/view/helpers/paginator.php
@@ -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';