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

[quix0rs-gnu-social.git] / plugins / Mapstraction / actions / usermap.php

diff --git a/plugins/Mapstraction/actions/usermap.php b/plugins/Mapstraction/actions/usermap.php
index 99a43e538a5c81fb09ac551fec98b101450ba936..4aef1400abd363a74f3b7e465c87ac1d34958311 100644 (file)
--- a/plugins/Mapstraction/actions/usermap.php
+++ b/plugins/Mapstraction/actions/usermap.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  */
 class UsermapAction extends MapAction
 {
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if(parent::prepare($args)) {
             $this->notice = empty($this->tag)