GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

File and File_redirection records are saved in File_redirection::where() now

Browse Source
This commit is contained in:
hannes
2016-01-25 19:00:05 +00:00
parent 48e1a2431b
commit ca0c792ed3
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
classes/File.php
View 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...";
}
}
}