Fixed bug #15798: Deprecate some old functions in typo3/template.php
authorBenni Mack <benni.mack@typo3.org>
Thu, 14 Oct 2010 10:20:20 +0000 (10:20 +0000)
committerBenni Mack <benni.mack@typo3.org>
Thu, 14 Oct 2010 10:20:20 +0000 (10:20 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9059 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/backend.php
typo3/classes/class.typo3logo.php
typo3/sysext/cms/layout/db_new_content_el.php
typo3/sysext/wizard_crpages/class.tx_wizardcrpages_webfunc_2.php
typo3/template.php

index dce4058..67367ec 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-10-14  Benjamin Mack  <benni@typo3.org>
 
+       * Fixed bug #15798: Deprecate some old functions in typo3/template.php
        * Fixed bug #15801: Deprecate t3lib_div::rm_endcomma
        * Fixed bug #103: No Plain-text List Option
 
index 0036924..4c64393 100644 (file)
@@ -583,7 +583,7 @@ class TYPO3backend {
         * @return      string  HTML code snippet to display the TYPO3 logo
         */
        protected function getLogo() {
-               $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="'.$GLOBALS['TBE_TEMPLATE']->thisBlur().'">'.
+               $logo = '<a href="http://www.typo3.com/" target="_blank">'.
                                '<img'.t3lib_iconWorks::skinImg('','gfx/alt_backend_logo.gif','width="117" height="32"').' title="TYPO3 Content Management Framework" alt="" />'.
                                '</a>';
 
@@ -592,7 +592,7 @@ class TYPO3backend {
                        if(substr($GLOBALS['TBE_STYLES']['logo'], 0, 3) == '../')       {
                                $imgInfo = @getimagesize(PATH_site.substr($GLOBALS['TBE_STYLES']['logo'], 3));
                        }
-                       $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="'.$GLOBALS['TBE_TEMPLATE']->thisBlur().'">'.
+                       $logo = '<a href="http://www.typo3.com/" target="_blank">'.
                                '<img src="'.$GLOBALS['TBE_STYLES']['logo'].'" '.$imgInfo[3].' title="TYPO3 Content Management Framework" alt="" />'.
                                '</a>';
                }
index 71e30df..2e1303c 100644 (file)
@@ -63,14 +63,14 @@ class TYPO3Logo {
                $imgInfo = getimagesize(PATH_site . TYPO3_mainDir . $logoFile);
 
 
-               $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="'.$GLOBALS['TBE_TEMPLATE']->thisBlur().'">'.
+               $logo = '<a href="http://www.typo3.com/" target="_blank">'.
                                '<img'.t3lib_iconWorks::skinImg('', $logoFile, $imgInfo[3]).' title="TYPO3 Content Management System" alt="" />'.
                                '</a>';
 
                        // overwrite with custom logo
                if($GLOBALS['TBE_STYLES']['logo'])      {
                        $imgInfo = @getimagesize(t3lib_div::resolveBackPath(PATH_typo3 . $GLOBALS['TBE_STYLES']['logo'], 3));
-                       $logo = '<a href="http://www.typo3.com/" target="_blank" onclick="' . $GLOBALS['TBE_TEMPLATE']->thisBlur() . '">' .
+                       $logo = '<a href="http://www.typo3.com/" target="_blank">' .
                                '<img src="' . $GLOBALS['TBE_STYLES']['logo'] . '" ' . $imgInfo[3] . ' title="TYPO3 Content Management System" alt="" />' .
                                '</a>';
                }
index a77b4e5..309e26a 100644 (file)
@@ -309,11 +309,11 @@ class SC_db_new_content_el {
                                                // Radio button:
                                        $oC = "document.editForm.defValues.value=unescape('".rawurlencode($wInfo['params'])."');goToalt_doc();".(!$this->onClickEvent?"window.location.hash='#sel2';":'');
                                        $content .= $this->elementWrapper['wizardPart'][0] .
-                                               '<input type="radio" name="tempB" value="' . htmlspecialchars($k) . '" onclick="' . htmlspecialchars($this->doc->thisBlur().$oC) . '" />' .
+                                               '<input type="radio" name="tempB" value="' . htmlspecialchars($k) . '" onclick="' . htmlspecialchars($oC) . '" />' .
                                                $this->elementWrapper['wizardPart'][1];
 
                                                // Onclick action for icon/title:
-                                       $aOnClick = 'document.getElementsByName(\'tempB\')['.$cc.'].checked=1;'.$this->doc->thisBlur().$oC.'return false;';
+                                       $aOnClick = 'document.getElementsByName(\'tempB\')['.$cc.'].checked=1;'.$oC.'return false;';
 
                                                // Icon:
                                        $iInfo = @getimagesize($wInfo['icon']);
index 9d0c4c7..d0f4b9a 100755 (executable)
@@ -258,7 +258,7 @@ class tx_wizardcrpages_webfunc_2 extends t3lib_extobjbase {
         * @return      string          HTML code for a help-bubble image.
         */
        function helpBubble()   {
-               return '<img src="'.$GLOBALS['BACK_PATH'].'gfx/helpbubble.gif" width="14" height="14" hspace="2" align="top"'.$this->pObj->doc->helpStyle().' alt="" />';
+               return '<img src="'.$GLOBALS['BACK_PATH'].'gfx/helpbubble.gif" width="14" height="14" hspace="2" align="top" alt="" />';
        }
 
        /**
index cfe8fc1..0447405 100644 (file)
@@ -418,8 +418,10 @@ class template {
         * Use this in links to remove the underlining after being clicked
         *
         * @return      string
+        * @deprecated since TYPO3 4.5, will be removed in TYPO3 4.7
         */
        function thisBlur()     {
+               t3lib_div::logDeprecatedFunction();
                return ($GLOBALS['CLIENT']['FORMSTYLE']?'this.blur();':'');
        }
 
@@ -428,8 +430,10 @@ class template {
         * Use for <a>-links to help texts
         *
         * @return      string
+        * @deprecated since TYPO3 4.5, will be removed in TYPO3 4.7
         */
        function helpStyle()    {
+               t3lib_div::logDeprecatedFunction();
                return $GLOBALS['CLIENT']['FORMSTYLE'] ? ' style="cursor:help;"':'';
        }