Merge branch 'nightly' of gitorious.org:social/mainline into nightly

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

diff --git a/actions/replies.php b/actions/replies.php
index 49098d0950781f62942b29dc0fb131089e70e0fc..5bf2f8edc429bb4829f0966c82053fccb7576045 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -74,6 +74,26 @@ class RepliesAction extends ManagedAction
             // TRANS: Client error when page not found (404)
             $this->clientError(_('No such page.'), 404);
         }
+<<<<<<< HEAD
+
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * Just show the page. All args already handled.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return void
+     */
+    function handle(array $args=array())
+    {
+        parent::handle($args);
+        $this->showPage();
+=======
+>>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
     }
 
     /**
@@ -183,7 +203,11 @@ class RepliesAction extends ManagedAction
         $this->elementEnd('div');
     }
 
+<<<<<<< HEAD
+    function isReadOnly(array $args=array())
+=======
     public function isReadOnly($args)
+>>>>>>> 1442ca16b410d327d7ec6269944144dfa075ff17
     {
         return true;
     }