From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 7 Jul 2008 21:36:39 +0000 (+0000)
Subject: Checking options parameter for combos
X-Git-Tag: v2.4.2~19^2~1923
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=e69cba03db9c0f74d3febcdc9014e81aafa5914e;p=fa-stable.git

Checking options parameter for combos
---

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 3aae2521..864c486a 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -51,7 +51,8 @@ $opts = array(		// default options
 	'box_hint' => null // box/selectors hints; null = std see below
 );
 // ------ merge options with defaults ----------
-	$opts = array_merge($opts, $options);
+	if($options != null)
+		$opts = array_merge($opts, $options);
 	if (!is_array($opts['where']))  $opts['where'] = array($opts['where']);
 
 	$search_box = $opts['search_box']===true ? '_'.$name.'_edit' : $opts['search_box'];
@@ -231,7 +232,8 @@ $opts = array(		// default options
 	'disabled' => false
 );
 // ------ merge options with defaults ----------
-	$opts = array_merge($opts, $options);
+	if($options != null)
+		$opts = array_merge($opts, $options);
 	$select_submit =  $opts['select_submit']===true ? '_'.$name.'_update' : $opts['select_submit'];
 	$spec_id = $opts['spec_id'];
 	$spec_option = $opts['spec_option'];