More multilang support for site fullname, plus a couple extra comments. merged from...

diff --git a/filter/emailprotect/filter.php b/filter/emailprotect/filter.php
index 3a6131858fa076c3463a9b63a7dae8e61ae8db2f..9e706c52e5ab24cbe0af1d41dd8957a78f781bd8 100644 (file)
--- a/filter/emailprotect/filter.php
+++ b/filter/emailprotect/filter.php
@@ -5,6 +5,11 @@
 
 function emailprotect_filter($courseid, $text) {
 
+    
+    if (!empty($CFG->formatstring)) {
+        return $text;
+    }
+                                            
 /// Do a quick check using stripos to avoid unnecessary work
     if (strpos($text, '@') === false) {
         return $text;