Typo and SVN revision fixed

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index c852bdd5d71685ef6ae1403980d940f999cdae23..b1aeb83b02054f9accd16ad8604953a17712c9ca 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -268,7 +268,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
 
        case "finalize": // Write captured data to files
                if ((REQUEST_ISSET_POST(('finalize'))) && (!isInstalled())) {
-                       // You have submitted data then we have to reset the fatal messages
+                       // You have submitted data then we have to reset the SQLs
                        INIT_SQLS();
 
                        // Connect to MySQL server
@@ -286,6 +286,11 @@ if ((!isInstalled()) || (!isAdminRegistered()))
                                                                // Read the file
                                                                $fileContent = READ_FILE($FQFN, true);
 
+                                                               // Replace the {!prefix!} with actual one
+                                                               while (strpos($fileContent, "{!prefix!}") !== false) {
+                                                                       $fileContent = str_replace("{!prefix!}", $mysql['prefix'], $fileContent);
+                                                               } // END - while
+
                                                                // And split it up against ;\n ...
                                                                SET_SQLS(merge_array(GET_SQLS(), explode(";\n", $fileContent)));
                                                        } else {
@@ -302,7 +307,7 @@ if ((!isInstalled()) || (!isAdminRegistered()))
                                                } // END - if
 
                                                // Now run all queries through and try to keep out empty or comment queries
-                                               RUN_FILTER('run_sqls', array('dry_run' => false));
+                                               runFilterChain('run_sqls');
 
                                                // Ok, all done. So we can write the config data to the php files
                                                if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", REQUEST_POST('spath'), 0);