Index: branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php
===================================================================
diff -u -r6947 -r6991
--- branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php (.../install_over_kx.php) (revision 6947)
+++ branches/unlabeled/unlabeled-1.1.2/admin/install_over_kx.php (.../install_over_kx.php) (revision 6991)
@@ -14,10 +14,13 @@
require_once FULL_PATH.'/admin/install/install_lib.php';
- // 1. run in-portal install scripts & import language packs
+ echo 'In-Portal Installation
';
+
+ echo '1. Importing Database
';
RunSchemaFile($application->Conn, FULL_PATH.'/admin/install/inportal_schema.sql', 'dbconnection');
RunSQLFile($application->Conn, FULL_PATH.'/admin/install/inportal_data.sql', 'dbconnection');
-
+
+ echo '2. Writing config.php
';
if (!(isset($ini_file) && $ini_file)) {
$ini_file = FULL_PATH.'/config.php';
$ini_vars = inst_parse_portal_ini($ini_file, true);
@@ -29,9 +32,5 @@
set_ini_value('Module Versions', 'In-Portal', $mod_version);
save_values();
- // 2. run in-commerce install script
- $application->SetVar('skip_redirect', true);
- $application->SetVar('redirect', true); // simulate external call to install.php script
-
- include_once FULL_PATH.'/in-commerce/admin/install.php';
+ echo 'Done
';
?>
\ No newline at end of file