#681940 by chx: Fixed Multistep node forms cant change the basic options. (with tests)

2 files changed, 40 insertions, 1 deletions

diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index ebc40b4dc..77b45f76b 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -86,7 +86,10 @@ function node_object_prepare($node) {
   // If this is a new node, fill in the default values.
   if (!isset($node->nid)) {
     foreach (array('status', 'promote', 'sticky') as $key) {
-      $node->$key = (int) in_array($key, $node_options);
+      // Multistep node forms might have filled in something already.
+      if (!isset($node->$key)) {
+        $node->$key = (int) in_array($key, $node_options);
+      }
     }
     global $user;
     $node->uid = $user->uid;
diff --git a/modules/node/node.test b/modules/node/node.test
index 4cd0a4859..c9f4fbd76 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -1276,3 +1276,39 @@ class NodeBlockFunctionalTest extends DrupalWebTestCase {
     $this->assertText($node4->title, t('Node found in block.'));
   }
 }
+/**
+ * Test multistep node forms basic options.
+ */
+class MultiStepNodeFormBasicOptionsTest extends DrupalWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Multistep node form basic options',
+      'description' => 'Test the persistence of basic options through multiple steps.',
+      'group' => 'Node',
+    );
+  }
+
+  function setUp() {
+    parent::setUp('poll');
+    $web_user = $this->drupalCreateUser(array('administer nodes', 'create poll content'));
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Change the default values of basic options to ensure they persist.
+   */
+  function testMultiStepNodeFormBasicOptions() {
+    $edit = array(
+      'title' => 'a',
+      'status' => FALSE,
+      'promote' => FALSE,
+      'sticky' => 1,
+      'choice[new:0][chtext]' => 'a',
+      'choice[new:1][chtext]' => 'a',
+    );
+    $this->drupalPost('node/add/poll', $edit, t('More choices'));
+    $this->assertNoFieldChecked('edit-status', 'status stayed unchecked');
+    $this->assertNoFieldChecked('edit-promote', 'promote stayed unchecked');
+    $this->assertFieldChecked('edit-sticky', 'sticky stayed checked');
+  }
+}