Skip to content
Snippets Groups Projects
Commit d8a4f8ed authored by bgm's avatar bgm
Browse files

CRM-13354: Fix support for locale detection from the domain (in Drupal), when...

CRM-13354: Fix support for locale detection from the domain (in Drupal), when the site is in a sub-directory (base_path() returns the subdirectory).
parent 4f489bde
No related branches found
No related tags found
No related merge requests found
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment