Fixed bug #15822: t3lib_beFunc use $this in static methods
authorSteffen Kamper <info@sk-typo3.de>
Fri, 15 Oct 2010 10:30:35 +0000 (10:30 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Fri, 15 Oct 2010 10:30:35 +0000 (10:30 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9071 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/class.t3lib_befunc.php

index d996784..49636de 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 
 2010-10-15 Steffen Kamper  <steffen@typo3.org>
 
 
 2010-10-15 Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #15822: t3lib_beFunc use $this in static methods
        * Fixed bug #15992: Bugfix: Incorrect default value of permalogin
        * Fixed bug #15993: Bug: Felogin shouldn't show the permalogin form controls when permalogin is set to "forced on" in install tool
 
        * Fixed bug #15992: Bugfix: Incorrect default value of permalogin
        * Fixed bug #15993: Bug: Felogin shouldn't show the permalogin form controls when permalogin is set to "forced on" in install tool
 
index 641d87f..4157c8a 100644 (file)
@@ -2053,8 +2053,9 @@ final class t3lib_BEfunc {
                                $params['table'] = $table;
                                $params['row'] = $row;
                                $params['title'] = '';
                                $params['table'] = $table;
                                $params['row'] = $row;
                                $params['title'] = '';
-
-                               t3lib_div::callUserFunction($TCA[$table]['ctrl']['label_userFunc'], $params, $this);
+                                       //create NULL-reference
+                               $null = NULL;
+                               t3lib_div::callUserFunction($TCA[$table]['ctrl']['label_userFunc'], $params, $null);
                                $t = $params['title'];
                        } else {
 
                                $t = $params['title'];
                        } else {
 
@@ -2164,8 +2165,10 @@ final class t3lib_BEfunc {
                                 *HOOK: pre-processing the human readable output from a record
                                 ****************/
                        if (is_array ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['preProcessValue'])) {
                                 *HOOK: pre-processing the human readable output from a record
                                 ****************/
                        if (is_array ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['preProcessValue'])) {
-                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['preProcessValue'] as $_funcRef) {
-                                       t3lib_div::callUserFunction($_funcRef,$theColConf,$this);
+                                       // create NULL-reference
+                               $null = NULL;
+                               foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['preProcessValue'] as $_funcRef) {
+                                       t3lib_div::callUserFunction($_funcRef, $theColConf, $null);
                                }
                        }
 
                                }
                        }
 
@@ -2302,12 +2305,14 @@ final class t3lib_BEfunc {
                                 *HOOK: post-processing the human readable output from a record
                                 ****************/
                        if (is_array ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['postProcessValue'])) {
                                 *HOOK: post-processing the human readable output from a record
                                 ****************/
                        if (is_array ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['postProcessValue'])) {
-                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['postProcessValue'] as $_funcRef) {
+                                       // create NULL-reference
+                               $null = NULL;
+                               foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['postProcessValue'] as $_funcRef) {
                                        $params = array(
                                                'value' => $l,
                                                'colConf' => $theColConf
                                        );
                                        $params = array(
                                                'value' => $l,
                                                'colConf' => $theColConf
                                        );
-                                       $l = t3lib_div::callUserFunction($_funcRef, $params, $this);
+                                       $l = t3lib_div::callUserFunction($_funcRef, $params, $null);
                                }
                        }
 
                                }
                        }
 
@@ -4141,7 +4146,7 @@ final class t3lib_BEfunc {
                        );
                }
                $cNotice = '<a href="http://typo3.com/" target="_blank">' .
                        );
                }
                $cNotice = '<a href="http://typo3.com/" target="_blank">' .
-                       '<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/loginlogo_transp.gif', 'width="75" height="19" vspace="2" hspace="4"') . ' alt="' .
+                       '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], 'gfx/loginlogo_transp.gif', 'width="75" height="19" vspace="2" hspace="4"') . ' alt="' .
                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '" align="left" />' .
                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.cms') . ' ' .
                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:version.short') . ' ' .
                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '" align="left" />' .
                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.cms') . ' ' .
                        $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:version.short') . ' ' .