X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=d3c8afd80de9953d1bb5d211368738cba41b7527;hp=fd68e77b913ebfef04439eaa1b479facf35b4e1b;hb=48affba7561e342c1f5691793dd96edadf4085d4;hpb=b6a6d0a2c0a0f274b937eb75c413db8fa9b44f9c

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index fd68e77b91..d3c8afd80d 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verbindet zu Ihrer Datenbank                     *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,11 +48,11 @@ foreach ( array(
 		'request',
 		'session',
 		'code',
+		'pool',
 		'language',
 		'sql',
 		'expression',
 		'filter',
-		'revision',
 		'extensions') as $lib) {
 
 	// Add it
@@ -96,14 +91,11 @@ if (!isset($GLOBALS['__header_sent'])) {
 // Init fatal messages
 initFatalMessages();
 
-// Init repository data sub-system
-initRepositoryData();
-
 // Enable HTML templates by default
 enableTemplateHtml();
 
 // Are we in installation phase?
-if ((!isInstalling()) && (!isInstallationPhase())) {
+if ((!isInstaller()) && (isInstalled())) {
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
@@ -118,6 +110,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
 	// Initialize SQL link
 	initSqlLink();
+
+	// Init session
+	initSession();
 } else {
 	// Default output is 'direct' for HTML output
 	setConfigEntry('OUTPUT_MODE', 'direct');
@@ -129,7 +124,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	} // END - if
 
 	// CFG: DATABASE-TYPE
-	setConfigEntry('_DB_TYPE', 'mysql3');
+	setConfigEntry('_DB_TYPE', 'mysql');
 
 	// Set link as down
 	unsetSqlLinkUp(__FILE__, __LINE__);
@@ -140,9 +135,12 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Init message system
 	initMessages();
 
+	// Init session
+	initSession();
+
 	// Include more
-	foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
-		// Load the include
+	foreach (array('databases', 'install-functions', 'load_config', 'load_cache') as $inc) {
+		// Load include file
 		loadIncludeOnce('inc/' . $inc . '.php');
 	} // END - foreach