Merge branch 'nightly', beginning of 1.2.x

[quix0rs-gnu-social.git] / plugins / OStatus / actions / peopletagsalmon.php

diff --git a/plugins/OStatus/actions/peopletagsalmon.php b/plugins/OStatus/actions/peopletagsalmon.php
index 35911a68077526cb506198befb569a86af3bbf2f..46f4b0bdd848417af8c3db1eb2775bf6e1d1fbe9 100644 (file)
--- a/plugins/OStatus/actions/peopletagsalmon.php
+++ b/plugins/OStatus/actions/peopletagsalmon.php
@@ -21,15 +21,13 @@
  * @package OStatusPlugin
  */
 
-if (!defined('STATUSNET')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 class PeopletagsalmonAction extends SalmonAction
 {
     var $peopletag = null;
 
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);