Merge branch 'master' into nightly

[quix0rs-gnu-social.git] / plugins / Oembed / classes / File_oembed.php

diff --git a/plugins/Oembed/classes/File_oembed.php b/plugins/Oembed/classes/File_oembed.php
index 07629b6ab92a3ddf8dac7a756b7d868f0559ba80..c7650a1ff379228869739ad510c800a8da895db9 100644 (file)
--- a/plugins/Oembed/classes/File_oembed.php
+++ b/plugins/Oembed/classes/File_oembed.php
@@ -68,12 +68,8 @@ class File_oembed extends Managed_DataObject
     }
 
     static function _getOembed($url) {
-        $parameters = array(
-            'maxwidth' => common_config('thumbnail', 'width'),
-            'maxheight' => common_config('thumbnail', 'height'),
-        );
         try {
-            return oEmbedHelper::getObject($url, $parameters);
+            return oEmbedHelper::getObject($url);
         } catch (Exception $e) {
             common_log(LOG_INFO, "Error during oembed lookup for $url - " . $e->getMessage());
             return false;
@@ -128,12 +124,12 @@ class File_oembed extends Managed_DataObject
                 if ($file instanceof File) {
                     $file_oembed->mimetype = $file->mimetype;
                 } else {
-                    $file_redir = File_redirection::getKV('url', $given_url);
-                    if (empty($file_redir)) {
-                        $redir_data = File_redirection::where($given_url);
-                        $file_oembed->mimetype = $redir_data['type'];
+                    $redir = File_redirection::where($given_url);
+                    if (empty($redir->file_id)) {
+                        $f = $redir->getFile();
+                        $file_oembed->mimetype = $f->mimetype;
                     } else {
-                        $file_id = $file_redir->file_id;
+                        $file_id = $redir->file_id;
                     }
                 }
             }