File_to_post indexing and cleaning preparations

diff --git a/classes/File.php b/classes/File.php
index 242da159c23e5fbb438f4967b4503d1f4dd40bce..1e296242b79f350c610fa327819ed2cfa4ed481a 100644 (file)
--- a/classes/File.php
+++ b/classes/File.php
@@ -569,6 +569,14 @@ class File extends Managed_DataObject
                     $thumbs->delete();
                 }
             }
+
+            $f2p = new File_to_post();
+            $f2p->file_id = $this->id;
+            if ($f2p->find()) {
+                while ($f2p->fetch()) {
+                    $f2p->delete();
+                }
+            }
         }
 
         // And finally remove the entry from the database

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);