Merge branch 'develop' into 7.0dev

yurabakhtin · yurabakhtin · commit 96bb180f61cb · 2020-01-16T20:35:36.000+03:00
diff --git a/plugins/auto_anchors_plugin/_auto_anchors.plugin.php b/plugins/auto_anchors_plugin/_auto_anchors.plugin.php
@@ -49,7 +49,7 @@ function PluginInit( & $params )
 	function get_coll_setting_definitions( & $params )
 	{
 		$default_params = array(
-				'default_comment_rendering' => 'opt-in',
+				'default_comment_rendering' => 'never',
 				'default_post_rendering' => 'opt-out'
 			);
 
@@ -251,4 +251,4 @@ function callback_auto_anchor( $m )
 	}
 }
 
-?>
+?>

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ function PluginInit( & $params )`
`49`	`49`	`function get_coll_setting_definitions( & $params )`
`50`	`50`	`{`
`51`	`51`	`$default_params = array(`
`52`		`- 'default_comment_rendering' => 'opt-in',`
	`52`	`+ 'default_comment_rendering' => 'never',`
`53`	`53`	`'default_post_rendering' => 'opt-out'`
`54`	`54`	`);`
`55`	`55`
`@@ -251,4 +251,4 @@ function callback_auto_anchor( $m )`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`-?>`
	`254`	`+?>`