Merge pull request #1019 from Arantor/release-2.1

Various minor stuff.

Sources/Profile-Modify.php

@@ -1874,7 +1874,7 @@ function alert_configuration($memID)
 		'msg' => array(
 			'msg_mention' => array('alert' => 'yes', 'email' => 'yes'),
 			'msg_quote' => array('alert' => 'yes', 'email' => 'yes'),
-			'msg_like' => array('alert' => 'yes', 'email' => 'yes'),
+			'msg_like' => array('alert' => 'yes', 'email' => 'never'),
 		),
 		'pm' => array(
 			'pm_new' => array('alert' => 'always', 'email' => 'yes', 'help' => 'alert_pm_new', 'permission' => array('name' => 'pm_read', 'is_board' => false)),
@@ -1885,8 +1885,8 @@ function alert_configuration($memID)
 			'msg_report_reply' => array('alert' => 'yes', 'email' => 'yes', 'permission' => array('name' => 'moderate_board', 'is_board' => true)),
 		),
 		'members' => array(
+			'member_register' => array('alert' => 'yes', 'email' => 'yes', 'permission' => array('name' => 'moderate_forum', 'is_board' => false)),
 			'request_group' => array('alert' => 'yes', 'email' => 'yes'),
-			'register_new' => array('alert' => 'yes', 'email' => 'yes'),
 			'warn_own' => array('alert' => 'yes', 'email' => 'yes'),
 			'warn_any' => array('alert' => 'yes', 'email' => 'yes', 'permission' => array('name' => 'issue_warning', 'is_board' => false)),
 		),

Sources/Security.php

@@ -1373,7 +1373,7 @@ function frameOptionsHeader($override = null)
 	header('X-Frame-Options: ' . $option);
 
 	// And some other useful ones.
-	header('X-XSS-Protection: 1; mode=block');
+	header('X-XSS-Protection: 1');
 	header('X-Content-Type-Options: nosniff');
 }
 

Themes/default/Profile.template.php

@@ -1919,7 +1919,7 @@ function template_alert_configuration()
 		{
 			echo '
 						<tr class="windowbg', $use_bg2 ? '2' : '', '">
-							<td>', $txt['alert_' . $alert_id], '</td>';
+							<td>', $txt['alert_' . $alert_id], isset($alert_details['help']) ? '<a href="' . $scripturl . '?action=helpadmin;help=' . $alert_details['help'] . '" onclick="return reqOverlayDiv(this.href);" class="help floatright"><img src="' . $settings['images_url'] . '/helptopics.png" alt="' . $txt['help'] . '" title="' . $txt['help'] . '">' : '', '</td>';
 
 			foreach (array('alert', 'email') as $type)
 			{

Themes/default/languages/Alerts.english.php

@@ -11,4 +11,7 @@ $txt['alert_settings'] = 'Settings';
 $txt['alerts_no_unread'] = 'No unread alerts.';
 
 $txt['alert_msg_like'] = '{member_link} liked your post {msg_msg}';
+$txt['alert_member_register_standard'] = '{member_link} just signed up';
+$txt['alert_member_register_approval'] = '{member_link} just signed up (account requires approval)';
+$txt['alert_member_register_activation'] = '{member_link} just signed up (account requires activation)';
 ?>

Themes/default/languages/Profile.english.php

@@ -142,7 +142,7 @@ $txt['alert_group_moderation'] = 'Moderation';
 $txt['alert_msg_report'] = 'When a message is reported';
 $txt['alert_msg_report_reply'] = 'When a report I\'ve replied to gets replied to';
 $txt['alert_group_members'] = 'Members';
-$txt['alert_register_new'] = 'When a new person registers';
+$txt['alert_member_register'] = 'When a new person registers';
 $txt['alert_warn_own'] = 'If I receive a warning';
 $txt['alert_warn_any'] = 'When other members receive a warning';
 $txt['alert_group_calendar'] = 'Calendar';