diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-02-03 22:33:51 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-02-03 22:33:51 +0100 |
| commit | d50b8df36483a3f3dbee2f701c80b84368133537 (patch) | |
| tree | 2ab4f59904714dd067644150c0b88ee9c7171288 | |
| parent | ad2d1fcbcb4ca905ee7c1358e2545e1475c81ff5 (diff) | |
| parent | 6f92996d98239e93b8a6e8002b048b9afd2bf352 (diff) | |
| download | forums-d50b8df36483a3f3dbee2f701c80b84368133537.tar forums-d50b8df36483a3f3dbee2f701c80b84368133537.tar.gz forums-d50b8df36483a3f3dbee2f701c80b84368133537.tar.bz2 forums-d50b8df36483a3f3dbee2f701c80b84368133537.tar.xz forums-d50b8df36483a3f3dbee2f701c80b84368133537.zip | |
Merge pull request #1997 from marc1706/ticket/12159
[ticket/12159] Fix codesniffer complaints due to profilefields and passwords
* marc1706/ticket/12159:
[ticket/12159] Fix codesniffer complaints due to profilefields and passwords
| -rw-r--r-- | phpBB/includes/ucp/ucp_remind.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/profilefields/manager.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_date.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_dropdown.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/profilefields/type/type_int.php | 2 |
5 files changed, 3 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php index 44395abb44..99e945eeae 100644 --- a/phpBB/includes/ucp/ucp_remind.php +++ b/phpBB/includes/ucp/ucp_remind.php @@ -27,7 +27,7 @@ class ucp_remind function main($id, $mode) { global $config, $phpbb_root_path, $phpEx; - global $db, $user, $auth, $template, $phpbb_container;; + global $db, $user, $auth, $template, $phpbb_container; if (!$config['allow_password_reset']) { diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php index 7564c920c9..ead978374c 100644 --- a/phpBB/phpbb/profilefields/manager.php +++ b/phpBB/phpbb/profilefields/manager.php @@ -313,7 +313,7 @@ class manager $profile_field = $this->type_collection[$ident_ary['data']['field_type']]; $value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']); - if ($value === NULL) + if ($value === null) { continue; } diff --git a/phpBB/phpbb/profilefields/type/type_date.php b/phpBB/phpbb/profilefields/type/type_date.php index 409c2e7be0..0de80f2baf 100644 --- a/phpBB/phpbb/profilefields/type/type_date.php +++ b/phpBB/phpbb/profilefields/type/type_date.php @@ -327,7 +327,6 @@ class type_date extends type_base return $current_value; } - return parent::get_excluded_options($key, $action, $current_value, $field_data, $step); } diff --git a/phpBB/phpbb/profilefields/type/type_dropdown.php b/phpBB/phpbb/profilefields/type/type_dropdown.php index 9a6545249d..b5b393d91b 100644 --- a/phpBB/phpbb/profilefields/type/type_dropdown.php +++ b/phpBB/phpbb/profilefields/type/type_dropdown.php @@ -273,7 +273,6 @@ class type_dropdown extends type_base return sizeof(explode("\n", $this->request->variable('lang_options', '', true))); } - return parent::get_excluded_options($key, $action, $current_value, $field_data, $step); } diff --git a/phpBB/phpbb/profilefields/type/type_int.php b/phpBB/phpbb/profilefields/type/type_int.php index 6ffc8fbea0..77a4f813da 100644 --- a/phpBB/phpbb/profilefields/type/type_int.php +++ b/phpBB/phpbb/profilefields/type/type_int.php @@ -87,7 +87,7 @@ class type_int extends type_base */ public function get_default_field_value($field_data) { - if ($field_data['field_default_value'] === '') + if ($field_data['field_default_value'] === '') { // We cannot insert an empty string into an integer column. return null; |