summaryrefslogtreecommitdiff
path: root/modules/block
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-10-10 20:11:21 +0000
committerDries Buytaert <dries@buytaert.net>2010-10-10 20:11:21 +0000
commit2e226e9adfbba8d59056079201af9149c5597d5c (patch)
treead9a555de1c92b344bda0622e3eece06b366f9ea /modules/block
parent928361636cbc2c5922d79b2753c873fccae09f89 (diff)
downloadbrdo-2e226e9adfbba8d59056079201af9149c5597d5c.tar.gz
brdo-2e226e9adfbba8d59056079201af9149c5597d5c.tar.bz2
- Patch #936582 by Haza, joachim: fixed empty block at foot of dashboard block admin page.
Diffstat (limited to 'modules/block')
-rw-r--r--modules/block/block.admin.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index b6a8919c5..181f941ed 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -148,8 +148,10 @@ function block_admin_display_form($form, &$form_state, $blocks, $theme, $block_r
);
}
}
- // Do not allow disabling the main system content block.
- $form['blocks']['system_main']['region']['#required'] = TRUE;
+ // Do not allow disabling the main system content block when it is present.
+ if (isset($form['blocks']['system_main']['region'])) {
+ $form['blocks']['system_main']['region']['#required'] = TRUE;
+ }
$form['actions'] = array(
'#tree' => FALSE,