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.