diff options
| author | Brion Vibber <brion@pobox.com> | 2010-12-07 10:50:05 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-12-07 10:50:05 -0800 |
| commit | 9df856e667a12cd217576263efbc72fff12692d9 (patch) | |
| tree | dc8d588e8b01d1ec788c78d6aec10a9b9d26bec6 /lib/command.php | |
| parent | 01f32e3998b8d031d2a39e2d0506253142b6632e (diff) | |
| parent | 4b4b763255ad3b2bff8f18da2bd3927b52a54e55 (diff) | |
Merge branch '0.9.x' into merge
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'lib/command.php')
| -rw-r--r-- | lib/command.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/command.php b/lib/command.php index a25ea4a9d..852d0a8f7 100644 --- a/lib/command.php +++ b/lib/command.php @@ -139,7 +139,7 @@ class Command { $user = null; if (Event::handle('StartCommandGetUser', array($this, $arg, &$user))) { - $user = User::staticGet('nickname', $arg); + $user = User::staticGet('nickname', Nickname::normalize($arg)); } Event::handle('EndCommandGetUser', array($this, $arg, &$user)); if (!$user){ @@ -479,7 +479,7 @@ class MessageCommand extends Command return; } - $this->text = common_shorten_links($this->text); + $this->text = $this->user->shortenLinks($this->text); if (Message::contentTooLong($this->text)) { // XXX: i18n. Needs plural support. @@ -582,7 +582,7 @@ class ReplyCommand extends Command return; } - $this->text = common_shorten_links($this->text); + $this->text = $this->user->shortenLinks($this->text); if (Notice::contentTooLong($this->text)) { // XXX: i18n. Needs plural support. |