diff options
author | Zach Copley <zach@status.net> | 2010-11-16 02:32:46 +0000 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2010-11-16 02:32:46 +0000 |
commit | bd566b6f855a19efb1d74eeaa39ab4e621903b12 (patch) | |
tree | befc30688421cc1fc99b1aef7e64d45f08614cd2 /lib/util.php | |
parent | ca4c0a160122d20f95877102f9712aee45c7afb8 (diff) | |
parent | eb0495d10719f2be86f8f97e82aaa1b8bf923c7d (diff) |
Merge branch '0.9.x' into facebook-upgrade
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 14814b7e9..68592bf74 100644 --- a/lib/util.php +++ b/lib/util.php @@ -877,7 +877,7 @@ function common_linkify($url) { } if (!empty($f)) { - if ($f->getEnclosure() || File_oembed::staticGet('file_id',$f->id)) { + if ($f->getEnclosure()) { $is_attachment = true; $attachment_id = $f->id; |