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 e241b5812c6af7b0ab73ea459b2d610921f0c655..161eb67a5061e9553d165086fdaf22b209364ce5 100644 (file)
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -97,20 +97,18 @@ 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?
         // XXX: Needs to be above the parent::__construct() call...?
 
-        $this->id_suffix = rand();
+        // When creating a notice form we don't want to collide with
+        // possibly existing HTML elements, as naming conventions are similar.
+        $this->id_suffix = mt_rand();
 
         parent::__construct($action);
 
-        if (is_null($options)) {
-            $options = array();
-        }
-
         $this->actionName  = $action->trimmed('action');
 
         $prefill = array('content', 'inreplyto', 'lat', 
@@ -262,7 +260,7 @@ class NoticeForm extends Form
                     'type' => 'checkbox',
                     'class' => 'checkbox',
                     'id' => $this->id() . '-notice_data-geo',
-                    'checked' => true, // ?
+                    'checked' => false, // Must be unchecked by default
                 ));
                 $this->out->text(' ');
                 // TRANS: Field label to add location to a notice.