diff --git a/README b/README index 92b4a0802d..a96378e228 100644 --- a/README +++ b/README @@ -1,11 +1,11 @@ + WeBWorK Online Homework Delivery System - Version 2.5.1 - Branch: openwebwork/webwork2 ww2.5.1 + Version 2.5.* + Branch: github.com/openwebwork - http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.5.1 - Copyright 2000-2011, The WeBWorK Project + http://webwork.maa.org/wiki/Release_notes_for_WeBWorK_2.5.0 + Copyright 2000-2012, The WeBWorK Project http://webwork.maa.org All rights reserved. - diff --git a/bin/OPL-update b/bin/OPL-update index aa5d79f9a6..11e05bd494 100755 --- a/bin/OPL-update +++ b/bin/OPL-update @@ -56,12 +56,12 @@ my %NPLtables = ( path => 'NPL-path', pgfile => 'NPL-pgfile', keyword => 'NPL-keyword', - pgfile-keyword => 'NPL-pgfile-keyword', + pgfile_keyword => 'NPL-pgfile-keyword', textbook => 'NPL-textbook', chapter => 'NPL-chapter', section => 'NPL-section', problem => 'NPL-problem', - pgfile-problem => 'NPL-pgfile-problem', + pgfile_problem => 'NPL-pgfile-problem', ); @@ -97,19 +97,20 @@ sub dbug { ##Figure out which set of tables to use +my %tables; if( -e "$libraryRoot/VERSION") { include("$libraryRoot/VERSION"); if($OPL_VERSION eq '2.5.0') { - my %tables = %OPLtables; + %tables = %OPLtables; my $lib = 'OPL'; print "Got OPLtables!\n"; } else { - my %tables = %NPLtables; + %tables = %NPLtables; my $lib = 'NPL'; print "Got NPLtables! (1)\n"; } -else { - my %tables = %NPLtables; +} else { + %tables = %NPLtables; my $lib = 'NPL'; print "Got NPLtables! (2)\n"; } diff --git a/bin/check_modules.pl b/bin/check_modules.pl index 6dc265a2e6..fcca289b6b 100755 --- a/bin/check_modules.pl +++ b/bin/check_modules.pl @@ -61,9 +61,11 @@ Getopt::Std HTML::Entities HTML::Tagset + HTML::Template IO::File Iterator Iterator::Util + JSON Locale::Maketext::Lexicon Locale::Maketext::Simple Mail::Sender diff --git a/conf/localOverrides.conf.dist b/conf/localOverrides.conf.dist index 116de693c8..253139c0d7 100644 --- a/conf/localOverrides.conf.dist +++ b/conf/localOverrides.conf.dist @@ -253,7 +253,8 @@ $problemDefaults{max_attempts} = -1; pgproblemeditor1 => 1, # pgproblemeditor2 => 1, # pgproblemeditor3 => 1, - ); +); + ################################################################################ # Directory for temporary files