GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber
2011-02-28 10:18:18 -08:00
parent 4e3537a12b 6a6584741f
commit 2bd9532ebe
5 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/util.php
View File

@@ -925,11 +925,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);