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

Merge branch '1.0.x' into testing

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-26 17:06:14 -04:00
commit a9f83008b8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/util.php
View File

@ -2163,7 +2163,11 @@ function common_shorten_url($long_url, User $user=null, $force = false)
} else { } else {
$shortenedUrl = common_local_url('redirecturl', $shortenedUrl = common_local_url('redirecturl',
array('id' => $f->id)); array('id' => $f->id));
return $shortenedUrl; if ((mb_strlen($shortenedUrl) < mb_strlen($long_url)) || $force) {
return $shortenedUrl;
} else {
return $long_url;
}
} }
} else { } else {
return $long_url; return $long_url;