diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index b323c43bbf1bb480cfc26a3d3ea513859e0f2e3c..b2539b0eae2ddce6d2e5475dd49fbb428a742b05 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -28,37 +28,37 @@ function node_configure_rebuild_confirm_submit($form, &$form_state) { function node_node_operations() { $operations = array( 'publish' => array( - 'label' => t('Publish'), + 'label' => t('Publish selected content'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED)), ), 'unpublish' => array( - 'label' => t('Unpublish'), + 'label' => t('Unpublish selected content'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('status' => NODE_NOT_PUBLISHED)), ), 'promote' => array( - 'label' => t('Promote to front page'), + 'label' => t('Promote selected content to front page'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED, 'promote' => NODE_PROMOTED)), ), 'demote' => array( - 'label' => t('Demote from front page'), + 'label' => t('Demote selected content from front page'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('promote' => NODE_NOT_PROMOTED)), ), 'sticky' => array( - 'label' => t('Make sticky'), + 'label' => t('Make selected content sticky'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED, 'sticky' => NODE_STICKY)), ), 'unsticky' => array( - 'label' => t('Remove stickiness'), + 'label' => t('Make selected content not sticky'), 'callback' => 'node_mass_update', 'callback arguments' => array('updates' => array('sticky' => NODE_NOT_STICKY)), ), 'delete' => array( - 'label' => t('Delete'), + 'label' => t('Delete selected content'), 'callback' => NULL, ), ); diff --git a/modules/node/node.api.php b/modules/node/node.api.php index 09dfe9d3c6e8dff400c95aa8adadb6e554fcfcad..ef7f7bdec5796925945c12920b0d1fa9f4383d56 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -222,28 +222,39 @@ function hook_node_grants_alter(&$grants, $account, $op) { */ function hook_node_operations() { $operations = array( - 'approve' => array( - 'label' => t('Approve the selected posts'), - 'callback' => 'node_operations_approve', + 'publish' => array( + 'label' => t('Publish selected content'), + 'callback' => 'node_mass_update', + 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED)), ), - 'promote' => array( - 'label' => t('Promote the selected posts'), - 'callback' => 'node_operations_promote', + 'unpublish' => array( + 'label' => t('Unpublish selected content'), + 'callback' => 'node_mass_update', + 'callback arguments' => array('updates' => array('status' => NODE_NOT_PUBLISHED)), ), - 'sticky' => array( - 'label' => t('Make the selected posts sticky'), - 'callback' => 'node_operations_sticky', + 'promote' => array( + 'label' => t('Promote selected content to front page'), + 'callback' => 'node_mass_update', + 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED, 'promote' => NODE_PROMOTED)), ), 'demote' => array( - 'label' => t('Demote the selected posts'), - 'callback' => 'node_operations_demote', + 'label' => t('Demote selected content from front page'), + 'callback' => 'node_mass_update', + 'callback arguments' => array('updates' => array('promote' => NODE_NOT_PROMOTED)), ), - 'unpublish' => array( - 'label' => t('Unpublish the selected posts'), - 'callback' => 'node_operations_unpublish', + 'sticky' => array( + 'label' => t('Make selected content sticky'), + 'callback' => 'node_mass_update', + 'callback arguments' => array('updates' => array('status' => NODE_PUBLISHED, 'sticky' => NODE_STICKY)), + ), + 'unsticky' => array( + 'label' => t('Make selected content not sticky'), + 'callback' => 'node_mass_update', + 'callback arguments' => array('updates' => array('sticky' => NODE_NOT_STICKY)), ), 'delete' => array( - 'label' => t('Delete the selected posts'), + 'label' => t('Delete selected content'), + 'callback' => NULL, ), ); return $operations;