diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-06 18:39:12 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-06 18:39:12 -0700 |
| commit | 75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6 (patch) | |
| tree | c66d2a27b37c15d16095b6f1f720c70917d00c98 /include/diaspora.php | |
| parent | f17c1f96944cd347296ede2a4d0afaee17b49234 (diff) | |
| parent | a1ed2bf2ac97c438b1b44bd96b8cb07a4eb81337 (diff) | |
| download | volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.tar.gz volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.tar.bz2 volse-hubzilla-75b8bfc07a2431a6d4d5f2f72864d6cd3aa33cf6.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 1ca3cebd3..acdddd0ef 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2427,6 +2427,20 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } */ + if($item['item_flags'] & ITEM_CONSENSUS) { + $poll = replace_macros(get_markup_template('diaspora_consensus.tpl'), array( + '$guid_q' => random_string(), + '$question' => '', + '$guid_y' => random_string(), + '$agree' => t('Agree'), + '$guid_n' => random_string(), + '$disagree' => t('Disagree'), + '$guid_a' => random_string(), + '$abstain' => t('Abstain') + )); + } + else + $poll = ''; $public = (($item['item_private']) ? 'false' : 'true'); @@ -2451,6 +2465,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $msg = replace_macros($tpl, array( '$body' => xmlify($body), '$guid' => $item['mid'], + '$poll' => $poll, '$handle' => xmlify($myaddr), '$public' => $public, '$created' => $created, |