]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
File and File_redirection records are saved in File_redirection::where() now
authorhannes <h@nnesmannerhe.im>
Mon, 25 Jan 2016 19:00:05 +0000 (19:00 +0000)
committerhannes <h@nnesmannerhe.im>
Mon, 25 Jan 2016 19:00:05 +0000 (19:00 +0000)
classes/File.php

index 83c76195b6cddf91473adc99ee62eabae515ad70..46eae4d9a9d9bbbfdbc4abdea78f799cbf2967ce 100644 (file)
@@ -150,18 +150,6 @@ class File extends Managed_DataObject
         $redir = File_redirection::where($given_url);
         $file = $redir->getFile();
 
-        // If we still don't have a File object, let's create one now!
-        if (empty($file->id)) {
-            if ($redir->url === $given_url || !$followRedirects) {
-                // Save the File object based on our lookup trace
-                $file->saveFile();
-            } else {
-                $file->saveFile();
-                $redir->file_id = $file->id;
-                $redir->insert();
-            }
-        }
-
         if (!$file instanceof File || empty($file->id)) {
             // This should not happen
             throw new ServerException('URL processing failed without new File object');
@@ -674,4 +662,4 @@ class File extends Managed_DataObject
         echo "DONE.\n";
         echo "Resuming core schema upgrade...";
     }
-}
+}
\ No newline at end of file