Merge pull request #14776 from eileenmcnaughton/bgm515

dev/drupal#75 Drupal8: fix call to languageNegotiationURL() when called from cv
civicrm · Jul 10, 2019 · f7bdfd9 · f7bdfd9
2 parents d8a2070 + 1593366
commit f7bdfd9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
@@ -707,7 +707,7 @@ public function languageNegotiationURL($url, $addLanguagePart = TRUE, $removeLan
 
     // Drupal might not be bootstrapped if being called by the REST API.
     if (!class_exists('Drupal') || !\Drupal::hasContainer()) {
-      return NULL;
+      return $url;
     }
 
     $language = $this->getCurrentLanguage();