summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2005-01-14 17:30:00 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2005-01-14 17:30:00 +0000
commitbeada9364d728f9b9f06f04085b723d833d45706 (patch)
treee62d5fe3de34224088acc27d279cb72dd32b502b
parent9d809b87b0ce3328c05bdf58fce277462626d986 (diff)
downloadbrdo-beada9364d728f9b9f06f04085b723d833d45706.tar.gz
brdo-beada9364d728f9b9f06f04085b723d833d45706.tar.bz2
Remove left-overs from admin.module.
-rw-r--r--database/database.mysql1
-rw-r--r--database/database.pgsql1
-rw-r--r--database/updates.inc7
-rw-r--r--includes/module.inc2
4 files changed, 7 insertions, 4 deletions
diff --git a/database/database.mysql b/database/database.mysql
index df93453ae..18e9731e3 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -775,7 +775,6 @@ CREATE TABLE watchdog (
-- Insert some default values
--
-INSERT INTO system VALUES ('modules/admin.module','admin','module','',1,0,0);
INSERT INTO system VALUES ('modules/block.module','block','module','',1,0,0);
INSERT INTO system VALUES ('modules/comment.module','comment','module','',1,0,0);
INSERT INTO system VALUES ('modules/filter.module','filter','module','',1,0,0);
diff --git a/database/database.pgsql b/database/database.pgsql
index 5c2f9265c..7e312e54c 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -762,7 +762,6 @@ CREATE TABLE watchdog (
-- Insert some default values
--
-INSERT INTO system VALUES ('modules/admin.module','admin','module','',1,0,0);
INSERT INTO system VALUES ('modules/block.module','block','module','',1,0,0);
INSERT INTO system VALUES ('modules/comment.module','comment','module','',1,0,0);
INSERT INTO system VALUES ('modules/filter.module','filter','module','',1,0,0);
diff --git a/database/updates.inc b/database/updates.inc
index 1a340188a..a0791c056 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -91,7 +91,8 @@ $sql_updates = array(
"2004-11-15" => "update_112",
"2004-11-28" => "update_113",
"2004-12-05" => "update_114",
- "2005-01-07" => "update_115"
+ "2005-01-07" => "update_115",
+ "2005-01-14" => "update_116"
);
function update_32() {
@@ -2078,6 +2079,10 @@ function update_115() {
return $ret;
}
+function update_116() {
+ return array(update_sql("DELETE FROM {system} WHERE name = 'admin'"));
+}
+
function update_sql($sql) {
$edit = $_POST["edit"];
$result = db_query($sql);
diff --git a/includes/module.inc b/includes/module.inc
index d31222a98..820fdf7e9 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -45,7 +45,7 @@ function module_list($refresh = FALSE, $bootstrap = FALSE) {
}
if (!$list) {
- $list = array('admin' => 'admin', 'filter' => 'filter', 'system' => 'system', 'user' => 'user', 'watchdog' => 'watchdog');
+ $list = array('filter' => 'filter', 'system' => 'system', 'user' => 'user', 'watchdog' => 'watchdog');
if ($bootstrap) {
$result = db_query("SELECT name, filename, throttle, bootstrap FROM {system} WHERE type = 'module' AND status = 1 AND bootstrap = 1");
}