Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x

2011-07-04 12:26:59 -04:00 · 2011-07-04 12:26:59 -04:00 · 144755d1c9
commit 144755d1c9
parent 15dafffb3b 333876c6a9
1 changed files with 0 additions and 2 deletions
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@ -200,12 +200,10 @@ class Poll_response extends Managed_DataObject
        $rendered = sprintf(_m('voted for "%s"'), $link);

        $tags    = array();
-        $replies = array();

        $options = array_merge(array('urls' => array(),
                                     'rendered' => $rendered,
                                     'tags' => $tags,
-                                     'replies' => $replies,
                                     'reply_to' => $poll->getNotice()->id,
                                     'object_type' => PollPlugin::POLL_RESPONSE_OBJECT),
                               $options);