From: Markus Klein Date: Mon, 20 Feb 2012 09:50:57 +0000 (+0100) Subject: [TASK] Remove useless code after utf-8 code conversion X-Git-Tag: TYPO3_6-2-0alpha1~18^2~64 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/a29341be4b13720efa9fec80f38e1a98c0e5de3d [TASK] Remove useless code after utf-8 code conversion 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 --- diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php index 18ee6c662272..9e21451293c9 100644 --- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php +++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php @@ -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 = {