Updated some references to the long gnone "isEnclosure" function to the new "getEnclosure"

classes/File.php

@@ -251,6 +251,8 @@ class File extends Memcached_DataObject
                         if($oembed->modified) $enclosure->modified=$oembed->modified;
                         unset($oembed->size);
                     }
+                } else {
+                    return false;
                 }
             }
         }

lib/api.php

@@ -288,11 +288,12 @@ class ApiAction extends Action
             $twitter_status['attachments'] = array();
 
             foreach ($attachments as $attachment) {
-                if ($attachment->isEnclosure()) {
+                $enclosure_o=$attachment->getEnclosure();
+                if ($attachment_enclosure) {
                     $enclosure = array();
-                    $enclosure['url'] = $attachment->url;
+                    $enclosure['url'] = $enclosure_o->url;
-                    $enclosure['mimetype'] = $attachment->mimetype;
+                    $enclosure['mimetype'] = $enclosure_o->mimetype;
-                    $enclosure['size'] = $attachment->size;
+                    $enclosure['size'] = $enclosure_o->size;
                     $twitter_status['attachments'][] = $enclosure;
                 }
             }

lib/util.php

@@ -596,13 +596,7 @@ function common_linkify($url) {
     }
 
     if (!empty($f)) {
-        if ($f->isEnclosure()) {
+        if ($f->getEnclosure()) {
-            $is_attachment = true;
-            $attachment_id = $f->id;
-        } else {
-            $foe = File_oembed::staticGet('file_id', $f->id);
-            if (!empty($foe)) {
-                // if it has OEmbed info, it's an attachment, too
             $is_attachment = true;
             $attachment_id = $f->id;
 
@@ -612,7 +606,6 @@ function common_linkify($url) {
             }
         }
     }
-    }
 
     // Add clippy
     if ($is_attachment) {