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

[quix0rs-gnu-social.git] / plugins / SearchSub / actions / searchunsub.php

diff --git a/plugins/SearchSub/actions/searchunsub.php b/plugins/SearchSub/actions/searchunsub.php
index f7f006e21c831fedc1e9662d177b1732285f65b3..8e135e62fa26adfad9fb7ca2386c082929ccc659 100644 (file)
--- a/plugins/SearchSub/actions/searchunsub.php
+++ b/plugins/SearchSub/actions/searchunsub.php
@@ -62,7 +62,7 @@ class SearchunsubAction extends SearchsubAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         // Throws exception on error
 
@@ -79,7 +79,7 @@ class SearchunsubAction extends SearchsubAction
             $subscribe = new SearchSubForm($this, $this->search);
             $subscribe->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             $url = common_local_url('search',
                                     array('search' => $this->search));