Added special checks for mailto: in elgg_normalize_url() and elgg.normalize_url().

diff --git a/engine/lib/output.php b/engine/lib/output.php
index 7bfc4be6e773cf1a85a52226f597b72e13f1b373..0069360f06216e7b23f2307cac934396ea124bd6 100644 (file)
--- a/engine/lib/output.php
+++ b/engine/lib/output.php
@@ -271,8 +271,8 @@ function elgg_normalize_url($url) {
                // '?query=test', #target
                return $url;
        
-       } elseif (stripos($url, 'javascript:') === 0) {
-               // 'javascript:'
+       } elseif (stripos($url, 'javascript:') === 0 || stripos($url, 'mailto:') === 0) {
+               // 'javascript:' and 'mailto:'
                // Not covered in FILTER_VALIDATE_URL
                return $url;
 

diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js
index 81209ebd057f25d0d19489391d4cf021c1676003..dc7c07165cf2dcfaf65b38c602d700101c745585 100644 (file)
--- a/js/lib/elgglib.js
+++ b/js/lib/elgglib.js
@@ -283,7 +283,7 @@ elgg.normalize_url = function(url) {
        }
 
        // 'javascript:'
-       else if (url.indexOf('javascript:') === 0) {
+       else if (url.indexOf('javascript:') === 0 || url.indexOf('mailto:') === 0 ) {
                return url;
        }