aboutsummaryrefslogtreecommitdiffstats
path: root/include/msgclean.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-28 19:57:28 -0700
committerfriendica <info@friendica.com>2012-03-28 19:57:28 -0700
commita946b7cea3e589fc08ca25d84e5d660efa5b3de6 (patch)
treeebf3ee7180161123f2befda27075c4a3a941853b /include/msgclean.php
parent60fe74ce970468be187664198529dbd8d5a01a6c (diff)
parent75f3d41da2d85cb61ac627807011c312b96e3bb1 (diff)
downloadvolse-hubzilla-a946b7cea3e589fc08ca25d84e5d660efa5b3de6.tar.gz
volse-hubzilla-a946b7cea3e589fc08ca25d84e5d660efa5b3de6.tar.bz2
volse-hubzilla-a946b7cea3e589fc08ca25d84e5d660efa5b3de6.zip
Merge branch 'pull'
Diffstat (limited to 'include/msgclean.php')
-rw-r--r--include/msgclean.php2
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);