aboutsummaryrefslogtreecommitdiffstats
path: root/include/email.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-04-01 14:11:37 +0200
committerMichael Vogel <icarus@dabo.de>2012-04-01 14:11:37 +0200
commit7d23149a61f75923b2c71a288a722ee219f5e6ba (patch)
treedea64e1cfc15eb6f95e7440e532258dfb909c21c /include/email.php
parent59b45f7fc12027c387f04a2121ea398c1d534626 (diff)
parentbb67ca9f1c61f96db6da15aee646a20c0b77a255 (diff)
downloadvolse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.gz
volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.tar.bz2
volse-hubzilla-7d23149a61f75923b2c71a288a722ee219f5e6ba.zip
Merge commit 'upstream/master'
Diffstat (limited to 'include/email.php')
-rwxr-xr-xinclude/email.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/email.php b/include/email.php
index bd44cb763..b43ae0dc1 100755
--- a/include/email.php
+++ b/include/email.php
@@ -250,7 +250,7 @@ function email_header_encode($in_str, $charset) {
// remove trailing spacer and
// add start and end delimiters
- $spacer = preg_quote($spacer);
+ $spacer = preg_quote($spacer,'/');
$out_str = preg_replace("/" . $spacer . "$/", "", $out_str);
$out_str = $start . $out_str . $end;
}