Merge pull request #168 from Qwatayean/patch-9

#150 fix for phalanx overview activity + recycle being shown
jkroepke · Jun 27, 2018 · a49eb34 · a49eb34
2 parents 5ff828c + fb143a3
commit a49eb34
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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