aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2014-02-17 08:17:47 +0100
committerzottel <github@zottel.net>2014-02-17 08:17:47 +0100
commit2bca2199112625593eb412584e17e874e71ca913 (patch)
treec6679ddb544217a10d8255578009c4ba8951bc6b /include/text.php
parent54727d3a66df92596378ea7f5c412d5e6037b037 (diff)
parentf38ab0904101366bf536d46ab460dcd5cf4f60ca (diff)
downloadvolse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.gz
volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.bz2
volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/text.php')
-rwxr-xr-xinclude/text.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php
index 2b334068f..2f5accf6e 100755
--- a/include/text.php
+++ b/include/text.php
@@ -621,6 +621,11 @@ function get_tags($s) {
}
+function strip_zids($s) {
+ return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s);
+}
+
+
// quick and dirty quoted_printable encoding