fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-15 09:19:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3.2 (~r11225)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/addon/addon.admin.model.php
View file

@ -142,6 +142,11 @@
$addon_info->mid_list = array();
}
if($extra_vals->xe_run_method)
{
$addon_info->xe_run_method = $extra_vals->xe_run_method;
}
// Add information
if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
@ -187,7 +192,10 @@
$obj->title = $val->title->body;
$obj->type = $val->attrs->type;
$obj->description = $val->description->body;
$obj->value = $extra_vals->{$obj->name};
if($obj->name)
{
$obj->value = $extra_vals->{$obj->name};
}
if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
@ -280,7 +288,10 @@
$obj->title = $val->title->body;
$obj->type = $val->type->body ? $val->type->body : 'text';
$obj->description = $val->description->body;
$obj->value = $extra_vals->{$obj->name};
if($obj->name)
{
$obj->value = $extra_vals->{$obj->name};
}
if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
// 'Select'type obtained from the option list.