@@ -163,7 +163,7 @@ function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = F
// $number does not use drupal_static as it should not be reset
// since it uniquely identifies each call to checkBookNode().
static$number=0;
$this->drupalGet('node/'.$node->nid);
$this->drupalGet('node/'.$node->id());
// Check outline structure.
if($nodes!==NULL){
...
...
@@ -175,22 +175,22 @@ function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = F
// Check previous, up, and next links.
if($previous){
$this->assertRaw(l('<b>‹</b> '.$previous->label(),'node/'.$previous->nid,array('html'=>TRUE,'attributes'=>array('rel'=>array('prev'),'title'=>t('Go to previous page')))),'Previous page link found.');
$this->assertRaw(l('<b>‹</b> '.$previous->label(),'node/'.$previous->id(),array('html'=>TRUE,'attributes'=>array('rel'=>array('prev'),'title'=>t('Go to previous page')))),'Previous page link found.');
}
if($up){
$this->assertRaw(l('Up','node/'.$up->nid,array('html'=>TRUE,'attributes'=>array('title'=>t('Go to parent page')))),'Up page link found.');
$this->assertRaw(l('Up','node/'.$up->id(),array('html'=>TRUE,'attributes'=>array('title'=>t('Go to parent page')))),'Up page link found.');
}
if($next){
$this->assertRaw(l($next->label().' <b>›</b>','node/'.$next->nid,array('html'=>TRUE,'attributes'=>array('rel'=>array('next'),'title'=>t('Go to next page')))),'Next page link found.');
$this->assertRaw(l($next->label().' <b>›</b>','node/'.$next->id(),array('html'=>TRUE,'attributes'=>array('rel'=>array('next'),'title'=>t('Go to next page')))),'Next page link found.');
$this->assertText($node->label(),'Printer friendly title found.');
$this->assertRaw(check_markup($node->body[Language::LANGCODE_NOT_SPECIFIED][0]['value'],$node->body[Language::LANGCODE_NOT_SPECIFIED][0]['format']),'Printer friendly body found.');
...
...
@@ -223,10 +223,10 @@ function checkBookNode(EntityInterface $node, $nodes, $previous = FALSE, $up = F
@@ -771,7 +771,7 @@ function comment_get_thread(EntityInterface $node, $mode, $comments_per_page) {
$count_query=db_select('comment','c');
$count_query->addExpression('COUNT(*)');
$count_query
->condition('c.nid',$node->nid)
->condition('c.nid',$node->id())
->addTag('node_access')
->addTag('comment_filter')
->addMetaData('base_table','comment')
...
...
@@ -1071,7 +1071,7 @@ function comment_form_node_form_alter(&$form, $form_state) {
),
'#weight'=>30,
);
$comment_count=isset($node->nid)?db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid',array(':nid'=>$node->nid))->fetchField():0;
$comment_count=$node->id()?db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = :nid',array(':nid'=>$node->id()))->fetchField():0;