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

@ -256,7 +256,16 @@ class addonAdminModel extends addon
foreach($extra_vars as $key => $val)
{
if(!$val)
{
continue;
}
$obj = new stdClass();
if(!$val->attrs)
{
$val->attrs = new stdClass();
}
if(!$val->attrs->type)
{
$val->attrs->type = 'text';
@ -342,6 +351,11 @@ class addonAdminModel extends addon
$addon_info->extra_vars = array();
foreach($extra_vars as $key => $val)
{
if(!$val)
{
continue;
}
$obj = new stdClass();
$obj->group = $group->title->body;