Fixed bug: #10896 php-warnings after merge into Core - missing argument
authorTolleiv Nietsch <info@tolleiv.de>
Wed, 17 Nov 2010 13:00:47 +0000 (13:00 +0000)
committerTolleiv Nietsch <info@tolleiv.de>
Wed, 17 Nov 2010 13:00:47 +0000 (13:00 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces/trunk@2921 743128fe-103e-dd11-99c4-001b210b3e58

typo3/sysext/workspaces/ChangeLog
typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php

index 4516df6..d97fd63 100644 (file)
@@ -1,6 +1,7 @@
 2010-11-17  Tolleiv Nietsch <info@tolleiv.de>
 
        * Fixed bug: #10896 php-warnings after merge into Core - missing argument 
+       * Fixed bug: #10895 php-warnings after merge into Core - array_merge on non-array
 
 2010-11-17  Oliver Hader  <oliver@tpyo3.org>
 
index 17668ec..a3855f2 100644 (file)
@@ -49,7 +49,7 @@ class tx_Workspaces_ExtDirect_MassActionHandler extends tx_Workspaces_ExtDirect_
 
                        // in case we're working within "All Workspaces" we can't provide Mass Actions
                if ($currentWorkspace != tx_Workspaces_Service_Workspaces::SELECT_ALL_WORKSPACES) {
-                       $publishAccess = $GLOBALS['BE_USER']->workspacePublishAccess();
+                       $publishAccess = $GLOBALS['BE_USER']->workspacePublishAccess($currentWorkspace);
                        if ($publishAccess && !($GLOBALS['BE_USER']->workspaceRec['publish_access'] & 1)) {
                                $actions[] = array('action' => 'publish', 'title' => 'Publish' //$GLOBALS['LANG']->getLL('label_doaction_publish'));
                                );