Merge branch 'release/0.5.2'

ta2edchimp · Oct 2, 2015 · 50b0c05 · 50b0c05
2 parents f7e0b4f + cc1e22d
commit 50b0c05
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git 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.

diff --git 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
@@ -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) {

diff --git 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git 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;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php
 
-define('BR_VERSION', '0.5.1');
+define('BR_VERSION', '0.5.2');
 
 require_once('vendor/autoload.php');
 

diff --git 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"]);