diff options
| author | zottel <github@zottel.net> | 2012-03-29 10:23:45 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-29 10:23:45 +0200 |
| commit | 953840cf822718cba66a0727b576c674c6e44875 (patch) | |
| tree | a924cf0031d16f6f15b7d84d5f519ca4257042b4 /include/msgclean.php | |
| parent | fb817a29a934a68f194a42c29d3ed11da2da558f (diff) | |
| parent | 3ee529d095ac7e83ae1e71d86cbe6d443885d54e (diff) | |
| download | volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.gz volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.bz2 volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/msgclean.php')
| -rw-r--r-- | include/msgclean.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/msgclean.php b/include/msgclean.php index 284ad1ce4..eabb47788 100644 --- a/include/msgclean.php +++ b/include/msgclean.php @@ -13,7 +13,7 @@ function savereplace($pattern, $replace, $text) function unifyattributionline($message) { - $quotestr = array('quote', 'collapsed'); + $quotestr = array('quote', 'spoiler'); foreach ($quotestr as $quote) { $message = savereplace('/----- Original Message -----\s.*?From: "([^<"].*?)" <(.*?)>\s.*?To: (.*?)\s*?Cc: (.*?)\s*?Sent: (.*?)\s.*?Subject: ([^\n].*)\s*\['.$quote.'\]/i', "[".$quote."='$1']\n", $message); |