Merge branch '0.8.x' into 0.9.x

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 4c6372c2bb96eac658aa94be085ee05c29ce4d49..23ec2a1b5827c3aca92ecb4f20d36c7e6da10718 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -433,13 +433,14 @@ class NewnoticeAction extends Action
         $content = $this->trimmed('status_textarea');
         if (!$content) {
             $replyto = $this->trimmed('replyto');
+            $inreplyto = $this->trimmed('inreplyto');
             $profile = Profile::staticGet('nickname', $replyto);
             if ($profile) {
                 $content = '@' . $profile->nickname . ' ';
             }
         }
 
-        $notice_form = new NoticeForm($this, '', $content);
+        $notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
         $notice_form->show();
     }