diff --git a/core/modules/node/node.install b/core/modules/node/node.install index 6b188ce..ac88175 100644 --- a/core/modules/node/node.install +++ b/core/modules/node/node.install @@ -764,7 +764,7 @@ function node_update_8014(&$sandbox) { $query ->fields('r', array('nid', 'timestamp')) ->fields('n', array('created')) - ->condition('r.status', 1,'=') + ->condition('r.status', 1) ->groupBy('r.nid'); db_insert('node_update_8014') ->from($query) @@ -784,11 +784,11 @@ function node_update_8014(&$sandbox) { $sandbox['count'] += 1; // See if the node has multiple revisions. If it does, use the revision // timestamp. If not then use the node created date. - $revisions = db_query('SELECT COUNT(*) FROM {node_revision} WHERE nid = :nid', array(':nid' => $nid,))->fetchField(); + $revisions = db_query('SELECT COUNT(*) FROM {node_revision} WHERE nid = :nid', array(':nid' => $nid))->fetchField(); $published = ($revisions > 1) ? $record->timestamp : $record->created; db_update('node') - ->condition('nid', $nid, '=') - ->fields(array('published' => $published,)) + ->condition('nid', $nid) + ->fields(array('published' => $published)) ->execute(); } $sandbox['last'] += $batch; diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php index a56d5e2..2391c1f 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/NodePublishUpgradePathTest.php @@ -39,7 +39,7 @@ public function testNodePublishedTimestampUpgrade() { $this->assertTrue($this->performUpgrade(), 'The upgrade was completed successfully.'); $nodes = node_load_multiple(NULL); foreach ($nodes as $node) { - $revisions = db_query('SELECT COUNT(*) FROM {node_revision} WHERE nid = :nid', array(':nid' => $node->nid,))->fetchField(); + $revisions = db_query('SELECT COUNT(*) FROM {node_revision} WHERE nid = :nid', array(':nid' => $node->nid))->fetchField(); $timestamp = ''; if ($revisions > 1) { $timestamp = db_query('SELECT timestamp FROM {node_revision} WHERE nid = :nid AND status = 1 GROUP BY nid', array(':nid' => $node->nid))->fetchField();