summaryrefslogtreecommitdiffstats
path: root/pages/chat.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 /pages/chat.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 'pages/chat.php')
-rw-r--r--pages/chat.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/pages/chat.php b/pages/chat.php
index 5be6689..68a0abf 100644
--- a/pages/chat.php
+++ b/pages/chat.php
@@ -101,7 +101,7 @@ function getChatDone(data) {
p = '';
p = p+ " <div class='chatColumn1'>";
p = p+ " <span class='chatTimestamp' title='"+timestampDetails+"'>["+timestamp+"]</span>";
- p = p+ " <div class='grid_td chatBadge' style='float:left; width:35px; height:35px; background:"+chat.wallColor+" url(images/marks/"+chat.wallEmblem+");'>";
+ p = p+ " <div class='grid_td chatBadge' style='float:left; width:35px; height:35px; background:"+chat.wallColor+" url("+linkEmblem(chat.wallEmblem, chat.wallOrientation)+");'>";
p = p+ " <div style='background-color:transparent;' class='grid_td_inner grid_td_rocks'>";
p = p+ " </div>";
p = p+ " </div>";