Merge pull request #1899 from dlobo/CRM-13697

[civicrm-core.git] / CRM / Utils / System / Drupal.php

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index fda57c0385727286cb67e173ed0b285bf2121983..692dbe48f86d8d2908912c8b12205caf890c6f86 100644 (file)
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -958,7 +958,7 @@ AND    u.status = 1
         if ($urlType == LOCALE_LANGUAGE_NEGOTIATION_URL_PREFIX) {
           if (isset($language->prefix) && $language->prefix) {
             if ($addLanguagePart) {
-              $url .= $language->prefix . '/';
+              $url = (CRM_Utils_System::isSSL() ? 'https' : 'http') . '://' . $language->domain . base_path();
             }
             if ($removeLanguagePart) {
               $url = str_replace("/{$language->prefix}/", '/', $url);