Merge remote-tracking branch 'upstream/dev' into website-import-remote

2016-07-16 21:04:04 -04:00
parent e7b8531751 f396b1bf73
commit 99354ac576
34 changed files with 2628 additions and 2699 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -774,6 +774,10 @@ function strip_zids($s) {
 	return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s);
 }

+function strip_zats($s) {
+	return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s);
+}
+

 // quick and dirty quoted_printable encoding