Passed
Pull Request — master (#326)
by
unknown
04:30
created
core/user.php 1 patch
Braces   +7 added lines, -14 removed lines patch added patch discarded remove patch
@@ -202,8 +202,7 @@  discard block
 block discarded – undo
202 202
 		if (isset($this->data[$key]))
203 203
 		{
204 204
 			return $this->data[$key];
205
-		}
206
-		else if ($default && $this->get_default_value($key) !== null)
205
+		} else if ($default && $this->get_default_value($key) !== null)
207 206
 		{
208 207
 			return $this->get_default_value($key);
209 208
 		}
@@ -401,12 +400,10 @@  discard block
 block discarded – undo
401 400
 		if (is_array($user_ids) && !empty($user_ids))
402 401
 		{
403 402
 			$sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids));
404
-		}
405
-		else if ($user_ids == 'all')
403
+		} else if ($user_ids == 'all')
406 404
 		{
407 405
 			$sql_where = '';
408
-		}
409
-		else
406
+		} else
410 407
 		{
411 408
 			$sql_where = 'WHERE user_id = ' . (int) $user_ids;
412 409
 		}
@@ -437,8 +434,7 @@  discard block
 block discarded – undo
437 434
 					{
438 435
 						// While incrementing, the images might be lower than 0.
439 436
 						$validated_data[$name] = (int) $value;
440
-					}
441
-					else
437
+					} else
442 438
 					{
443 439
 						$validated_data[$name] = max(0, (int) $value);
444 440
 					}
@@ -584,8 +580,7 @@  discard block
 block discarded – undo
584 580
 					'warnings'            => 0,
585 581
 					'allow_pm'            => 0,
586 582
 				);
587
-			}
588
-			else
583
+			} else
589 584
 			{
590 585
 				$user_sig = '';
591 586
 				// We add the signature to every posters entry because enable_sig is post dependent
@@ -631,8 +626,7 @@  discard block
 block discarded – undo
631 626
 				if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email'))
632 627
 				{
633 628
 					$user_cache[$user_id]['email'] = ($this->config['board_email_form'] && $this->config['email_enable']) ? append_sid("{$this->root_path}memberlist.$this->php_ext", "mode=email&u=$user_id") : (($this->config['board_hide_emails'] && !$this->auth->acl_get('a_email')) ? '' : 'mailto:' . $row['user_email']);
634
-				}
635
-				else
629
+				} else
636 630
 				{
637 631
 					$user_cache[$user_id]['email'] = '';
638 632
 				}
@@ -645,8 +639,7 @@  discard block
 block discarded – undo
645 639
 						if ($diff == 0)
646 640
 						{
647 641
 							$diff = ($now['mday'] - $bday_day < 0) ? 1 : 0;
648
-						}
649
-						else
642
+						} else
650 643
 						{
651 644
 							$diff = ($diff < 0) ? 1 : 0;
652 645
 						}
Please login to merge, or discard this patch.