[BUGFIX] Fix wrong replacements of "language" class name
authorHelmut Hummel <helmut.hummel@typo3.org>
Mon, 24 Sep 2012 19:20:03 +0000 (21:20 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Mon, 24 Sep 2012 19:38:58 +0000 (21:38 +0200)
The namespace script replaced "language" strings
with TYPO3\\CMS\\Lang\\LanguageService also in
places where it did not make sense.

Fixes: #41330
Releases: 6.0

Change-Id: Icf1bb6d154850abf77c6deafbfbbfd47bf8c2552
Reviewed-on: http://review.typo3.org/15008
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/backend/Tests/Unit/Utility/IconUtilityTest.php
typo3/sysext/core/Classes/FormProtection/Exception.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/setup/ext_emconf.php

index f4e2c4a..7a9bc34 100644 (file)
@@ -83,7 +83,7 @@ class IconUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
                $this->mockRecord['t3ver_id'] = '0';
                $this->mockRecord['t3ver_state'] = '0';
                $this->mockRecord['t3ver_wsid'] = '0';
-               $this->mockRecord['sys_TYPO3\\CMS\\Lang\\LanguageService_uid'] = '0';
+               $this->mockRecord['sys_language_uid'] = '0';
                $this->mockRecord['l18n_parent'] = '0';
                $this->mockRecord['subheader'] = '';
                $this->mockRecord['bodytext'] = '';
index ea9ff5e..70b1327 100644 (file)
@@ -30,7 +30,7 @@ namespace TYPO3\CMS\Core\FormProtection;
  * @subpackage t3lib_formprotection
  * @api
  */
-class Exception extends UnexpectedValueException {
+class Exception extends \UnexpectedValueException {
 
 
 }
index 98ff711..ac93d65 100644 (file)
@@ -742,7 +742,7 @@ class SetupModuleController {
                        // Setting comes from another extension
                        $context = $strParts[0];
                        $field = $strParts[1];
-               } elseif (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList('TYPO3\\CMS\\Lang\\LanguageService,simuser,reset', $str)) {
+               } elseif (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList('language,simuser,reset', $str)) {
                        $field = 'option_' . $str;
                }
                return \TYPO3\CMS\Backend\Utility\BackendUtility::wrapInHelp($context, $field, $label);
index 8635e9c..5fe6061 100755 (executable)
@@ -10,7 +10,7 @@
  ***************************************************************/
 $EM_CONF[$_EXTKEY] = array(
        'title' => 'User>User Settings',
-       'description' => 'Allows users to edit a limited set of options for their user profile, eg. preferred TYPO3\\CMS\\Lang\\LanguageService and their name and email address.',
+       'description' => 'Allows users to edit a limited set of options for their user profile, eg. preferred language and their name and email address.',
        'category' => 'module',
        'shy' => 1,
        'dependencies' => '',