From 672126968f42ebda3cc444190c4364ea35144dad 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/3] Updated some references to the long gnone "isEnclosure"
 function to the new "getEnclosure"

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

diff --git a/classes/File.php b/classes/File.php
index c527c4ffe9..34e4632a8c 100644
--- a/classes/File.php
+++ b/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;
                 }
             }
         }
diff --git a/lib/api.php b/lib/api.php
index 794b140507..b4803fe62d 100644
--- a/lib/api.php
+++ b/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['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 fb3b8be876..01b159ac15 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -596,20 +596,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 7be5e7e524bbe3a789b2f352f14a011fc1dc8ba2 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/3] stupid mistake... let's not talk about this.

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

diff --git a/lib/api.php b/lib/api.php
index b4803fe62d..825262b4c1 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -289,7 +289,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;

From b7940ef39f476b6a4cd7619267b735e98b0d7cfa Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 22 Jan 2010 11:02:23 -0500
Subject: [PATCH 3/3] Fix unqueuemanager to work with new Queue layout pushed
 in 0e852def6ae5aa529cca0aef1187152fb5a880be

"* Queue handlers should now define a handle() method instead of handle_notice()"

And Queue managers should call handle() :)
---
 lib/unqueuemanager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/unqueuemanager.php b/lib/unqueuemanager.php
index 5595eac052..785de7c8ce 100644
--- a/lib/unqueuemanager.php
+++ b/lib/unqueuemanager.php
@@ -47,7 +47,7 @@ class UnQueueManager extends QueueManager
         
         $handler = $this->getHandler($queue);
         if ($handler) {
-            $handler->handle_notice($notice);
+            $handler->handle($notice);
         } else {
             if (Event::handle('UnqueueHandleNotice', array(&$notice, $queue))) {
                 throw new ServerException("UnQueueManager: Unknown queue: $queue");