diff core/modules/workspaces/src/EntityQuery/QueryTrait.php @ 18:af1871eacc83

Update to Drupal core 8.7.1

--- a/core/modules/workspaces/src/EntityQuery/QueryTrait.php	Thu Feb 28 13:21:36 2019 +0000
+++ b/core/modules/workspaces/src/EntityQuery/QueryTrait.php	Thu May 09 15:33:08 2019 +0100
@@ -69,4 +69,18 @@
     return $this;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isSimpleQuery() {
+    // We declare that this is not a simple query in
+    // \Drupal\workspaces\EntityQuery\QueryTrait::prepare(), but that's not
+    // enough because the parent method can return TRUE in some circumstances.
+    if ($this->sqlQuery->getMetaData('active_workspace_id')) {
+      return FALSE;
+    }
+
+    return parent::isSimpleQuery();
+  }
+
 }