We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 144755d1 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 15dafffb 333876c6
......@@ -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),
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment