X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=html%2Fshow-tournament.pl;h=9b987a06a1d4f26739066329be5c79071df50801;hp=c359511e54b6b332d76ef899b44f1072cff2e987;hb=7ef3ba3f1bf9b5114f60614458d9ae4cb0327bbb;hpb=f24e4feebe4555e63b5c5df1090f1982fed89f58

diff --git a/html/show-tournament.pl b/html/show-tournament.pl
index c359511..9b987a0 100755
--- a/html/show-tournament.pl
+++ b/html/show-tournament.pl
@@ -9,7 +9,7 @@ my $id = $cgi->param('id');
 
 my $dbh = ccbs::db_connect();
 
-my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments WHERE tournament=?', undef, $id);
+my $tournament = $dbh->selectrow_hashref('SELECT * FROM tournaments NATURAL JOIN seasons NATURAL JOIN countries NATURAL JOIN machines NATURAL JOIN scoringsystems WHERE tournament=?', undef, $id);
 
 # Swoop all the data in in a big join, then order it over to quasi-sane Perl objects.
 # (round -> parallel -> player -> songs -> title,chosen,score)
@@ -59,5 +59,5 @@ for my $score (@$scores) {
 }
 
 ccbs::print_header();
-ccbs::process_template('show-tournament.tmpl', 'Turnering', { tournament => $tournament, rounds => \@rounds });
+ccbs::process_template('show-tournament.tmpl', $tournament->{'tournamentname'}, { tournament => $tournament, rounds => \@rounds });
 $dbh->disconnect;