diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-02-19 13:19:26 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-02-19 13:19:26 +0000 |
| commit | 570dcc57529acce8d6ced538af003afd140538fe (patch) | |
| tree | b95f1f13f1f7c90f522b047ab728125b2d98e161 /includes | |
| parent | 860e546695c14b2f348ca8c2a9c1d8bd2730c780 (diff) | |
| download | brdo-570dcc57529acce8d6ced538af003afd140538fe.tar.gz brdo-570dcc57529acce8d6ced538af003afd140538fe.tar.bz2 | |
- Patch #892864 by pwolanin, pounard: remove drupal_static() in _drupal_bootstrap_full().
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/common.inc b/includes/common.inc index 6770e494f..3133da3f0 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1050,15 +1050,15 @@ function _fix_gpc_magic_files(&$item, $key) { * Fix double-escaping problems caused by "magic quotes" in some PHP installations. */ function fix_gpc_magic() { - $fixed = &drupal_static(__FUNCTION__, FALSE); + static $fixed = FALSE; if (!$fixed && ini_get('magic_quotes_gpc')) { array_walk($_GET, '_fix_gpc_magic'); array_walk($_POST, '_fix_gpc_magic'); array_walk($_COOKIE, '_fix_gpc_magic'); array_walk($_REQUEST, '_fix_gpc_magic'); array_walk($_FILES, '_fix_gpc_magic_files'); - $fixed = TRUE; } + $fixed = TRUE; } /** @@ -4874,12 +4874,12 @@ function drupal_valid_token($token, $value = '', $skip_anonymous = FALSE) { } function _drupal_bootstrap_full() { - $called = &drupal_static(__FUNCTION__); + static $called = FALSE; if ($called) { return; } - $called = 1; + $called = TRUE; require_once DRUPAL_ROOT . '/' . variable_get('path_inc', 'includes/path.inc'); require_once DRUPAL_ROOT . '/includes/theme.inc'; require_once DRUPAL_ROOT . '/includes/pager.inc'; |