#7812: cObj CONTENT should allowed on static_* tables
authorMartin Kutschker <martin.t.kutschker@blackbox.net>
Fri, 29 Aug 2008 19:10:47 +0000 (19:10 +0000)
committerMartin Kutschker <martin.t.kutschker@blackbox.net>
Fri, 29 Aug 2008 19:10:47 +0000 (19:10 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4029 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index b653b54..84142ad 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 2008-08-29  Martin Kutschker  <masi@typo3.org>
 
        * Fixed bug #8677: FE login redirect after logout does not work (thanx to Steffen Kamper)
+       * Fixed bug #7812: cObj CONTENT should allowed on static_* tables (thanx to Georg Ringer)
 
 2008-08-27  Martin Kutschker  <masi@typo3.org>
 
index 1507639..dfbe99e 100755 (executable)
@@ -1208,7 +1208,7 @@ class tslib_cObj {
                        $GLOBALS['TSFE']->recordRegister[$originalRec]++;
                }
 
-               if ($conf['table']=='pages' || substr($conf['table'],0,3)=='tt_' || substr($conf['table'],0,3)=='fe_' || substr($conf['table'],0,3)=='tx_' || substr($conf['table'],0,4)=='ttx_' || substr($conf['table'],0,5)=='user_'       {
+               if ($conf['table']=='pages' || substr($conf['table'],0,3)=='tt_' || substr($conf['table'],0,3)=='fe_' || substr($conf['table'],0,3)=='tx_' || substr($conf['table'],0,4)=='ttx_' || substr($conf['table'],0,5)=='user_' || substr($conf['table'],0,7)=='static_')       {
 
                        $renderObjName = $conf['renderObj'] ? $conf['renderObj'] : '<'.$conf['table'];
                        $renderObjKey = $conf['renderObj'] ? 'renderObj' : '';
@@ -6910,6 +6910,10 @@ class tslib_cObj {
                        }
                        $pid_uid_flag++;
                }
+               // static_* tables are allowed to be fetched from root page
+               if (substr($table,0,7)=='static_') {
+                       $pid_uid_flag++;
+               }               
                if (trim($conf['pidInList']))   {
                        $listArr = t3lib_div::intExplode(',',str_replace('this',$GLOBALS['TSFE']->contentPid,$conf['pidInList']));      // str_replace instead of ereg_replace 020800
                                // removes all pages which are not visible for the user!