Merge https://github.com/redmatrix/redmatrix into pending_merge

2015-04-30 17:53:47 -07:00
parent 097002910e e8d2dd7204
commit 9fc87d43c9
9 changed files with 19 additions and 5 deletions
--- 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']) {