diff -u b/core/modules/system/system.install b/core/modules/system/system.install
--- b/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -634,7 +634,8 @@
}
// Check if xdebug.max_nesting_level is below 256, as it crashes some pages.
- if (extension_loaded('xdebug') && ini_get('xdebug.max_nesting_level') < 256) {
+ $xdebug_nesting_level = 256;
+ if (extension_loaded('xdebug') && ini_get('xdebug.max_nesting_level') < $xdebug_nesting_level) {
// Report on where correct ini file is to user.
$ini_scanned_files = php_ini_scanned_files();
@@ -649,11 +650,9 @@
}
}
+ $description = t('A max_nesting_level lower than @lvl will cause some pages in your Drupal site to crash. To fix this it is recommended to set xdebug.max_nesting_level=@lvl in your PHP configuration for Xdebug.', array('@lvl' => $xdebug_nesting_level));
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 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.');
+ $description .= ' ' . t('Your Xdebug configuration is located in @iniLocation.', array('@iniLocation' => $ini_location));
}
$requirements['xdebug_max_nesting_level'] = array(
only in patch2:
unchanged:
--- a/.htaccess
+++ b/.htaccess
@@ -39,6 +39,7 @@ AddEncoding gzip svgz
php_value mbstring.http_input pass
php_value mbstring.http_output pass
php_flag mbstring.encoding_translation off
+ php_value xdebug.max_nesting_level 256
# Requires mod_expires to be enabled.