projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dc56a09
)
CRM-16108 - Backport to 4.6.
author
Dave Greenberg
<dave@civicrm.org>
Fri, 13 Mar 2015 22:08:47 +0000
(15:08 -0700)
committer
Dave Greenberg
<dave@civicrm.org>
Fri, 13 Mar 2015 22:08:47 +0000
(15:08 -0700)
----------------------------------------
* CRM-16108: Some URL's cannot be parsed
https://issues.civicrm.org/jira/browse/CRM-16108
CRM/Mailing/BAO/Mailing.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Mailing/BAO/Mailing.php
b/CRM/Mailing/BAO/Mailing.php
index 94e7f7f40a09f0009d11d25e383d70608a695f5e..e0b42420cb6369df7f808e45c195b7b3b4f0e209 100644
(file)
--- a/
CRM/Mailing/BAO/Mailing.php
+++ b/
CRM/Mailing/BAO/Mailing.php
@@
-631,7
+631,7
@@
ORDER BY i.contact_id, i.{$tempColumn}
$protos = '(https?|ftp)';
$letters = '\w';
- $gunk = '\{\}/#~:.?+=&;%@!\,\-';
+ $gunk = '\{\}/#~:.?+=&;%@!\,\-
\|\(\)\*
';
$punc = '.:?\-';
$any = "{$letters}{$gunk}{$punc}";
if ($onlyHrefs) {