Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / plugins / Poll / newpollform.php

diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
index 295619b1b9ea3bf2366da66195b9aa79eda9d195..309125a68621eddf22a4581976438dfb0cbe91b0 100644 (file)
--- a/plugins/Poll/newpollform.php
+++ b/plugins/Poll/newpollform.php
@@ -122,15 +122,23 @@ class NewpollForm extends Form
                 $default = '';
             }
             $this->li();
-            $this->out->input('option' . ($i + 1),
+            $this->out->input('poll-option' . ($i + 1),
                               // TRANS: Field label for an answer option on the page to create a poll.
                               // TRANS: %d is the option number.
                               sprintf(_m('Option %d'), $i + 1),
-                              $default);
+                              $default,
+                              null,
+                              'option' . ($i + 1));
             $this->unli();
         }
 
         $this->out->elementEnd('ul');
+
+        $toWidget = new ToSelector($this->out,
+                                   common_current_user(),
+                                   null);
+        $toWidget->show();
+
         $this->out->elementEnd('fieldset');
     }
 
@@ -142,6 +150,6 @@ class NewpollForm extends Form
     function formActions()
     {
         // TRANS: Button text for saving a new poll.
-        $this->out->submit('submit', _m('BUTTON', 'Save'));
+        $this->out->submit('poll-submit', _m('BUTTON', 'Save'), 'submit', 'submit');
     }
 }