Merge pull request #1506 from drdrew42/feature/q-a-plugin

Hotfix? Update for WordPress Q&A plugin

Author: drdrew42

lib/WeBWorK/ContentGenerator.pm

@@ -1711,7 +1711,7 @@ sub feedbackMacro_form {
 	    if ($key eq 'pg_object') {
 	        my $tmp = $value->{body_text};
 	        $tmp .= CGI::p(CGI::b("Note: "). CGI::i($value->{result}->{msg})) if $value->{result}->{msg} ;
-	        $result .= CGI::hidden($key, encode_base64($tmp, "") );
+	        $result .= CGI::hidden($key, encode_base64(Encode::encode('UTF-8', $tmp), "") );
 	    } else {
 			$result .= CGI::hidden($key, $value) . "\n";
 		}

lib/WeBWorK/ContentGenerator/Problem.pm

@@ -2257,6 +2257,7 @@ sub output_past_answer_button{
 sub output_email_instructor{
 	my $self = shift;
 	my $r = $self->r;
+	my $courseName = $r->urlpath->arg("courseID");
 	my $problem = $self->{problem};
 	my %will = %{ $self->{will} };
 	my $pg = $self->{pg};
@@ -2265,6 +2266,7 @@ sub output_email_instructor{
 
 	print $self->feedbackMacro(
 		module             => __PACKAGE__,
+		courseId           => $courseName,
 		set                => $self->{set}->set_id,
 		problem            => $problem->problem_id,
 		problemPath        => $problem->source_file,