diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-29 15:14:25 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-29 15:14:25 -0700 |
commit | 873b8328272ae9cb189477fd10e75b16d5ce050e (patch) | |
tree | 89979da777a4d2158321f56a69409882d6e96321 /plugins/Realtime | |
parent | a8d92dad5e4b82dd5a4f0ca7ed52f37256b60cd2 (diff) | |
parent | bf468e2a8db4d67a0f1a2c7fdfd0aa9306e006fc (diff) |
Merge branch 'master' into testing
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
Diffstat (limited to 'plugins/Realtime')
-rw-r--r-- | plugins/Realtime/realtimeupdate.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/Realtime/realtimeupdate.js b/plugins/Realtime/realtimeupdate.js index 0f7a680d7..2e5851ae5 100644 --- a/plugins/Realtime/realtimeupdate.js +++ b/plugins/Realtime/realtimeupdate.js @@ -130,7 +130,7 @@ RealtimeUpdate = { user = data['user']; html = data['html'].replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"').replace(/&/g,'&'); source = data['source'].replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"').replace(/&/g,'&'); -console.log(data); + ni = "<li class=\"hentry notice\" id=\"notice-"+unique+"\">"+ "<div class=\"entry-title\">"+ "<span class=\"vcard author\">"+ |