[TASK] Remove locale-workaround for PHP before 5.5 36/34536/2
authorStefan Neufeind <typo3.neufeind@speedpartner.de>
Mon, 24 Nov 2014 10:46:34 +0000 (11:46 +0100)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Wed, 26 Nov 2014 14:52:33 +0000 (15:52 +0100)
Since CMS 7 requires at least PHP 5.5 we can remove a
workaround for a bug with turkish locales.
According to the bugreport this is fixed since the 5.5-branch:
https://bugs.php.net/bug.php?id=18556

Change-Id: I905f1c4efda8ea10b615c65d13289cfa596785f3
Resolves: #63288
Releases: master
Reviewed-on: http://review.typo3.org/34536
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Reviewed-by: Stefan Froemken <froemken@gmail.com>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php

index 0b771ac..5c1d46e 100644 (file)
@@ -2613,11 +2613,7 @@ class TypoScriptFrontendController {
                        // Do we set all except LC_NUMERIC
                        $locale = setlocale(LC_COLLATE, $this->config['config']['locale_all']);
                        if ($locale) {
-                               // PHP fatals with uppercase I characters in method names with turkish locale LC_CTYPE
-                               // @see http://bugs.php.net/bug.php?id=35050
-                               if (substr($this->config['config']['locale_all'], 0, 2) != 'tr') {
-                                       setlocale(LC_CTYPE, $this->config['config']['locale_all']);
-                               }
+                               setlocale(LC_CTYPE, $this->config['config']['locale_all']);
                                setlocale(LC_MONETARY, $this->config['config']['locale_all']);
                                setlocale(LC_TIME, $this->config['config']['locale_all']);
                                $this->localeCharset = $this->csConvObj->get_locale_charset($this->config['config']['locale_all']);