From fb143a39bd01e1227b8a1d63820199b7629e6b21 Mon Sep 17 00:00:00 2001 From: Roberto <36681655+Qwatayean@users.noreply.github.com> Date: Thu, 21 Jun 2018 02:38:08 +0000 Subject: [PATCH] fix for phalanx activity + recycle being shown --- includes/classes/class.FlyingFleetsTable.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/classes/class.FlyingFleetsTable.php b/includes/classes/class.FlyingFleetsTable.php index 5d83a59fe..3c579e755 100644 --- a/includes/classes/class.FlyingFleetsTable.php +++ b/includes/classes/class.FlyingFleetsTable.php @@ -44,14 +44,14 @@ public function setMissions($missions) { } private function getFleets($acsID = false) { - /*if($this->IsPhalanx) { + if($this->IsPhalanx) { $where = '(fleet_start_id = :planetId AND fleet_start_type = 1 AND fleet_mission != 4) OR - (fleet_end_id = :planetId AND fleet_end_type = 1 AND fleet_mess IN (0, 2))'; + (fleet_end_id = :planetId AND fleet_end_type = 1 AND fleet_mission != 8 AND fleet_mess IN (0, 2))'; $param = array( ':planetId' => $this->planetId ); - } else*/if(!empty($acsID)) { + } elseif(!empty($acsID)) { $where = 'fleet_group = :acsId'; $param = array( ':acsId' => $acsID