Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / classes / File_thumbnail.php

diff --git a/classes/File_thumbnail.php b/classes/File_thumbnail.php
index 1250f70404481062e3492da8b37748789a0f521a..7acc8a4cde924a4ac2d54e01146613f71ae4d52c 100644 (file)
--- a/classes/File_thumbnail.php
+++ b/classes/File_thumbnail.php
@@ -28,7 +28,7 @@ class File_thumbnail extends Managed_DataObject
     public $__table = 'file_thumbnail';                  // table name
     public $file_id;                         // int(4)  primary_key not_null
     public $url;                             // text
-    public $filename;                        // varchar(191)   not 255 because utf8mb4 takes more space
+    public $filename;                        // text
     public $width;                           // int(4)  primary_key
     public $height;                          // int(4)  primary_key
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
@@ -39,7 +39,7 @@ class File_thumbnail extends Managed_DataObject
             'fields' => array(
                 'file_id' => array('type' => 'int', 'not null' => true, 'description' => 'thumbnail for what URL/file'),
                 'url' => array('type' => 'text', 'not null' => false, 'description' => 'URL of thumbnail'),
-                'filename' => array('type' => 'varchar', 'length' => 191, 'description' => 'if stored locally, filename is put here'),
+                'filename' => array('type' => 'text', 'description' => 'if stored locally, filename is put here'),
                 'width' => array('type' => 'int', 'description' => 'width of thumbnail'),
                 'height' => array('type' => 'int', 'description' => 'height of thumbnail'),
                 'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
@@ -61,6 +61,9 @@ class File_thumbnail extends Managed_DataObject
      * @param int $file_id
      */
     public static function saveNew($data, $file_id) {
+        // @TODO Must be an object (see below code)
+        assert(is_object($data));
+
         if (!empty($data->thumbnail_url)) {
             // Non-photo types such as video will usually
             // show us a thumbnail, though it's not required.