summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-05-23 19:14:42 +0000
committerDries Buytaert <dries@buytaert.net>2009-05-23 19:14:42 +0000
commit77423ed423604447d32d35f3dc9df3026922ebc1 (patch)
tree2405009d63ff9b35c1b4976957995155da094f25 /includes
parent6c590f25efec7abf2053f1acab4939a65762ed88 (diff)
downloadbrdo-77423ed423604447d32d35f3dc9df3026922ebc1.tar.gz
brdo-77423ed423604447d32d35f3dc9df3026922ebc1.tar.bz2
- Patch #471032 by chx: variable_del is broken!
Diffstat (limited to 'includes')
-rw-r--r--includes/bootstrap.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 590f1ba35..f0b588913 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -661,14 +661,12 @@ function variable_set($name, $value) {
* The name of the variable to undefine.
*/
function variable_del($name) {
- global $conf;
-
db_delete('variable')
->condition('name', $name)
->execute();
cache_clear_all('variables', 'cache');
- unset($conf[$name]);
+ unset($GLOBALS['conf'][$name]);
}