diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index a397009..8db6d26 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -638,10 +638,10 @@ function system_requirements($phase) {
if (extension_loaded('xdebug') && ini_get('xdebug.max_nesting_level') < 256) {
// Report on where correct ini file is to user.
- $ini_location = false;
$ini_scanned_files = php_ini_scanned_files();
+ $ini_location = php_ini_loaded_file();
if ($ini_scanned_files !== false) {
- $ini_files = explode(',', php_ini_scanned_files());
+ $ini_files = explode(',', $ini_scanned_files);
foreach ($ini_files as $value) {
if (strpos($value, 'xdebug.ini') !== false) {
$ini_location = trim($value);
@@ -650,20 +650,16 @@ function system_requirements($phase) {
}
}
- if (!$ini_location) {
- $ini_location = php_ini_loaded_file();
- }
-
- if ($ini_location !== false) {
- $description = t('A max_nesting_level lower than 256 will cause issues with Drupal. To fix this it is recommended to set xdebug.max_nesting_level=256 in your PHP configuration for Xdebug in @iniLocation', array('@iniLocation' => $ini_location));
+ if ($ini_location !== FALSE) {
+ $description = t('A max_nesting_level lower than 256 will cause some pages in your Drupal site to crash. To fix this it is recommended to set xdebug.max_nesting_level=256 in your PHP configuration for Xdebug in %iniLocation.', array('%iniLocation' => $ini_location));
}
else {
- $description = t('A max_nesting_level lower than 256 will cause issues with Drupal. To fix this it is recommended to set xdebug.max_nesting_level=256 in your PHP configuration for Xdebug');
+ $description = t('A max_nesting_level lower than 256 will cause some pages in your Drupal site to crash. To fix this it is recommended to set xdebug.max_nesting_level=256 in your PHP configuration for Xdebug.');
}
$requirements['xdebug_max_nesting_level'] = array(
'title' => t('Xdebug Settings'),
- 'value' => t('xdebug.max_nesting_level set to @value', array('@value' => ini_get('xdebug.max_nesting_level'))),
+ 'value' => t('xdebug.max_nesting_level is set to %value.', array('%value' => ini_get('xdebug.max_nesting_level'))),
'description' => $description,
'severity' => REQUIREMENT_ERROR,
);