From 5feda6551b04399087acfe5b276e81991feb061e Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Sun, 27 Sep 2015 19:01:34 +0200 Subject: [PATCH] close #35 fixed pilot tracking on corporation maps --- app/main/model/corporationmodel.php | 2 +- app/main/model/mapmodel.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/main/model/corporationmodel.php b/app/main/model/corporationmodel.php index b2926c5e..5bc9ab89 100644 --- a/app/main/model/corporationmodel.php +++ b/app/main/model/corporationmodel.php @@ -14,7 +14,7 @@ class CorporationModel extends BasicModel { protected $fieldConf = [ 'corporationCharacters' => [ - 'has-many' => ['Model\CharacterModel', 'allianceId'] + 'has-many' => ['Model\CharacterModel', 'corporationId'] ], 'mapCorporations' => [ 'has-many' => ['Model\CorporationMapModel', 'corporationId'] diff --git a/app/main/model/mapmodel.php b/app/main/model/mapmodel.php index d8c55078..74dee797 100644 --- a/app/main/model/mapmodel.php +++ b/app/main/model/mapmodel.php @@ -420,14 +420,16 @@ class MapModel extends BasicModel { if(is_null($charactersData)){ $charactersData = []; - $characters = $this->getCharacters(); foreach($characters as $character){ $charactersData[] = $character->getData(true); } - $this->updateCacheData($charactersData, 'CHARACTERS', 10); + // cache active characters (if found) + if(!empty($charactersData)){ + $this->updateCacheData($charactersData, 'CHARACTERS', 10); + } } return $charactersData;