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 /classes/User.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 'classes/User.php')
-rw-r--r-- | classes/User.php | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/classes/User.php b/classes/User.php index 92180a9fb..041c64c38 100644 --- a/classes/User.php +++ b/classes/User.php @@ -927,4 +927,23 @@ class User extends Memcached_DataObject throw new ServerException(_('Single-user mode code called when not enabled.')); } } + + /** + * Find and shorten links in the given text using this user's URL shortening + * settings. + * + * By default, links will be left untouched if the text is shorter than the + * configured maximum notice length. Pass true for the $always parameter + * to force all links to be shortened regardless. + * + * Side effects: may save file and file_redirection records for referenced URLs. + * + * @param string $text + * @param boolean $always + * @return string + */ + public function shortenLinks($text, $always=false) + { + return common_shorten_links($text, $always, $this); + } } |