diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-08 00:56:28 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-08 00:56:28 +0100 |
| commit | 8d3cdd5dae42ebec0e4f66ef3e991984054645e7 (patch) | |
| tree | 5a13d1fd9d20d225716388e62dc95252deeb581e | |
| parent | 9d28bcd30812e0706536988cb6e43118f3dc5851 (diff) | |
| parent | 9f8d258de484bebbe481213c66355f02164afb1f (diff) | |
| download | forums-8d3cdd5dae42ebec0e4f66ef3e991984054645e7.tar forums-8d3cdd5dae42ebec0e4f66ef3e991984054645e7.tar.gz forums-8d3cdd5dae42ebec0e4f66ef3e991984054645e7.tar.bz2 forums-8d3cdd5dae42ebec0e4f66ef3e991984054645e7.tar.xz forums-8d3cdd5dae42ebec0e4f66ef3e991984054645e7.zip | |
Merge branch 'develop-olympus' into develop
| -rwxr-xr-x | git-tools/hooks/prepare-commit-msg | 24 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_compress.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
4 files changed, 29 insertions, 3 deletions
diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg new file mode 100755 index 0000000000..284354081e --- /dev/null +++ b/git-tools/hooks/prepare-commit-msg @@ -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 diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e54c4fd9bb..7b8d8f63f2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -101,6 +101,8 @@ <li>[Fix] Minor language fixes. (Bug #54855)</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] 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> </ul> diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index f17c780a65..f422eaa8c1 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -502,8 +502,8 @@ class compress_tar extends compress function compress_tar($mode, $file, $type = '') { $type = (!$type) ? $file : $type; - $this->isgz = (strpos($type, '.tar.gz') !== false || strpos($type, '.tgz') !== false) ? true : false; - $this->isbz = (strpos($type, '.tar.bz2') !== false) ? true : false; + $this->isgz = preg_match('#(\.tar\.gz|\.tgz)$#', $type); + $this->isbz = preg_match('#\.tar\.bz2$#', $type); $this->mode = &$mode; $this->file = &$file; diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index b3f9edb0cf..2e4e7ccd34 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -83,7 +83,7 @@ class session $query_string = trim(implode('&', $use_args)); // 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)); // current directory within the phpBB root (for example: adm) |