From 330d3488835fbb3647672b6fc22f9d7df8ca4784 Mon Sep 17 00:00:00 2001
From: Darin McBride <dmcbride@cpan.org>
Date: Wed, 16 Dec 2015 21:52:16 -0700
Subject: [PATCH] Order colonies for unallied properly.

---
 lib/Lacuna/DB/Result/Empire.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Lacuna/DB/Result/Empire.pm b/lib/Lacuna/DB/Result/Empire.pm
index 44860abe..98bccce5 100644
--- a/lib/Lacuna/DB/Result/Empire.pm
+++ b/lib/Lacuna/DB/Result/Empire.pm
@@ -585,14 +585,14 @@ sub get_status {
     my ($self) = @_;
     my $real_empire = $self->current_session ? $self->current_session->empire : $self;
 
-    my $planet_rs = $real_empire->planets->search({},{ -order_by => 'name' });
+    my $planet_rs = $real_empire->planets;
     if ($self->alliance_id) {
         $planet_rs = Lacuna->db->resultset('Map::Body')->
             search(
                    { -or => { empire_id => $real_empire->id, alliance_id => $real_empire->alliance_id } },
-                   { prefetch => 'star', order_by => 'me.name' },
                   );
     }
+    $planet_rs = $planet_rs->search({},{ prefetch => 'star', order_by => 'me.name' });
     my %planets;
     my %stations;
     my %colonies;
-- 
2.51.2