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

use getByID (also bad variable reference)

This commit is contained in:
Mikael Nordfeldth 2016-04-18 15:08:47 +02:00
parent 107f612384
commit c48508d590
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classes/File_redirection.php
View File

@ -173,12 +173,11 @@ class File_redirection extends Managed_DataObject
try {
$r = File_redirection::getByUrl($in_url);
$f = File::getKV('id',$r->file_id);
if($file instanceof File) {
try {
$f = File::getByID($r->file_id);
$r->file = $f;
$r->redir_url = $f->url;
} else {
$r->redir_url = $f->url;
} catch (NoResultException $e) {
// Invalid entry, delete and run again
common_log(LOG_ERR, "Could not find File with id=".$r->file_id." referenced in File_redirection, deleting File redirection entry and and trying again...");
$r->delete();