makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1997 from marc1706/ticket/12159

Browse source 
[ticket/12159] Fix codesniffer complaints due to profilefields and passwords

* marc1706/ticket/12159:
  [ticket/12159] Fix codesniffer complaints due to profilefields and passwords
This commit is contained in:
Andreas Fischer 2014-02-03 22:33:51 +01:00
commit d50b8df364
5 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_remind.php
View file

@ -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'])
{

2
phpBB/phpbb/profilefields/manager.php
View file

@ -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;
}

1
phpBB/phpbb/profilefields/type/type_date.php
View file

@ -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);
}

1
phpBB/phpbb/profilefields/type/type_dropdown.php
View file

@ -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);
}

2
phpBB/phpbb/profilefields/type/type_int.php
View file

@ -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;