Migration of stelzi's commit 1022 with some changes so we have a nicer code. See...

[mailer.git] / install.php

diff --git a/install.php b/install.php
index d632be4e43ead547dd2e729d3660306079fab085..b1ad8f173626a96ce458bd4f54763af8368065a2 100644 (file)
--- a/install.php
+++ b/install.php
@@ -65,22 +65,22 @@ $GLOBALS['module'] = 'install';
 // Load config file
 require('inc/config-global.php');
 
-// Header
-loadInclude('inc/header.php');
-
-// Reload page to page=welcome when it is not specified
-if (!REQUEST_ISSET_GET('page')) {
-       redirectToUrl('install.php?page=welcome');
-} // END - if
-
 // Already installed?
-if ((isInstalled()) && (isAdminRegistered())) {
+if (isInstalled()) {
        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
 } // END - if
 
 // Does something goes wrong?
 if (getTotalFatalErrors() == 0) {
+       // Reload page to page=welcome when it is not specified
+       if (!REQUEST_ISSET_GET('page')) {
+               redirectToUrl('install.php?page=welcome');
+       } // END - if
+
+       // Load header here
+       loadIncludeOnce('inc/header.php');
+
        // Add main installation table
        LOAD_TEMPLATE('install_header');
 
@@ -89,10 +89,13 @@ if (getTotalFatalErrors() == 0) {
 
        // Close main installation table
        LOAD_TEMPLATE('install_footer');
-}
 
-// Footer
-loadInclude('inc/footer.php');
+       // Footer
+       loadIncludeOnce('inc/footer.php');
+} else {
+       // Output fatal messages
+       loadInclude('inc/fatal_errors.php');
+}
 
 //
 ?>