Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

2 files changed, 11 insertions, 16 deletions

diff --git a/includes/datas.php b/includes/datas.php
index 66c816b..cdaf0c8 100644
--- a/includes/datas.php
+++ b/includes/datas.php
@@ -574,7 +574,7 @@ function getAchievementCurrency($userID, $aType) {
 		case 3:
 			$sql = "SELECT totalTies
 			FROM `users`
-			WHERE `userID` = '$userID'";
+			WHERE `ID` = '$userID'";
 		break;
 		case 4:
 			$sql = "SELECT championPoints
diff --git a/includes/playerStats.php b/includes/playerStats.php
index b302812..ec9a616 100644
--- a/includes/playerStats.php
+++ b/includes/playerStats.php
@@ -18,22 +18,17 @@ function setIsHighScoreFlag($fromDate)
 	$fromDate =  mysql_escape_string($fromDate);
 	
 	$sql = "
-	UPDATE solutions
-	SET solutions.isHighScore = 1
-	WHERE solutions.ID IN
+	UPDATE solutions AS s1
+	SET s1.isHighScore = 1
+	WHERE s1.dateModified < CURDATE()
+	AND s1.dateModified >= '$fromDate'
+	AND s1.ID =
 	(
 		SELECT s2.ID
-		FROM (SELECT * FROM solutions) AS s2
-		INNER JOIN mapOfTheDay ON s2.mapID = mapOfTheDay.mapID
-		WHERE s2.ID =
-		(
-			SELECT s3.ID
-			FROM (SELECT * FROM solutions) AS s3
-			WHERE s3.mapID = s2.mapID
-			ORDER BY moves DESC, dateModified ASC
-			LIMIT 1
-		)
-		AND mapOfTheDay.mapDate >= '$fromDate'
+		FROM (SELECT ID, mapID, moves, dateModified FROM solutions) AS s2
+		WHERE s2.mapID = s1.mapID
+		ORDER BY moves DESC, dateModified ASC
+		LIMIT 1
 	)
 	";
 	
@@ -150,7 +145,7 @@ function addPlayerChampionPointsForMapsOfTheDay($fromDate)
 		AND mapOfTheDay.mapDate < CURDATE()
 	)
 	WHERE solutions.dateModified >= $fromDate;
-	AND mapOfTheDay.mapDate < CURDATE()
+	AND solutions.dateModified < CURDATE()
 	";
 	
 	$sql4 = "