From 1eefde87962f1b2189abb335f89f34cd2850e634 Mon Sep 17 00:00:00 2001 From: Nicolas Buduroi Date: Thu, 25 Jun 2009 05:53:40 +0800 Subject: [PATCH] Changed the name of with-params to with-request-params to not clash with similarly named function from form-helpers. Signed-off-by: James Reeves --- src/compojure/http/request.clj | 2 +- src/compojure/http/routes.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compojure/http/request.clj b/src/compojure/http/request.clj index 48e9cbda..834736a2 100644 --- a/src/compojure/http/request.clj +++ b/src/compojure/http/request.clj @@ -84,7 +84,7 @@ (assoc-func :form-params parse-form-params) (assoc-func :params get-merged-params))) -(defn with-params +(defn with-request-params "Decorator that adds urlencoded parameters to the request map." [handler] (fn [request] diff --git a/src/compojure/http/routes.clj b/src/compojure/http/routes.clj index 866445a0..5970e169 100644 --- a/src/compojure/http/routes.clj +++ b/src/compojure/http/routes.clj @@ -204,7 +204,7 @@ and cookies to the request." [& handlers] (-> (apply routes* handlers) - with-params + with-request-params with-cookies)) ;; Macros for easily creating a compiled routing table