diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-06 02:13:31 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-06 02:13:31 +0100 |
| commit | 5d1d32a65bced82f068dbed497cc418eae5f4701 (patch) | |
| tree | e80ca9ee2576d3d428d05ba822f546f598c05af6 | |
| parent | 07fd27053040b1e3cd5a36f5d53b529caa3f695e (diff) | |
| parent | 9d005973b0b31077a81243d7573734bb63af2a27 (diff) | |
| download | forums-5d1d32a65bced82f068dbed497cc418eae5f4701.tar forums-5d1d32a65bced82f068dbed497cc418eae5f4701.tar.gz forums-5d1d32a65bced82f068dbed497cc418eae5f4701.tar.bz2 forums-5d1d32a65bced82f068dbed497cc418eae5f4701.tar.xz forums-5d1d32a65bced82f068dbed497cc418eae5f4701.zip | |
Merge branch 'bug/evil3/51555' into develop-olympus
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 0897328949..e54c4fd9bb 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -100,6 +100,7 @@ <li>[Fix] Add terminating semicolons to JavaScript code. (Bug #58085 - Patch by nn-)</li> <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>[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.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); } } |