From c30f95c55cb4fcdde53c0549335d29ed6849cf95 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 22 Jan 2010 10:12:26 -0500
Subject: [PATCH 1/2] Updated some references to the long gnone "isEnclosure"
 function to the new "getEnclosure"

---
 classes/File.php  |  2 ++
 lib/apiaction.php |  9 +++++----
 lib/util.php      | 15 ++++-----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/classes/File.php b/classes/File.php
index 91b12d2e28..189e04ce02 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -279,6 +279,8 @@ class File extends Memcached_DataObject
                         if($oembed->modified) $enclosure->modified=$oembed->modified;
                         unset($oembed->size);
                     }
+                } else {
+                    return false;
                 }
             }
         }
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 8049c09016..f71432e032 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -291,11 +291,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['mimetype'] = $attachment->mimetype;
-                    $enclosure['size'] = $attachment->size;
+                    $enclosure['url'] = $enclosure_o->url;
+                    $enclosure['mimetype'] = $enclosure_o->mimetype;
+                    $enclosure['size'] = $enclosure_o->size;
                     $twitter_status['attachments'][] = $enclosure;
                 }
             }
diff --git a/lib/util.php b/lib/util.php
index 439db581a5..add1b0ae67 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -770,20 +770,13 @@ 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;
 
-                $thumb = File_thumbnail::staticGet('file_id', $f->id);
-                if (!empty($thumb)) {
-                    $has_thumb = true;
-                }
+            $thumb = File_thumbnail::staticGet('file_id', $f->id);
+            if (!empty($thumb)) {
+                $has_thumb = true;
             }
         }
     }

From 09705a1e989d202859d637f8a84383f365b7906a Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 22 Jan 2010 10:40:21 -0500
Subject: [PATCH 2/2] stupid mistake... let's not talk about this.

---
 lib/apiaction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/apiaction.php b/lib/apiaction.php
index f71432e032..eef0ba637d 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -292,7 +292,7 @@ class ApiAction extends Action
 
             foreach ($attachments as $attachment) {
                 $enclosure_o=$attachment->getEnclosure();
-                if ($attachment_enclosure) {
+                if ($enclosure_o) {
                     $enclosure = array();
                     $enclosure['url'] = $enclosure_o->url;
                     $enclosure['mimetype'] = $enclosure_o->mimetype;