Fixed bug #15968: Remove block mode from syntaxhighlighted code
authorSteffen Kamper <info@sk-typo3.de>
Tue, 12 Oct 2010 21:24:59 +0000 (21:24 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Tue, 12 Oct 2010 21:24:59 +0000 (21:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9049 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/info_pagetsconfig/class.tx_infopagetsconfig_webinfo.php
typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php

index 1439149..3f93722 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 2010-10-12  Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #15968: Remove block mode from syntaxhighlighted code
        * Added feature #15621: Feature: TYPO3 misses page-option to force SSL oder Non-SSL to page (Thanks to Steffen Ritter)
        * Update #15970: Update ExtJS to version 3.3.0
        * Follow-up to #15900: [Feature] Add SVG support for all browsers
index 1bafb58..51e2726 100755 (executable)
@@ -127,7 +127,7 @@ class tx_infopagetsconfig_webinfo extends t3lib_extobjbase {
 
                                        $tsparser = t3lib_div::makeInstance('t3lib_TSparser');
                                        $tsparser->lineNumberOffset=0;
-                                       $TScontent = $tsparser->doSyntaxHighlight(trim($v).chr(10),'',1);
+                                       $TScontent = $tsparser->doSyntaxHighlight(trim($v) .LF, '', 0);
 
                                        $lines[]='
                                                <tr><td nowrap="nowrap" class="bgColor5">'.$pTitle.'</td></tr>
index f1aad46..4878dca 100644 (file)
@@ -34,7 +34,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
        function init(&$pObj,$conf)     {
                parent::init($pObj,$conf);
 
-               $this->pObj->modMenu_setDefaultList.= ',ts_analyzer_checkLinenum,ts_analyzer_checkSyntax,ts_analyzer_checkSyntaxBlockmode';
+               $this->pObj->modMenu_setDefaultList.= ',ts_analyzer_checkLinenum,ts_analyzer_checkSyntax';
        }
 
        function modMenu()      {
@@ -47,7 +47,6 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                        'ts_analyzer_checkComments' => '1',
                        'ts_analyzer_checkCrop' => '1',
                        'ts_analyzer_checkSyntax' => '1',
-                       'ts_analyzer_checkSyntaxBlockmode' => '1',
                );
        }
 
@@ -146,8 +145,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                t3lib_BEfunc::getFuncCheck($this->pObj->id, "SET[ts_analyzer_checkCrop]", $this->pObj->MOD_SETTINGS["ts_analyzer_checkCrop"], '', $addParams, 'id="checkTs_analyzer_checkCrop"') .
                                '<label for="checkTs_analyzer_checkCrop">' . $GLOBALS['LANG']->getLL('cropLines', true) . '</label> '
                                :
-                               t3lib_BEfunc::getFuncCheck($this->pObj->id, "SET[ts_analyzer_checkSyntaxBlockmode]", $this->pObj->MOD_SETTINGS["ts_analyzer_checkSyntaxBlockmode"], '', $addParams, 'id="checkTs_analyzer_checkSyntaxBlockmode"') .
-                               '<label for="checkTs_analyzer_checkSyntaxBlockmode">' . $GLOBALS['LANG']->getLL('blockMode', true) . '</label> '
+                               ''
                        ) . '</div>';
 
 
@@ -173,7 +171,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                                        <tr>
                                                                <td><img src="clear.gif" width="3" height="1" alt="" /></td>
                                                                <td class="bgColor2"><table border="0" cellpadding="0" cellspacing="0" class="bgColor0" width="100%"><tr><td nowrap="nowrap">' .
-                                                               $tmpl->ext_outputTS(array($val), $this->pObj->MOD_SETTINGS['ts_analyzer_checkLinenum'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkComments'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkCrop'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkSyntax'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkSyntaxBlockmode']) .
+                                                               $tmpl->ext_outputTS(array($val), $this->pObj->MOD_SETTINGS['ts_analyzer_checkLinenum'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkComments'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkCrop'], $this->pObj->MOD_SETTINGS['ts_analyzer_checkSyntax'], 0) .
                                                                '</td></tr></table>
                                                                </td>
                                                        </tr>
@@ -210,7 +208,7 @@ class tx_tstemplateanalyzer extends t3lib_extobjbase {
                                                                <td><img src="clear.gif" width="3" height="1" alt="" /></td><td class="bgColor2"><strong>' . htmlspecialchars($tmpl->templateTitles[current($tmpl->clearList_setup)]) . '</strong></td></tr>
                                                        <tr>
                                                                <td><img src="clear.gif" width="3" height="1" alt="" /></td>
-                                                               <td class="bgColor2"><table border="0" cellpadding="0" cellspacing="0" class="bgColor0" width="100%"><tr><td nowrap="nowrap">'.$tmpl->ext_outputTS(array($val),$this->pObj->MOD_SETTINGS['ts_analyzer_checkLinenum'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkComments'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkCrop'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkSyntax'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkSyntaxBlockmode']).'</td></tr></table>
+                                                               <td class="bgColor2"><table border="0" cellpadding="0" cellspacing="0" class="bgColor0" width="100%"><tr><td nowrap="nowrap">'.$tmpl->ext_outputTS(array($val),$this->pObj->MOD_SETTINGS['ts_analyzer_checkLinenum'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkComments'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkCrop'],$this->pObj->MOD_SETTINGS['ts_analyzer_checkSyntax'], 0).'</td></tr></table>
                                                                </td>
                                                        </tr>
                                                ';