Merge pull request #2792 from somiaj/allow-at-userid-hotfix

Allow @ in user id when adding new course. (Hotfix)

Author: drgrice1

lib/WeBWorK/ContentGenerator/CourseAdmin.pm

@@ -267,11 +267,11 @@ sub add_course_validate ($c) {
 	for (1 .. $number_of_additional_users) {
 		my $userID = trim_spaces($c->param("add_initial_userID_$_")) || '';
 
-		unless ($userID =~ /^[\w.,-]*$/) {
+		unless ($userID =~ /^[\w.,-@]*$/) {
 			push @errors,
 				$c->maketext(
 					'User ID number [_1] may only contain letters, numbers, hyphens, periods, commas, '
-					. 'and underscores.',
+					. 'at symbols, and underscores.',
 					$_
 				);
 		}

templates/ContentGenerator/CourseAdmin/add_course_form.html.ep

@@ -91,7 +91,8 @@
 						data        => {
 							'bs-placement' => 'top',
 							'bs-title'     => maketext(
-								'User ID may contain only numbers, letters, hyphens, periods, and underscores.'
+								'User ID may contain only numbers, letters, hyphens, periods, commas, at symbols, '
+								. 'and underscores.'
 							)
 						} =%>
 					<%= label_for "add_initial_userID_$_" => maketext('User ID') =%>