summaryrefslogtreecommitdiff
path: root/mulkcms.lisp
diff options
context:
space:
mode:
authorMatthias Andreas Benkard <code@mail.matthias.benkard.de>2011-03-19 21:51:39 +0100
committerMatthias Andreas Benkard <code@mail.matthias.benkard.de>2011-03-19 21:51:39 +0100
commit0efb4d6599625813479b0d280e12ae614b0dadd4 (patch)
tree959ffb92bb520b99624039e31bc71147682343a7 /mulkcms.lisp
parentffa16d2022a4ff058dace836f5e0a4fc94f64db7 (diff)
Make the “lang” parameter override the characteristics precedence list rather than augmenting it.
Diffstat (limited to 'mulkcms.lisp')
-rw-r--r--mulkcms.lisp12
1 files changed, 6 insertions, 6 deletions
diff --git a/mulkcms.lisp b/mulkcms.lisp
index 802fbba..4cf1473 100644
--- a/mulkcms.lisp
+++ b/mulkcms.lisp
@@ -1033,12 +1033,12 @@
(defun find-request-handler (path params)
(let ((*requested-characteristics*
- (append (when-let (langstr (or (cdr (assoc "lang" params :test #'equal))
- (cdr (assoc "hl" params :test #'equal))))
- (let ((langs (split-sequence #\| langstr)))
- (mapcar (lambda (x) (list (cons "language" x)))
- langs)))
- *default-characteristics-precedence-list*))
+ (or (when-let (langstr (or (cdr (assoc "lang" params :test #'equal))
+ (cdr (assoc "hl" params :test #'equal))))
+ (let ((langs (split-sequence #\| langstr)))
+ (mapcar (lambda (x) (list (cons "language" x)))
+ langs)))
+ *default-characteristics-precedence-list*))
(*propagated-params* (remove-if-not (lambda (x)
(equal (car x) "lang"))
params)))