Fixed bug #14505: treeView implementation fails in adding title-tags to sprite icons...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7724 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 9d8d590..df43d24 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
        * Fixed bug #12604: fileNameASCIIPrefix got deprecated but is used in core (Thanks to Steffen Gebert)
        * Fixed bug #11437: New labels in the log module are hardcoded (Thanks to Andy Grunwald)
        * Fixed bug #14461: TCEforms: Use fieldsets for palettes instead of tables (Thanks to Jo Hasenau)
+       * Fixed bug #14505: treeView implementation fails in adding title-tags to sprite icons (Thanks to Steffen Ritter)
 
 2010-05-28  Christian Kuhn  <lolli@schwarzbu.ch>
 

diff --git a/t3lib/class.t3lib_treeview.php b/t3lib/class.t3lib_treeview.php
index ce91c48..14b0d91 100644 (file)
--- a/t3lib/class.t3lib_treeview.php
+++ b/t3lib/class.t3lib_treeview.php
@@ -658,7 +658,7 @@ class t3lib_treeView {
                } else {
 
                        $icon = t3lib_iconWorks::getSpriteIconForRecord($this->table, $row, array(
-                               'title' => ($this->showDefaultTitleAttribute ? 'UID: '. $row['uid'] : ''),
+                               'title' => ($this->showDefaultTitleAttribute ? 'UID: ' . $row['uid'] : $this->getTitleAttrib($row)),
                                'class' => 'c-recIcon'
                        ));
                

diff --git a/typo3/class.filelistfoldertree.php b/typo3/class.filelistfoldertree.php
index 88b176c..06282c0 100644 (file)
--- a/typo3/class.filelistfoldertree.php
+++ b/typo3/class.filelistfoldertree.php
@@ -80,10 +80,7 @@ class filelistFolderTree extends t3lib_folderTree {
         * @param       array           Data row for element.
         * @return      string          Page icon
         */
-       function wrapIcon($icon,&$row)  {
-
-                       // Add title attribute to input icon tag
-               $theFolderIcon = $this->addTagAttributes($icon,($this->titleAttrib ? $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"' : ''));
+       function wrapIcon($theFolderIcon, &$row)        {
 
                        // Wrap icon in click-menu link.
                if (!$this->ext_IconMode)       {

diff --git a/typo3/class.webpagetree.php b/typo3/class.webpagetree.php
index df0ca9b..8ec0692 100644 (file)
--- a/typo3/class.webpagetree.php
+++ b/typo3/class.webpagetree.php
@@ -90,7 +90,7 @@ class webPageTree extends t3lib_browseTree {
         * @param       array           Data row for element.
         * @return      string          Page icon
         */
-       function wrapIcon($icon,&$row)  {
+       function wrapIcon($thePageIcon, &$row)  {
                        // If the record is locked, present a warning sign.
                if ($lockInfo=t3lib_BEfunc::isRecordLocked('pages',$row['uid']))        {
                        $aOnClick = 'alert('.$GLOBALS['LANG']->JScharCode($lockInfo['msg']).');return false;';
@@ -99,9 +99,6 @@ class webPageTree extends t3lib_browseTree {
                                '</a>';
                } else $lockIcon = '';
 
-                       // Add title attribute to input icon tag
-               $thePageIcon = $this->addTagAttributes($icon, $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"');
-
                        // Wrap icon in click-menu link.
                if (!$this->ext_IconMode)       {
                        $thePageIcon = $GLOBALS['TBE_TEMPLATE']->wrapClickMenuOnIcon($thePageIcon,'pages',$row['uid'],0,'&bank='.$this->bank);