Commit 4c6e35e0 authored by yched's avatar yched

#84634 - PHP5 array_merge errors - possible fix ?

parent c6b542d7
......@@ -744,7 +744,10 @@ function _content_type_info($reset = FALSE) {
while ($field = db_fetch_array($field_result)) {
$global_settings = $field['global_settings'] ? unserialize($field['global_settings']) : array();
unset($field['global_settings']);
$field = array_merge($field, $global_settings);
// TODO : the test below should not be necessary, but problems were reported with PHP5
if (is_array($global_settings)) {
$field = array_merge($field, $global_settings);
}
$instance_info = db_fetch_array(db_query("SELECT type_name, label FROM {node_field_instance} WHERE field_name = '%s'", $field['field_name']));
$field['widget']['label'] = $instance_info['label'];
$field['type_name'] = $instance_info['type_name'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment