From: Brion Vibber <brion@status.net>
Date: Fri, 12 Nov 2010 22:03:08 +0000 (-0800)
Subject: Save oEmbed photo references as thumbnails if there's not a separate thumbnail_url... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2c4313467f07cae059798ac500ec2a1c31953877;p=quix0rs-gnu-social.git

Save oEmbed photo references as thumbnails if there's not a separate thumbnail_url entry in the return data. This fixes thumb saving for Flickr photo references.
---

diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index a5540ecfee..bcb2f7bacc 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -120,7 +120,7 @@ class File_oembed extends Memcached_DataObject
             }
         }
         $file_oembed->insert();
-        if (!empty($data->thumbnail_url)) {
+        if (!empty($data->thumbnail_url) || ($data->type == 'photo')) {
             $ft = File_thumbnail::staticGet('file_id', $file_id);
             if (!empty($ft)) {
                 common_log(LOG_WARNING, "Strangely, a File_thumbnail object exists for new file $file_id",
diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index d371b9e8aa..17bac7f08c 100644
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -55,10 +55,21 @@ class File_thumbnail extends Memcached_DataObject
      * @param int $file_id
      */
     public static function saveNew($data, $file_id) {
-        self::saveThumbnail($file_id,
-                            $data->thumbnail_url,
-                            $data->thumbnail_width,
-                            $data->thumbnail_height);
+        if (!empty($data->thumbnail_url)) {
+            // Non-photo types such as video will usually
+            // show us a thumbnail, though it's not required.
+            self::saveThumbnail($file_id,
+                                $data->thumbnail_url,
+                                $data->thumbnail_width,
+                                $data->thumbnail_height);
+        } else if ($data->type == 'photo') {
+            // The inline photo URL given should also fit within
+            // our requested thumbnail size, per oEmbed spec.
+            self::saveThumbnail($file_id,
+                                $data->url,
+                                $data->width,
+                                $data->height);
+        }
     }
 
     /**