summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2011-11-22 20:18:35 -0500
committerDries2011-11-22 20:18:35 -0500
commitda6015e0526f51ed10d2052566a34500f080a584 (patch)
tree968c4de755bd1a378aa64da79984ca75b44e2960
parent97c83c4f4df342514dc5449fbd98e98f98dd8051 (diff)
- Patch #1297410 by bhosmer, bfroehle: drop remnants of #node_edit_form().
-rw-r--r--core/modules/forum/forum.module8
-rw-r--r--core/modules/node/node.pages.inc4
2 files changed, 7 insertions, 5 deletions
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index f538216..3575bfd 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -594,7 +594,13 @@ function forum_form_alter(&$form, $form_state, $form_id) {
$form['advanced']['parent']['#access'] = FALSE;
}
}
- if (!empty($form['#node_edit_form']) && isset($form['taxonomy_forums'])) {
+}
+
+/**
+ * Implements hook_form_BASE_FORM_ID_alter().
+ */
+function forum_form_node_form_alter(&$form, &$form_state, $form_id) {
+ if (isset($form['taxonomy_forums'])) {
$langcode = $form['taxonomy_forums']['#language'];
// Make the vocabulary required for 'real' forum-nodes.
$form['taxonomy_forums'][$langcode]['#required'] = TRUE;
diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index c7b26e7..c6993b6 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -106,10 +106,6 @@ function node_form($form, &$form_state, $node) {
unset($node->in_preview);
}
- // Identify this as a node edit form.
- // @todo D8: Remove. Modules can implement hook_form_BASE_FORM_ID_alter() now.
- $form['#node_edit_form'] = TRUE;
-
// Override the default CSS class name, since the user-defined node type name
// in 'TYPE-node-form' potentially clashes with third-party class names.
$form['#attributes']['class'][0] = drupal_html_class('node-' . $node->type . '-form');