diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-06 03:33:16 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-06 03:33:16 +0100 |
| commit | 797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6 (patch) | |
| tree | ec0e46b4091f89f405d11473f84b616450b5f966 /phpBB/includes | |
| parent | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (diff) | |
| parent | 568fb83373361abb8c9f3886fee944a8d9e5f66d (diff) | |
| download | forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.gz forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.bz2 forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.tar.xz forums-797a9ed28cdf6fa9e42f92bfb0891dee7fc7d8b6.zip | |
Merge branch 'develop-olympus' into develop
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f58b29d232..8d31eaba7f 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.7'); +define('PHPBB_VERSION', '3.0.7-PL1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 38f910974a..917433a970 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -114,7 +114,7 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false) { $_v = null; } - set_var($_k, $_k, $sub_key_type); + set_var($_k, $_k, $sub_key_type, $multibyte); set_var($var[$k][$_k], $_v, $sub_type, $multibyte); } } |