From cf720cb1cae28d684df6df23f52946809e3a7f2c Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Mon, 30 Mar 2015 17:13:09 -0700
Subject: [PATCH] Admin-UI: Fix for writeParms filter/batch while using
 'optArray'

---
 e107_handlers/admin_ui.php     | 10 ++++++++++
 e107_handlers/form_handler.php | 22 ++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index a81da0392..220c90fc3 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -5903,6 +5903,16 @@ class e_admin_form_ui extends e_form
 					break;
 
 					case 'dropdown': // use the array $parm;
+
+						if(!empty($parms['optArray']))
+						{
+							$fopts = $parms;
+							$parms = $fopts['optArray'];
+							unset($fopts['optArray']);
+							$parms['__options'] = $fopts;
+						}
+
+
 						if(!is_array(varset($parms['__options']))) parse_str($parms['__options'], $parms['__options']);
 						$opts = $parms['__options'];
 						if(vartrue($opts['multiple']))
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 312cb533b..d03974f6d 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2824,7 +2824,7 @@ class e_form
 		{
 			$attributes['type'] = $parms['type'];	
 		}
-				
+
 		$this->renderValueTrigger($field, $value, $parms, $id);
 
 		$tp = e107::getParser();
@@ -2987,6 +2987,15 @@ class e_form
 				
 				if(!is_array(varset($wparms['__options']))) parse_str($wparms['__options'], $wparms['__options']);
 
+				if(!empty($wparms['optArray']))
+				{
+					$fopts = $wparms;
+					$wparms = $fopts['optArray'];
+					unset($fopts['optArray']);
+					$wparms['__options'] = $fopts;
+				}
+
+
 				$opts = $wparms['__options'];
 				unset($wparms['__options']);
 				$_value = $value;
@@ -3606,7 +3615,16 @@ class e_form
 				$parms['pattern'] = vartrue($attributes['pattern'], $required_data[3]);	
 			}
 		}
-		
+
+		// XXX Fixes For the above.  - use optArray variable. eg. $field['key']['writeParms']['optArray'] = array('one','two','three');
+		if(($attributes['type'] == 'dropdown' || $attributes['type'] == 'radio') && !empty($parms['optArray']))
+		{
+			$fopts = $parms;
+			$parms = $fopts['optArray'];
+			unset($fopts['optArray']);
+			$parms['__options'] = $fopts;
+		}
+
 		$this->renderElementTrigger($key, $value, $parms, $required_data, $id);
 		
 		switch($attributes['type'])