diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-05-25 15:36:52 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-05-25 15:36:52 +0200 |
| commit | 2d79e536d13f7923a7059d03cc69f201a935a56b (patch) | |
| tree | 46e0d8f51612fc35a199a4c86171342e1d376e84 /inc/subscription.php | |
| parent | 7ee92f4c27f4f435c2d44501bd326c965dbafd51 (diff) | |
| parent | 5ff127375bd2292958b989dcec18dbca5a8a751f (diff) | |
| download | rpg-2d79e536d13f7923a7059d03cc69f201a935a56b.tar.gz rpg-2d79e536d13f7923a7059d03cc69f201a935a56b.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/subscription.php')
| -rw-r--r-- | inc/subscription.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/subscription.php b/inc/subscription.php index 8e3a99a8f..c94f17ad0 100644 --- a/inc/subscription.php +++ b/inc/subscription.php @@ -278,8 +278,8 @@ function subscription_addresslist(&$data){ } $pres = array('style' => 'every', 'escaped' => true); if (!$self && isset($_SERVER['REMOTE_USER'])) { - $pres['user'] = '((?:(?!' . preg_quote_cb($_SERVER['REMOTE_USER']) . - ')\S?)+)'; + $pres['user'] = '((?!' . preg_quote_cb($_SERVER['REMOTE_USER']) . + '(?: |$))\S+)'; } $subs = subscription_find($id, $pres); $emails = array(); |