diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-11-27 21:24:15 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-11-27 21:24:15 +0000 |
| commit | f56c1a85d3582b7052bbbc7b8cca1425651b4933 (patch) | |
| tree | 2854bf93440a2554d418bbd224bfd7849d4ce871 /phpBB/install | |
| parent | 49e8de0ca281cc2f73040157b5957f5d9ade18a7 (diff) | |
| download | forums-f56c1a85d3582b7052bbbc7b8cca1425651b4933.tar forums-f56c1a85d3582b7052bbbc7b8cca1425651b4933.tar.gz forums-f56c1a85d3582b7052bbbc7b8cca1425651b4933.tar.bz2 forums-f56c1a85d3582b7052bbbc7b8cca1425651b4933.tar.xz forums-f56c1a85d3582b7052bbbc7b8cca1425651b4933.zip | |
#5640
git-svn-id: file:///svn/phpbb/trunk@6676 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rwxr-xr-x | phpBB/install/install_install.php | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 8d06564e3c..1f2f10caec 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -129,7 +129,7 @@ class install_install extends module 'BODY' => $lang['REQUIREMENTS_EXPLAIN'], )); - $passed = array('php' => false, 'db' => false, 'files' => false); + $passed = array('php' => false, 'db' => false, 'files' => false, 'pcre' => false); // Test for basic PHP settings $template->assign_block_vars('checks', array( @@ -186,6 +186,26 @@ class install_install extends module 'S_LEGEND' => false, )); + // Check for PCRE UTF-8 support + if (preg_match('//u', '')) + { + $passed['pcre'] = true; + $result = '<b style="color:green">' . $lang['YES'] . '</b>'; + } + else + { + $result = '<b style="color:red">' . $lang['NO'] . '</b>'; + } + + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['PCRE_UTF_SUPPORT'], + 'TITLE_EXPLAIN' => $lang['PCRE_UTF_SUPPORT_EXPLAIN'], + 'RESULT' => $result, + + 'S_EXPLAIN' => true, + 'S_LEGEND' => false, + )); + // Test for available database modules $template->assign_block_vars('checks', array( 'S_LEGEND' => true, @@ -395,8 +415,8 @@ class install_install extends module // And finally where do we want to go next (well today is taken isn't it :P) $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : ''; - $url = ($passed['php'] && $passed['db'] && $passed['files']) ? $this->p_master->module_url . "?mode=$mode&sub=database&language=$language" : $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language "; - $submit = ($passed['php'] && $passed['db'] && $passed['files']) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; + $url = ($passed['php'] && $passed['db'] && $passed['files'] && $passed['pcre']) ? $this->p_master->module_url . "?mode=$mode&sub=database&language=$language" : $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language "; + $submit = ($passed['php'] && $passed['db'] && $passed['files'] && $passed['pcre']) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; $template->assign_vars(array( |