From ffe2f1677b9088435d7c33d9d7c726d9aaa087b1 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 15 Mar 2012 21:56:19 +0000
Subject: [PATCH] Don't overwrite current option (set from explicit attribute
 or content) with a legacy option

---
 etemplate/js/et2_core_widget.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js
index 860617e643..9ce5a618be 100644
--- a/etemplate/js/et2_core_widget.js
+++ b/etemplate/js/et2_core_widget.js
@@ -481,7 +481,11 @@ var et2_widget = Class.extend({
 
 				for (var j = 0; j < splitted.length && j < _proto.legacyOptions.length; j++)
 				{
-					_target[_proto.legacyOptions[j]] = splitted[j];
+					// Check to make sure we don't overwrite a current option with a legacy option
+					if(typeof _target[_proto.legacyOptions[j]] === "undefined")
+					{
+						_target[_proto.legacyOptions[j]] = splitted[j];
+					}
 				}
 			}
 			else