From 50ef5dda3878135c64a2b1f014b79909953932d6 Mon Sep 17 00:00:00 2001 From: ta2edchimp Date: Fri, 2 Oct 2015 18:09:27 +0200 Subject: [PATCH 1/5] Type fixed. --- classes/Admin.php | 2 +- classes/Battle.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Admin.php b/classes/Admin.php index c2eadb6..1557576 100644 --- a/classes/Admin.php +++ b/classes/Admin.php @@ -243,7 +243,7 @@ public static function repopulateStatistics() { } if ($resultPartialFailures === true) { - $results["error"] = "Some statistics could not be repopulated."; + $result["error"] = "Some statistics could not be repopulated."; } return $result; diff --git a/classes/Battle.php b/classes/Battle.php index 75e4b17..2dffa70 100644 --- a/classes/Battle.php +++ b/classes/Battle.php @@ -773,7 +773,7 @@ public static function updateStats($battleReportID = 0) { return false; } - $return = false; + $result = false; // ... and start over looping, this time through each battle party's memberlist foreach ($battleParties as $battleParty) { From d8aca807c9a921a29afdf16c850b86c95482a994 Mon Sep 17 00:00:00 2001 From: ta2edchimp Date: Fri, 2 Oct 2015 18:09:47 +0200 Subject: [PATCH 2/5] NL at EOF added. --- database/brBattleParties.sql | 2 +- database/brBattles.sql | 2 +- database/brCombatants.sql | 2 +- database/brDamageComposition.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/database/brBattleParties.sql b/database/brBattleParties.sql index bed6b08..28d3dce 100644 --- a/database/brBattleParties.sql +++ b/database/brBattleParties.sql @@ -10,4 +10,4 @@ CREATE TABLE `brBattleParties` ( `brEfficiency` decimal(5,2) NOT NULL DEFAULT '0.00', PRIMARY KEY (`brBattlePartyID`), KEY `brBattleParties_IX_battleReport` (`battleReportID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/database/brBattles.sql b/database/brBattles.sql index 3aaf19c..92475de 100644 --- a/database/brBattles.sql +++ b/database/brBattles.sql @@ -17,4 +17,4 @@ CREATE TABLE `brBattles` ( `brDamageTotal` int(11) NOT NULL DEFAULT '0', `brIskDestroyedTotal` decimal(17,2) NOT NULL DEFAULT '0.00', PRIMARY KEY (`battleReportID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/database/brCombatants.sql b/database/brCombatants.sql index 7d19132..48f11d1 100644 --- a/database/brCombatants.sql +++ b/database/brCombatants.sql @@ -18,4 +18,4 @@ CREATE TABLE `brCombatants` ( `damageTaken` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`brCombatantID`), KEY `brCombatants_IX_characterID` (`characterID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/database/brDamageComposition.sql b/database/brDamageComposition.sql index 66944bb..7c3f103 100644 --- a/database/brDamageComposition.sql +++ b/database/brDamageComposition.sql @@ -5,4 +5,4 @@ CREATE TABLE `brDamageComposition` ( `brDealingCombatantID` int(11) NOT NULL DEFAULT '0', `brDamageDealt` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`brDamageCompositionID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8; From d92ac7d50bfbdfeeea75042804fb59360b5317c7 Mon Sep 17 00:00:00 2001 From: ta2edchimp Date: Fri, 2 Oct 2015 18:10:50 +0200 Subject: [PATCH 3/5] Removed dead code. --- views/index.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/views/index.php b/views/index.php index a33a7e1..3185282 100644 --- a/views/index.php +++ b/views/index.php @@ -26,13 +26,6 @@ if ($previewEndTime < $battle["endTime"]) $previewEndTime = $battle["endTime"]; - // $totalLost = $battle["iskLostTeamA"] + $battle["iskLostTeamB"] + $battle["iskLostTeamC"]; - // if ($totalLost > 0.0) - // $battle["efficiency"] = 1.0 - $battle["iskLostTeamA"] / $totalLost; - // else - // $battle["efficiency"] = 0.0; - - // $previewISKdestroyed = $previewISKdestroyed + $totalLost; $previewEfficiencyAvg = $previewEfficiencyAvg + $battle["efficiency"]; $battle["hasAAR"] = !empty($battle["summary"]); From 04f92920fe977b6378477e404bec89f4082c6396 Mon Sep 17 00:00:00 2001 From: ta2edchimp Date: Fri, 2 Oct 2015 18:12:01 +0200 Subject: [PATCH 4/5] Versionbump. --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index d3f3419..f30339f 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ Date: Fri, 2 Oct 2015 18:12:25 +0200 Subject: [PATCH 5/5] Updated. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb8c6b2..4a06b6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Release 0.5.2 + +- 04f9292 Versionbump. +- d92ac7d Removed dead code. +- d8aca80 NL at EOF added. +- 50ef5dd Type fixed. +- 80689e6 Merge branch 'release/0.5.1' into develop + # Release 0.5.1 - 25cd71d Versionbump.