[BUGFIX] Warning in list module
[Packages/TYPO3.CMS.git] / typo3 / alt_shortcut.php
index e19d7d6..f7dff88 100644 (file)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2010 Kasper Skårhøj (kasperYYYY@typo3.com)
+*  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -479,9 +479,12 @@ class SC_alt_shortcut {
 
                        // Load search for something.
                if ($this->searchFor)   {
-                       $firstMP = intval($GLOBALS['WEBMOUNTS'][0]);
+                       $urlParameters = array();
+                       $urlParameters['id'] = intval($GLOBALS['WEBMOUNTS'][0]);
+                       $urlParameters['search_field'] = $this->searchFor;
+                       $urlParameters['search_levels'] = 4;
                        $this->content .= $this->doc->wrapScriptTags('jump(unescape("' .
-                               rawurlencode(t3lib_extMgm::extRelPath('list') . 'mod1/db_list.php?id=' . $firstMP . '&search_field=' . rawurlencode($this->searchFor) . '&search_levels=4') .
+                               rawurlencode(t3lib_BEfunc::getModuleUrl('web_list', $urlParameters, '')) .
                        '"), "web_list", "web");');
                }
        }
@@ -733,11 +736,13 @@ class SC_alt_shortcut {
                }
 
                        // Add custom workspaces (selecting all, filtering by BE_USER check):
-               $workspaces = $TYPO3_DB->exec_SELECTgetRows('uid,title,adminusers,members,reviewers','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
-               if (count($workspaces)) {
-                       foreach ($workspaces as $rec)   {
-                               if ($BE_USER->checkWorkspace($rec))     {
-                                       $options[$rec['uid']] = $rec['uid'].': '.$rec['title'];
+               if (t3lib_extMgm::isLoaded('workspaces')) {
+                       $workspaces = $TYPO3_DB->exec_SELECTgetRows('uid,title,adminusers,members,reviewers','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
+                       if (count($workspaces)) {
+                               foreach ($workspaces as $rec)   {
+                                       if ($BE_USER->checkWorkspace($rec))     {
+                                               $options[$rec['uid']] = $rec['uid'].': '.$rec['title'];
+                                       }
                                }
                        }
                }
@@ -866,8 +871,8 @@ class SC_alt_shortcut {
 }
 
 
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php']) {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php']);
+if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php'])) {
+       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php']);
 }
 
 
@@ -880,4 +885,4 @@ $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
 
-?>
\ No newline at end of file
+?>