Fixed bug #16703: TCEForms->getIconHTML() does not resolve back paths before checking...

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

diff --git a/ChangeLog b/ChangeLog
index 78fcca7..dab8feb 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-17  Jeff Segars  <jeff@webempoweredchurch.org>
+
+       * Fixed bug #16703: TCEForms->getIconHTML() does not resolve back paths before checking static files
+

 2010-12-17  Benjamin Mack  <benni@typo3.org>
 
        * Fixed bug #9002: exec_SELECTquery() has wrong documentation: Third parameter (WHERE clause) is NOT optional
 2010-12-17  Benjamin Mack  <benni@typo3.org>
 
        * Fixed bug #9002: exec_SELECTquery() has wrong documentation: Third parameter (WHERE clause) is NOT optional

diff --git a/t3lib/class.t3lib_tceforms.php b/t3lib/class.t3lib_tceforms.php
index e55c68c..a25db79 100644 (file)
--- a/t3lib/class.t3lib_tceforms.php
+++ b/t3lib/class.t3lib_tceforms.php
@@ -4161,7 +4161,7 @@ class t3lib_TCEforms {
         */
        protected function getIconHtml($icon, $alt = '', $title = '') {
                $iconArray = $this->getIcon($icon);
         */
        protected function getIconHtml($icon, $alt = '', $title = '') {
                $iconArray = $this->getIcon($icon);

-               if (is_file(PATH_typo3 . $iconArray[0])) {
+               if (is_file(t3lib_div::resolveBackPath(PATH_typo3 . $iconArray[0]))) {

                        return '<img src="' . $iconArray[0] . '" alt="' . $alt . '" ' . ($title ? 'title="' . $title . '"' : '') . ' />';
                } else {
                        return t3lib_iconWorks::getSpriteIcon($icon, array('alt'=> $alt, 'title'=> $title));
                        return '<img src="' . $iconArray[0] . '" alt="' . $alt . '" ' . ($title ? 'title="' . $title . '"' : '') . ' />';
                } else {
                        return t3lib_iconWorks::getSpriteIcon($icon, array('alt'=> $alt, 'title'=> $title));