Merge branch 'master' of git://github.com/HansPinckaers/etherpad-lite

This commit is contained in:
Peter 'Pita' Martischka 2011-04-08 12:48:21 +01:00
commit 312a923a28
8 changed files with 300 additions and 156 deletions

View file

@ -529,6 +529,7 @@ function handleClientReady(client, message)
userInfo: {
"ip": "127.0.0.1",
"colorId": authorManager.getAuthorColorId(sessioninfos[pad2sessions[message.padId][i]].author),
"name": authorManager.getAuthorName(sessioninfos[pad2sessions[message.padId][i]].author),
"userAgent": "Anonymous",
"userId": sessioninfos[pad2sessions[message.padId][i]].author
}