Merge branch 'streamline_error_messages'

mgage · mgage · commit d4580a70e053 · 2012-02-18T16:04:12.000-05:00
diff --git a/lib/WeBWorK/ContentGenerator/Problem.pm b/lib/WeBWorK/ContentGenerator/Problem.pm
@@ -726,9 +726,10 @@ sub pre_header_initialize {
 	# because the PG file is never run
 	#
 	if (defined ($pg->{pgcore}) ) {
-		$self->addmessage(join(CGI::br(),@{$pg->{flags}->{DEBUG_messages}} ) ) if @{$pg->{flags}->{DEBUG_messages}};
-		$self->{pgdebug}          = $pg->{pgcore}->{flags}->{DEBUG_messages};
-		$self->{pgwarning}        = $pg->{pgcore}->{flags}->{WARNING_messages};
+		my @debug_msgs = @{ $pg->{pgcore}->get_debug_messages};
+		$self->addmessage(join(CGI::br(),@debug_msgs) ) if @debug_msgs;
+		$self->{pgdebug}          = $pg->{pgcore}->get_debug_messages;
+		$self->{pgwarning}        = $pg->{pgcore}->get_warning_messages;
 		$self->{pginternalerrors} = $pg->{pgcore}->get_internal_debug_messages ;
 		$self->{pgerrors} = @{$self->{pgdebug}} || @{$self->{pgwarning}} || @{$self->{pginternalerrors}};
 	}

Original file line number	Diff line number	Diff line change
`@@ -726,9 +726,10 @@ sub pre_header_initialize {`
`726`	`726`	`# because the PG file is never run`
`727`	`727`	`#`
`728`	`728`	`if (defined ($pg->{pgcore}) ) {`
`729`		`- $self->addmessage(join(CGI::br(),@{$pg->{flags}->{DEBUG_messages}} ) ) if @{$pg->{flags}->{DEBUG_messages}};`
`730`		`- $self->{pgdebug} = $pg->{pgcore}->{flags}->{DEBUG_messages};`
`731`		`- $self->{pgwarning} = $pg->{pgcore}->{flags}->{WARNING_messages};`
	`729`	`+ my @debug_msgs = @{ $pg->{pgcore}->get_debug_messages};`
	`730`	`+ $self->addmessage(join(CGI::br(),@debug_msgs) ) if @debug_msgs;`
	`731`	`+ $self->{pgdebug} = $pg->{pgcore}->get_debug_messages;`
	`732`	`+ $self->{pgwarning} = $pg->{pgcore}->get_warning_messages;`
`732`	`733`	`$self->{pginternalerrors} = $pg->{pgcore}->get_internal_debug_messages ;`
`733`	`734`	`$self->{pgerrors} = @{$self->{pgdebug}} \|\| @{$self->{pgwarning}} \|\| @{$self->{pginternalerrors}};`
`734`	`735`	`}`