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

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

diff --git a/lib/action.php b/lib/action.php
index 29fadbf8836894c989064860000652653788fbd5..9d3f74854e3fca2e2f72e32d2e31e4f21706c81a 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -205,7 +205,7 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return nothing
      */
-    function showPage()
+    public function showPage()
     {
         if (GNUsocial::isAjax()) {
             self::showAjax();
@@ -1220,7 +1220,7 @@ class Action extends HTMLOutputter // lawsuit
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }