Merge branch 'master' into pocorate

2015-01-29 15:21:19 -08:00
parent fd0b6c967f d7dae3c72a
commit df6d54c64e
5 changed files with 5 additions and 6 deletions
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -564,6 +564,7 @@ function connedit_content(&$a) {
 		}

 		$poco_rating = get_config('system','poco_rating_enable');
+		$poco_rating = 0; // leave disabled until we're ready for it. 
 		// if unset default to enabled
 		if($poco_rating === false)
 			$poco_rating = true;