Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / actions / newnotice.php

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 0d4dcfccd5b9a9f4a13ae0f3434041b7b8a6fff0..faafd9551d97511709f82e716ceb7c223dfc8f79 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -154,7 +154,7 @@ class NewnoticeAction extends Action
             return;
         }
 
-        $content_shortened = common_shorten_links($content);
+        $content_shortened = $user->shortenLinks($content);
         if (Notice::contentTooLong($content_shortened)) {
             // TRANS: Client error displayed when the parameter "status" is missing.
             // TRANS: %d is the maximum number of character for a notice.