summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-11-22 13:46:11 +0000
committerDries Buytaert <dries@buytaert.net>2008-11-22 13:46:11 +0000
commit6608f70cff82808b3c9bbc98ae3dd76d123330f0 (patch)
treeab746e095b421924b35c1ddcb8ff7dee8e0920cb /includes
parenteb68540da33d7a911922bf497faa999236978e06 (diff)
downloadbrdo-6608f70cff82808b3c9bbc98ae3dd76d123330f0.tar.gz
brdo-6608f70cff82808b3c9bbc98ae3dd76d123330f0.tar.bz2
- Patch #308834 by c960657: move setting of magic_quotes_runtime out of settings.php because (i) we don't want a user to change it and (ii) it gets executed a bit earlier in the Drupal bootstrap.
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 9e4e78ea0..009ad4da5 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -394,8 +394,15 @@ 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.
+
// Prevent PHP from generating HTML errors messages.
ini_set('html_errors', 0);
+ // Don't escape quotes when reading files from disk etc.
+ ini_set('magic_quotes_runtime', '0');
}
/**