summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngie Byron2010-01-13 12:58:47 (GMT)
committerAngie Byron2010-01-13 12:58:47 (GMT)
commit183d87803765c29efd7dcaf775ae227dbafd5175 (patch)
treeed2bc26dd6d244d8ff62314411f24c0584bb0f59
parent85213d3bee5c4373f12378c3fa910f0e93e6d678 (diff)
#261258 follow-up by dbabbage: Fixed some missed node title changes that were breaking testbot.
-rw-r--r--modules/node/node.module4
-rw-r--r--modules/node/node.test9
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index af855d7..33910f6 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -976,8 +976,8 @@ function node_save($node) {
unset($node->log);
}
- // When saving a new node revision, unset any existing revision ID so as to
- // ensure that a new revision will actually be created, and store the old
+ // When saving a new node revision, unset any existing $node->vid so as to
+ // ensure that a new revision will actually be created, then store the old
// revision ID in a separate property for use by node hook implementations.
if (!$node->is_new && !empty($node->revision) && $node->vid) {
$node->old_vid = $node->vid;
diff --git a/modules/node/node.test b/modules/node/node.test
index 7ec078d..394f7e3 100644
--- a/modules/node/node.test
+++ b/modules/node/node.test
@@ -181,8 +181,7 @@ class NodeRevisionsTestCase extends DrupalWebTestCase {
'vid' => $node->vid,
'uid' => $node->uid,
'type' => $node->type,
- 'title' => array(LANGUAGE_NONE => array(array('value' => $new_title))),
- 'log' => '',
+ 'title' => $new_title,
);
node_save($updated_node);
$this->drupalGet('node/' . $node->nid);
@@ -201,14 +200,14 @@ class NodeRevisionsTestCase extends DrupalWebTestCase {
'vid' => $node->vid,
'uid' => $node->uid,
'type' => $node->type,
- 'title' => array(LANGUAGE_NONE => array(array('value' => $new_title))),
+ 'title' => $new_title,
'revision' => 1,
);
node_save($updated_node);
$this->drupalGet('node/' . $node->nid);
- $this->assertText($new_title, t('New node title appears on the page.'));
+ $this->assertText($new_title, 'New node title appears on the page.');
$node_revision = node_load($node->nid, NULL, TRUE);
- $this->assertTrue(empty($node_revision->log), t('After a new node revision is saved with an empty log message, the log message for the node is empty.'));
+ $this->assertTrue(empty($node_revision->log), 'After a new node revision is saved with an empty log message, the log message for the node is empty.');
}
}