Merge pull request openwebwork#75 from mgage/release/2.7

Fix bug in using HTML::Scrubber
aubreyja · Jun 8, 2013 · 4f1efe0 · 4f1efe0
2 parents 28425f7 + 08d88a8
commit 4f1efe0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm b/lib/WeBWorK/ContentGenerator/GatewayQuiz.pm
@@ -1019,7 +1019,9 @@ sub pre_header_initialize {
 	    );
 	foreach my $key (keys %$formFields) {
 	    if ($key =~ /AnSwEr/) {
-		$formFields->{$key} = $scrubber->scrub($formFields->{$key});
+		$formFields->{$key} = $scrubber->scrub(		
+			(defined $formFields->{$key})? $formFields->{key}:'' # using // would be more elegant but breaks perl 5.8.x
+		);
 		### HTML::scrubber is a little too enthusiastic about
 		### removing > and < so we have to add them back in otherwise
 		### they confuse pg

diff --git a/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm b/lib/WeBWorK/ContentGenerator/Instructor/ProblemGrader.pm
@@ -141,7 +141,7 @@ sub initialize {
 			comment => 0
 			);
 
-		    my $comment = $scrubber->scrub($r->param("$userID.comment"));
+		    my $comment = $scrubber->scrub( ( defined $r->param("$userID.comment") )?$r->param("$userID.comment"):'' );
 		    my $userPastAnswerID = $db->latestProblemPastAnswer($courseName, $userID, $setID, $problemID); 
 
 		    if ($userPastAnswerID) {

diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -732,7 +732,9 @@ sub pre_header_initialize {
 	    );
 	foreach my $key (keys %$formFields) {
 	    if ($key =~ /AnSwEr/) {
-		$formFields->{$key} = $scrubber->scrub($formFields->{$key});
+		$formFields->{$key} = $scrubber->scrub(		
+			(defined $formFields->{$key})? $formFields->{key}:'' # using // would be more elegant but breaks perl 5.8.x
+		);
 		### HTML::scrubber is a little too enthusiastic about
 		### removing > and < so we have to add them back in otherwise
 		### they confuse pg