Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / managedaction.php

diff --git a/lib/managedaction.php b/lib/managedaction.php
index 318df320e1cf6c19cf4e12ece68782aaea80682a..278131b7a6461db41501a8ad417ccfa09fc52874 100644 (file)
--- a/lib/managedaction.php
+++ b/lib/managedaction.php
@@ -32,6 +32,20 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class ManagedAction extends Action
 {
+    protected function prepare(array $args=array())
+    {
+        if (!parent::prepare($args)) {
+            return false;
+        }
+        $this->doPreparation();
+        return true;
+    }
+
+    protected function doPreparation()
+    {
+        // pass by default
+    }
+
     /**
      * Handler method
      */
@@ -47,28 +61,12 @@ class ManagedAction extends Action
             }
         }
 
-        if (StatusNet::isAjax()) {
-            $this->showAjax();
-        } else {
-            $this->showPage();
-        }
+        $this->showPage();
     }
 
     protected function handlePost()
     {
         // This will only be run if the Action has the property canPost==true
-    }
-
-    public function showAjax()
-    {
-        $this->startHTML('text/xml;charset=utf-8');
-        $this->elementStart('head');
-        // TRANS: Title for conversation page.
-        $this->element('title', null, _m('TITLE','Notice'));
-        $this->elementEnd('head');
-        $this->elementStart('body');
-        $this->showContent();
-        $this->elementEnd('body');
-        $this->endHTML();
+        assert($this->canPost);
     }
 }