Profile block base style

[quix0rs-gnu-social.git] / actions / newmessage.php

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 4867fe976513b718b2462c558fb191fc26ec3933..67695210ec21ebf5db6add7234fbd1f0d2ee1f33 100644 (file)
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -34,7 +34,6 @@ class NewmessageAction extends Action {
        }
 
        function save_new_message() {
-
                $user = common_current_user();
                assert($user); # XXX: maybe an error instead...
 
@@ -52,11 +51,15 @@ class NewmessageAction extends Action {
                if (!$content) {
                        $this->show_form(_('No content!'));
                        return;
-               } else if (mb_strlen($content) > 140) {
-                       common_debug("Content = '$content'", __FILE__);
-                       common_debug("mb_strlen(\$content) = " . mb_strlen($content), __FILE__);
-                       $this->show_form(_('That\'s too long. Max message size is 140 chars.'));
-                       return;
+               } else {
+                       $content_shortened = common_shorten_links($content);
+
+                       if (mb_strlen($content_shortened) > 140) {
+                               common_debug("Content = '$content_shortened'", __FILE__);
+                               common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
+                               $this->show_form(_('That\'s too long. Max message size is 140 chars.'));
+                               return;
+                       }
                }
 
                $other = User::staticGet('id', $to);
@@ -81,7 +84,7 @@ class NewmessageAction extends Action {
 
                $this->notify($user, $other, $message);
 
-               $url = common_local_url('outbox');
+               $url = common_local_url('outbox', array('nickname' => $user->nickname));
 
                common_redirect($url, 303);
        }