From aa0a60ea2ba4446cc09614b79ad31cf61b1a5416 Mon Sep 17 00:00:00 2001
From: abijah <abijah@97e9348a-65ac-dc4b-aefc-98561f571b83>
Date: Tue, 28 Jul 2009 16:07:34 +0000
Subject: [PATCH] Modified the grid helper to allow a view to directly specify
 custom post data without wiping out any custom post data set by the element. 
 It's not been used or tested.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@401 97e9348a-65ac-dc4b-aefc-98561f571b83
---
 views/helpers/grid.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/helpers/grid.php b/views/helpers/grid.php
index 618f26e..c789119 100644
--- a/views/helpers/grid.php
+++ b/views/helpers/grid.php
@@ -211,7 +211,7 @@ class GridHelper extends AppHelper {
 
     // Incorporate all other user options
     if (isset($config))
-      $this->jqGrid_options = array_merge($this->jqGrid_options, $config);
+      $this->jqGrid_options = array_merge_recursive($this->jqGrid_options, $config);
 
     echo $view->element('jqGrid', $this->jqGrid_options);