diff options
author | Stefan <stefan@stefans-entwicklerecke.de> | 2014-12-30 14:55:49 +0100 |
---|---|---|
committer | Stefan <stefan@stefans-entwicklerecke.de> | 2014-12-30 14:55:49 +0100 |
commit | c20a7e9bce8b0dc1e73987304a7b2fc2d5a7a0c2 (patch) | |
tree | 320be9849c1a5cb152788e225e1319b6ec7b086f /src/node/handler/PadMessageHandler.js | |
parent | 5df638bfac35a757393ae2195cfaab0b6014b920 (diff) | |
parent | 9cf19b99feaa9500a7805bdc63bad1cb022f981b (diff) | |
download | etherpad-lite-c20a7e9bce8b0dc1e73987304a7b2fc2d5a7a0c2.zip |
Merge pull request #2406 from Gared/fix/author-not-set-callback
Fix missing callback of #2400 and ignore missing author on timeslider on client-side
Diffstat (limited to 'src/node/handler/PadMessageHandler.js')
-rw-r--r-- | src/node/handler/PadMessageHandler.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 6c784399..3228330e 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -1070,7 +1070,12 @@ function handleClientReady(client, message) { authorManager.getAuthor(authorId, function(err, author) { - if(ERR(err, callback) || !author) return; + if(!author && !err) + { + messageLogger.error("There is no author for authorId:", authorId); + return callback(); + } + if(ERR(err, callback)) return; historicalAuthorData[authorId] = {name: author.name, colorId: author.colorId}; // Filter author attribs (e.g. don't send author's pads to all clients) callback(); }); |