Skip to content

Commit

Permalink
Merge branch 'release/0.5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
ta2edchimp committed Oct 2, 2015
2 parents f7e0b4f + cc1e22d commit 50b0c05
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 14 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion classes/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion classes/Battle.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion database/brBattleParties.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2 changes: 1 addition & 1 deletion database/brBattles.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2 changes: 1 addition & 1 deletion database/brCombatants.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2 changes: 1 addition & 1 deletion database/brDamageComposition.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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;
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2 changes: 1 addition & 1 deletion index.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

define('BR_VERSION', '0.5.1');
define('BR_VERSION', '0.5.2');

require_once('vendor/autoload.php');

Expand Down
7 changes: 0 additions & 7 deletions views/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"]);
Expand Down

0 comments on commit 50b0c05

Please sign in to comment.