Installation rewritten to use more EL code

[mailer.git] / install.php

diff --git a/install.php b/install.php
index cdf507ee1c86f2f7600237dee6b4325aaca1a223..85abd0c042d7d88318d5a49fc83badcea69b7cfa 100644 (file)
--- a/install.php
+++ b/install.php
@@ -68,7 +68,7 @@ if (!isGetRequestParameterSet('page')) {
 setUsername('{--USERNAME_INSTALLER--}');
 
 // Already installed?
 setUsername('{--USERNAME_INSTALLER--}');
 
 // Already installed?

-if ((isInstalled()) && (getRequestParameter('page' != 'finished'))) {
+if ((isInstalled()) && (getRequestParameter('page') != 'finished')) {

        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if
        // Add fatal message
        addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}');
 } // END - if


@@ -83,7 +83,7 @@ runFilterChain('handle_fatal_errors');
 loadIncludeOnce('inc/install-inc.php');
 
 // Load main installation table
 loadIncludeOnce('inc/install-inc.php');
 
 // Load main installation table

-loadTemplate('install_main', false, getInstallerContent());
+loadTemplate('install_main');

 
 // Footer
 loadIncludeOnce('inc/footer.php');
 
 // Footer
 loadIncludeOnce('inc/footer.php');