diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/apidirectmessagenew.php | 2 | ||||
| -rw-r--r-- | actions/apistatusesupdate.php | 2 | ||||
| -rw-r--r-- | actions/apitimelineuser.php | 2 | ||||
| -rw-r--r-- | actions/newmessage.php | 2 | ||||
| -rw-r--r-- | actions/newnotice.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php index b335a9c93..978c75353 100644 --- 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. diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 1a3b54900..a8ec7f8bb 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -231,7 +231,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction return; } - $status_shortened = common_shorten_links($this->status); + $status_shortened = $this->auth_user->shortenlinks($this->status); if (Notice::contentTooLong($status_shortened)) { // Note: Twitter truncates anything over 140, flags the status diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index b0c8b4df8..d90507aa4 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -380,7 +380,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $rendered = $this->purify($sourceContent); $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8'); - $shortened = common_shorten_links($content); + $shortened = $this->auth_user->shortenLinks($content); $options = array('is_local' => Notice::LOCAL_PUBLIC, 'rendered' => $rendered, diff --git a/actions/newmessage.php b/actions/newmessage.php index c58ed3849..447a00580 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -144,7 +144,7 @@ class NewmessageAction extends Action $this->showForm(_('No content!')); return; } else { - $content_shortened = common_shorten_links($this->content); + $content_shortened = $user->shortenLinks($this->content); if (Message::contentTooLong($content_shortened)) { // TRANS: Form validation error displayed when message content is too long. diff --git a/actions/newnotice.php b/actions/newnotice.php index 0d4dcfccd..faafd9551 100644 --- 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. |