From: skodak <skodak>
Date: Fri, 30 Mar 2007 21:10:15 +0000 (+0000)
Subject: More multilang support for site fullname, plus a couple extra comments. merged from... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c543cfe15fca667a3db83dabfa60b5c0fe6e3723;p=moodle.git

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

diff --git a/filter/emailprotect/filter.php b/filter/emailprotect/filter.php
index 3a6131858f..9e706c52e5 100644
--- 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;