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

Merge branch 'develop-olympus' into develop

Browse source
This commit is contained in:
Nils Adermann 2010-03-08 00:56:28 +01:00
commit 8d3cdd5dae
4 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
git-tools/hooks/prepare-commit-msg Executable file
View file

@ -0,0 +1,24 @@
#!/bin/sh
#
# A hook to add [$branch] to the beginning of a commit message
# if certain conditions are met.
#
# This is a prepare-commit-msg hook.
#
# To install this you can either copy or symlink it to
# $GIT_DIR/hooks, example:
#
# ln -s ../../git-tools/hooks/prepare-commit-msg \\
# .git/hooks/prepare-commit-msg
#
# Make sure it is executable.
# strip off ref: refs/heads/
branch="$(cat $GIT_DIR/HEAD | sed 's/ref: refs\/heads\///g')"
# * only run when normal commit is made (without -m or -F;
# not a merge, etc.)
# * also make sure the branch name begins with bug/
if [ "$2" = "" ] && [ $(echo "$branch" | grep -e '^bug/') ]; then
echo "[$branch] $(cat $1)" > "$1"
fi

2
phpBB/docs/CHANGELOG.html
View file

@ -101,6 +101,8 @@
<li>[Fix] Minor language fixes. (Bug #54855)</li> <li>[Fix] Minor language fixes. (Bug #54855)</li>
<li>[Fix] Parsing urls in signatures properly uses config settings. (Bug #57105)</li> <li>[Fix] Parsing urls in signatures properly uses config settings. (Bug #57105)</li>
<li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li>
<li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li>
<li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li>
<li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
</ul> </ul>

4
phpBB/includes/functions_compress.php
View file

@ -502,8 +502,8 @@ class compress_tar extends compress
function compress_tar($mode, $file, $type = '') function compress_tar($mode, $file, $type = '')
{ {
$type = (!$type) ? $file : $type; $type = (!$type) ? $file : $type;
$this->isgz = (strpos($type, '.tar.gz') !== false || strpos($type, '.tgz') !== false) ? true : false; $this->isgz = preg_match('#(\.tar\.gz|\.tgz)$#', $type);
$this->isbz = (strpos($type, '.tar.bz2') !== false) ? true : false; $this->isbz = preg_match('#\.tar\.bz2$#', $type);
$this->mode = &$mode; $this->mode = &$mode;
$this->file = &$file; $this->file = &$file;

2
phpBB/includes/session.php
View file

@ -83,7 +83,7 @@ class session
$query_string = trim(implode('&', $use_args)); $query_string = trim(implode('&', $use_args));
// basenamed page name (for example: index.php) // basenamed page name (for example: index.php)
$page_name = basename($script_name); $page_name = (substr($script_name, -1, 1) == '/') ? '' : basename($script_name);
$page_name = urlencode(htmlspecialchars($page_name)); $page_name = urlencode(htmlspecialchars($page_name));
// current directory within the phpBB root (for example: adm) // current directory within the phpBB root (for example: adm)