From 23b588c584f485f10ae265bf30e15d231f428f1e Mon Sep 17 00:00:00 2001
From: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Date: Mon, 24 Nov 2014 11:46:34 +0100
Subject: [PATCH] [TASK] Remove locale-workaround for PHP before 5.5
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>
---
.../Classes/Controller/TypoScriptFrontendController.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index 0b771ac85b4e..5c1d46e38cb0 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -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']);
--
GitLab