X-Git-Url: https://git.donarmstrong.com/?p=roundcube.git;a=blobdiff_plain;f=installer%2Findex.php;h=7ed52240ba9a631d3c6e061f09d3a085f232d752;hp=1c157da7f1e602b446829d76cc2120a9bdb84477;hb=a2dd2e41259a5e90016efcd7d083020b95e25527;hpb=fe4a852cd4335d3d2089b13e10d409fa2fa816d8
diff --git a/installer/index.php b/installer/index.php
index 1c157da..7ed5224 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,5 +1,33 @@
|
+ +-------------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('display_errors', 1);
@@ -41,7 +69,7 @@ if ($RCI->configured && ($RCI->getprop('enable_installer') || $_SESSION['allowin
header('Content-type: text/plain');
header('Content-Disposition: attachment; filename="'.$filename.'"');
-
+
$RCI->merge_config();
echo $RCI->create_config($_GET['_mergeconfig'], true);
exit;
@@ -68,14 +96,13 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
+
+
+
+
+
@@ -120,7 +147,7 @@ else {
- 
- 