diff options
author | Brion Vibber <brion@pobox.com> | 2010-12-02 10:56:44 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-12-02 13:41:56 -0800 |
commit | aa96c3c1d9823382e9e6de0da5084fcc111f2ee5 (patch) | |
tree | 06846b7b32f718d3e62a212fc60924d2f6008668 /actions/newmessage.php | |
parent | c4f67f76476a4ca608bcf2fc860ad5ef889d269d (diff) |
Fix for tickets #2917, #2262: user URL shortening options not being applied in non-web channels
common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.
Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.
Note also ticket #2919: there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
Diffstat (limited to 'actions/newmessage.php')
-rw-r--r-- | actions/newmessage.php | 2 |
1 files changed, 1 insertions, 1 deletions
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. |