Completed
Push — develop ( 3861a6...5ec043 )
by Daniel
06:44
created
model/entity/field.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -167,8 +167,7 @@  discard block
 block discarded – undo
167 167
 		if ($mode === 'edit')
168 168
 		{
169 169
 			return generate_text_for_edit($this->field_explain, $this->field_exp_uid, $this->field_exp_options);
170
-		}
171
-		else
170
+		} else
172 171
 		{
173 172
 			$parse_flags = ($this->field_exp_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
174 173
 			return generate_text_for_display($this->field_explain, $this->field_exp_uid, $this->field_exp_bitfield, $parse_flags);
@@ -185,8 +184,7 @@  discard block
 block discarded – undo
185 184
 		if (!is_array($settings))
186 185
 		{
187 186
 			$this->field_settings = $settings;
188
-		}
189
-		else if (sizeof($settings))
187
+		} else if (sizeof($settings))
190 188
 		{
191 189
 			$this->field_settings = json_encode($settings);
192 190
 		}
Please login to merge, or discard this patch.
model/entity/type.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -231,8 +231,7 @@  discard block
 block discarded – undo
231 231
 		if ($mode === 'edit')
232 232
 		{
233 233
 			return generate_text_for_edit($this->content_desc, $this->content_desc_uid, $this->content_desc_options);
234
-		}
235
-		else
234
+		} else
236 235
 		{
237 236
 			$parse_flags = ($this->content_desc_bitfield ? OPTION_FLAG_BBCODE : 0) | OPTION_FLAG_SMILIES;
238 237
 			return generate_text_for_display($this->content_desc, $this->content_desc_uid, $this->content_desc_bitfield, $parse_flags);
@@ -250,8 +249,7 @@  discard block
 block discarded – undo
250 249
 		if (!is_array($settings))
251 250
 		{
252 251
 			$this->content_view_settings = $settings;
253
-		}
254
-		else if (sizeof($settings))
252
+		} else if (sizeof($settings))
255 253
 		{
256 254
 			$this->content_view_settings = json_encode($settings);
257 255
 		}
Please login to merge, or discard this patch.
services/fields.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
 		if (!empty($custom_tpl))
76 76
 		{
77
-			$this->tpl_name	= ($tpl_name) ? $tpl_name : $content_type . '_' . $view_mode;
77
+			$this->tpl_name	= ($tpl_name) ? $tpl_name : $content_type.'_'.$view_mode;
78 78
 		}
79 79
 
80 80
 		$this->view_mode = (in_array($view_mode, array('summary', 'detail'))) ? $view_mode : 'summary';
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 */
97 97
 	public function show($type, array $topic_data, array $post_data, array $users_cache, array $attachments, array &$update_count, array $topic_tracking_info, array $topic_data_overwrite = array(), $mode = '')
98 98
 	{
99
-		$callable = 'get_' . $this->view_mode . '_template_data';
99
+		$callable = 'get_'.$this->view_mode.'_template_data';
100 100
 		$tpl_data = array_merge(
101 101
 			$this->{$callable}($type, $topic_data, $post_data, $users_cache, $attachments, $update_count, $topic_tracking_info, $mode),
102 102
 			$topic_data_overwrite
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		{
167 167
 			$field_type		= $row['field_type'];
168 168
 			$field_value	= &$post_field_data[$field_name];
169
-			$field_contents	= $this->form_fields[$field_type]->display_field($field_value, $this->view_mode, $tpl_data, $row);
169
+			$field_contents = $this->form_fields[$field_type]->display_field($field_value, $this->view_mode, $tpl_data, $row);
170 170
 
171 171
 			// this essentially hides other fields if the field returns an array
172 172
 			if (is_array($field_contents))
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 				break;
176 176
 			}
177 177
 
178
-			$fields_data[$field_name] = '<div class="field-label ' . $this->label[$row['field_' . $this->view_mode . '_ldisp']] . '">' . $row['field_label'] . ': </div>' . $field_contents;
178
+			$fields_data[$field_name] = '<div class="field-label '.$this->label[$row['field_'.$this->view_mode.'_ldisp']].'">'.$row['field_label'].': </div>'.$field_contents;
179 179
 		}
180 180
 
181 181
 		return $fields_data;
Please login to merge, or discard this patch.