[BUGFIX] Fix the element browsers
authorThomas Maroschik <tmaroschik@dfau.de>
Sun, 26 Aug 2012 00:57:57 +0000 (02:57 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sun, 26 Aug 2012 09:39:13 +0000 (11:39 +0200)
Change-Id: I6e961a5a945b77068aa075a27bbb23682124f2fe
Fixes: #40203
Relates: #40095
Releases: 6.0
Reviewed-on: http://review.typo3.org/14103
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/browse_links.php
typo3/sysext/core/Classes/Core/Bootstrap.php
typo3/sysext/lang/Classes/LanguageService.php
typo3/sysext/rtehtmlarea/Classes/FolderTree.php
typo3/sysext/rtehtmlarea/Classes/PageTree.php
typo3/sysext/rtehtmlarea/mod3/browse_links.php

index f6fac16..787e6ba 100644 (file)
@@ -36,7 +36,7 @@
  */
 $BACK_PATH = '';
 require 'init.php';
-$LANG->includeLLFile('EXT:lang/locallang_TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser.xml');
+$LANG->includeLLFile('EXT:lang/locallang_browse_links.xml');
 /*
  * @deprecated since 6.0, the classname SC_browse_links and this file is obsolete
  * and will be removed by 7.0. The class was renamed and is now located at:
@@ -44,7 +44,7 @@ $LANG->includeLLFile('EXT:lang/locallang_TYPO3\\CMS\\Recordlist\\Browser\\Elemen
  */
 require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('recordlist') . 'Classes/Controller/ElementBrowserController.php';
 // Make instance:
-$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('SC_TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser');
+$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Recordlist\\Controller\\ElementBrowserController');
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
index 9d68bc4..697d56b 100644 (file)
@@ -786,7 +786,7 @@ class Bootstrap {
         */
        public function initializeLanguageObject() {
                /** @var $GLOBALS['LANG'] \TYPO3\CMS\Lang\LanguageService */
-               $GLOBALS['LANG'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('language');
+               $GLOBALS['LANG'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\CMS\Lang\LanguageService');
                $GLOBALS['LANG']->init($GLOBALS['BE_USER']->uc['lang']);
                return $this;
        }
index 98a5c58..d0445f8 100644 (file)
@@ -135,7 +135,7 @@ class LanguageService {
         * $LANG = t3lib_div::makeInstance('language');
         * $LANG->init($GLOBALS['BE_USER']->uc['lang']);
         *
-        * @throws RuntimeException
+        * @throws \RuntimeException
         * @param string $lang The language key (two character string from backend users profile)
         * @return void
         */
index 687fdaa..953cc4f 100644 (file)
@@ -9,7 +9,7 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * @package TYPO3
  * @subpackage core
  */
-class FolderTree extends rteFolderTree {
+class FolderTree extends \rteFolderTree {
 
        /**
         * Wrapping the title in a link, if applicable.
index 96a8d0b..811b412 100644 (file)
@@ -44,7 +44,7 @@ namespace TYPO3\CMS\Rtehtmlarea;
  * @package TYPO3
  * @subpackage core
  */
-class PageTree extends rtePageTree {
+class PageTree extends \rtePageTree {
 
        /**
         * Create the page navigation tree in HTML
index 329cc1f..9e8a66a 100644 (file)
@@ -48,7 +48,7 @@ $LANG->includeLLFile('EXT:rtehtmlarea/htmlarea/locallang_dialogs.xml');
  */
 require_once \TYPO3\CMS\Core\Extension\ExtensionManager::extPath('rtehtmlarea') . 'Classes/Controller/BrowseLinksController.php';
 // Make instance:
-$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_rtehtmlarea_SC_TYPO3\\CMS\\Recordlist\\Browser\\ElementBrowser');
+$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Rtehtmlarea\\Controller\\BrowseLinksController');
 $SOBE->main();
 $SOBE->printContent();
 ?>
\ No newline at end of file