diff -ru typo3/mod/user/ws/index.php typo3_new/mod/user/ws/index.php
--- typo3/mod/user/ws/index.php 2008-10-27 16:48:50.000000000 +0100
+++ typo3_new/mod/user/ws/index.php 2008-10-27 17:03:49.000000000 +0100
@@ -738,7 +738,11 @@
// here only if obtaining mount points for custom workspaces
// Warning: all fields needed for t3lib_iconWorks::getIconImage()!
- $MPs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'pages', 'deleted=0 AND uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($wksp['db_mountpoints']) . ')', '', 'title');
+ if($GLOBALS['BE_USER']->workspaceRec['use_user_db_mounts'] == 1) {
+ $MPs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'pages', 'deleted=0 AND uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($GLOBALS['BE_USER']->groupData['webmounts']) . ')', '', 'title');
+ } else {
+ $MPs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'pages', 'deleted=0 AND uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($wksp['db_mountpoints']) . ')', '', 'title');
+ }
$content_array = array();
if (count($MPs) > 0) {
$isAdmin = $GLOBALS['BE_USER']->isAdmin();
Binary files typo3/sysext/.DS_Store and typo3_new/sysext/.DS_Store differ
Binary files typo3/sysext/beuser/.DS_Store and typo3_new/sysext/beuser/.DS_Store differ
diff -ru typo3/sysext/beuser/mod/index.php typo3_new/sysext/beuser/mod/index.php
--- typo3/sysext/beuser/mod/index.php 2008-10-27 16:51:15.000000000 +0100
+++ typo3_new/sysext/beuser/mod/index.php 2008-10-27 17:02:12.000000000 +0100
@@ -1055,14 +1055,14 @@
}
// Add custom workspaces (selecting all, filtering by BE_USER check):
- $workspaces = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,title,adminusers,members,reviewers,db_mountpoints','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
+ $workspaces = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,title,adminusers,members,reviewers,db_mountpoints,use_user_db_mounts','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
if (count($workspaces)) {
foreach ($workspaces as $rec) {
if ($this->checkWorkspace($rec)) {
$options[$rec['uid']] = $rec['uid'].': '.$rec['title'];
-
+
// Check if all mount points are accessible, otherwise show error:
- if (trim($rec['db_mountpoints'])!=='') {
+ if (trim($rec['db_mountpoints'])!=='' && ($rec['use_user_db_mounts'] == 0)) {
$mountPoints = t3lib_div::intExplode(',',$this->workspaceRec['db_mountpoints'],1);
foreach ($mountPoints as $mpId) {
if (!$this->isInWebMount($mpId,'1=1')) {
diff -ru typo3/sysext/lang/locallang_csh_sysws.xml typo3_new/sysext/lang/locallang_csh_sysws.xml
--- typo3/sysext/lang/locallang_csh_sysws.xml 2008-10-27 16:22:34.000000000 +0100
+++ typo3_new/sysext/lang/locallang_csh_sysws.xml 2008-10-27 17:08:21.000000000 +0100
@@ -23,6 +23,8 @@
"Notify all users on any change" : All users in workspace are notified regardless of change.
+
+
diff -ru typo3/sysext/lang/locallang_tca.xml typo3_new/sysext/lang/locallang_tca.xml
--- typo3/sysext/lang/locallang_tca.xml 2008-10-27 16:27:42.000000000 +0100
+++ typo3_new/sysext/lang/locallang_tca.xml 2008-10-27 17:08:56.000000000 +0100
@@ -79,6 +79,7 @@
+