[TASK] Remove deprecated cObj HTML
authorChristian Kuhn <lolli@schwarzbu.ch>
Sat, 21 Apr 2012 11:31:50 +0000 (13:31 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 21 Apr 2012 11:41:43 +0000 (13:41 +0200)
Deprecated since 4.6 and can be removed in 6.0

Change-Id: Id7e77a26d2681480553b86fadfa147cf0f1ffcd2
Resolves: #36402
Releases: 6.0
Reviewed-on: http://review.typo3.org/10670
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/cms/ext_autoload.php
typo3/sysext/cms/tslib/class.tslib_content.php
typo3/sysext/cms/tslib/content/class.tslib_content_html.php [deleted file]

index 25e9f6d..0456533 100644 (file)
@@ -56,7 +56,6 @@ return array(
        'tslib_content_form' => PATH_tslib . 'content/class.tslib_content_form.php',
        'tslib_content_hierarchicalmenu' => PATH_tslib . 'content/class.tslib_content_hierarchicalmenu.php',
        'tslib_content_horizontalruler' => PATH_tslib . 'content/class.tslib_content_horizontalruler.php',
-       'tslib_content_html' => PATH_tslib . 'content/class.tslib_content_html.php',
        'tslib_content_image' => PATH_tslib . 'content/class.tslib_content_image.php',
        'tslib_content_imageresource' => PATH_tslib . 'content/class.tslib_content_imageresource.php',
        'tslib_content_imagetext' => PATH_tslib . 'content/class.tslib_content_imagetext.php',
index 945e6a7..d9b9560 100644 (file)
@@ -627,7 +627,6 @@ class tslib_cObj {
         */
        public function getContentObject($name) {
                $classMapping = array(
-                       'HTML' => 'Html',
                        'TEXT' => 'Text',
                        'CASE' => 'Case',
                        'CLEARGIF' => 'ClearGif',
@@ -686,9 +685,11 @@ class tslib_cObj {
         *
         * @param       array           array of TypoScript properties
         * @return      string          Output
+        * @deprecated since 6.0, will be removed in two versions
         */
        function HTML($conf) {
-               return $this->getContentObject('HTML')->render($conf);
+               t3lib_div::logDeprecatedFunction();
+               return '';
        }
 
        /**
diff --git a/typo3/sysext/cms/tslib/content/class.tslib_content_html.php b/typo3/sysext/cms/tslib/content/class.tslib_content_html.php
deleted file mode 100644 (file)
index 11de6c2..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2010-2011 Xavier Perseguers <typo3@perseguers.ch>
- *  (c) 2010-2011 Steffen Kamper <steffen@typo3.org>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the textfile GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-
-/**
- * Contains HTML class object.
- *
- * @author Xavier Perseguers <typo3@perseguers.ch>
- * @author Steffen Kamper <steffen@typo3.org>
- * @deprecated since TYPO3 4.6, will be removed in TYPO3 4.8 - use TEXT from now on
- */
-class tslib_content_Html extends tslib_content_Abstract {
-
-       /**
-        * Rendering the cObject, HTML
-        *
-        * @param       array           Array of TypoScript properties
-        * @return      string          Output
-        */
-       public function render($conf = array()) {
-               t3lib_div::logDeprecatedFunction();
-
-               $theValue = $conf['value'];
-
-               if (isset($conf['value.'])) {
-                       $theValue = $this->cObj->stdWrap($theValue, $conf['value.']);
-               }
-
-               if (isset($conf['stdWrap.'])) {
-                       $theValue = $this->cObj->stdWrap($theValue, $conf['stdWrap.']);
-               }
-
-               return $theValue;
-       }
-}
-
-
-if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_html.php'])) {
-       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['tslib/content/class.tslib_content_html.php']);
-}
-
-?>
\ No newline at end of file