[TASK] Remove useless code after utf-8 code conversion
authorMarkus Klein <klein.t3@mfc-linz.at>
Mon, 20 Feb 2012 09:50:57 +0000 (10:50 +0100)
committerMarco Bresch <marco.bresch@starfinanz.de>
Wed, 11 Apr 2012 14:36:54 +0000 (16:36 +0200)
Depends on: https://review.typo3.org/9101

Change-Id: I264281c0e2aacf9afe7fb568441d810b13805708
Resolves: #34106
Releases: 4.7
Reviewed-on: http://review.typo3.org/9117
Reviewed-by: Stefan Neufeind
Reviewed-by: Marco Bresch
Tested-by: Marco Bresch
typo3/sysext/workspaces/Classes/Controller/PreviewController.php

index 18ee6c6..9e21451 100644 (file)
@@ -295,12 +295,6 @@ class Tx_Workspaces_Controller_PreviewController extends Tx_Workspaces_Controlle
                        'donateWindow_button_postpone' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:donateWindow.button_postpone'),
                );
 
-                       // Convert labels/settings back to UTF-8 since json_encode() only works with UTF-8:
-               if ($GLOBALS['LANG']->charSet !== 'utf-8') {
-                       $t3Configuration['username'] = $GLOBALS['LANG']->csConvObj->conv($t3Configuration['username'], $GLOBALS['LANG']->charSet, 'utf-8');
-                       $GLOBALS['LANG']->csConvObj->convArray($t3LLLcore, $GLOBALS['LANG']->charSet, 'utf-8');
-               }
-
                $js = '
                TYPO3.configuration = ' . json_encode($t3Configuration) . ';
                TYPO3.LLL = {