Mercurial > hg > cmmr2012-drupal-site

diff core/modules/workspaces/src/EntityQuery/Tables.php @ 5:12f9dff5fda9 tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to Drupal core 8.7.1
author Chris Cannam
date Thu, 09 May 2019 15:34:47 +0100
parents a9cd425dd02b
children
line wrap: on
line diff
--- a/core/modules/workspaces/src/EntityQuery/Tables.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/modules/workspaces/src/EntityQuery/Tables.php	Thu May 09 15:34:47 2019 +0100
@@ -97,7 +97,7 @@
 
       if (isset($this->baseTablesEntityType[$base_table])) {
         $entity_type_id = $this->baseTablesEntityType[$base_table];
-        $revision_key = $this->entityManager->getDefinition($entity_type_id)->getKey('revision');
+        $revision_key = $this->entityTypeManager->getActiveDefinition($entity_type_id)->getKey('revision');
 
         if ($id_field === $revision_key || $id_field === 'revision_id') {
           $workspace_association_table = $this->contentWorkspaceTables[$base_table];
@@ -141,7 +141,7 @@
    */
   public function addWorkspaceAssociationJoin($entity_type_id, $base_table_alias, $active_workspace_id) {
     if (!isset($this->contentWorkspaceTables[$base_table_alias])) {
-      $entity_type = $this->entityManager->getDefinition($entity_type_id);
+      $entity_type = $this->entityTypeManager->getActiveDefinition($entity_type_id);
       $id_field = $entity_type->getKey('id');
 
       // LEFT join the Workspace association entity's table so we can properly