diff options
| author | Gabriel Vazquez <leviatan21@phpbb.com> | 2009-06-20 19:23:02 +0000 |
|---|---|---|
| committer | Gabriel Vazquez <leviatan21@phpbb.com> | 2009-06-20 19:23:02 +0000 |
| commit | c3da86afc6be7183cdf320fe6ff0f6f5ffe46c28 (patch) | |
| tree | 12b475157e333fd3416c583ef4fc417d337f34e2 | |
| parent | 433de350c0fa2e1e09c23e6f5f29f118222d2df8 (diff) | |
| download | forums-c3da86afc6be7183cdf320fe6ff0f6f5ffe46c28.tar forums-c3da86afc6be7183cdf320fe6ff0f6f5ffe46c28.tar.gz forums-c3da86afc6be7183cdf320fe6ff0f6f5ffe46c28.tar.bz2 forums-c3da86afc6be7183cdf320fe6ff0f6f5ffe46c28.tar.xz forums-c3da86afc6be7183cdf320fe6ff0f6f5ffe46c28.zip | |
Fixed bug #45735
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9637 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_language.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 007964e6d5..7054f58022 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -124,6 +124,7 @@ <li>[Fix] Fix unicode words wrong censoring. (Bug #16555 - Patch by rxu)</li> <li>[Fix] Display coloured usernames in ACP groups management screens</li> <li>[Fix] Correct the width value for poll_center.gif omitted in imageset.cfg for subsilver2. (Bug #43005 - Patch by rxu)</li> + <li>[Fix] Correctly load complex language variable using acp_language (Bug #45735 - Patch by leviatan21)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 71970b4b50..3eee702b1d 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -1254,7 +1254,7 @@ $lang = array_merge($lang, array( $keys = func_get_args(); $non_static = array_shift($keys); - $value = array_shift($keys); + $value = utf8_normalize_nfc(array_shift($keys)); if (!$non_static) { |