From 07c5bdb2272d3c9c290698d229ebc02fb4bcbe44 Mon Sep 17 00:00:00 2001
From: Geert De Deckere <geert@idoe.be>
Date: Sun, 2 Aug 2009 15:12:19 +0200
Subject: [PATCH] Removed array_merge() calls in favor of array addition

---
 classes/kohana/pagination.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/kohana/pagination.php b/classes/kohana/pagination.php
index c6b85b6..566eb6d 100644
--- a/classes/kohana/pagination.php
+++ b/classes/kohana/pagination.php
@@ -49,7 +49,7 @@ class Kohana_Pagination {
 	public function __construct(array $config = array())
 	{
 		// Overwrite system defaults with application defaults
-		$this->config = array_merge($this->config, $this->config_group());
+		$this->config = $this->config_group() + $this->config;
 
 		// Pagination setup
 		$this->setup($config);
@@ -106,7 +106,7 @@ class Kohana_Pagination {
 		}
 
 		// Overwrite the current config settings
-		$this->config = array_merge($this->config, $config);
+		$this->config = $config + $this->config;
 
 		// Only (re)calculate pagination when needed
 		if ($this->current_page === NULL
-- 
2.11.4.GIT