Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
deb25900
Commit
deb25900
authored
Sep 12, 2014
by
alexpott
Browse files
Issue
#2332295
followup by klausi: Fixed Unicode requirements check not working with PHP 5.6.
parent
6d8e333e
Changes
1
Show whitespace changes
Inline
Side-by-side
core/lib/Drupal/Component/Utility/Unicode.php
View file @
deb25900
...
...
@@ -163,8 +163,10 @@ public static function check() {
static
::
$status
=
static
::
STATUS_ERROR
;
return
'mbstring.encoding_translation'
;
}
// mbstring.http_input is deprecated and empty by default in PHP 5.6.
if
(
version_compare
(
PHP_VERSION
,
'5.6.0'
)
==
-
1
&&
ini_get
(
'mbstring.http_input'
)
!=
'pass'
)
{
// mbstring.http_input and mbstring.http_output are deprecated and empty by
// default in PHP 5.6.
if
(
version_compare
(
PHP_VERSION
,
'5.6.0'
)
==
-
1
)
{
if
(
ini_get
(
'mbstring.http_input'
)
!=
'pass'
)
{
static
::
$status
=
static
::
STATUS_ERROR
;
return
'mbstring.http_input'
;
}
...
...
@@ -172,6 +174,7 @@ public static function check() {
static
::
$status
=
static
::
STATUS_ERROR
;
return
'mbstring.http_output'
;
}
}
// Set appropriate configuration.
mb_internal_encoding
(
'utf-8'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment