Merge branch 'feature/router'

expressjs · Apr 25, 2011 · 1d2dd2a · 1d2dd2a
2 parents 658e064 + 63db694
commit 1d2dd2a
Show file tree

Hide file tree

Showing 6 changed files with 406 additions and 66 deletions.
diff --git a/History.md b/History.md
@@ -13,7 +13,6 @@ Closes #638
   * Fixed partial lookup precedence. Closes #631
 Shaw]
 
-
 2.2.2 / 2011-04-12 
 ==================
 

diff --git a/lib/http.js b/lib/http.js
@@ -11,7 +11,7 @@
 
 var qs = require('qs')
   , connect = require('connect')
-  , router = connect.router
+  , router = require('./router')
   , methods = router.methods.concat(['del', 'all'])
   , view = require('./view')
   , url = require('url')

diff --git a/lib/request.js b/lib/request.js
@@ -197,7 +197,7 @@ req.flash = function(type, msg){
       , args = arguments
       , formatters = this.app.flashFormatters || {};
     formatters.__proto__ = flashFormatters;
-    msg = utils.miniMarkdown(utils.htmlEscape(msg));
+    msg = utils.miniMarkdown(utils.escape(msg));
     msg = msg.replace(/%([a-zA-Z])/g, function(_, format){
       var formatter = formatters[format];
       if (formatter) return formatter(args[i++]);