Merge lp:~edb/quam-plures/new_group_on_install into lp:quam-plures

[EdB]

http://forums.quamplures.net/viewtopic.php?f=11&t=1180

Sets "group for new registrants" to g-1 if no sample posts are installed, g-4 if they are.

[lp:~edb/quam-plures/new_group_on_install]

7647. By EdB on 2012-08-02

adding core updates

=== modified file 'qp_install/_functions_install.php'
--- qp_install/_functions_install.php	2012-07-24 09:39:41 +0000
+++ qp_install/_functions_install.php	2012-08-02 15:49:23 +0000
@@ -311,12 +311,19 @@
  */
 function create_default_settings( $override = array() )
 {
-	global $DB, $app_db_version, $default_locale, $Group_Admins;
+	global $DB, $app_db_version, $default_locale, $create_sample_contents;
+
+	// default group is 1 unless we are installing sample contents
+	$default_group_ID = 1;
+	if( $create_sample_contents )
+	{
+		$default_group_ID = 4;
+	}
 
 	$defaults = array(
 		'db_version' => $app_db_version,
 		'default_locale' => $default_locale,
-		'newusers_grp_ID' => $Group_Admins->ID,
+		'newusers_grp_ID' => $default_group_ID,
 		'default_blog_ID' => 1,
 	);