Merge branch 'dev' into perms

2016-07-17 21:40:04 -07:00
parent 191cd21028 571b8cc85b
commit de4f9d68bd
43 changed files with 2703 additions and 2707 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