From: rollox <rollox@users.noreply.github.com>
Date: Wed, 30 Mar 2016 22:19:46 +0000 (+0100)
Subject: CRM-18317 - Links to Drupal system broken if hook altered by a module
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aaba8ae5c99eeb52989a7569ba364cb028e4ba51;p=civicrm-core.git

CRM-18317 - Links to Drupal system broken if hook altered by a module

Let Drupal render the system url for 'user/password' instead of Civi, so that any Drupal hooks that alter this path have a chance to do so.
---

diff --git a/CRM/Utils/System/Drupal.php b/CRM/Utils/System/Drupal.php
index 008b801cba..3b214841b9 100644
--- a/CRM/Utils/System/Drupal.php
+++ b/CRM/Utils/System/Drupal.php
@@ -149,7 +149,7 @@ class CRM_Utils_System_Drupal extends CRM_Utils_System_DrupalBase {
           array(':mail' => $params['mail'])
         )->fetchField();
         if ((bool) $uid) {
-          $resetUrl = $config->userFrameworkBaseURL . 'user/password';
+          $resetUrl = url('user/password');
           $errors[$emailName] = ts('The email address %1 is already registered. <a href="%2">Have you forgotten your password?</a>',
             array(1 => $params['mail'], 2 => $resetUrl)
           );