Merge remote-tracking branch 'origin/1.1.x' into 1.1.x

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

diff --git a/plugins/Poll/Poll_response.php b/plugins/Poll/Poll_response.php
index a4ea999933ecdd146a7a80070d17cd9f355c8217..2518ac2bebd057f8a35e9b6b5a070c8cd99e6238 100644 (file)
--- a/plugins/Poll/Poll_response.php
+++ b/plugins/Poll/Poll_response.php
@@ -46,6 +46,7 @@ class Poll_response extends Managed_DataObject
 {
     public $__table = 'poll_response'; // table name
     public $id;          // char(36) primary key not null -> UUID
+    public $uri;          // varchar(255)
     public $poll_id;     // char(36) -> poll.id UUID
     public $profile_id;  // int -> profile.id
     public $selection;   // int -> choice #
@@ -200,12 +201,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);