diff options
| author | friendica <redmatrix@redmatrix.me> | 2015-04-30 17:53:47 -0700 |
|---|---|---|
| committer | friendica <redmatrix@redmatrix.me> | 2015-04-30 17:53:47 -0700 |
| commit | 9fc87d43c9a38b3ba1079412fde81ef0f5190fed (patch) | |
| tree | 678814e4037551388050c3afb1eb8cae39615b92 /include | |
| parent | 097002910ead3ec263f723eb66e659f0469b8bb6 (diff) | |
| parent | e8d2dd7204b2ae80819905075de1a036c2be9aa6 (diff) | |
| download | volse-hubzilla-9fc87d43c9a38b3ba1079412fde81ef0f5190fed.tar.gz volse-hubzilla-9fc87d43c9a38b3ba1079412fde81ef0f5190fed.tar.bz2 volse-hubzilla-9fc87d43c9a38b3ba1079412fde81ef0f5190fed.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/conversation.php b/include/conversation.php index 8c9029a43..fb012667e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1095,6 +1095,8 @@ function status_editor($a, $x, $popup = false) { // $plaintext = false; $voting = feature_enabled(local_channel(), 'consensus_tools'); + if(x($x, 'novoting')) + $voting = false; $mimeselect = ''; if(array_key_exists('mimetype', $x) && $x['mimetype']) { |