[TASK] Introduce $GLOBALS['TYPO3_CONF_VARS']['DB']['port']

[Packages/TYPO3.CMS.git] / typo3 / sysext / core / Classes / Core / Bootstrap.php

diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 7ac3041..7bf89e7 100644 (file)
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -255,7 +255,6 @@ class Bootstrap {
                        isset($GLOBALS['TYPO3_CONF_VARS']['DB']['extTablesDefinitionScript'])
                        ? $GLOBALS['TYPO3_CONF_VARS']['DB']['extTablesDefinitionScript']
                        : 'extTables.php');
-               unset($GLOBALS['TYPO3_CONF_VARS']['DB']);
                define('TYPO3_user_agent', 'User-Agent: ' . $GLOBALS['TYPO3_CONF_VARS']['HTTP']['userAgent']);
                return $this;
        }
@@ -690,8 +689,10 @@ class Bootstrap {
                $databaseConnection->setDatabasePassword(TYPO3_db_password);
 
                $databaseHost = TYPO3_db_host;
-               // Check if a port was specified
-               if (strpos($databaseHost, ':') > 0) {
+               if (isset($GLOBALS['TYPO3_CONF_VARS']['DB']['port'])) {
+                       $databaseConnection->setDatabasePort($GLOBALS['TYPO3_CONF_VARS']['DB']['port']);
+               } elseif (strpos($databaseHost, ':') > 0) {
+                       // @TODO: Find a way to handle this case in the install tool and drop this
                        list($databaseHost, $databasePort) = explode(':', $databaseHost);
                        $databaseConnection->setDatabasePort($databasePort);
                }