Index: config_default.php =================================================================== --- config_default.php (Revision 9481) +++ config_default.php (Arbeitskopie) @@ -441,7 +441,7 @@ * and both settings need to be adjusted for UTF-8 in order to work properly */ // If this value is -1 then the setting has not been modified in localconf.php -if ($TYPO3_CONF_VARS['BE']['forceCharset'] == '-1') { +if ($TYPO3_CONF_VARS['BE']['forceCharset'] == '-1' && $typo_db) { if (t3lib_div::compat_version('4.5')) { // 1) no option was set in localconf.php but the Update Wizard // was already used, so the admin is knowing what he's doing, @@ -454,7 +454,7 @@ 'Please proceed to the Update Wizard in the TYPO3 Install Tool to update your configuration.'); } -} elseif ($TYPO3_CONF_VARS['BE']['forceCharset'] !== 'utf-8') { +} elseif ($TYPO3_CONF_VARS['BE']['forceCharset'] !== 'utf-8' && $typo_db) { t3lib_div::deprecationLog('This TYPO3 installation does not enforce the UTF-8 character set.' . chr(10) . 'Everything other than UTF-8 is deprecated since TYPO3 4.5.' . chr(10) . 'The DB, its connection and TYPO3 should be migrated to UTF-8 therefore. Please check your setup.'); @@ -462,13 +462,13 @@ // If this value is -1 then the setting has not been modified in localconf.php -if ($TYPO3_CONF_VARS['SYS']['setDBinit'] == '-1') { +if ($TYPO3_CONF_VARS['SYS']['setDBinit'] == '-1' && $typo_db) { if (t3lib_div::compat_version('4.5')) { // 1) no option was set in localconf.php but the Update Wizard // was already used, so the admin is knowing what he's doing, // 2) a new installation with the new default value $TYPO3_CONF_VARS['SYS']['setDBinit'] = 'SET NAMES utf8'; - } elseif (TYPO3_enterInstallScript !== '1') { + } elseif (TYPO3_enterInstallScript !== '1' && $typo_db) { // The value needs to be set in localconf.php die('This installation was just upgraded to TYPO3 ' . TYPO3_branch . '. In this version, some default settings have changed.
' . 'You can continue to use your settings by specifying the former default values in localconf.php.
' . @@ -476,7 +476,7 @@ } // Only accept "SET NAMES utf8" for this setting. Otherwise, a deprecation warning will be issued. -} elseif (!preg_match('/SET NAMES utf8/', $TYPO3_CONF_VARS['SYS']['setDBinit'])) { +} elseif (!preg_match('/SET NAMES utf8/', $TYPO3_CONF_VARS['SYS']['setDBinit']) && $typo_db) { // TODO: Add a link to a website with more information here t3lib_div::deprecationLog('This TYPO3 installation is using the $TYPO3_CONF_VARS[\'SYS\'][\'setDBinit\'] property with the following value:' . chr(10) . $TYPO3_CONF_VARS['SYS']['setDBinit'] . chr(10) . chr(10) .