diff options
| author | Zach Copley <zach@status.net> | 2010-11-17 22:16:08 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2010-11-17 22:16:08 +0000 |
| commit | 645a4d1754128fdb34e4805ea9aa59f41af8df6f (patch) | |
| tree | 10336fb9b33aa12b8bffa03d1d93e2b30d6d7b6d /lib/util.php | |
| parent | 163f18b8acd59e7343da4bdde9d0a5f5bd762308 (diff) | |
| parent | 197b56778a04a1d0f12dabb84e95dc9b80902aeb (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/util.php')
| -rw-r--r-- | lib/util.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/util.php b/lib/util.php index 68592bf74..ce5da1cd8 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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)) { |