Merge branch '0.9.x' into facebook-upgrade

2010-11-16 02:32:46 +00:00
parent ca4c0a1601 eb0495d107
commit bd566b6f85
58 changed files with 2602 additions and 1362 deletions
--- 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;