From 11d5deac850066099be6f3b3921dbdd312379149 Mon Sep 17 00:00:00 2001 From: abijah Date: Tue, 4 Aug 2009 22:09:18 +0000 Subject: [PATCH] Undid the change from r401, since it wasn't being used and was interferring with the specification of sort_column. If we really want that functionality, we can add it in when needed and come up with a more general solution for view specific sorting as well. git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@484 97e9348a-65ac-dc4b-aefc-98561f571b83 --- site/views/helpers/grid.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site/views/helpers/grid.php b/site/views/helpers/grid.php index c789119..68292b3 100644 --- a/site/views/helpers/grid.php +++ b/site/views/helpers/grid.php @@ -211,8 +211,9 @@ class GridHelper extends AppHelper { // Incorporate all other user options if (isset($config)) - $this->jqGrid_options = array_merge_recursive($this->jqGrid_options, $config); + $this->jqGrid_options = array_merge($this->jqGrid_options, $config); + //pr(compact('config') + array('jqGrid_options' => $this->jqGrid_options)); echo $view->element('jqGrid', $this->jqGrid_options); // Since we only have one instance of this class