diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-08-17 10:46:30 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-08-17 10:46:30 +0000 |
| commit | 0b9e7c07e8eca7a4316e2daea78ddc59c41c1270 (patch) | |
| tree | 8d7d034bc5edc2ed8504b1ccc7de1621e48af68d | |
| parent | bbe2e8478b0687c2252a2e47bdb0003a23918ef5 (diff) | |
| download | brdo-0b9e7c07e8eca7a4316e2daea78ddc59c41c1270.tar.gz brdo-0b9e7c07e8eca7a4316e2daea78ddc59c41c1270.tar.bz2 | |
- Patch #265899 by mfb: uri_brief mail token did not support https URLs.
| -rw-r--r-- | modules/user/user.module | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 23151d2d9..ab5b2a48e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2036,7 +2036,7 @@ function user_mail_tokens($account, $language) { '!site' => variable_get('site_name', 'Drupal'), '!login_url' => user_pass_reset_url($account), '!uri' => $base_url, - '!uri_brief' => substr($base_url, strlen('http://')), + '!uri_brief' => preg_replace('!^https?://!', '', $base_url), '!mailto' => $account->mail, '!date' => format_date(time(), 'medium', '', NULL, $language->language), '!login_uri' => url('user', array('absolute' => TRUE, 'language' => $language)), |