merge 0.9.x 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 37d7bc149c6455ec561a9c9fd5c50d25f2bc7a96..309125a68621eddf22a4581976438dfb0cbe91b0 100644 (file)
--- a/plugins/Poll/newpollform.php
+++ b/plugins/Poll/newpollform.php
@@ -122,11 +122,13 @@ 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();
         }
 
@@ -148,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');
     }
 }