diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php index 292cd6b..9faec48 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Module/DependencyTest.php @@ -127,7 +127,7 @@ function testModuleEnableOrder() { // - options depends on number // - ban depends on xmlrpc (via module_test) // The correct enable order is: - $expected_order = array('xmlrpc', 'ban', 'node', 'datetime', 'comment', 'number', 'options', 'history', 'taxonomy', 'forum'); + $expected_order = array('xmlrpc', 'ban', 'node', 'datetime', 'comment', 'history', 'number', 'options', 'taxonomy', 'forum'); // Enable the modules through the UI, verifying that the dependency chain // is correct. diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module index cb467ea..c94f0e7 100644 --- a/core/modules/tracker/tracker.module +++ b/core/modules/tracker/tracker.module @@ -207,7 +207,7 @@ function tracker_comment_update(CommentInterface $comment) { // $comment->save() calls hook_comment_publish() for all published comments // so we need to handle all other values here. if ($comment->status->value != CommentInterface::PUBLISHED && $comment->entity_type->value == 'node') { - _tracker_remove($comment->entity_id->target_id, $comment->getOwnerId(), $comment->changed->value); + _tracker_remove($comment->entity_id->value, $comment->getOwnerId(), $comment->changed->value); } } @@ -219,7 +219,7 @@ function tracker_comment_update(CommentInterface $comment) { */ function tracker_comment_publish(CommentInterface $comment) { if ($comment->entity_type->value == 'node') { - _tracker_add($comment->entity_id->target_id, $comment->getOwnerId(), $comment->changed->value); + _tracker_add($comment->entity_id->value, $comment->getOwnerId(), $comment->changed->value); } } @@ -228,7 +228,7 @@ function tracker_comment_publish(CommentInterface $comment) { */ function tracker_comment_unpublish(CommentInterface $comment) { if ($comment->entity_type->value == 'node') { - _tracker_remove($comment->entity_id->target_id, $comment->getOwnerId(), $comment->changed->value); + _tracker_remove($comment->entity_id->value, $comment->getOwnerId(), $comment->changed->value); } } @@ -237,7 +237,7 @@ function tracker_comment_unpublish(CommentInterface $comment) { */ function tracker_comment_delete(CommentInterface $comment) { if ($comment->entity_type->value == 'node') { - _tracker_remove($comment->entity_id->target_id, $comment->getOwnerId(), $comment->changed->value); + _tracker_remove($comment->entity_id->value, $comment->getOwnerId(), $comment->changed->value); } } diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php index 9fe91bb..52cdb42 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/AccessTest.php @@ -22,7 +22,7 @@ class AccessTest extends PluginTestBase { * * @var array */ - public static $testViews = array('test_access_none', 'test_access_static', 'test_access_dynamic'); + public static $testViews = array('node', 'test_access_none', 'test_access_static', 'test_access_dynamic'); public static function getInfo() { return array(