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

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

diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
index ee5a477d49eca4a75d04264b8137f8dd4c33260e..d80dd609e3aba1dfcff24f222d3127f7d8e9d01a 100644 (file)
--- a/actions/atompubshowsubscription.php
+++ b/actions/atompubshowsubscription.php
@@ -132,7 +132,7 @@ class AtompubshowsubscriptionAction extends AtompubAction
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
             return false;