From d194845e4ebd2f39539f04826b4d208055501e33 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 24 Apr 2012 19:44:50 +0000
Subject: [PATCH] Minor fixes / avoid warnings

---
 etemplate/inc/class.etemplate_widget_menupopup.inc.php      | 5 +++++
 etemplate/inc/class.etemplate_widget_projectmanager.inc.php | 2 +-
 etemplate/inc/class.etemplate_widget_transformer.inc.php    | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
index abefca5ef8..e4dc48bec1 100644
--- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php
+++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php
@@ -289,6 +289,11 @@ class etemplate_widget_menupopup extends etemplate_widget
 						'label' => $s,
 						'title' => $cat['description'],
 					);
+					// For multi-select, send data too
+					if($rows > 1)
+					{
+						$options[$cat['id']]['data'] = $cat['data'];
+					}
 				}
 				// preserv unavailible cats (eg. private user-cats)
 				/* TODO
diff --git a/etemplate/inc/class.etemplate_widget_projectmanager.inc.php b/etemplate/inc/class.etemplate_widget_projectmanager.inc.php
index 446796a62d..2afb1a4b20 100644
--- a/etemplate/inc/class.etemplate_widget_projectmanager.inc.php
+++ b/etemplate/inc/class.etemplate_widget_projectmanager.inc.php
@@ -54,7 +54,7 @@ class etemplate_widget_projectmanager extends etemplate_widget_transformer
 				$extension,
 				$template
 			);
-			self::$request->sel_options[$form_name] += $cell['sel_options'];
+			self::$request->sel_options[$form_name] += (array)$cell['sel_options'];
 
 			// if no_lang was modified, forward modification to the client
 			if ($cell['no_lang'] != $this->attr['no_lang'])
diff --git a/etemplate/inc/class.etemplate_widget_transformer.inc.php b/etemplate/inc/class.etemplate_widget_transformer.inc.php
index 4d6f3702d4..b1c784c20a 100644
--- a/etemplate/inc/class.etemplate_widget_transformer.inc.php
+++ b/etemplate/inc/class.etemplate_widget_transformer.inc.php
@@ -131,7 +131,7 @@ abstract class etemplate_widget_transformer extends etemplate_widget
 				case 'sel_options':
 					self::$request->sel_options[$form_name] = $val;
 					break;
-				case 'type':	// not an attribute in etempalte2
+				case 'type':	// not an attribute in etemplate2
 				default:
 					self::setElementAttribute($form_name, $attr, $val);
 					break;