|
@@ -101,7 +101,7 @@ discard block |
|
|
block discarded – undo |
|
101
|
101
|
$this->set_content_fields($view_mode_fields, $entity->get_content_fields()); |
|
102
|
102
|
|
|
103
|
103
|
$this->board_url = generate_board_url(true); |
|
104
|
|
- $this->tpl_name = ($custom_tpl) ? ($tpl_name ?: $this->content_type . '_' . $view_mode) : ''; |
|
|
104
|
+ $this->tpl_name = ($custom_tpl) ? ($tpl_name ?: $this->content_type . '_' . $view_mode) : ''; |
|
105
|
105
|
$this->db_fields = $db_fields; |
|
106
|
106
|
} |
|
107
|
107
|
|
|
@@ -220,7 +220,7 @@ discard block |
|
|
block discarded – undo |
|
220
|
220
|
$field_data['field_props'] = array_replace_recursive($this->form_fields[$field_type]->get_default_props(), $field_data['field_props']); |
|
221
|
221
|
$field_data['field_value'] = &$field_values[$field_name]; |
|
222
|
222
|
|
|
223
|
|
- $field_contents = $this->form_fields[$field_type]->display_field($field_data, $tpl_data, $this->display_mode); |
|
|
223
|
+ $field_contents = $this->form_fields[$field_type]->display_field($field_data, $tpl_data, $this->display_mode); |
|
224
|
224
|
|
|
225
|
225
|
// this essentially hides other fields if the field returns an array |
|
226
|
226
|
if (is_array($field_contents)) |
Please login to merge, or discard this patch.