No more needed (for this fix) but maybe later. So I always only comment them out.

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

diff --git a/lib/noticeform.php b/lib/noticeform.php
index f1f322ae332de9d75ba55e8199613155dd0d17df..161eb67a5061e9553d165086fdaf22b209364ce5 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -97,7 +97,7 @@ class NoticeForm extends Form
      *                        'location_id' ID of location
      *                        'location_ns' Namespace of location
      */
-    function __construct($action, $options=null)
+    function __construct(Action $action, array $options = array())
     {
         // XXX: ??? Is this to keep notice forms distinct?
         // Do we have to worry about sub-second race conditions?
@@ -109,10 +109,6 @@ class NoticeForm extends Form
 
         parent::__construct($action);
 
-        if (is_null($options)) {
-            $options = array();
-        }
-
         $this->actionName  = $action->trimmed('action');
 
         $prefill = array('content', 'inreplyto', 'lat',