Index: t3lib/class.t3lib_db.php =================================================================== --- t3lib/class.t3lib_db.php (revision 8041) +++ t3lib/class.t3lib_db.php (working copy) @@ -1114,8 +1114,8 @@ 4 ); } else { - $setDBinit = t3lib_div::trimExplode(LF, $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit'], TRUE); - foreach ($setDBinit as $v) { + $setDBinit = t3lib_div::trimExplode(LF, str_replace("' . LF . '", LF, $GLOBALS['TYPO3_CONF_VARS']['SYS']['setDBinit']), TRUE); + foreach ($setDBinit as $v) { if (mysql_query($v, $this->link) === FALSE) { t3lib_div::sysLog('Could not initialize DB connection with query "' . $v . '": ' . mysql_error($this->link), Index: typo3/sysext/install/mod/class.tx_install.php =================================================================== --- typo3/sysext/install/mod/class.tx_install.php (revision 8041) +++ typo3/sysext/install/mod/class.tx_install.php (working copy) @@ -1973,8 +1973,9 @@ $textAreaMarkers = array( 'id' => $k . '-' . $vk, 'name' => 'TYPO3_INSTALL[extConfig]['.$k.']['.$vk.']', - 'value' => $value + 'value' => str_replace(array("'.chr(10).'", "' . LF . '"), array(LF, LF), $value) ); + $value = str_replace(array("'.chr(10).'", "' . LF . '"), array(' | ', ' | '), $value); // Fill the markers in the subpart $textAreaSubpart = t3lib_parsehtml::substituteMarkerArray( $textAreaSubpart, @@ -2082,9 +2083,9 @@ $description = trim($commentArr[1][$k][$vk]); if (preg_match('/^string \(textarea\)/i', $description)) { // Force Unix linebreaks in textareas - $value = str_replace(chr(13),'',$value); + $value = str_replace(chr(13), '', $value); // Preserve linebreaks - $value = str_replace(chr(10),"'.chr(10).'",$value); + $value = str_replace(LF, "' . LF . '", $value); } if (preg_match('/^boolean/i', $description)) { // When submitting settings in the Install Tool, values that default to "false" or "true" Index: typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html =================================================================== --- typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html (revision 8041) +++ typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html (working copy) @@ -17,7 +17,7 @@
  • - +