diff options
| -rw-r--r-- | modules/comment/comment.admin.inc | 3 | ||||
| -rw-r--r-- | modules/comment/comment.module | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc index 59a9717f8..9c773dec5 100644 --- a/modules/comment/comment.admin.inc +++ b/modules/comment/comment.admin.inc @@ -134,7 +134,6 @@ function comment_admin_overview_validate($form, &$form_state) { // We can't execute any 'Update options' if no comments were selected. if (count($form_state['values']['comments']) == 0) { form_set_error('', t('Please select one or more comments to perform the update on.')); - drupal_goto('admin/content/comment'); } } @@ -146,7 +145,7 @@ function comment_admin_overview_validate($form, &$form_state) { */ function comment_admin_overview_submit($form, &$form_state) { $operations = comment_operations(); - if ($operations[$form_state['values']['operation']][1]) { + if (!empty($operations[$form_state['values']['operation']][1])) { // Extract the appropriate database query operation. $query = $operations[$form_state['values']['operation']][1]; foreach ($form_state['values']['comments'] as $cid => $value) { diff --git a/modules/comment/comment.module b/modules/comment/comment.module index afcd985d8..444ed9d80 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1467,21 +1467,21 @@ function comment_delete_multiple($cids) { function comment_operations($action = NULL) { if ($action == 'publish') { $operations = array( - 'publish' => array(t('Publish the selected comments'), db_update('comment')->fields(array( 'status' => COMMENT_PUBLISHED)) ), - 'delete' => array(t('Delete the selected comments'), '') + 'publish' => array(t('Publish the selected comments'), db_update('comment')->fields(array('status' => COMMENT_PUBLISHED))), + 'delete' => array(t('Delete the selected comments'), ''), ); } elseif ($action == 'unpublish') { $operations = array( - 'unpublish' => array(t('Unpublish the selected comments'), db_update('comment')->fields(array( 'status' => COMMENT_NOT_PUBLISHED)) ), - 'delete' => array(t('Delete the selected comments'), '') + 'unpublish' => array(t('Unpublish the selected comments'), db_update('comment')->fields(array('status' => COMMENT_NOT_PUBLISHED))), + 'delete' => array(t('Delete the selected comments'), ''), ); } else { $operations = array( - 'publish' => array(t('Publish the selected comments'), db_update('comment')->fields(array( 'status' => COMMENT_PUBLISHED)) ), - 'unpublish' => array(t('Unpublish the selected comments'), db_update('comment')->fields(array( 'status' => COMMENT_NOT_PUBLISHED)) ), - 'delete' => array(t('Delete the selected comments'), '') + 'publish' => array(t('Publish the selected comments'), db_update('comment')->fields(array('status' => COMMENT_PUBLISHED))), + 'unpublish' => array(t('Unpublish the selected comments'), db_update('comment')->fields(array('status' => COMMENT_NOT_PUBLISHED))), + 'delete' => array(t('Delete the selected comments'), ''), ); } |