Commit e70f32e3 authored by Dave Cooper's avatar Dave Cooper

Merge various patches into publish-shared.

parent 423cd1a2
......@@ -386,7 +386,7 @@ package-qualified object name\")
(with-http-body (req ent)))))))
(defun publish-shared (&key path object-type host (server *wserver*)
(defun publish-shared (&key path object-type object host (server *wserver*)
(key (make-keyword-sensitive (format nil "~a_~a" host path))))
"Void. Used to publish a site which is to have a shared toplevel instance tree,
and no URI rewriting (i.e. no \"/sessions/XXX/\" at the beginning of the path). So,
......@@ -405,12 +405,12 @@ being generated dynamically.
:host (list \"\" \"\" \"\"))
(let ((object (make-object (if (stringp object-type)
(read-safe-string object-type)
:instance-id key
:plain-url? t
:host host)))
(let ((object (or object (make-object (if (stringp object-type)
(read-safe-string object-type)
:instance-id key
:plain-url? t
:host host))))
(setf (gethash key *instance-hash-table*) (list object))
(publish :path path
......@@ -429,8 +429,6 @@ being generated dynamically.
(define-object form-element-processor ()
(bashee query-plist)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment