Merge pull request #14302 from mlutfy/drupal19

dev/drupal#19 Drupal8: fix bootstrap when used by the REST API
civicrm · May 23, 2019 · 8e4a28d · 8e4a28d
2 parents 7099e2c + c5a1e8d
commit 8e4a28d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
@@ -659,7 +659,7 @@ public function postURL($action) {
    */
   public function getCurrentLanguage() {
     // Drupal might not be bootstrapped if being called by the REST API.
-    if (!class_exists('Drupal')) {
+    if (!class_exists('Drupal') || !\Drupal::hasContainer()) {
       return NULL;
     }
 
@@ -706,7 +706,7 @@ public function languageNegotiationURL($url, $addLanguagePart = TRUE, $removeLan
     }
 
     // Drupal might not be bootstrapped if being called by the REST API.
-    if (!class_exists('Drupal')) {
+    if (!class_exists('Drupal') || !\Drupal::hasContainer()) {
       return NULL;
     }