4 files changed, 41 insertions, 22 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 60d5def4d1..511148baf9 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -508,11 +508,34 @@ class acp_profile
 							}
 						}
 					}
-					/* else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
+					else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
 					{
-						// Get the number of options if this key is 'field_maxlen'
-						$var = request_var('field_default_value', 0);
-					}*/
+						// 'field_length' == 1 defines radio buttons. Possible values are 1 or 2 only.
+						// 'field_length' == 2 defines checkbox. Possible values are 0 or 1 only.
+						// If we switch the type on step 2, we have to adjust field value.
+						// 1 is a common value for the checkbox and radio buttons.
+
+						// Adjust unchecked checkbox value.
+						// If we return or save settings from 2nd/3rd page
+						// and the checkbox is unchecked, set the value to 0.
+						if (isset($_REQUEST['step']) && !isset($_REQUEST[$key]))
+						{
+							$var = 0;
+						}
+
+						// If we switch to the checkbox type but former radio buttons value was 2,
+						// which is not the case for the checkbox, set it to 0 (unchecked).
+						if ($cp->vars['field_length'] == 2 && $var == 2)
+						{
+							$var = 0;
+						}
+						// If we switch to the radio buttons but the former checkbox value was 0,
+						// which is not the case for the radio buttons, set it to 0.
+						else if ($cp->vars['field_length'] == 1 && $var == 0)
+						{
+							$var = 2;
+						}
+					}
 					else if ($field_type == FIELD_INT && $key == 'field_default_value')
 					{
 						// Permit an empty string
@@ -680,6 +703,10 @@ class acp_profile
 						{
 							$_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true));
 						}
+						else if ($field_type == FIELD_BOOL && $key == 'field_default_value')
+						{
+							$_new_key_ary[$key] =  request_var($key, $cp->vars[$key]);
+						}
 						else
 						{
 							if (!isset($_REQUEST[$key]))
diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php
index 97cfd35750..ec5a76df87 100644
--- a/phpBB/includes/acp/acp_ranks.php
+++ b/phpBB/includes/acp/acp_ranks.php
@@ -51,7 +51,7 @@ class acp_ranks
 				}
 				$rank_title = utf8_normalize_nfc(request_var('title', '', true));
 				$special_rank = request_var('special_rank', 0);
-				$min_posts = ($special_rank) ? 0 : request_var('min_posts', 0);
+				$min_posts = ($special_rank) ? 0 : max(0, request_var('min_posts', 0));
 				$rank_image = request_var('rank_image', '');
 
 				// The rank image has to be a jpg, gif or png
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index c8fe748c02..7b449d3b35 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -83,11 +83,11 @@ version = {VERSION}
 		$this->template_cfg .= '
 # Some configuration options
 
-#
-# You can use this function to inherit templates from another template.
-# The template of the given name has to be installed.
-# Templates cannot inherit from inheriting templates.
-#';
+# Template inheritance
+# See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/
+# Set value to empty or this template name to ignore template inheritance.
+inherit_from = {INHERIT_FROM}
+';
 
 		// Execute overall actions
 		switch ($action)
@@ -1346,9 +1346,7 @@ version = {VERSION}
 			// Export template core code
 			if ($mode == 'template' || $inc_template)
 			{
-				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version']), $this->template_cfg);
-
-				$use_template_name = '';
+				$use_template_name = $style_row['template_name'];
 
 				// Add the inherit from variable, depending on it's use...
 				if ($style_row['template_inherits_id'])
@@ -1362,7 +1360,8 @@ version = {VERSION}
 					$db->sql_freeresult($result);
 				}
 
-				$template_cfg .= ($use_template_name) ? "\ninherit_from = $use_template_name" : "\n#inherit_from = ";
+				$template_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}', '{INHERIT_FROM}'), array($mode, $style_row['template_name'], $style_row['template_copyright'], $config['version'], $use_template_name), $this->template_cfg);
+
 				$template_cfg .= "\n\nbbcode_bitfield = {$style_row['bbcode_bitfield']}";
 
 				$data[] = array(
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index a282ef1d7f..cf6716c322 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -128,7 +128,7 @@ class acp_users
 		$dropdown_modes = array();
 		while ($row = $db->sql_fetchrow($result))
 		{
-			if (!$this->p_master->module_auth($row['module_auth']))
+			if (!$this->p_master->module_auth_self($row['module_auth']))
 			{
 				continue;
 			}
@@ -756,7 +756,6 @@ class acp_users
 						'username'			=> utf8_normalize_nfc(request_var('user', $user_row['username'], true)),
 						'user_founder'		=> request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0),
 						'email'				=> strtolower(request_var('user_email', $user_row['user_email'])),
-						'email_confirm'		=> strtolower(request_var('email_confirm', '')),
 						'new_password'		=> request_var('new_password', '', true),
 						'password_confirm'	=> request_var('password_confirm', '', true),
 					);
@@ -788,7 +787,6 @@ class acp_users
 								array('string', false, 6, 60),
 								array('email', $user_row['user_email'])
 							),
-							'email_confirm'		=> array('string', true, 6, 60)
 						);
 					}
 
@@ -799,11 +797,6 @@ class acp_users
 						$error[] = 'NEW_PASSWORD_ERROR';
 					}
 
-					if ($data['email'] != $user_row['user_email'] && $data['email_confirm'] != $data['email'])
-					{
-						$error[] = 'NEW_EMAIL_ERROR';
-					}
-
 					if (!check_form_key($form_name))
 					{
 						$error[] = 'FORM_INVALID';