Misses this file to merge. I like the comments.

[quix0rs-gnu-social.git] / lib / mailhandler.php

diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index 65c5622de37a5d98edc4e9260e06403fe25c3656..a71633519391120d445df9807ae9420763012179 100644 (file)
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -18,7 +18,6 @@
  */
 
 require_once(INSTALLDIR . '/lib/mail.php');
-require_once(INSTALLDIR . '/lib/mediafile.php');
 require_once('Mail/mimeDecode.php');
 
 // @todo FIXME: we use both Mail_mimeDecode and mailparse
@@ -74,7 +73,7 @@ class MailHandler
             $mf = null;
 
             try {
-                $mf = MediaFile::fromFileHandle($attachment, $user);
+                $mf = MediaFile::fromFilehandle($attachment, $user->getProfile());
             } catch(ClientException $ce) {
                 $this->error($from, $ce->getMessage());
             }
@@ -109,9 +108,9 @@ class MailHandler
         }
         $from = $froms[0];
         $addr = common_canonical_email($from['address']);
-        $user = User::staticGet('email', $addr);
+        $user = User::getKV('email', $addr);
         if (!$user) {
-            $user = User::staticGet('smsemail', $addr);
+            $user = User::getKV('smsemail', $addr);
         }
         return $user;
     }