Challenges are now displayed in the correct order again. Ay' carumba.

1 files changed, 10 insertions, 8 deletions

diff --git a/pages/challengelist.php b/pages/challengelist.php
index fcc384b..db20081 100644
--- a/pages/challengelist.php
+++ b/pages/challengelist.php
@@ -60,16 +60,18 @@ function ChallengeList($challengeListResultset) {
 	$r = '';
 	while($data = mysql_fetch_array($challengeListResultset)) {
 		$tier = $data['challengeTier'];
-		$mapid = $data['mapID'];
-		$challengeID = $data['challengeID'];
-		$challenges[$tier][$mapid][$challengeID] = $data;
+		$challengeSuborder = $data['challengeSuborder'];
+		$ordering = $data['ordering'];
+		$challenges[$tier][$challengeSuborder][$ordering] = $data;
 	}
 	
-	foreach ($challenges as $tier => $map) {
+	foreach ($challenges as $tier => $challengeMap) {
 		$r .= "<b>Section $tier</b> levels:<div class='challengelist_tier' style='border: 1px solid yellow; overflow: auto;'>";
-		foreach ($map as $mapid => $challenge) {
-		//	$r .= "MAP $mapid";
-			
+		foreach ($challengeMap as $challengeSuborder => $challenge) {
+			//Hack to get the first element of the array:
+			$firstChallenge = $challenge[key($challenge)];
+			$mapid = $firstChallenge['mapID'];
+
 			$mapCode = getMapCode($mapid);
 			$map = new map($mapCode);
 			$thumbnail = DisplayMapThumbnail($map);
@@ -78,7 +80,7 @@ function ChallengeList($challengeListResultset) {
 			$r .= "$map->name";
 			$r .= $thumbnail;
 			
-			foreach ($challenge as $challengeID => $content) {
+			foreach ($challenge as $ordering => $content) {
 				//Each challenge gets its own star
 				if($content["dateSolved"] !== NULL)
 					$cssClass = "challengelist_complete";