diff options
| author | Patrick Davison <snapwilliam@gmail.com> | 2013-01-14 14:49:51 -0800 |
|---|---|---|
| committer | Patrick Davison <snapwilliam@gmail.com> | 2013-01-14 14:49:51 -0800 |
| commit | 59fc439d341900d99c00a31ff1653b274ba2a037 (patch) | |
| tree | 5bd4b89bb500bc5557750228030ee0f2b8e2fb6d /pages/memberlist.php | |
| parent | fab36d921f22cb5999357932785e03aa88269f8d (diff) | |
| parent | 532faa4d5cc5b20fba8422c87b0aac846874af43 (diff) | |
| download | pathery-59fc439d341900d99c00a31ff1653b274ba2a037.tar.xz | |
Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery
Conflicts:
css/challenge.css
Diffstat (limited to 'pages/memberlist.php')
| -rw-r--r-- | pages/memberlist.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pages/memberlist.php b/pages/memberlist.php index 22d88b4..2fa2cdc 100644 --- a/pages/memberlist.php +++ b/pages/memberlist.php @@ -13,7 +13,7 @@ htmlHeader( topbar($Links);
-include_once ('./includes/db.inc.php');
+include_once ('./includes/sqlEmbedded.php');
include_once ('./includes/datas.php');
@@ -115,8 +115,8 @@ $sql = "SELECT WHERE solutions.userID = users.ID AND
solutions.dateModified BETWEEN DATE_SUB(CURRENT_DATE, INTERVAL 7 DAY) AND CURRENT_DATE) AS totalMovesThisWeek,
(SELECT COUNT(*) FROM solutions WHERE solutions.userID = users.ID AND solutions.dateModified < CURRENT_DATE) AS totalMazes,
- SUM(CASE WHEN statistics.type IN (32, 33, 34, 35) THEN statistics.value ELSE 0 END) as totalWins,
- SUM(CASE WHEN statistics.type IN (1, 2, 3, 4) THEN statistics.value ELSE 0 END) as totalTies,
+ users.totalWins,
+ users.totalTies,
IfNull(userData.wallColor, '#666666') as wallColor,
IfNull(userData.displayColor, '#cccccc'),
userData.wallEmblem,
@@ -124,7 +124,6 @@ $sql = "SELECT users.dateLogin as dateLogin
FROM `users`
LEFT JOIN `userData` ON users.ID = userData.userID
-LEFT JOIN `statistics` ON users.ID = statistics.userID
GROUP BY users.ID
$order
";
|