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

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

diff --git a/classes/File_to_post.php b/classes/File_to_post.php
index 1d2733738fb277f2d13f9b1e392cf390dafae678..4c751ae4f399d78a70ad9266f4f89ee95540bea2 100644 (file)
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -52,6 +52,7 @@ class File_to_post extends Managed_DataObject
                 'file_to_post_post_id_fkey' => array('notice', array('post_id' => 'id')),
             ),
             'indexes' => array(
+                'file_id_idx' => array('file_id'),
                 'post_id_idx' => array('post_id'),
             ),
         );
@@ -87,7 +88,7 @@ class File_to_post extends Managed_DataObject
     function delete($useWhere=false)
     {
         $f = File::getKV('id', $this->file_id);
-        if (!empty($f)) {
+        if ($f instanceof File) {
             $f->blowCache();
         }
         return parent::delete($useWhere);