mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 03:29:23 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
commit 7588b43526
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-tools/hooks/commit-msg
View File

@ -66,12 +66,13 @@ then
exit 0
fi
msg=$(grep -nE '.{81,}' "$1");
msg=$(grep -v '^#' "$1" |grep -nE '.{81,}')
if [ $? -eq 0 ]
then
echo "The following lines are greater than 80 characters long:\n" >&2;
echo $msg >&2;
echo "The following lines are greater than 80 characters long:" >&2;
echo >&2
echo "$msg" >&2;
quit $ERR_LENGTH;
fi

2
phpBB/includes/functions.php
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))
{