add toselector to poll

diff --git a/plugins/Poll/newpoll.php b/plugins/Poll/newpoll.php
index 1048b0a1edd930d87b89cb4a99d600993b56bda1..e7d5d3dd0d6d32484d7b9cb9e4f83cada24bb1c0 100644 (file)
--- a/plugins/Poll/newpoll.php
+++ b/plugins/Poll/newpoll.php
@@ -138,10 +138,19 @@ class NewPollAction extends Action
                 throw new ClientException(_m('Poll must have at least two options.'));
             }
 
+            // Notice options; distinct from choices for the poll
+
+            $options = array();
+
+            // Does the heavy-lifting for getting "To:" information
+
+            ToSelector::fillOptions($this, $options);
 
             $saved = Poll::saveNew($this->user->getProfile(),
-                                              $this->question,
-                                              $this->options);
+                                   $this->question,
+                                   $this->options,
+                                   $options);
+
         } catch (ClientException $ce) {
             $this->error = $ce->getMessage();
             $this->showPage();

diff --git a/plugins/Poll/newpollform.php b/plugins/Poll/newpollform.php
index 295619b1b9ea3bf2366da66195b9aa79eda9d195..37d7bc149c6455ec561a9c9fd5c50d25f2bc7a96 100644 (file)
--- a/plugins/Poll/newpollform.php
+++ b/plugins/Poll/newpollform.php
@@ -131,6 +131,12 @@ class NewpollForm extends Form
         }
 
         $this->out->elementEnd('ul');
+
+        $toWidget = new ToSelector($this->out,
+                                   common_current_user(),
+                                   null);
+        $toWidget->show();
+
         $this->out->elementEnd('fieldset');
     }