projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/5.22' into 5.22-master-2020-01-24-13-18-00
[civicrm-core.git]
/
CRM
/
Mailing
/
BAO
/
TrackableURL.php
diff --git
a/CRM/Mailing/BAO/TrackableURL.php
b/CRM/Mailing/BAO/TrackableURL.php
index 23c01cf5cc0aa862e28232929503dcdf25dc344f..86650e3afe3dab47bf4baadd4e46f2b0d36a73a2 100644
(file)
--- a/
CRM/Mailing/BAO/TrackableURL.php
+++ b/
CRM/Mailing/BAO/TrackableURL.php
@@
-57,7
+57,6
@@
class CRM_Mailing_BAO_TrackableURL extends CRM_Mailing_DAO_TrackableURL {
else {
$hrefExists = FALSE;
else {
$hrefExists = FALSE;
- $config = CRM_Core_Config::singleton();
$tracker = new CRM_Mailing_BAO_TrackableURL();
if (preg_match('/^href/i', $url)) {
$tracker = new CRM_Mailing_BAO_TrackableURL();
if (preg_match('/^href/i', $url)) {
@@
-73,11
+72,11
@@
class CRM_Mailing_BAO_TrackableURL extends CRM_Mailing_DAO_TrackableURL {
}
$id = $tracker->id;
}
$id = $tracker->id;
- $redirect =
$config->userFrameworkResourceURL . "extern/url.php?u=$id"
;
+ $redirect =
CRM_Utils_System::externUrl('extern/url', "u=$id")
;
$urlCache[$mailing_id . $url] = $redirect;
}
$urlCache[$mailing_id . $url] = $redirect;
}
- $returnUrl =
"{$urlCache[$mailing_id . $url]}&qid={$queue_id}"
;
+ $returnUrl =
CRM_Utils_System::externUrl('extern/url', "u=$id&qid=$queue_id")
;
if ($hrefExists) {
$returnUrl = "href='{$returnUrl}' rel='nofollow'";
if ($hrefExists) {
$returnUrl = "href='{$returnUrl}' rel='nofollow'";