Fixed bug #17385: Restore proper behavior of LOAD_REGISTER
authorFrancois Suter <francois.suter@typo3.org>
Wed, 16 Feb 2011 09:40:01 +0000 (09:40 +0000)
committerFrancois Suter <francois.suter@typo3.org>
Wed, 16 Feb 2011 09:40:01 +0000 (09:40 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/branches/TYPO3_4-5@10470 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/cms/tslib/content/class.tslib_content_loadregister.php

index 58409ee..2ee9dd8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2011-02-16  Francois Suter  <francois.suter@typo3.org>
 
        * Cleanup #17513: Improve sys_note CSH file
+       * Fixed bug #17385: Restore proper behavior of LOAD_REGISTER (Thanks to Jo Hasenau)
 
 2011-02-15  Stanislas Rolland  <typo3@sjbr.ca>
 
index 8821d25..e934d8d 100644 (file)
@@ -52,7 +52,7 @@ class tslib_content_LoadRegister extends tslib_content_Abstract {
                                if(!$isExecuted[$register]) {
                                        $registerProperties = $register . '.';
                                        if(isset($conf[$register]) && isset($conf[$registerProperties])) {
-                                               $theValue = $this->cObj->stdWrap($theValue, $conf[$registerProperties]);
+                                               $theValue = $this->cObj->stdWrap($conf[$register], $conf[$registerProperties]);
                                        } else if(isset($conf[$registerProperties])) {
                                                $theValue = $this->cObj->stdWrap('', $conf[$registerProperties]);
                                        }