From dd9edf387a540fcbbe056c6e46e28b094e57f312 Mon Sep 17 00:00:00 2001
From: Mathieu Lutfy <mathieu@symbiotic.coop>
Date: Tue, 9 Jul 2019 20:07:16 -0400
Subject: [PATCH] dev/drupal#75 Drupal8: fix call to languageNegotiationURL()
 when called from cv

---
 CRM/Utils/System/Drupal8.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
index 76b9580125..a8b8a0e947 100644
--- a/CRM/Utils/System/Drupal8.php
+++ b/CRM/Utils/System/Drupal8.php
@@ -709,7 +709,7 @@ class CRM_Utils_System_Drupal8 extends CRM_Utils_System_DrupalBase {
 
     // 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();
-- 
2.25.1