diff options
| author | David Rothstein <drothstein@gmail.com> | 2014-11-01 11:46:15 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2014-11-01 11:46:15 -0400 |
| commit | 5f380f922531255efe95ee443606379dcac2fc9e (patch) | |
| tree | a38ef6c9ad13c70e75f4016bcc1097ff41ba47b4 /includes/unicode.inc | |
| parent | 4a93ebd89d77e3bc850059cdc1923c364042331f (diff) | |
| download | brdo-5f380f922531255efe95ee443606379dcac2fc9e.tar.gz brdo-5f380f922531255efe95ee443606379dcac2fc9e.tar.bz2 | |
Issue #2332295 by sanduhrs, klausi, er.pushpinderrana, Berdir | jfha73: Fixed Unicode requirements check not working with PHP 5.6.
Diffstat (limited to 'includes/unicode.inc')
| -rw-r--r-- | includes/unicode.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/includes/unicode.inc b/includes/unicode.inc index fd497cca7..f9684a897 100644 --- a/includes/unicode.inc +++ b/includes/unicode.inc @@ -116,11 +116,15 @@ function _unicode_check() { if (ini_get('mbstring.encoding_translation') != 0) { return array(UNICODE_ERROR, $t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.encoding_translation</em> setting. Please refer to the <a href="@url">PHP mbstring documentation</a> for more information.', array('@url' => 'http://www.php.net/mbstring'))); } - if (ini_get('mbstring.http_input') != 'pass') { - return array(UNICODE_ERROR, $t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_input</em> setting. Please refer to the <a href="@url">PHP mbstring documentation</a> for more information.', array('@url' => 'http://www.php.net/mbstring'))); - } - if (ini_get('mbstring.http_output') != 'pass') { - return array(UNICODE_ERROR, $t('Multibyte string output conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_output</em> setting. Please refer to the <a href="@url">PHP mbstring documentation</a> for more information.', array('@url' => 'http://www.php.net/mbstring'))); + // 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') { + return array(UNICODE_ERROR, $t('Multibyte string input conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_input</em> setting. Please refer to the <a href="@url">PHP mbstring documentation</a> for more information.', array('@url' => 'http://www.php.net/mbstring'))); + } + if (ini_get('mbstring.http_output') != 'pass') { + return array(UNICODE_ERROR, $t('Multibyte string output conversion in PHP is active and must be disabled. Check the php.ini <em>mbstring.http_output</em> setting. Please refer to the <a href="@url">PHP mbstring documentation</a> for more information.', array('@url' => 'http://www.php.net/mbstring'))); + } } // Set appropriate configuration |