Skip to content

Commit

Permalink
Merge branch 'master' of github.com:cdent/twikifier
Browse files Browse the repository at this point in the history
  • Loading branch information
cdent committed Jun 3, 2011
2 parents ca97ea5 + 09a6067 commit 761ba9f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions server.js
Expand Up @@ -55,7 +55,8 @@ var processRequest = function(args, emitter) {
tiddlerTitle = args[1],
tiddlyweb_cookie = args[2] || '',
memcache = new Memcached('127.0.0.1:11211'),
globals = twikifier.createWikifier(window, jQuery),
globals = twikifier.createWikifier(window, jQuery,
{container: collection_uri}),
namespace = getNamespace(collection_uri),
wikify = globals[0],
store = globals[1],
Expand Down Expand Up @@ -158,7 +159,6 @@ server.addListener('connection', function(c) {
c.addListener('data', function(data) {
var dataString = data.toString().replace(/(\r|\n)+$/, '');
var args = dataString.split(/\x00/);
console.log(args);
var output = processRequest(args);
if (typeof output === "string") {
c.end(output);
Expand Down

0 comments on commit 761ba9f

Please sign in to comment.