summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-05-23 19:21:30 +0000
committerDries Buytaert <dries@buytaert.net>2009-05-23 19:21:30 +0000
commit6ef4875e8702725c58d309bab0bebdcb2dcf5482 (patch)
treec6d24a9701674c494952ed6a27931be274354418
parent77423ed423604447d32d35f3dc9df3026922ebc1 (diff)
downloadbrdo-6ef4875e8702725c58d309bab0bebdcb2dcf5482.tar.gz
brdo-6ef4875e8702725c58d309bab0bebdcb2dcf5482.tar.bz2
- Rollback of last patch.
-rw-r--r--includes/bootstrap.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index f0b588913..590f1ba35 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -661,12 +661,14 @@ 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($GLOBALS['conf'][$name]);
+ unset($conf[$name]);
}