Commit 4dee9b3a authored by catch's avatar catch
Browse files

Issue #3395626 by amateescu: Fix workspace-support check in entity queries 

(cherry picked from commit 2e06d213)
parent 18a5fe06

core/modules/workspaces/src/EntityQuery/QueryTrait.php

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public function prepare() { 


    // Only alter the query if the active workspace is not the default one and

    // the entity type is supported.

    if ($this->workspaceManager->hasActiveWorkspace() && $this->workspaceManager->isEntityTypeSupported($this->entityType)) {

    if ($this->workspaceManager->isEntityTypeSupported($this->entityType) && $this->workspaceManager->hasActiveWorkspace()) {

      $active_workspace = $this->workspaceManager->getActiveWorkspace();

      $this->sqlQuery->addMetaData('active_workspace_id', $active_workspace->id());

      $this->sqlQuery->addMetaData('simple_query', FALSE);