Merge branch 'testing' of git@gitorious.org:statusnet/mainline

Conflicts:
	plugins/OStatus/OStatusPlugin.php

1 files changed, 9 insertions, 0 deletions

diff --git a/classes/File.php b/classes/File.php
index 91b12d2e2..1b8ef1b3e 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -279,10 +279,19 @@ class File extends Memcached_DataObject
                         if($oembed->modified) $enclosure->modified=$oembed->modified;
                         unset($oembed->size);
                     }
+                } else {
+                    return false;
                 }
             }
         }
         return $enclosure;
     }
+
+    // quick back-compat hack, since there's still code using this
+    function isEnclosure()
+    {
+        $enclosure = $this->getEnclosure();
+        return !empty($enclosure);
+    }
 }