Moved usersData table to users table, added a few more columns to users (currently unused)

1 files changed, 3 insertions, 5 deletions

diff --git a/api/app.php b/api/app.php
index 806e4ae..959d960 100644
--- a/api/app.php
+++ b/api/app.php
@@ -145,16 +145,14 @@ function getScoresB($mapID, $pageNumber = 1, $pageDivide = 10) {
 		users.displayName as display,

 		solutions.moves as moves,

 		users.ID as ID,

-		IfNull(userData.displayColor, '#cccccc') as displayColor,

-		IfNull(userData.wallColor, '#666666') as wallColor,

-		IfNull(userData.wallEmblem, 'blank.png') as wallEmblem,

+		users.displayColor,

+		users.wallColor,

+		users.wallEmblem,

 		solutions.dateModified as cdate

 	FROM 

 		`users`

 		JOIN `solutions`

 			ON users.ID = solutions.userID

-		LEFT JOIN `userData`

-			ON users.ID = userData.userID

 	WHERE solutions.mapID = '$mapID'

 	ORDER BY solutions.moves DESC, solutions.dateModified ASC, solutions.ID DESC

 	";