diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:38:04 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-14 17:38:04 +0200 |
| commit | 7ccb19fa001cb0f76499fd19256e60df382c6d2a (patch) | |
| tree | e556f0887841680da57c308fb3e371c076345b1d /phpBB/phpbb | |
| parent | 89f7fc63e8713aa6c332dce5e77df6112af8d635 (diff) | |
| parent | 8f5d76111243fae8d2926037e8fef0cbc97802c7 (diff) | |
| download | forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.gz forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.bz2 forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.tar.xz forums-7ccb19fa001cb0f76499fd19256e60df382c6d2a.zip | |
Merge branch 'prep-release-3.1.5' into 3.1.x
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v315.php | 31 | ||||
| -rw-r--r-- | phpBB/phpbb/user.php | 2 |
2 files changed, 32 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v31x/v315.php b/phpBB/phpbb/db/migration/data/v31x/v315.php new file mode 100644 index 0000000000..778cdf717e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v315.php @@ -0,0 +1,31 @@ +<?php +/** +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited <https://www.phpbb.com> +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v31x; + +class v315 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v315rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.5')), + ); + } +} diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 882e9cef26..3bc1af2899 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -637,7 +637,7 @@ class user extends \phpbb\session $lang_path = $this->lang_path; } - if (strpos($phpbb_root_path . $filename, $lang_path . $this->lang_name . '/') === 0) + if (strpos($phpbb_root_path . $filename, $lang_path) === 0) { $language_filename = $phpbb_root_path . $filename; } |