MDL-11758 removing one htmlpurifier file to prevent problems on some systems; merged...

diff --git a/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php b/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
deleted file mode 100644 (file)
index 6623f19..0000000
--- a/lib/htmlpurifier/HTMLPurifier/AttrDef/URI/Email/SimpleCheck.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-require_once 'HTMLPurifier/AttrDef/URI/Email.php';
-
-/**
- * Primitive email validation class based on the regexp found at 
- * http://www.regular-expressions.info/email.html
- */
-class HTMLPurifier_AttrDef_URI_Email_SimpleCheck extends HTMLPurifier_AttrDef_URI_Email
-{
-    
-    function validate($string, $config, &$context) {
-        // no support for named mailboxes i.e. "Bob <bob@example.com>"
-        // that needs more percent encoding to be done
-        if ($string == '') return false;
-        $string = trim($string);
-        $result = preg_match('/^[A-Z0-9._%-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i', $string);
-        return $result ? $string : false;
-    }
-    
-}
-

diff --git a/lib/htmlpurifier/readme_moodle.txt b/lib/htmlpurifier/readme_moodle.txt
index 82b82482b52463c37b76f61f3fde39ade1a78739..3731abf892b63ddb967cde295aeadd6e6f5dba27 100644 (file)
--- a/lib/htmlpurifier/readme_moodle.txt
+++ b/lib/htmlpurifier/readme_moodle.txt
@@ -4,6 +4,7 @@ Changes:
  * HMLTModule/Text.php - added  <nolink>, <tex>, <lang> and <algebra> tags
  * HMLTModule/XMLCommonAttributes.php - remove xml:lang - needed for multilang
  * AttrDef/Lang.php - relax lang check - needed for multilang
+ * AttrDef/URI/Email/SimpleCheck.php - deleted to prevent errors on some systems, not used anyway
 
 skodak