summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-01-06 07:25:44 +0000
committerDries Buytaert <dries@buytaert.net>2006-01-06 07:25:44 +0000
commit6c20d333d2737f2875292e69f6e4bdfcfd57a684 (patch)
tree8a687efe73b0fd2c90ea4acaa70c7129e3fcc206 /modules
parentcade6b2bdacd39923f2ed1bf581c035b9be92c62 (diff)
downloadbrdo-6c20d333d2737f2875292e69f6e4bdfcfd57a684.tar.gz
brdo-6c20d333d2737f2875292e69f6e4bdfcfd57a684.tar.bz2
- Patch #35667 by Crell: bug fix: on ?q=admin/block style.css was imported twice.
Diffstat (limited to 'modules')
-rw-r--r--modules/block.module4
-rw-r--r--modules/block/block.module4
2 files changed, 2 insertions, 6 deletions
diff --git a/modules/block.module b/modules/block.module
index ad479f239..7e4d93797 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -154,9 +154,7 @@ function block_admin_save($edit) {
function _block_rehash($order_by = array('weight')) {
global $theme_key;
- if (empty($theme_key)) {
- init_theme();
- }
+ init_theme();
$result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key);
while ($old_block = db_fetch_object($result)) {
diff --git a/modules/block/block.module b/modules/block/block.module
index ad479f239..7e4d93797 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -154,9 +154,7 @@ function block_admin_save($edit) {
function _block_rehash($order_by = array('weight')) {
global $theme_key;
- if (empty($theme_key)) {
- init_theme();
- }
+ init_theme();
$result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key);
while ($old_block = db_fetch_object($result)) {