From 0efb4d6599625813479b0d280e12ae614b0dadd4 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sat, 19 Mar 2011 21:51:39 +0100 Subject: =?UTF-8?q?Make=20the=20=E2=80=9Clang=E2=80=9D=20parameter=20overr?= =?UTF-8?q?ide=20the=20characteristics=20precedence=20list=20rather=20than?= =?UTF-8?q?=20augmenting=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mulkcms.lisp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mulkcms.lisp') 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))) -- cgit v1.2.3