Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts: doc/credits.bb mod/thing.php
2015-09-02 20:33:58 -07:00
parent c22da3da1c 470915a55b
commit 837b9224cc
3 changed files with 8 additions and 5 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -72,10 +72,6 @@ function notags($string) {
 //	return(str_replace(array("<",">","\xBA","\xBC","\xBE"), array('[',']','','',''), $string));
 }

-// use this on "body" or "content" input where angle chars shouldn't be removed,
-// and allow them to be safely displayed.
-
-

 /**
 * use this on "body" or "content" input where angle chars shouldn't be removed,