Merge pull request openwebwork#86 from openwebwork/hotfix1

Hotfix1
aubreyja · Jun 26, 2013 · 3deec62 · 3deec62
2 parents e013b7d + ddceace
commit 3deec62
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist
@@ -101,7 +101,7 @@ $webworkFiles{screenSnippets}{setHeader}         = "$webworkDirs{conf}/snippets/
 #$problemLibrary{root}        = "/opt/webwork/libraries/NationalProblemLibrary";
 #$problemLibrary{version}     = "2";
 # uncomment these lines below and comment out the line above if using OPL instead of NPL
-$problemLibrary{root}       = "/opt/webwork/library/webwork-open-problem-library/OpenProblemLibrary";
+$problemLibrary{root}       = "/opt/webwork/libraries/webwork-open-problem-library/OpenProblemLibrary";
 $problemLibrary{version}    = "2.5";  
 
 # Additional library buttons can be added to the Library Browser (SetMaker.pm)

diff --git a/lib/WeBWorK.pm b/lib/WeBWorK.pm
@@ -34,7 +34,6 @@ C<WeBWorK::ContentGenerator> to call.
 
 =cut
 
-BEGIN { $main::VERSION = "2.4.9"; }
 
 use strict;
 use warnings;

diff --git a/lib/WeBWorK/AchievementEvaluator.pm b/lib/WeBWorK/AchievementEvaluator.pm
@@ -27,7 +27,7 @@ use warnings;
 use WeBWorK::CGI;
 use WeBWorK::Utils qw(before after readFile sortAchievements);
 
-use Safe;
+use WWSafe;
 use Storable qw(nfreeze thaw);
 
 sub checkForAchievements {
@@ -75,7 +75,7 @@ sub checkForAchievements {
     our $localData = {};
     our $globalData = {};
 
-    my $compartment = new Safe;
+    my $compartment = new WWSafe;
 
     #initialize things that are ""
     if (not $achievementPoints) {

diff --git a/lib/WeBWorK/ContentGenerator/CourseAdmin.pm b/lib/WeBWorK/ContentGenerator/CourseAdmin.pm
@@ -3179,11 +3179,14 @@ Check the ownership and permissions of the course's directory, e.g $coursesDir/$
 #   registration forms added by Mike Gage 5-5-2008
 ################################################################################
 
-our $registered_file_name = "registered_$main::VERSION";
+
+our $registered_file_name = "registered_???";
 
 sub display_registration_form {
 	my $self = shift;
 	my $ce   = $self->r->ce;
+	my $ww_version = $ce->{WW_VERSION};
+	$registered_file_name = "registered_$ww_version";
 	my $registeredQ = (-e ($ce->{courseDirs}->{root})."/$registered_file_name")?1:0;
 	my $registration_subDisplay = ( defined($self->r->param('subDisplay') ) and $self->r->param('subDisplay') eq "registration") ?  1: 0;
 	my $register_site = ($self->r->param("register_site"))?1:0;
@@ -3196,8 +3199,8 @@ sub display_registration_form {
 	CGI::p("If you are using your WeBWorK server for courses please help us out by registering your server."),
 	CGI::p("We are often asked how many institutions are using WeBWorK and how many students are using
 	WeBWorK.  Since WeBWorK is open source and can be freely downloaded from ".
-	CGI::a({href=>'http://webwork.maa.org'},'http://webwork.maa.org' ). " and ".
-	CGI::a({href=> 'http://www.openwebwork.org'},'http://www.openwebwork.org'). ", it is frequently 
+	CGI::a({href=>'http://webwork.maa.org'},'http://webwork.maa.org' ). " or ".
+	CGI::a({href=> 'http://webwork.maa.org/wiki'},'http://webwork.maa.org/wiki'). ", it is frequently 
 	 difficult for us to give a reasonable answer to this  question."),
 	CGI::p("You can help by registering your current version of WeBWorK -- click the button, answer a few
 	questions (the ones you can answer easily) and submit the form to the MAA.  
@@ -3275,7 +3278,7 @@ sub registration_form {
 	print $self->hidden_fields("subDisplay");
 	print CGI::p({style=>"text-align: center"}, CGI::submit(-id => "register_site", -name=>"register_site", -label=>"Site has been registered"));
 	print CGI::end_form();
-	print q!<script type="text/javascript">
+#	print q!<script type="text/javascript">
 # 			$("#maa_content").load( alert("loaded") );
 #  	     	$("#return_to_main_page").append(
 #  	     		"<center><p>hey site is registered cool</p></center>"

diff --git a/lib/WebworkWebservice/RenderProblem.pm b/lib/WebworkWebservice/RenderProblem.pm
@@ -25,9 +25,7 @@ use base qw(WebworkWebservice);
 my $debugXmlCode=1;  # turns on the filter for debugging XMLRPC and SOAP code
 local(*DEBUGCODE);
 
-BEGIN { 
-	$main::VERSION = "2.5"; 
-}
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,7 +34,6 @@ C<WeBWorK::ContentGenerator> to call. @@
     =cut
-    BEGIN { $main::VERSION = "2.4.9"; }
     use strict;
     use warnings;
@@ Expand Down @@