[WWcvs] webwork2: Bringing HEAD and rel-2-1-patches in line

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
Bringing HEAD and rel-2-1-patches in line

Modified Files:
--------------
    webwork2/lib/WeBWorK:
        Constants.pm
        ContentGenerator.pm
    webwork2/lib/WeBWorK/ContentGenerator/Instructor:
        Scoring.pm

Revision Data
-------------
Index: ContentGenerator.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator.pm,v
retrieving revision 1.135
retrieving revision 1.136
diff -Llib/WeBWorK/ContentGenerator.pm -Llib/WeBWorK/ContentGenerator.pm -u -r1.135 -r1.136
--- lib/WeBWorK/ContentGenerator.pm
+++ lib/WeBWorK/ContentGenerator.pm
@@ -495,6 +495,7 @@
 	if ($authz->hasPermissions($user, "report_bugs")) {
 		print CGI::p(CGI::a({style=>"font-size:larger", href=>$ce->{webworkURLs}{bugReporter}}, "Report bugs")),CGI::hr();
 	}
+
 	my %displayOptions = (displayMode    => $self->{displayMode},
 	                      showOldAnswers => $self->{will}->{showOldAnswers}
 	);
@@ -528,6 +529,7 @@
 	}
 	print CGI::end_li();    
 
+
 	
 	if ($authz->hasPermissions($user, "change_password") or $authz->hasPermissions($user, "change_email_address")) {
 		print CGI::li(CGI::a({href=>$self->systemLink($options,
@@ -545,7 +547,9 @@
 	if ($authz->hasPermissions($user, "access_instructor_tools")) {
 		my $ipfx = "${pfx}Instructor::";
 		
+
 		# instructor tools link
+
 		my $instr = $urlpath->newFromModule("${ipfx}Index", %args);
 		# Class list editor
 		my $userList = $urlpath->newFromModule("${ipfx}UserList", %args);
@@ -598,6 +602,7 @@
 			print CGI::end_ul();
 		}
 		print CGI::end_li();
+
 	## Library browser
 		print CGI::li(CGI::a({href=>$self->systemLink($maker,params=>{  %displayOptions,})}, sp2nbsp($maker->name))) if $authz->hasPermissions($user, "modify_problem_sets");
 		print CGI::li(CGI::a({href=>$self->systemLink($assigner,params=>{  %displayOptions,})}, sp2nbsp($assigner->name))) if $authz->hasPermissions($user, "assign_problem_sets");
@@ -615,13 +620,17 @@
 		print CGI::end_li();
 	## Student Progress	
 	    print CGI::li(CGI::a({href=>$self->systemLink($progress,params=>{  %displayOptions,})}, sp2nbsp($progress->name)));
+
 		print CGI::start_li();
 			print CGI::start_ul();
 			if (defined $userID and $userID ne "") {
 				print  CGI::li(CGI::a({href=>$self->systemLink($userProgress,params=>{  %displayOptions,})}, $userID));
+
 			}
 			if (defined $setID and $setID ne "") {
+
 				print CGI::li(CGI::a({href=>$self->systemLink($setProgress,params=>{  %displayOptions,})}, sp2nbsp($setID)));
+
 			}
 			print CGI::end_ul();
 		print CGI::end_li();
Index: Constants.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/Constants.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -Llib/WeBWorK/Constants.pm -Llib/WeBWorK/Constants.pm -u -r1.23 -r1.24
--- lib/WeBWorK/Constants.pm
+++ lib/WeBWorK/Constants.pm
@@ -54,7 +54,7 @@
 
 # If non-empty, timing data will be sent to the file named rather than STDERR.
 # 
-$WeBWorK::Timing::Logfile = "/home/gage/webwork2/logs/timing.log";
+$WeBWorK::Timing::Logfile = "";
 
 ################################################################################
 # WeBWorK::ContentGenerator::Hardcopy
Index: Scoring.pm
===================================================================
RCS file: /webwork/cvs/system/webwork2/lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -Llib/WeBWorK/ContentGenerator/Instructor/Scoring.pm -u -r1.44 -r1.45
--- lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
+++ lib/WeBWorK/ContentGenerator/Instructor/Scoring.pm
@@ -518,8 +518,9 @@
 
 
 	return @scoringData;
-
 }
+
+
 # Often it's more efficient to just get everything out of the database
 # and then pick out what you want later.  Hence, these "everything2*" functions
 sub everything2info {