Heacy rewrite/cleanup:

[mailer.git] / inc / install / install_page_finalize.php

diff --git a/inc/install/install_page_finalize.php b/inc/install/install_page_finalize.php
index 14c2a0cc155da430e12a2af42274fc42f573a748..faf29112a719416e36cc50224f9e26ddf8d61d3c 100644 (file)
--- a/inc/install/install_page_finalize.php
+++ b/inc/install/install_page_finalize.php
@@ -36,7 +36,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!isInstallationPhase())) {
+if ((!defined('__SECURITY')) || (!isInstaller())) {
        die();
 } // END - if
 
@@ -56,7 +56,7 @@ if ((isPostRequestElementSet('finalize')) && (!isInstalled())) {
                // Seems to work, also right database?
                if (sqlSelectDatabase($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === TRUE) {
                        // Check for dumps
-                       if ((!isFileReadable(postRequestElement('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestElement('spath') . 'install/menu-'.getLanguage().'.sql'))) {
+                       if (!isInstallerSqlsReadable(postRequestElement('spath'))) {
                                // Installation area not found
                                reportBug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
                                return;