summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-08-29 09:12:03 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-08-29 09:12:03 +0000
commitbceaf8f0daf1d76bb33afdef8ea231fbc855a5c2 (patch)
treecec3f6333255ce0632498c8594bd56c67a140726 /modules/node
parentad0e8b5615f4585f78ccbe27912c2545875a77f1 (diff)
downloadbrdo-bceaf8f0daf1d76bb33afdef8ea231fbc855a5c2.tar.gz
brdo-bceaf8f0daf1d76bb33afdef8ea231fbc855a5c2.tar.bz2
#80574 Eaton and chx. Replace $_POST['edit'] with $_POST.
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.module14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index ab1224348..8d5ad794c 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1427,7 +1427,7 @@ function node_admin_nodes_validate($form_id, $edit) {
function node_admin_content() {
$output = drupal_get_form('node_filter_form');
- if ($_POST['edit']['operation'] == 'delete' && $_POST['edit']['nodes']) {
+ if ($_POST['operation'] == 'delete' && $_POST['nodes']) {
return drupal_get_form('node_multiple_delete_confirm');
}
// Call the form first, to allow for the form_values array to be populated.
@@ -1504,7 +1504,7 @@ function theme_node_admin_nodes($form) {
}
function node_multiple_delete_confirm() {
- $edit = $_POST['edit'];
+ $edit = $_POST;
$form['nodes'] = array('#prefix' => '<ul>', '#suffix' => '</ul>', '#tree' => TRUE);
// array_filter returns only elements with TRUE values
@@ -1652,7 +1652,7 @@ function node_revision_list($node) {
}
function node_admin_search() {
- return drupal_get_form('search_form', url('admin/content/search'), $_POST['edit']['keys'], 'node') . search_data($_POST['edit']['keys'], 'node');
+ return drupal_get_form('search_form', url('admin/content/search'), $_POST['keys'], 'node') . search_data($_POST['keys'], 'node');
}
/**
@@ -1814,7 +1814,7 @@ function node_validate($node, $form = array()) {
form_set_error('body', t('The body of your @type is too short. You need at least %words words.', array('%words' => $type->min_word_count, '@type' => $type->name)));
}
- if (isset($node->nid) && (node_last_changed($node->nid) > $_POST['edit']['changed'])) {
+ if (isset($node->nid) && (node_last_changed($node->nid) > $_POST['changed'])) {
form_set_error('changed', t('This content has been modified by another user, changes cannot be saved.'));
}
@@ -1947,8 +1947,8 @@ function node_form($node) {
function node_form_add_preview($form) {
global $form_values;
- $op = isset($_POST['op']) ? $_POST['op'] : '';
- if ($op == t('Preview')) {
+ $op = isset($form_values['op']) ? $form_values['op'] : '';
+ if ($op == $form_values['preview']) {
drupal_validate_form($form['form_id']['#value'], $form);
if (!form_get_errors()) {
// We pass the global $form_values here to preserve changes made during form validation
@@ -2157,7 +2157,7 @@ function node_form_submit($form_id, $edit) {
* Menu callback -- ask for confirmation of node deletion
*/
function node_delete_confirm() {
- $edit = $_POST['edit'];
+ $edit = $_POST;
$edit['nid'] = $edit['nid'] ? $edit['nid'] : arg(1);
$node = node_load($edit['nid']);