Commit 76f9dc1d authored by Matthew Wilkes's avatar Matthew Wilkes

Good catch Sidnei, damn you unexpected merge

parent 88c83fc6
......@@ -249,15 +249,7 @@ class ZPublisherExceptionHook:
REQUEST['AUTHENTICATED_USER'] = AccessControl.User.nobody
try:
result = f(client, REQUEST, t, v,
traceback,
error_log_url=error_log_url)
if result is not None:
t, v, traceback = result
response = REQUEST.RESPONSE
response.setStatus(t)
response.setBody(v)
return response
f(client, REQUEST, t, v, traceback, error_log_url=error_log_url)
except TypeError:
# Pre 2.6 call signature
f(client, REQUEST, t, v, traceback)
......
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