Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

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

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 32511a4b49c0f81cc05efe0d000d6a6bd06093d8..7dcab04c045d2bd3ba6e3bd2ac152e6571b184c2 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -66,17 +66,19 @@ class UnsubscribeAction extends Action
         }
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             $this->element('title', null, _('Unsubscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            common_subscribe_form($other);
+            $subscribe = new SubscribeForm($this, $other);
+            $subscribe->show();
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
             common_redirect(common_local_url('subscriptions', array('nickname' =>
-                                                                    $user->nickname)));
+                                                                    $user->nickname)),
+                            303);
         }
     }
 }