summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-08-14 07:17:37 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-08-14 07:17:37 +0000
commit20201f4ddc3d9a52671345ffac5eed8655052589 (patch)
treed696caa455abd314a5914aa0a5c40e4cefe5fc3e
parent3cc2b1e3d78d7e82572d59939507bb3eddce53b4 (diff)
downloadbrdo-20201f4ddc3d9a52671345ffac5eed8655052589.tar.gz
brdo-20201f4ddc3d9a52671345ffac5eed8655052589.tar.bz2
Fixing the last commit and CHANGELOG.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--modules/system/system.module7
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bdd68d415..55a689b6f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -43,6 +43,7 @@ Drupal x.x.x, xxxx-xx-xx (development version)
- removed the archive module.
- upgrade system:
* created space for update branches.
+- split up and removed drupal.css.
Drupal 4.7.0, 2006-05-01
------------------------
diff --git a/modules/system/system.module b/modules/system/system.module
index 11ebead49..583210a65 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -245,10 +245,9 @@ function system_menu($may_cache) {
global $custom_theme;
$custom_theme = variable_get('admin_theme', 'bluemarine');
}
- }
- else {
- // Add the CSS for this module
- // We put this in !$may_cache so it's only added once per request
+
+ // Add the CSS for this module. We put this in !$may_cache so it is only
+ // added once per request.
drupal_add_css(drupal_get_path('module', 'system') .'/defaults.css', 'core');
drupal_add_css(drupal_get_path('module', 'system') .'/system.css', 'core');
}