Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Brion Vibber
2010-03-29 15:15:51 -07:00
63 changed files with 3129 additions and 2998 deletions

View File

@@ -803,7 +803,7 @@ function common_linkify($url) {
}
if (!empty($f)) {
if ($f->getEnclosure()) {
if ($f->getEnclosure() || File_oembed::staticGet('file_id',$f->id)) {
$is_attachment = true;
$attachment_id = $f->id;