diff options
| author | Brion Vibber <brion@pobox.com> | 2010-12-07 10:50:05 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-12-07 10:50:05 -0800 |
| commit | 9df856e667a12cd217576263efbc72fff12692d9 (patch) | |
| tree | dc8d588e8b01d1ec788c78d6aec10a9b9d26bec6 /plugins/Facebook/facebookaction.php | |
| parent | 01f32e3998b8d031d2a39e2d0506253142b6632e (diff) | |
| parent | 4b4b763255ad3b2bff8f18da2bd3927b52a54e55 (diff) | |
Merge branch '0.9.x' into merge
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/Facebook/facebookaction.php')
| -rw-r--r-- | plugins/Facebook/facebookaction.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index 4c15fc039..e4edcea0d 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -370,7 +370,7 @@ class FacebookAction extends Action $this->showPage(_m('No notice content!')); return; } else { - $content_shortened = common_shorten_links($content); + $content_shortened = $user->shortenLinks($content); if (Notice::contentTooLong($content_shortened)) { // @todo FIXME: i18n: Needs plural. |