Merge branch 'develop' into release/1.7.4

This commit is contained in:
khongchi 2014-01-29 01:09:31 +09:00
commit 9d9dda94c6
12 changed files with 62 additions and 33 deletions

View file

@ -667,6 +667,7 @@ class widgetController extends widget
$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
if(!$widgetstyle_info) return $widget_content_body;
$widgetstyle_extra_var = new stdClass();
$widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
if(count($widgetstyle_extra_var_key['extra_var']))
{