diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-10 14:02:45 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-10 14:02:45 +0100 |
| commit | 40f3ae1d8fd9747afa7bf115a406f4b184146162 (patch) | |
| tree | 1b0e7091a79746feba1d577dffbb5f26baec8bc2 /phpBB/install/install_install.php | |
| parent | 29fdad396d62398f9544ebcfe5ac19cdaad5b120 (diff) | |
| parent | 195014867ae84fe04ec01c913e38bf1d435590f7 (diff) | |
| download | forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar.gz forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar.bz2 forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.tar.xz forums-40f3ae1d8fd9747afa7bf115a406f4b184146162.zip | |
Merge remote-tracking branch 'igorw/ticket/11183' into develop
* igorw/ticket/11183:
[ticket/11183] Remove $load_extensions and weird dl() calls
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 44 |
1 files changed, 9 insertions, 35 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index f922d50416..f80b8b5661 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -271,14 +271,6 @@ class install_install extends module 'S_LEGEND' => false, )); -/** -* Better not enabling and adding to the loaded extensions due to the specific requirements needed - if (!@extension_loaded('mbstring')) - { - can_load_dll('mbstring'); - } -*/ - $passed['mbstring'] = true; if (@extension_loaded('mbstring')) { @@ -382,17 +374,14 @@ class install_install extends module { if (!@extension_loaded($dll)) { - if (!can_load_dll($dll)) - { - $template->assign_block_vars('checks', array( - 'TITLE' => $lang['DLL_' . strtoupper($dll)], - 'RESULT' => '<strong style="color:red">' . $lang['UNAVAILABLE'] . '</strong>', + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['DLL_' . strtoupper($dll)], + 'RESULT' => '<strong style="color:red">' . $lang['UNAVAILABLE'] . '</strong>', - 'S_EXPLAIN' => false, - 'S_LEGEND' => false, - )); - continue; - } + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + continue; } $template->assign_block_vars('checks', array( @@ -873,22 +862,7 @@ class install_install extends module $written = false; // Create a list of any PHP modules we wish to have loaded - $load_extensions = array(); $available_dbms = get_available_dbms($data['dbms']); - $check_exts = array_merge(array($available_dbms[$data['dbms']]['MODULE']), $this->php_dlls_other); - - foreach ($check_exts as $dll) - { - if (!@extension_loaded($dll)) - { - if (!can_load_dll($dll)) - { - continue; - } - - $load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX; - } - } // Create a lock file to indicate that there is an install in progress $fp = @fopen($phpbb_root_path . 'cache/install_lock', 'wb'); @@ -902,7 +876,7 @@ class install_install extends module @chmod($phpbb_root_path . 'cache/install_lock', 0777); // Time to convert the data provided into a config file - $config_data = phpbb_create_config_file_data($data, $available_dbms[$data['dbms']]['DRIVER'], $load_extensions); + $config_data = phpbb_create_config_file_data($data, $available_dbms[$data['dbms']]['DRIVER']); // Attempt to write out the config file directly. If it works, this is the easiest way to do it ... if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && phpbb_is_writable($phpbb_root_path . 'config.' . $phpEx)) || phpbb_is_writable($phpbb_root_path)) @@ -1368,7 +1342,7 @@ class install_install extends module WHERE config_name = 'dbms_version'", ); - if (@extension_loaded('gd') || can_load_dll('gd')) + if (@extension_loaded('gd')) { $sql_ary[] = 'UPDATE ' . $data['table_prefix'] . "config SET config_value = 'phpbb_captcha_gd' |