From: Steffen Gebert <steffen.gebert@typo3.org>
Date: Mon, 23 Aug 2010 22:45:06 +0000 (+0000)
Subject: Fixed bug #13623: Deprecation log for IMAGE.alttext does not work (Thanks to Sebastia... 
X-Git-Tag: TYPO3_4-5-0alpha1~20
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/d3b4afec1f04079815116e90ee3276bb7edccb32

Fixed bug #13623: Deprecation log for IMAGE.alttext does not work (Thanks to Sebastian Michaelsen)

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

diff --git a/ChangeLog b/ChangeLog
index de53d234f585..b7a188a5c3ed 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2010-08-24 Steffen Gebert  <steffen@steffen-gebert.de>
 
 	* Added feature #15454: Provide a reason for logDeprecatedTypoScript()
+	* Fixed bug #13623: Deprecation log for IMAGE.alttext does not work (Thanks to Sebastian Michaelsen)
 
 2010-08-23 Steffen Gebert  <steffen@steffen-gebert.de>
 
diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index b89df1da435d..f3c0e1044b44 100644
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -3126,13 +3126,19 @@ class tslib_cObj {
 			$info[3] = t3lib_div::png_to_gif_by_imagemagick($info[3]);
 			$GLOBALS['TSFE']->imagesOnPage[]=$info[3];		// This array is used to collect the image-refs on the page...
 
-			if (!strlen($conf['altText']) && !is_array($conf['altText.']))	{	// Backwards compatible:
-				if ($conf['altText'] || $conf['altText.']) {
-					$GLOBALS['TSFE']->logDeprecatedTyposcript('IMAGE.alttext');
+				// Backwards compatibility if altText is not set and alttext is set
+				// @deprecated since TYPO3 4.3, will be removed in TYPO3 4.6
+			if (strlen($conf['alttext']) || is_array($conf['alttext.'])) {
+				$GLOBALS['TSFE']->logDeprecatedTyposcript(
+					'IMAGE.alttext',
+					'use IMAGE.altText instead - src: ' . $info[3] . ' - original image: ' . $info['origFile']
+				);
+				if (!strlen($conf['altText']) && !is_array($conf['altText.'])) {
+					$conf['altText'] = $conf['alttext'];
+					$conf['altText.'] = $conf['alttext.'];
 				}
-				$conf['altText'] = $conf['alttext'];
-				$conf['altText.'] = $conf['alttext.'];
 			}
+			
 			$altParam = $this->getAltParam($conf);
 			$theValue = '<img src="'.htmlspecialchars($GLOBALS['TSFE']->absRefPrefix.t3lib_div::rawUrlEncodeFP($info[3])).'" width="'.$info[0].'" height="'.$info[1].'"'.$this->getBorderAttr(' border="'.intval($conf['border']).'"').(($conf['params'] || is_array($conf['params.']))?' '.$this->stdWrap($conf['params'],$conf['params.']):'').($altParam).' />';
 			if ($conf['linkWrap'])	{