Merge pull request #810 from Arantor/release-2.1

More saving goodness, but still some of the more interesting places to be done yet.

Sources/ManageAttachments.php

@@ -250,6 +250,7 @@ function ManageAttachmentSettings($return_config = false)
 		call_integration_hook('integrate_save_attachment_settings');
 
 		saveDBSettings($config_vars);
+		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=manageattachments;sa=attachments');
 	}
 
@@ -336,6 +337,7 @@ function ManageAvatarSettings($return_config = false)
 		call_integration_hook('integrate_save_avatar_settings');
 
 		saveDBSettings($config_vars);
+		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=manageattachments;sa=avatars');
 	}
 

Sources/ManageBoards.php

@@ -868,6 +868,7 @@ function EditBoardSettings($return_config = false)
 		call_integration_hook('integrate_save_board_settings');
 
 		saveDBSettings($config_vars);
+		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=manageboards;sa=settings');
 	}
 

Sources/ManageCalendar.php

@@ -395,6 +395,7 @@ function ModifyCalendarSettings($return_config = false)
 			'calendar_updated' => time(),
 		));
 
+		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=managecalendar;sa=settings');
 	}
 

Sources/ManageMembergroups.php

@@ -1211,6 +1211,7 @@ function ModifyMembergroupsettings()
 
 		// Yeppers, saving this...
 		saveDBSettings($config_vars);
+		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=membergroups;sa=settings');
 	}
 

Sources/ManageRegistration.php

@@ -246,6 +246,7 @@ function SetReserved()
 			'reserveName' => (isset($_POST['matchname']) ? '1' : '0'),
 			'reserveNames' => str_replace("\r", '', $_POST['reserved'])
 		));
+		$context['saved_successful'] = true;
 	}
 
 	// Get the reserved word options and words.

Themes/default/Register.template.php

@@ -665,6 +665,10 @@ function template_edit_reserved_words()
 {
 	global $context, $settings, $options, $scripturl, $txt;
 
+	if (!empty($context['saved_successful']))
+		echo '
+	<div class="infobox">', $txt['settings_saved'], '</div>';
+
 	echo '
 		<form id="admin_form_wrapper" class="windowbg2" action="', $scripturl, '?action=admin;area=regcenter" method="post" accept-charset="', $context['character_set'], '">
 			<div class="cat_bar">