From 77957372abcd7e984c73ed7946190343cc269b53 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 7 Jul 2015 20:16:05 +0200 Subject: [PATCH] File_redirection static fixes and simplifying --- classes/File_redirection.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/classes/File_redirection.php b/classes/File_redirection.php index 75a3b577ae..2b6f86ed27 100644 --- a/classes/File_redirection.php +++ b/classes/File_redirection.php @@ -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 * @return string */ - function makeShort($long_url, $user=null) + static function makeShort($long_url, $user=null) { $canon = File_redirection::_canonUrl($long_url); @@ -214,11 +214,7 @@ class File_redirection extends Managed_DataObject // Did we get one? Is it shorter? - if (!empty($short_url)) { - return $short_url; - } else { - return $long_url; - } + return !empty($short_url) ? $short_url : $long_url; } /** @@ -235,18 +231,14 @@ class File_redirection extends Managed_DataObject * @return string */ - function forceShort($long_url, $user) + static function forceShort($long_url, $user) { $canon = File_redirection::_canonUrl($long_url); $short_url = File_redirection::_userMakeShort($canon, $user, true); // Did we get one? Is it shorter? - if (!empty($short_url)) { - return $short_url; - } else { - return $long_url; - } + return !empty($short_url) ? $short_url : $long_url; } static function _userMakeShort($long_url, User $user=null, $force = false) { -- 2.39.2