Merge branch '1.0.x' into testing
This commit is contained in:
commit
a9f83008b8
@ -2163,7 +2163,11 @@ function common_shorten_url($long_url, User $user=null, $force = false)
|
||||
} else {
|
||||
$shortenedUrl = common_local_url('redirecturl',
|
||||
array('id' => $f->id));
|
||||
if ((mb_strlen($shortenedUrl) < mb_strlen($long_url)) || $force) {
|
||||
return $shortenedUrl;
|
||||
} else {
|
||||
return $long_url;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return $long_url;
|
||||
|
Loading…
Reference in New Issue
Block a user