From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 25 Mar 2014 07:44:09 +0000 (+0200)
Subject: Merge branch 'master' into gruntmaster
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=commitdiff_plain;h=4b9db1733397fe5fe30625c9badb021c79116d5e;hp=4cea7880b004110af3dcffcf01a5851eb7be042c

Merge branch 'master' into gruntmaster
---

diff --git a/app.psgi b/app.psgi
index a661a31..0222a16 100644
--- a/app.psgi
+++ b/app.psgi
@@ -45,9 +45,9 @@ sub is_problem_private {
 sub admin_required {
 	local $_ = $_[0];
 	my $env = $_[1];
-	return $db->contest($1)->owner->id if $env->{'gruntmaster.contest'} && db->contest($env->{'gruntmaster.contest'})->start > time;
+	return $db->contest($1)->owner->id if $env->{'gruntmaster.contest'} && $db->contest($env->{'gruntmaster.contest'})->start > time;
 	return $db->problem($1)->owner->id if m,^/pb/$word, && is_problem_private $1 || $env->{'gruntmaster.problem'} && is_problem_private $env->{'gruntmaster.problem'};
-	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$word, && ($db->job($1)->private || is_problem_private $db->job($1)->problem || $db->job($1)->contest && $db->contest($db->job($1)->contest)->start > time);
+	return $db->job    ($1)->owner->id if m,^/log/(?:src/)?$word, && ($db->job($1)->private || is_problem_private $db->job($1)->problem->id || $db->job($1)->contest && $db->contest($db->job($1)->contest)->start > time);
 	''
 }