Fixed bug #5602: spamProtectEmailAddresses_atSubst is not recognized correctly

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

diff --git a/ChangeLog b/ChangeLog
index 3cc19c4..67391cd 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-30  Oliver Hader  <oh@inpublica.de>
+
+       * Fixed bug #5602: spamProtectEmailAddresses_atSubst is not recognized correctly
+
 2007-11-30  Ingo Renner        <ingo@typo3.org>
 
        * added positioning function for the clear cache menu which is needed to keep the menu below it's icon when new items are added to the toolbar

diff --git a/typo3/sysext/cms/tslib/class.tslib_content.php b/typo3/sysext/cms/tslib/class.tslib_content.php
index f306669..cc3ea10 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_content.php
+++ b/typo3/sysext/cms/tslib/class.tslib_content.php
@@ -5499,7 +5499,6 @@ class tslib_cObj {
         */
        function getMailTo($mailAddress,$linktxt,$initP='?') {
                if(!strcmp($linktxt,''))        { $linktxt = $mailAddress; }
-               $linktxtIsMailAddress = ($linktxt == $mailAddress ? true : false);
 
                $mailToUrl = 'mailto:'.$mailAddress;
 
@@ -5513,17 +5512,14 @@ class tslib_cObj {
                                if ($GLOBALS['TSFE']->config['config']['spamProtectEmailAddresses_atSubst']) {
                                        $atLabel = trim($GLOBALS['TSFE']->config['config']['spamProtectEmailAddresses_atSubst']);
                                }
-                               if ($linktxtIsMailAddress) {
-                                       $linktxt = str_replace('@',$atLabel?$atLabel:'(at)',$linktxt);
-                               }
+                               $spamProtectedMailAddress = str_replace('@', ($atLabel ? $atLabel : '(at)'), $mailAddress);
 
                                if ($GLOBALS['TSFE']->config['config']['spamProtectEmailAddresses_lastDotSubst']) {
                                        $lastDotLabel = trim($GLOBALS['TSFE']->config['config']['spamProtectEmailAddresses_lastDotSubst']);
                                        $lastDotLabel = $lastDotLabel ? $lastDotLabel : '(dot)';
-                                       if ($linktxtIsMailAddress) {
-                                               $linktxt = preg_replace('/\.([^\.]+)$/', $lastDotLabel.'$1', $linktxt);
-                                       }
+                                       $spamProtectedMailAddress = preg_replace('/\.([^\.]+)$/', $lastDotLabel.'$1', $spamProtectedMailAddress);
                                }
+                               $linktxt = str_replace($mailAddress, $spamProtectedMailAddress, $linktxt);
                        }
                } else {
                        $mailToUrl = $GLOBALS['TSFE']->absRefPrefix.$GLOBALS['TSFE']->config['mainScript'].$initP.'&jumpurl='.rawurlencode($mailToUrl).$GLOBALS['TSFE']->getMethodUrlIdToken;