Merge branch '1.0.x' of git+ssh://statusnetdev.net/var/www/evan into 1.0.x
This commit is contained in:
commit
144755d1c9
@ -200,12 +200,10 @@ class Poll_response extends Managed_DataObject
|
|||||||
$rendered = sprintf(_m('voted for "%s"'), $link);
|
$rendered = sprintf(_m('voted for "%s"'), $link);
|
||||||
|
|
||||||
$tags = array();
|
$tags = array();
|
||||||
$replies = array();
|
|
||||||
|
|
||||||
$options = array_merge(array('urls' => array(),
|
$options = array_merge(array('urls' => array(),
|
||||||
'rendered' => $rendered,
|
'rendered' => $rendered,
|
||||||
'tags' => $tags,
|
'tags' => $tags,
|
||||||
'replies' => $replies,
|
|
||||||
'reply_to' => $poll->getNotice()->id,
|
'reply_to' => $poll->getNotice()->id,
|
||||||
'object_type' => PollPlugin::POLL_RESPONSE_OBJECT),
|
'object_type' => PollPlugin::POLL_RESPONSE_OBJECT),
|
||||||
$options);
|
$options);
|
||||||
|
Loading…
Reference in New Issue
Block a user