diff options
Diffstat (limited to 'install.php')
| -rw-r--r-- | install.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/install.php b/install.php index acc96d3e6..767dd332f 100644 --- a/install.php +++ b/install.php @@ -58,6 +58,7 @@ $dokuwiki_hash = array( '2013-05-10' => '7b62b75245f57f122d3e0f8ed7989623', '2013-12-08' => '263c76af309fbf083867c18a34ff5214', '2014-05-05' => '263c76af309fbf083867c18a34ff5214', + 'devel' => 'b3ddc3f793eac8c135176e535054c00a', ); @@ -350,6 +351,16 @@ function store_data($d){ */ EOT; + // add any config options set by a previous installer + $preset = __DIR__.'/install.conf'; + if(file_exists($preset)){ + $output .= "# preset config options\n"; + $output .= file_get_contents($preset); + $output .= "\n\n"; + $output .= "# options selected in installer\n"; + @unlink($preset); + } + $output .= '$conf[\'title\'] = \''.addslashes($d['title'])."';\n"; $output .= '$conf[\'lang\'] = \''.addslashes($LC)."';\n"; $output .= '$conf[\'license\'] = \''.addslashes($d['license'])."';\n"; @@ -533,6 +544,11 @@ function check_functions(){ $ok = false; } + if(ini_get('mbstring.func_overload') != 0){ + $error[] = $lang['i_mbfuncoverload']; + $ok = false; + } + $funcs = explode(' ','addslashes call_user_func chmod copy fgets '. 'file file_exists fseek flush filesize ftell fopen '. 'glob header ignore_user_abort ini_get mail mkdir '. |