Fixing oddities in recursive stdWraps (bugs #4312 and #4871)
authorMartin Kutschker <martin.t.kutschker@blackbox.net>
Tue, 30 Jan 2007 20:07:01 +0000 (20:07 +0000)
committerMartin Kutschker <martin.t.kutschker@blackbox.net>
Tue, 30 Jan 2007 20:07:01 +0000 (20:07 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-0@1959 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/class.tslib_content.php

index 0492b7f..1073f7b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 
+2006-01-30  Martin Kutschker  <martin.t.kutschker@blackbox.net>
+
+       * Fixing oddities in recursive stdWraps (bugs #4312 and #4871)
+
 2006-01-28  Martin Kutschker  <martin.t.kutschker@blackbox.net>
 
        * Added "html { height: 100% }" to stylesheet to make RTE wizard work in IE7
-       * Make the EM work with PHP 4.1 (checking for md5_file())
+       * Make the EM work again with PHP 4.1 (checking for md5_file())
 
 2007-01-24  Dmitry Dulepov  <dmitry@typo3.org>
 
index c96d53c..f05511f 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2007 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -3201,7 +3201,7 @@ class tslib_cObj {
                        if ($conf['trim'])      { $content=trim($content); }
 
                                // Call stdWrap recursively
-                       if ($conf['stdWrap'])   { $content=$this->stdWrap($content,$conf['stdWrap.']); }
+                       if ($conf['stdWrap.'])  { $content=$this->stdWrap($content,$conf['stdWrap.']); }
 
                        if (   ($conf['required'] && (string)$content=='') || ($conf['if.'] && !$this->checkIf($conf['if.'])) || ($conf['fieldRequired'] && !trim($this->data[$conf['fieldRequired']]))    ){
                                $content = '';