Wrapper introduced, renaming to the naming convention:

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

diff --git a/inc/install-inc.php b/inc/install-inc.php
index 4958a31f53c47e364c9ba2f198b2bd3af9dd7f33..18af33b97dc2d136af0e86564ce398ec2efe379f 100644 (file)
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -51,7 +51,7 @@ loadExtension('timezone', 'test');
 setConfigEntry('timezone', 'Europe/Berlin');
 
 // And init timezone
-FILTER_INIT_TIMEZONE();
+FILTER_INIT_TIMEZONE(array());
 
 // Init variables
 $GLOBALS['install_mysql'] = array();
@@ -105,7 +105,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                        if (empty($GLOBALS['install_mysql']['dbase']))  $GLOBALS['install_mysql']['dbase']  = 'your_database';
                        if (empty($GLOBALS['install_mysql']['login']))  $GLOBALS['install_mysql']['login']  = 'your_login';
                        if (empty($GLOBALS['install_mysql']['host']))   $GLOBALS['install_mysql']['host']   = 'localhost';
-                       if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mxchange';
+                       if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer';
                        if (empty($GLOBALS['install_mysql']['type']))   $GLOBALS['install_mysql']['type']   = 'MyISAM';
                        if (ifFatalErrorsDetected()) {
                                addToInstallContent('<div class="install_fatal"><ul>');
@@ -200,9 +200,11 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                // You have submitted data then we have to reset the SQLs
                                initSqls();
 
-                               // Restore PHPs error handler to prevent ours to handle errors,
-                               // e.g. failed connection attempts. We want to handle them on
-                               // our own.
+                               /*
+                                * Restore PHPs error handler to prevent ours to handle errors,
+                                * e.g. failed connection attempts. We want to handle them on
+                                * our own.
+                                */
                                restore_error_handler();
 
                                // Connect to database server
@@ -215,7 +217,7 @@ if ((!isInstalled()) || (!isAdminRegistered())) {
                                                // Check for dumps
                                                if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) {
                                                        // Installation area not found
-                                                       addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}');
+                                                       debug_report_bug(__FILE__, __LINE__, 'SQL dumps not found. Please extract ALL files from the archive or checkout all files out from SVN.');
                                                        return;
                                                } // END - if