Commit non-functional changes prior to fixing bug #5611

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

diff --git a/t3lib/class.t3lib_page.php b/t3lib/class.t3lib_page.php
index 4543445..8f22428 100755 (executable)
--- a/t3lib/class.t3lib_page.php
+++ b/t3lib/class.t3lib_page.php
@@ -113,7 +113,7 @@ class t3lib_pageSelect {
        var $sys_language_uid = 0;
 
                // Versioning preview related:
        var $sys_language_uid = 0;
 
                // Versioning preview related:

-       var $versioningPreview = FALSE;         // If true, preview of other record versions is allowed. THIS MUST ONLY BE SET IF the page is not cached and truely previewed by a backend user!!!
+       var $versioningPreview = FALSE;         // If true, versioning preview of other record versions is allowed. THIS MUST ONLY BE SET IF the page is not cached and truely previewed by a backend user!!!

        var $versioningWorkspaceId = 0;         // Workspace ID for preview
        var $workspaceCache = array();
 
        var $versioningWorkspaceId = 0;         // Workspace ID for preview
        var $workspaceCache = array();
 


@@ -145,7 +145,7 @@ class t3lib_pageSelect {
 
                        // Filter out new/deleted place-holder pages in case we are NOT in a versioning preview (that means we are online!)
                if (!$this->versioningPreview)  {
 
                        // Filter out new/deleted place-holder pages in case we are NOT in a versioning preview (that means we are online!)
                if (!$this->versioningPreview)  {

-                       $this->where_hid_del.= ' AND NOT(pages.t3ver_state>0)';
+                       $this->where_hid_del.= ' AND NOT (pages.t3ver_state>0)';

                } else {
                                // For version previewing, make sure that enable-fields are not de-selecting hidden pages - we need versionOL() to unset them only if the overlay record instructs us to.
                        $this->versioningPreview_where_hid_del = $this->where_hid_del;  // Copy where_hid_del to other variable (used in relation to versionOL())
                } else {
                                // For version previewing, make sure that enable-fields are not de-selecting hidden pages - we need versionOL() to unset them only if the overlay record instructs us to.
                        $this->versioningPreview_where_hid_del = $this->where_hid_del;  // Copy where_hid_del to other variable (used in relation to versionOL())

diff --git a/typo3/sysext/cms/tslib/class.tslib_fe.php b/typo3/sysext/cms/tslib/class.tslib_fe.php
index 33be717..b569a97 100755 (executable)
--- a/typo3/sysext/cms/tslib/class.tslib_fe.php
+++ b/typo3/sysext/cms/tslib/class.tslib_fe.php
@@ -4086,7 +4086,7 @@ if (version == "n3") {
        function workspacePreviewInit() {
                $previewWS = t3lib_div::_GP('ADMCMD_previewWS');
                if ($this->beUserLogin && is_object($GLOBALS['BE_USER']) && t3lib_div::testInt($previewWS))     {
        function workspacePreviewInit() {
                $previewWS = t3lib_div::_GP('ADMCMD_previewWS');
                if ($this->beUserLogin && is_object($GLOBALS['BE_USER']) && t3lib_div::testInt($previewWS))     {

-                       if ($previewWS>=-1 && ($previewWS==0 || $GLOBALS['BE_USER']->checkWorkspace($previewWS)))       {       // Check Access to workspace. Live (0) is OK to preview for all.
+                       if ($previewWS==0 || ($previewWS>=-1 && $GLOBALS['BE_USER']->checkWorkspace($previewWS))) {     // Check Access to workspace. Live (0) is OK to preview for all.

                                $this->workspacePreview = intval($previewWS);
                        } else {
                                $this->workspacePreview = -99;  // No preview, will default to "Live" at the moment
                                $this->workspacePreview = intval($previewWS);
                        } else {
                                $this->workspacePreview = -99;  // No preview, will default to "Live" at the moment