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 1a887a7c1833af38accc486374c5d86a82461e9b..4c751ae4f399d78a70ad9266f4f89ee95540bea2 100644 (file)
--- a/classes/File_to_post.php
+++ b/classes/File_to_post.php
@@ -35,9 +35,6 @@ class File_to_post extends Managed_DataObject
     public $post_id;                         // int(4)  primary_key not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('File_to_post',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -55,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'),
             ),
         );
@@ -72,7 +70,7 @@ class File_to_post extends Managed_DataObject
                 $f2p->post_id = $notice_id;
                 $f2p->insert();
                 
-                $f = File::staticGet($file_id);
+                $f = File::getKV($file_id);
 
                 if (!empty($f)) {
                     $f->blowCache();
@@ -87,17 +85,12 @@ class File_to_post extends Managed_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('File_to_post', $kv);
-    }
-
-    function delete()
+    function delete($useWhere=false)
     {
-        $f = File::staticGet('id', $this->file_id);
-        if (!empty($f)) {
+        $f = File::getKV('id', $this->file_id);
+        if ($f instanceof File) {
             $f->blowCache();
         }
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 }