diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-03-14 13:58:57 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-03-14 13:58:57 +0100 |
| commit | 7588b4352638a3bb7fa0cff7ef9d78c8668d0905 (patch) | |
| tree | cce5f5e727e7a727cd29300017b3ffeeee6a6152 /phpBB/includes | |
| parent | 089e3a9ff4cced1570a21d40c3cca215642ccfe5 (diff) | |
| parent | c75b299eb160fd330476ea91d5236558a3a59ed7 (diff) | |
| download | forums-7588b4352638a3bb7fa0cff7ef9d78c8668d0905.tar forums-7588b4352638a3bb7fa0cff7ef9d78c8668d0905.tar.gz forums-7588b4352638a3bb7fa0cff7ef9d78c8668d0905.tar.bz2 forums-7588b4352638a3bb7fa0cff7ef9d78c8668d0905.tar.xz forums-7588b4352638a3bb7fa0cff7ef9d78c8668d0905.zip | |
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.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index d2e0bcac47..36610b1be7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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)) { |