MediaFile upload simplifying

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

diff --git a/lib/mediafile.php b/lib/mediafile.php
index f44bfae1fa2cc86965c547fb4b84c646642d4842..4ac33ab7e1def91bfbfbb3b42a00173f656f9668 100644 (file)
--- a/lib/mediafile.php
+++ b/lib/mediafile.php
@@ -132,7 +132,7 @@ class MediaFile
     {
         $file_redir = File_redirection::getKV('url', $url);
 
-        if ($file_redir instanceof File_redirection) {
+        if (!$file_redir instanceof File_redirection) {
             $file_redir = new File_redirection;
             $file_redir->url = $url;
             $file_redir->file_id = $file_id;
@@ -147,14 +147,15 @@ class MediaFile
         }
     }
 
-    static function fromUpload($param = 'media', Profile $scoped)
+    static function fromUpload($param='media', Profile $scoped=null)
     {
         if (is_null($scoped)) {
             $scoped = Profile::current();
         }
 
-        if (!isset($_FILES[$param]['error'])){
-            return;
+        // The existence of the "error" element means PHP has processed it properly even if it was ok.
+        if (!isset($_FILES[$param]) || !isset($_FILES[$param]['error'])) {
+            throw new NoUploadedMediaException($param);
         }
 
         switch ($_FILES[$param]['error']) {