Project

General

Profile

Download (2.83 KB)

Bug #21501 » 12514_v3.diff

Administrator Admin, 2010-06-23 17:05

View differences:

t3lib/class.t3lib_db.php (working copy)
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),
typo3/sysext/install/mod/class.tx_install.php (working copy)
$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,
......
$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"
typo3/sysext/install/Resources/Private/Templates/GenerateConfigForm.html (working copy)
</li>
<!-- ###TEXTAREA### begin -->
<li class="t3-install-form-label-above">
<label for="###ID###" class="t3-install-strong">###KEY### = ###LABEL###</label>
<label for="###ID###" class="t3-install-strong" title="###VALUE###">###KEY### = ###LABEL###</label>
<textarea id="###ID###" rows="5" cols="60" name="###NAME###">###VALUE###</textarea>
</li>
<!-- ###TEXTAREA### end -->
(4-4/4)