Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GroupPrivateMessage / actions / newgroupmessage.php

diff --git a/plugins/GroupPrivateMessage/actions/newgroupmessage.php b/plugins/GroupPrivateMessage/actions/newgroupmessage.php
index 37738a385ca1bce189af3f17551c0e008041ae7f..be6a3cd86b6c875daf843af17f8fe59ed1680d1a 100644 (file)
--- a/plugins/GroupPrivateMessage/actions/newgroupmessage.php
+++ b/plugins/GroupPrivateMessage/actions/newgroupmessage.php
@@ -81,7 +81,6 @@ class NewgroupmessageAction extends Action
         if ($nickname != $nicknameArg) {
             $url = common_local_url('newgroupmessage', array('nickname' => $nickname));
             common_redirect($url, 301);
-            return false;
         }
 
         $localGroup = Local_group::getKV('nickname', $nickname);
@@ -149,7 +148,7 @@ class NewgroupmessageAction extends Action
                            sprintf(_m('Direct message to %s sent.'),
                                    $this->group->nickname));
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             common_redirect($gm->url, 303);
         }