eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

File_redirection minor coding layout fix

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-07-07 19:59:43 +02:00
parent 45ee2060fa
commit d0458b824a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classes/File_redirection.php
View File

@ -176,7 +176,7 @@ class File_redirection extends Managed_DataObject
try { try {
$b = File_redirection::getByUrl($in_url); $b = File_redirection::getByUrl($in_url);
// this is a redirect to $b->file_id // this is a redirect to $b->file_id
$a = File::getKV('id', $b->file_id); $a = File::getByID($b->file_id);
return $a->url; return $a->url;
} catch (NoResultException $e) { } catch (NoResultException $e) {
// Oh well, let's keep going // Oh well, let's keep going
@ -186,11 +186,11 @@ class File_redirection extends Managed_DataObject
if ($discover) { if ($discover) {
$ret = File_redirection::lookupWhere($in_url); $ret = File_redirection::lookupWhere($in_url);
return $ret; return $ret;
} else { }
// No manual dereferencing; leave the unknown URL as is. // No manual dereferencing; leave the unknown URL as is.
return $in_url; return $in_url;
} }
}
/** /**
* Shorten a URL with the current user's configured shortening * Shorten a URL with the current user's configured shortening