summaryrefslogtreecommitdiffstats
path: root/includes/chats.php
diff options
context:
space:
mode:
authorBlueRaja <BlueRaja.admin@gmail.com>2013-03-19 03:26:48 -0500
committerBlueRaja <BlueRaja.admin@gmail.com>2013-03-19 03:26:48 -0500
commitb6680dd405fdf6cd2784facfe799742cfaf805ab (patch)
treee9cd81aebfc67c76053792583efb0a1fe942ff6c /includes/chats.php
parenta600bd24aa5272dfd3b9f178ef9e2c81ec0525b9 (diff)
parentbc57b007dfa5e6e723946143671a9db68a82f348 (diff)
downloadpathery-b6680dd405fdf6cd2784facfe799742cfaf805ab.tar.xz
Merge branch 'master' of git.raylu.net:pathery
Conflicts: globe.php pages/login.php
Diffstat (limited to 'includes/chats.php')
-rw-r--r--includes/chats.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/chats.php b/includes/chats.php
index 18d0810..6991a48 100644
--- a/includes/chats.php
+++ b/includes/chats.php
@@ -62,7 +62,8 @@ function getChat($startID = 0) {
users.displayName,
users.displayColor,
users.wallColor,
- users.wallEmblem
+ users.wallEmblem,
+ users.wallOrientation
FROM `chat`
LEFT JOIN `users`
ON chat.userID = users.ID