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

Issue 1010 fixed Fatal error: Cannot use object of type stdClass as array

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10186 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2012-02-24 07:04:05 +00:00
parent b1a78759e0
commit 52bd124ff9
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -178,17 +178,15 @@
if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); } if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
// 'Select'type obtained from the option list. // 'Select'type obtained from the option list.
if(is_array($val->options)) { if($val->options && !is_array($val->options))
$option_count = count($val->options); {
$val->options = array($val->options)
}
for($i = 0; $i < $option_count; $i++) { for($i = 0, $c = count($val->options); $i < $c; $i++) {
$obj->options[$i]->title = $val->options[$i]->title->body; $obj->options[$i]->title = $val->options[$i]->title->body;
$obj->options[$i]->value = $val->options[$i]->attrs->value; $obj->options[$i]->value = $val->options[$i]->attrs->value;
} }
} else {
$obj->options[0]->title = $val->options[0]->title->body;
$obj->options[0]->value = $val->options[0]->attrs->value;
}
$addon_info->extra_vars[] = $obj; $addon_info->extra_vars[] = $obj;
} }
@ -273,14 +271,15 @@
if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); } if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); } if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
// 'Select'type obtained from the option list. // 'Select'type obtained from the option list.
if(is_array($val->options)) { if($val->options && !is_array($val->options))
$option_count = count($val->options); {
$val->options = array($val->options)
}
for($i = 0; $i < $option_count; $i++) { for($i = 0, $c = count($val->options); $i < $c; $i++) {
$obj->options[$i]->title = $val->options[$i]->title->body; $obj->options[$i]->title = $val->options[$i]->title->body;
$obj->options[$i]->value = $val->options[$i]->value->body; $obj->options[$i]->value = $val->options[$i]->value->body;
} }
}
$addon_info->extra_vars[] = $obj; $addon_info->extra_vars[] = $obj;
} }