Completed
Push — develop ( 4d26b2...764757 )
by Daniel
07:05
created
services/form/form.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -195,8 +195,7 @@  discard block
 block discarded – undo
195 195
 			if ($previewing || empty($row['field_props']['is_db_field']))
196 196
 			{
197 197
 				$fields_data[$field] = $value;
198
-			}
199
-			else
198
+			} else
200 199
 			{
201 200
 				$this->db_fields[$field] = $value;
202 201
 			}
@@ -236,14 +235,12 @@  discard block
 block discarded – undo
236 235
 		if (!empty($field_value))
237 236
 		{
238 237
 			$this->errors[] = $obj->validate_field($row);
239
-		}
240
-		else if ($row['field_required'])
238
+		} else if ($row['field_required'])
241 239
 		{
242 240
 			if (!$row['field_mod_only'] || $cp_class === 'mcp')
243 241
 			{
244 242
 				$this->errors[] = $this->language->lang_array('CONTENT_FIELD_REQUIRED', array($row['field_label']));
245
-			}
246
-			else
243
+			} else
247 244
 			{
248 245
 				$req_mod_input = true;
249 246
 			}
Please login to merge, or discard this patch.
services/form/builder.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -286,8 +286,7 @@  discard block
 block discarded – undo
286 286
 		if (!$field_data['field_mod_only'] || $this->mode === 'mcp')
287 287
 		{
288 288
 			$this->form->add($field, $field_data['field_type'], $field_data, $topic_id);
289
-		}
290
-		else if (!empty($field_data['field_value']))
289
+		} else if (!empty($field_data['field_value']))
291 290
 		{
292 291
 			$this->form->add($field, 'hidden', $field_data, $topic_id);
293 292
 		}
@@ -334,8 +333,7 @@  discard block
 block discarded – undo
334 333
 			{
335 334
 				$data['force_visibility'] = $visibility;
336 335
 			}
337
-		}
338
-		else if ($this->force_state())
336
+		} else if ($this->force_state())
339 337
 		{
340 338
 			$data['force_visibility'] = ($mode == 'edit_first_post') ? ITEM_REAPPROVE : ITEM_UNAPPROVED;
341 339
 		}
@@ -399,8 +397,7 @@  discard block
 block discarded – undo
399 397
 		if ($visibility == ITEM_APPROVED)
400 398
 		{
401 399
 			$options[ITEM_REAPPROVE] = 'CONTENT_STATUS_REAPPROVE';
402
-		}
403
-		else
400
+		} else
404 401
 		{
405 402
 			$options[ITEM_UNAPPROVED]	= 'CONTENT_STATUS_DISAPPROVE';
406 403
 			$options[ITEM_APPROVED]		= 'CONTENT_STATUS_APPROVE';
Please login to merge, or discard this patch.
services/actions/type/save.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -137,8 +137,7 @@  discard block
 block discarded – undo
137 137
 			$unsaved_entity->set_content_id($entity->get_content_id());
138 138
 			$this->handle_langname_change($forum_id, $entity->get_content_langname(), $unsaved_entity->get_content_langname());
139 139
 			$this->copy_forum_permissions($forum_id, $forum_perm_from);
140
-		}
141
-		else
140
+		} else
142 141
 		{
143 142
 			$forum_id = $this->create_content_forum($unsaved_entity->get_content_langname(), $forum_perm_from);
144 143
 			$unsaved_entity->set_forum_id($forum_id);
@@ -210,8 +209,7 @@  discard block
 block discarded – undo
210 209
 			$u_set_permission = append_sid("{$this->phpbb_admin_path}index.$this->php_ext", 'i=permissions&mode=setting_forum_local&forum_id[]=' . $entity->get_forum_id(), true);
211 210
 			$lang_key = 'CONTENT_TYPE_CREATED';
212 211
 			$message = $this->language->lang($lang_key, '<a href="' . $u_set_permission . '">', '</a>');
213
-		}
214
-		else
212
+		} else
215 213
 		{
216 214
 			$this->meta_refresh(3, $u_action);
217 215
 			$lang_key = 'CONTENT_TYPE_UPDATED';
Please login to merge, or discard this patch.