summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-01-26 09:06:23 +0000
committerDries Buytaert <dries@buytaert.net>2006-01-26 09:06:23 +0000
commite54db453e01e2df2f68f233c3b2482492e3a4352 (patch)
tree7fa3bdeacd983626575f4a40c98d58384ddd0b87
parent1171cd2846bf111cb60d1aeef750107f7d0b50a2 (diff)
downloadbrdo-e54db453e01e2df2f68f233c3b2482492e3a4352.tar.gz
brdo-e54db453e01e2df2f68f233c3b2482492e3a4352.tar.bz2
- Patch #36029 by asimmonds/dopry: fixed critical bug in block administration.
-rw-r--r--modules/block.module3
-rw-r--r--modules/block/block.module3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/block.module b/modules/block.module
index 1c81dd672..7d8824d55 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -346,7 +346,8 @@ function block_admin_configure($module = NULL, $delta = 0) {
$form['user_vis_settings']['custom'] = array(
'#type' => 'radios',
'#title' => t('Custom visibility settings'),
- '#options' => array(t('Users cannot control whether or not they see this block.'), t('Show this block by default, but let individual users hide it.'), t('Hide this block by default but let individual users show it.'), t('Allow individual users to customize the visibility of this block in their account settings.')),
+ '#options' => array(t('Users cannot control whether or not they see this block.'), t('Show this block by default, but let individual users hide it.'), t('Hide this block by default but let individual users show it.')),
+ '#description' => t('Allow individual users to customize the visibility of this block in their account settings.'),
'#default_value' => $edit['custom'],
);
$form['page_vis_settings'] = array(
diff --git a/modules/block/block.module b/modules/block/block.module
index 1c81dd672..7d8824d55 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -346,7 +346,8 @@ function block_admin_configure($module = NULL, $delta = 0) {
$form['user_vis_settings']['custom'] = array(
'#type' => 'radios',
'#title' => t('Custom visibility settings'),
- '#options' => array(t('Users cannot control whether or not they see this block.'), t('Show this block by default, but let individual users hide it.'), t('Hide this block by default but let individual users show it.'), t('Allow individual users to customize the visibility of this block in their account settings.')),
+ '#options' => array(t('Users cannot control whether or not they see this block.'), t('Show this block by default, but let individual users hide it.'), t('Hide this block by default but let individual users show it.')),
+ '#description' => t('Allow individual users to customize the visibility of this block in their account settings.'),
'#default_value' => $edit['custom'],
);
$form['page_vis_settings'] = array(