bug #6601: fixed mount point issues with the local page tree cache

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

diff --git a/ChangeLog b/ChangeLog
index 84142ad..a21e45a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 
        * 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)
+       * Fixed bug #6601: fixed mount point issues with the local page tree cache
 
 2008-08-27  Martin Kutschker  <masi@typo3.org>
 

diff --git a/t3lib/class.t3lib_page.php b/t3lib/class.t3lib_page.php
index 5b99b98..931ef3f 100755 (executable)
--- a/t3lib/class.t3lib_page.php
+++ b/t3lib/class.t3lib_page.php
@@ -724,13 +724,8 @@ class t3lib_pageSelect {
 
                if ($GLOBALS['TYPO3_CONF_VARS']['FE']['enable_mount_pids'])     {
 
-                               // Set first Page uid:
-                       if (!$firstPageUid)     {
-                               $firstPageUid = $pageRec['uid'];
-                       }
-
-                       if (isset($this->cache_getMountPointInfo[$pageId][$firstPageUid]))     {
-                               return $this->cache_getMountPointInfo[$pageId][$firstPageUid];
+                       if (isset($this->cache_getMountPointInfo[$pageId]))     {
+                               return $this->cache_getMountPointInfo[$pageId];
                        }
 
                                // Get pageRec if not supplied:
@@ -741,6 +736,10 @@ class t3lib_pageSelect {
                                $this->versionOL('pages',$pageRec);             // Only look for version overlay if page record is not supplied; This assumes that the input record is overlaid with preview version, if any!
                        }
 
+                               // Set first Page uid:
+                       if (!$firstPageUid)     {
+                               $firstPageUid = $pageRec['uid'];
+                       }
 
                                // Look for mount pid value plus other required circumstances:
                        $mount_pid = intval($pageRec['mount_pid']);
@@ -773,7 +772,7 @@ class t3lib_pageSelect {
                        }
                }
 
-               $this->cache_getMountPointInfo[$pageId][$firstPageUid] = $result;
+               $this->cache_getMountPointInfo[$pageId] = $result;
                return $result;
        }