Fix for ticket #2248: flickr etc URLs that contain @ in the paths etc no longer accid...

diff --git a/lib/util.php b/lib/util.php
index 85f49e4c59f40c57ae2b74c54fffd76a48dcf064..8dd22de59248d019ad62e13ff023b0a6d004fafb 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -922,11 +922,11 @@ function common_linkify($url) {
     // functions
     $url = htmlspecialchars_decode($url);
 
-   if(strpos($url, '@') !== false && strpos($url, ':') === false) {
-       //url is an email address without the mailto: protocol
-       $canon = "mailto:$url";
-       $longurl = "mailto:$url";
-   }else{
+    if (strpos($url, '@') !== false && strpos($url, ':') === false && Validate::email($url)) {
+        //url is an email address without the mailto: protocol
+        $canon = "mailto:$url";
+        $longurl = "mailto:$url";
+    } else {
 
         $canon = File_redirection::_canonUrl($url);