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

Squashed commit of the following: 

commit 2b9bce9ef8f6cf55b7ac62231bcc0173260ba472
Merge: 3ba4f24 12b680e
Author: Evan Prodromou <evan@status.net>
Date:   Mon Aug 13 14:31:46 2012 -0400

    Merge commit 'refs/merge-requests/207' of git://gitorious.org/statusnet/mainline into merge-requests/207

commit 12b680e375db9de01cac77dd9a71adb729292dc7
Author: Mikael Nordfeldth <mmn@hethane.se>
Date:   Fri Aug 10 20:49:52 2012 +0200

    testing whether $user is predefined before otherwise setting it to common_current_user()
This commit is contained in:
Evan Prodromou 2012-08-13 14:33:19 -04:00
parent 19c3cd541d
commit 4b125eed96
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util.php
View File

@ -1040,7 +1040,9 @@ function common_linkify($url) {
*/
function common_shorten_links($text, $always = false, User $user=null)
{
$user = common_current_user();
if ($user === null) {
$user = common_current_user();
}
$maxLength = User_urlshortener_prefs::maxNoticeLength($user);