Merge branch 'master' into gruntmaster

diff --git a/lib/Gruntmaster/Page/Pb/Entry.pm b/lib/Gruntmaster/Page/Pb/Entry.pm
index f178b5058232a6d049396352688c666405a517c0..95b15a40abf74c3a4f43f084325e3cd9ef200b00 100644 (file)
--- a/lib/Gruntmaster/Page/Pb/Entry.pm
+++ b/lib/Gruntmaster/Page/Pb/Entry.pm
@@ -7,7 +7,7 @@ use Gruntmaster::Page::Base pb_entry => '<tmpl_var name>';
 our @ISA = qw/Gruntmaster::Page::Base/;
 our $VERSION = '0.001';
 
-use constant FORMATS => [qw/C CPP MONO JAVA PASCAL PERL PYTHON/];
+use constant FORMATS => [qw/C CPP JAVA PERL PYTHON/];
 
 sub _generate{
        my ($self, $htc, $lang, $env, $contest, $id) = @_;

diff --git a/lib/Gruntmaster/Page/Submit.pm b/lib/Gruntmaster/Page/Submit.pm
index b08399e005d4f74e0b666aceafcee0e0decb39d1..0159a9d06865f7a3f1132324e171bf310a4c748a 100644 (file)
--- a/lib/Gruntmaster/Page/Submit.pm
+++ b/lib/Gruntmaster/Page/Submit.pm
@@ -27,7 +27,7 @@ sub generate{
        my ($problem, $format, $contest, $private, $prog) = map {scalar $r->param($_)} 'problem', 'prog_format', 'contest', 'private', 'source_code';
        my $upload = $r->upload('prog');
        if (defined $upload) {
-               my $temp = read_file $upload->filename;
+               my $temp = read_file $upload->path;
                $prog = $temp if $temp
        }
        die if defined $contest && $contest !~ /^\w+$/ ;