summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/block.module6
-rw-r--r--modules/block/block.module6
2 files changed, 8 insertions, 4 deletions
diff --git a/modules/block.module b/modules/block.module
index b7a4d9819..2ed842f01 100644
--- a/modules/block.module
+++ b/modules/block.module
@@ -380,8 +380,10 @@ function block_admin_configure($module = NULL, $delta = 0) {
}
function block_admin_configure_validate($form_id, $form_values) {
- if (empty($form_values['info']) || db_num_rows(db_query("SELECT bid FROM {boxes} WHERE bid != %d AND info = '%s'", $form_values['delta'], $form_values['info']))) {
- form_set_error('info', t('Please ensure that each block description is unique.'));
+ if ($form_values['module'] == 'block') {
+ if (empty($form_values['info']) || db_num_rows(db_query("SELECT bid FROM {boxes} WHERE bid != %d AND info = '%s'", $form_values['delta'], $form_values['info']))) {
+ form_set_error('info', t('Please ensure that each block description is unique.'));
+ }
}
}
diff --git a/modules/block/block.module b/modules/block/block.module
index b7a4d9819..2ed842f01 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -380,8 +380,10 @@ function block_admin_configure($module = NULL, $delta = 0) {
}
function block_admin_configure_validate($form_id, $form_values) {
- if (empty($form_values['info']) || db_num_rows(db_query("SELECT bid FROM {boxes} WHERE bid != %d AND info = '%s'", $form_values['delta'], $form_values['info']))) {
- form_set_error('info', t('Please ensure that each block description is unique.'));
+ if ($form_values['module'] == 'block') {
+ if (empty($form_values['info']) || db_num_rows(db_query("SELECT bid FROM {boxes} WHERE bid != %d AND info = '%s'", $form_values['delta'], $form_values['info']))) {
+ form_set_error('info', t('Please ensure that each block description is unique.'));
+ }
}
}