Fixed bug #12788: Recycler does not show up

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6582 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index c720006..fd306f9 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
        * Fixed bug #11326: Memcached backend does not work well if cache of a page shall expire after 30 days (thanks to Vladimir Podkovanov)
        * Fixed bug #11345: Uncaught exception InvalidArgumentException on creating graphical menus
        * Fixed bug #12489: IRRE - Problem with clearing of floated elements in IE
+       * Fixed bug #12788: Recycler does not show up
 
 2009-11-26  Francois Suter  <francois@typo3.org>
 

diff --git a/typo3/sysext/recycler/mod1/index.php b/typo3/sysext/recycler/mod1/index.php
index b66eaeb..143b21d 100644 (file)
--- a/typo3/sysext/recycler/mod1/index.php
+++ b/typo3/sysext/recycler/mod1/index.php
@@ -211,8 +211,16 @@ class  tx_recycler_module1 extends t3lib_SCbase {
                        'depth_4'               => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_4'),
                        'depth_infi'    => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.depth_infi'),
                );
+
                $extensionLabels = $this->getJavaScriptLabelsFromLocallang('js.', 'label_');
-               return array_merge($coreLabels, $extensionLabels);
+               $javaScriptLabels = array_merge($coreLabels, $extensionLabels);
+
+                       // Convert labels back to UTF-8 since json_encode() only works with UTF-8:
+               if ($GLOBALS['LANG']->charSet !== 'utf-8') {
+                       $GLOBALS['LANG']->csConvObj->convArray($javaScriptLabels, $GLOBALS['LANG']->charSet, 'utf-8');
+               }
+
+               return $javaScriptLabels;
        }
 
        /**