summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-12-02 10:56:44 -0800
committerBrion Vibber <brion@pobox.com>2010-12-02 13:41:56 -0800
commitaa96c3c1d9823382e9e6de0da5084fcc111f2ee5 (patch)
tree06846b7b32f718d3e62a212fc60924d2f6008668 /scripts
parentc4f67f76476a4ca608bcf2fc860ad5ef889d269d (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 'scripts')
-rw-r--r--scripts/restoreuser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/restoreuser.php b/scripts/restoreuser.php
index 8327c796c..b37e9db74 100644
--- a/scripts/restoreuser.php
+++ b/scripts/restoreuser.php
@@ -219,7 +219,7 @@ function postNote($user, $activity)
$rendered = purify($sourceContent);
$content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8');
- $shortened = common_shorten_links($content);
+ $shortened = $user->shortenLinks($content);
$options = array('is_local' => Notice::LOCAL_PUBLIC,
'uri' => $sourceUri,