Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #37714 by asimmonds: fixed saving of blocks.

4.7.x
Dries Buytaert 2005-11-16 22:07:48 +00:00
parent 48929eba7a
commit 8b02851fee
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/block.module
View File

@ -380,10 +380,12 @@ function block_admin_configure($module = NULL, $delta = 0) {
} }
function block_admin_configure_validate($form_id, $form_values) { function block_admin_configure_validate($form_id, $form_values) {
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']))) { 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.')); form_set_error('info', t('Please ensure that each block description is unique.'));
} }
} }
}
function block_admin_configure_execute($form_id, $form_values) { function block_admin_configure_execute($form_id, $form_values) {
if (!form_get_errors()) { if (!form_get_errors()) {

2
modules/block/block.module
View File

@ -380,10 +380,12 @@ function block_admin_configure($module = NULL, $delta = 0) {
} }
function block_admin_configure_validate($form_id, $form_values) { function block_admin_configure_validate($form_id, $form_values) {
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']))) { 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.')); form_set_error('info', t('Please ensure that each block description is unique.'));
} }
} }
}
function block_admin_configure_execute($form_id, $form_values) { function block_admin_configure_execute($form_id, $form_values) {
if (!form_get_errors()) { if (!form_get_errors()) {