$longurl->url is just the same $canon we fed to File_redirection::where()

This commit is contained in:
hannes 2016-01-05 23:06:02 +00:00
parent 64f2f3d976
commit 8b78e01d4c

View File

@ -980,7 +980,7 @@ function common_linkify($url) {
} else { } else {
$canon = File_redirection::_canonUrl($url); $canon = File_redirection::_canonUrl($url);
$longurl_data = File_redirection::where($canon, common_config('attachments', 'process_links')); $longurl_data = File_redirection::where($canon, common_config('attachments', 'process_links'));
$longurl = $longurl_data->url; $longurl = $longurl_data->redir_url;
} }
$attrs = array('href' => $canon, 'title' => $longurl); $attrs = array('href' => $canon, 'title' => $longurl);
@ -2430,4 +2430,4 @@ function html_sprintf()
$args[$i] = htmlspecialchars($args[$i]); $args[$i] = htmlspecialchars($args[$i]);
} }
return call_user_func_array('sprintf', $args); return call_user_func_array('sprintf', $args);
} }