@@ -160,8 +160,7 @@ discard block |
||
| 160 | 160 | if (isset($this->data[$key])) |
| 161 | 161 | { |
| 162 | 162 | return $this->data[$key]; |
| 163 | - } |
|
| 164 | - else if ($default && $this->get_default_value($key) !== null) |
|
| 163 | + } else if ($default && $this->get_default_value($key) !== null) |
|
| 165 | 164 | { |
| 166 | 165 | return $this->get_default_value($key); |
| 167 | 166 | } |
@@ -359,12 +358,10 @@ discard block |
||
| 359 | 358 | if (is_array($user_ids) && !empty($user_ids)) |
| 360 | 359 | { |
| 361 | 360 | $sql_where = 'WHERE ' . $this->db->sql_in_set('user_id', array_map('intval', $user_ids)); |
| 362 | - } |
|
| 363 | - else if ($user_ids == 'all') |
|
| 361 | + } else if ($user_ids == 'all') |
|
| 364 | 362 | { |
| 365 | 363 | $sql_where = ''; |
| 366 | - } |
|
| 367 | - else |
|
| 364 | + } else |
|
| 368 | 365 | { |
| 369 | 366 | $sql_where = 'WHERE user_id = ' . (int) $user_ids; |
| 370 | 367 | } |
@@ -395,8 +392,7 @@ discard block |
||
| 395 | 392 | { |
| 396 | 393 | // While incrementing, the iamges might be lower than 0. |
| 397 | 394 | $validated_data[$name] = (int) $value; |
| 398 | - } |
|
| 399 | - else |
|
| 395 | + } else |
|
| 400 | 396 | { |
| 401 | 397 | $validated_data[$name] = max(0, (int) $value); |
| 402 | 398 | } |
@@ -542,8 +538,7 @@ discard block |
||
| 542 | 538 | 'warnings' => 0, |
| 543 | 539 | 'allow_pm' => 0, |
| 544 | 540 | ); |
| 545 | - } |
|
| 546 | - else |
|
| 541 | + } else |
|
| 547 | 542 | { |
| 548 | 543 | $user_sig = ''; |
| 549 | 544 | // We add the signature to every posters entry because enable_sig is post dependent |
@@ -589,8 +584,7 @@ discard block |
||
| 589 | 584 | if ((!empty($row['user_allow_viewemail']) && $this->auth->acl_get('u_sendemail')) || $this->auth->acl_get('a_email')) |
| 590 | 585 | { |
| 591 | 586 | $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']); |
| 592 | - } |
|
| 593 | - else |
|
| 587 | + } else |
|
| 594 | 588 | { |
| 595 | 589 | $user_cache[$user_id]['email'] = ''; |
| 596 | 590 | } |
@@ -603,8 +597,7 @@ discard block |
||
| 603 | 597 | if ($diff == 0) |
| 604 | 598 | { |
| 605 | 599 | $diff = ($now['mday'] - $bday_day < 0) ? 1 : 0; |
| 606 | - } |
|
| 607 | - else |
|
| 600 | + } else |
|
| 608 | 601 | { |
| 609 | 602 | $diff = ($diff < 0) ? 1 : 0; |
| 610 | 603 | } |