try to make replies point to the clicked-on notice

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

diff --git a/actions/showmessage.php b/actions/showmessage.php
index 08c71b5a999001bfc4e964277d54cdcae482cf94..c171ffe0b596b790bd5b458dbcae1a0393ed9026 100644 (file)
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -27,9 +27,7 @@ class ShowmessageAction extends MailboxAction {
 
                Action::handle($args);
 
-               $id = $this->trimmed('message');
-
-               $message = Message::staticGet('message', $id);
+               $message = $this->get_message();
 
                if (!$message) {
                        $this->client_error(_('No such message.'), 404);
@@ -38,20 +36,17 @@ class ShowmessageAction extends MailboxAction {
                
                $cur = common_current_user();
                
-               if (!$cur ||
-                       $cur->id != $message->from_profile &&
-                       $cur->id != $message->to_profile) 
-               {
+               if ($cur && ($cur->id == $message->from_profile || $cur->id == $message->to_profile)) {
+                       $this->show_page($cur, 1);
+               } else {
                        $this->client_error(_('Only the sender and recipient may read this message.'), 403);
                        return;
                }
-                       
-               $this->show_page($cur, 1);
        }
        
        function get_message() {
                $id = $this->trimmed('message');
-               $message = Message::staticGet('message', $id);
+               $message = Message::staticGet('id', $id);
                return $message;
        }