[WWcvs] webwork2: fixed warnings in &nav and &options when set is not asssigned.

[Sam H. v. a. <we...@ma...>]

Log Message:
-----------
fixed warnings in &nav and &options when set is not asssigned.

Modified Files:
--------------
    webwork2/lib/WeBWorK/ContentGenerator:
        Problem.pm

Revision Data
-------------
Index: Problem.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Problem.pm,v
retrieving revision 1.188
retrieving revision 1.189
diff -Llib/WeBWorK/ContentGenerator/Problem.pm -Llib/WeBWorK/ContentGenerator/Problem.pm -u -r1.188 -r1.189
--- lib/WeBWorK/ContentGenerator/Problem.pm
+++ lib/WeBWorK/ContentGenerator/Problem.pm
@@ -666,8 +666,8 @@
 	#warn "doing options in Problem";
 	
 	# don't show options if we don't have anything to show
-	return if $self->{invalidSet} or $self->{invalidProblem};
-	return unless $self->{isOpen};
+	return "" if $self->{invalidSet} or $self->{invalidProblem};
+	return "" unless $self->{isOpen};
 	
 	my $displayMode = $self->{displayMode};
 	my %can = %{ $self->{can} };
@@ -762,7 +762,11 @@
 		push @links, "Next Problem", "", "navNext";
 	}
 	
-	my $tail = "&displayMode=".$self->{displayMode}."&showOldAnswers=".$self->{will}->{showOldAnswers};
+	my $tail = "";
+	
+	$tail .= "&displayMode=".$self->{displayMode} if defined $self->{displayMode};
+	$tail .= "&showOldAnswers=".$self->{will}->{showOldAnswers}
+		if defined $self->{will}->{showOldAnswers};
 	return $self->navMacro($args, $tail, @links);
 }