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

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

diff --git a/actions/robotstxt.php b/actions/robotstxt.php
index d686042cb12fe8e52a2a74a4fb910c1a57a05582..4df04b564a5b46127578c12c611f352dd80e2de6 100644 (file)
--- a/actions/robotstxt.php
+++ b/actions/robotstxt.php
@@ -27,9 +27,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Prints out a static robots.txt
@@ -40,19 +38,9 @@ if (!defined('STATUSNET')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class RobotstxtAction extends Action
+class RobotstxtAction extends ManagedAction
 {
-    /**
-     * Handles requests
-     *
-     * Since this is a relatively static document, we
-     * don't do a prepare()
-     *
-     * @param array $args GET, POST, and URL params; unused.
-     *
-     * @return void
-     */
-    function handle($args)
+    public function showPage()
     {
         if (Event::handle('StartRobotsTxt', array($this))) {
 
@@ -88,7 +76,7 @@ class RobotstxtAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }