Merge branch 'master' into testing

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

diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index b335a9c93ee360903538f390f268ceffd648f70f..e33077cdac7d5277a310ce7b5efe71c62b3bc41d 100644 (file)
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -119,7 +119,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
                 $this->format
             );
         } else {
-            $content_shortened = common_shorten_links($this->content);
+            $content_shortened = $this->auth_user->shortenLinks($this->content);
             if (Message::contentTooLong($content_shortened)) {
                 $this->clientError(
                     // TRANS: Client error displayed when message content is too long.
@@ -141,7 +141,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         } else if (!$this->user->mutuallySubscribed($this->other)) {
             $this->clientError(
                 // TRANS: Client error displayed trying to direct message another user who's not a friend (403).
-                _('Can\'t send direct messages to users who aren\'t your friend.'),
+                _('Cannot send direct messages to users who aren\'t your friend.'),
                 403,
                 $this->format
             );