eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Zach Copley
2010-11-17 22:16:08 +00:00
parent 163f18b8ac 197b56778a
commit 645a4d1754
24 changed files with 4028 additions and 1986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util.php
View File

@@ -848,7 +848,7 @@ function common_linkify($url) {
$canon = File_redirection::_canonUrl($url);
$longurl_data = File_redirection::where($canon);
$longurl_data = File_redirection::where($canon, common_config('attachments', 'process_links'));
if (is_array($longurl_data)) {
$longurl = $longurl_data['url'];
} elseif (is_string($longurl_data)) {
@@ -872,8 +872,10 @@ function common_linkify($url) {
$f = File::staticGet('url', $longurl);
if (empty($f)) {
// XXX: this writes to the database. :<
$f = File::processNew($longurl);
if (common_config('attachments', 'process_links')) {
// XXX: this writes to the database. :<
$f = File::processNew($longurl);
}
}
if (!empty($f)) {