1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10096] Fixed whitespace in functions.php.
  [ticket/10078] Avoid \n in strings given to echo for portability.
  [ticket/10092] Ignore overlength comment lines in commit-msg hook.
This commit is contained in:
Andreas Fischer
2011-03-14 13:58:57 +01:00
2 changed files with 5 additions and 4 deletions

View File

@@ -4258,7 +4258,7 @@ function phpbb_http_login($param)
if (!is_null($username) && is_null($password) && strpos($username, 'Basic ') === 0)
{
list($username, $password) = explode(':', base64_decode(substr($username, 6)), 2);
}
}
if (!is_null($username) && !is_null($password))
{