diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-15 16:46:23 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-15 16:46:23 +0100 |
| commit | 512aee5124c04bed2b20f416796b30fdf1101c02 (patch) | |
| tree | 22084f735624a8ba8c939fbc4bfde37f7838a6dc /phpBB/includes/acp/acp_main.php | |
| parent | 08827fa733f0e84d91727d9feaeb057d5af0d163 (diff) | |
| parent | 39f8592312933eba903818f1a4de6bc5ac2b3dd0 (diff) | |
| download | forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar.gz forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar.bz2 forums-512aee5124c04bed2b20f416796b30fdf1101c02.tar.xz forums-512aee5124c04bed2b20f416796b30fdf1101c02.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10419] Reword the language strings
[ticket/10419] Reword some language strings, minor code changes
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
Diffstat (limited to 'phpBB/includes/acp/acp_main.php')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index a922ef570c..6304ff9d47 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -600,6 +600,17 @@ class acp_main $template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002)); } + if (extension_loaded('mbstring')) + { + $template->assign_vars(array( + 'S_MBSTRING_LOADED' => true, + 'S_MBSTRING_FUNC_OVERLOAD_FAIL' => (intval(@ini_get('mbstring.func_overload')) & (MB_OVERLOAD_MAIL | MB_OVERLOAD_STRING)), + 'S_MBSTRING_ENCODING_TRANSLATION_FAIL' => (@ini_get('mbstring.encoding_translation') != 0), + 'S_MBSTRING_HTTP_INPUT_FAIL' => (@ini_get('mbstring.http_input') != 'pass'), + 'S_MBSTRING_HTTP_OUTPUT_FAIL' => (@ini_get('mbstring.http_output') != 'pass'), + )); + } + // Fill dbms version if not yet filled if (empty($config['dbms_version'])) { |