wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

File_redirection static fixes and simplifying

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-07-07 20:16:05 +02:00
parent 33dc06ae21
commit 77957372ab
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/File_redirection.php
View File

@ -206,7 +206,7 @@ class File_redirection extends Managed_DataObject
* @param User $user whose shortening options to use; defaults to the current web session user * @param User $user whose shortening options to use; defaults to the current web session user
* @return string * @return string
*/ */
function makeShort($long_url, $user=null) static function makeShort($long_url, $user=null)
{ {
$canon = File_redirection::_canonUrl($long_url); $canon = File_redirection::_canonUrl($long_url);
@ -214,11 +214,7 @@ class File_redirection extends Managed_DataObject
// Did we get one? Is it shorter? // Did we get one? Is it shorter?
if (!empty($short_url)) { return !empty($short_url) ? $short_url : $long_url;
return $short_url;
} else {
return $long_url;
}
} }
/** /**
@ -235,18 +231,14 @@ class File_redirection extends Managed_DataObject
* @return string * @return string
*/ */
function forceShort($long_url, $user) static function forceShort($long_url, $user)
{ {
$canon = File_redirection::_canonUrl($long_url); $canon = File_redirection::_canonUrl($long_url);
$short_url = File_redirection::_userMakeShort($canon, $user, true); $short_url = File_redirection::_userMakeShort($canon, $user, true);
// Did we get one? Is it shorter? // Did we get one? Is it shorter?
if (!empty($short_url)) { return !empty($short_url) ? $short_url : $long_url;
return $short_url;
} else {
return $long_url;
}
} }
static function _userMakeShort($long_url, User $user=null, $force = false) { static function _userMakeShort($long_url, User $user=null, $force = false) {