diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc index 009ad4da51afb48372a5514918d44dae439e539e..b2f4a27ed7f390c11bf74e92df7c541508f9011e 100644 --- a/includes/bootstrap.inc +++ b/includes/bootstrap.inc @@ -395,13 +395,13 @@ function drupal_initialize_variables() { // Enforce E_ALL, but allow users to set levels not part of E_ALL. error_reporting(E_ALL | error_reporting()); - // Override PHP settings required for Drupal to work properly. The .htaccess - // file contains settings that cannot be changed at runtime. See - // sites/default/default.settings.php for more non-runtime settings. + // Override PHP settings required for Drupal to work properly. + // sites/default/default.settings.php contains more runtime settings. + // The .htaccess file contains settings that cannot be changed at runtime. - // Prevent PHP from generating HTML errors messages. + // Prevent PHP from generating HTML error messages. ini_set('html_errors', 0); - // Don't escape quotes when reading files from disk etc. + // Don't escape quotes when reading files from the database, disk, etc. ini_set('magic_quotes_runtime', '0'); } diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php index 50b762f9ce122bf213082baed29d6976f366cb5a..e8043588040fa373c20ef30f1df2247298b5f0e6 100644 --- a/sites/default/default.settings.php +++ b/sites/default/default.settings.php @@ -189,7 +189,7 @@ * PHP settings: * * To see what PHP settings are possible, including whether they can be set at - * runtime (i.e., when ini_set() occurs), read the PHP documentation: + * runtime (by using ini_set()), read the PHP documentation: * http://www.php.net/manual/en/ini.php#ini.list * See drupal_initialize_variables() in includes/bootstrap.inc for required * runtime settings and the .htaccess file for non-runtime settings. Settings