diff options
| author | BlueRaja <BlueRaja.admin@gmail.com> | 2013-01-24 03:07:21 -0600 |
|---|---|---|
| committer | BlueRaja <BlueRaja.admin@gmail.com> | 2013-01-24 03:07:21 -0600 |
| commit | 555cb086402521801ef1a3bfa893c3a9aa734715 (patch) | |
| tree | 93edcf7428124bdd02146ddf3b4f9a894b5ae35d /pages/chat.php | |
| parent | b6dc90e3f658a8201424aafec8e304c74d981022 (diff) | |
| parent | 5758770c5c0733383858463b2b33cadcc03b6f2f (diff) | |
| download | pathery-555cb086402521801ef1a3bfa893c3a9aa734715.tar.xz | |
Merge branch 'master' of git.raylu.net:pathery
Conflicts:
db updates.sql
Diffstat (limited to 'pages/chat.php')
| -rw-r--r-- | pages/chat.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pages/chat.php b/pages/chat.php index 10e8f7f..094f86a 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -191,11 +191,17 @@ function getChatDone(data) { //console.log('(END) lastID', lastID);
}
+function prepChat(chat) {
+ chat = chat.join('|:|');
+ chat = chat.replace(/\&/g,'%26')
+ return chat;
+}
+
function getChat(message) {
//console.log('LASTID:', lastID);
var dataString = 'getChatFromID='+lastID;
if (chatBuffer.length > 0) {
- dataString += '&send=true&messages='+chatBuffer.join('|:|');
+ dataString += '&send=true&messages='+prepChat(chatBuffer);
chatBuffer.length = 0;
}
//$.getJSON('ajax_chat.php?getChatFromID='+lastID++message, );
@@ -206,7 +212,6 @@ function getChat(message) { data: dataString,
success: function(data) {getChatDone(data);}
});
-
}
function sendChat() {
|