diff options
| -rw-r--r-- | CHANGELOG.txt | 2 | ||||
| -rw-r--r-- | includes/unicode.inc | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index a6a899c6c..f0e9535c7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,8 @@ Drupal 7.33, xxxx-xx-xx (development version) ----------------------- +- Fixed a bug in the Unicode requirements check which prevented installing + Drupal on PHP 5.6. - Fixed a bug which caused drupal_get_bootstrap_phase() to abort the bootstrap when called early in the page request. - Renamed the "Search result" view mode to "Search result highlighting input" 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 |