From d7b0c04459a6ec42a37255c38d67cea14fb60e61 Mon Sep 17 00:00:00 2001
From: BlueRaja <BlueRaja.admin@gmail.com>
Date: Sat, 26 Jan 2013 03:30:45 -0600
Subject: Moved usersData table to users table, added a few more columns to
 users (currently unused)

---
 pages/leaderboard.php | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'pages/leaderboard.php')

diff --git a/pages/leaderboard.php b/pages/leaderboard.php
index b5e3a76..cb9a029 100644
--- a/pages/leaderboard.php
+++ b/pages/leaderboard.php
@@ -106,9 +106,9 @@ function getStat ($type, $daysAgo = 1) {
 		users.displayName as Name,
 		SUM(solutions.moves) as Moves,
 		timediff(MAX(dateModified), maps.dateCreated) as Timetaken,
-		userData.wallColor,
-		userData.wallEmblem,
-		userData.displayColor,
+		users.wallColor,
+		users.wallEmblem,
+		users.displayColor,
 		users.ID as userID,
 		SUM(CASE WHEN solutions.dateModified < CURDATE()
 		    THEN solutions.championPointsWorth
@@ -118,8 +118,6 @@ function getStat ($type, $daysAgo = 1) {
 		ON maps.ID = solutions.mapID
 	JOIN `users`
 		ON solutions.userID = users.ID
-	LEFT JOIN `userData`
-		ON users.ID = userData.userID
 	WHERE $where
 	GROUP BY solutions.userID
 	ORDER BY Moves DESC, MAX(dateModified) ASC
@@ -198,9 +196,9 @@ function displayPastMaze($mapType, $name, $daysAgo = 1) {
 		users.displayName as Name,
 		SUM(solutions.moves) as Moves,
 		timediff(solutions.dateModified, maps.dateCreated) as Timetaken,
-		userData.wallColor,
-		userData.wallEmblem,
-		userData.displayColor,
+		users.wallColor,
+		users.wallEmblem,
+		users.displayColor,
 		users.ID as userID,
 		solutions.championPointsWorth
 	FROM `maps`
@@ -210,8 +208,6 @@ function displayPastMaze($mapType, $name, $daysAgo = 1) {
 		ON solutions.userID = users.ID
 	JOIN `mapOfTheDay`
 		ON maps.ID = mapOfTheDay.mapID
-	LEFT JOIN `userData`
-		ON users.ID = userData.userID
 	WHERE 
 		 maps.ID = '$mapID'
 	GROUP BY solutions.userID
-- 
cgit v1.2.3