From d06a8f1a773e6c56dd37d3f1f6d3f6b87fbdd330 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 2 May 2015 19:35:16 +0000
Subject: [PATCH] allow all sort of expanded content in legacy options eg.
 ",1,${cont[nm][somevalue]}"

---
 etemplate/js/et2_core_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etemplate/js/et2_core_widget.js b/etemplate/js/et2_core_widget.js
index 820be2361f..f3b3a78636 100644
--- a/etemplate/js/et2_core_widget.js
+++ b/etemplate/js/et2_core_widget.js
@@ -504,8 +504,8 @@ var et2_widget = ClassWithAttributes.extend(
 					var mod = this.getArrayMgr("modifications").getEntry(_target.id);
 					if(typeof mod.options != "undefined") attrValue = _attrsObj[i].value = mod.options;
 				}
-				// Check for entire legacy options passed in content
-				if(attrValue.charAt(0) == '@' && attrValue.indexOf(',') == -1)
+				// expand legacyOptions with content
+				if(attrValue.charAt(0) == '@' || attrValue.indexOf('$') != -1)
 				{
 					attrValue = mgr.expandName(attrValue);
 				}