Commit deb25900 authored by alexpott's avatar alexpott
Browse files

Issue #2332295 followup by klausi: Fixed Unicode requirements check not working with PHP 5.6.

parent 6d8e333e
...@@ -163,14 +163,17 @@ public static function check() { ...@@ -163,14 +163,17 @@ public static function check() {
static::$status = static::STATUS_ERROR; static::$status = static::STATUS_ERROR;
return 'mbstring.encoding_translation'; return 'mbstring.encoding_translation';
} }
// mbstring.http_input is deprecated and empty by default in PHP 5.6. // mbstring.http_input and mbstring.http_output are deprecated and empty by
if (version_compare(PHP_VERSION, '5.6.0') == -1 && ini_get('mbstring.http_input') != 'pass') { // default in PHP 5.6.
static::$status = static::STATUS_ERROR; if (version_compare(PHP_VERSION, '5.6.0') == -1) {
return 'mbstring.http_input'; if (ini_get('mbstring.http_input') != 'pass') {
} static::$status = static::STATUS_ERROR;
if (ini_get('mbstring.http_output') != 'pass') { return 'mbstring.http_input';
static::$status = static::STATUS_ERROR; }
return 'mbstring.http_output'; if (ini_get('mbstring.http_output') != 'pass') {
static::$status = static::STATUS_ERROR;
return 'mbstring.http_output';
}
} }
// Set appropriate configuration. // Set appropriate configuration.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment