X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FCalls.pm;h=6e51754b11ae6867a1e0a89ac32536d7f653d9f5;hb=eb2ec45ab96b0968c5bfc5d17ec6c6d7a57ebe37;hp=91e59dfc81e76508880f11dd5788bf19184374de;hpb=b6cb51ce02932a2d761d06ed5b1303fc2fc9cb87;p=ndwebbie.git

diff --git a/NDWeb/Pages/Calls.pm b/NDWeb/Pages/Calls.pm
index 91e59df..6e51754 100644
--- a/NDWeb/Pages/Calls.pm
+++ b/NDWeb/Pages/Calls.pm
@@ -156,10 +156,10 @@ sub render_body {
 				NATURAL JOIN planet_stats) t ON i.target = t.id
 					AND t.tick = ( SELECT MAX(tick) FROM planet_stats)
 			WHERE  i.sender = $1 
-				AND (i.tick > $2 - 14 OR i.mission = 'Full Fleet')
+				AND (i.tick > $2 - 14 OR i.mission = 'Full fleet')
 			ORDER BY i.tick,x,y,z
 		});
-		my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ?');
+		my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE id = ? ORDER BY num');
 		$outgoings->execute($call->{planet},$call->{landing_tick});
 		my @fleets;
 		while (my $fleet = $outgoings->fetchrow_hashref){
@@ -199,7 +199,6 @@ sub render_body {
 				push @ships,$ship;
 			}
 			$fleet->{Ships} = \@ships;
-			delete $fleet->{id};
 			push @defenders, $fleet;
 		}
 		$BODY->param(Defenders => \@defenders);