Commit e774bf3a authored by Hanno Schlichting's avatar Hanno Schlichting

Merged r101181 from branches/2.12

parent e1c3381a
...@@ -24,6 +24,7 @@ from App.config import getConfiguration ...@@ -24,6 +24,7 @@ from App.config import getConfiguration
from time import asctime from time import asctime
from types import StringType, ListType from types import StringType, ListType
from zExceptions import Redirect from zExceptions import Redirect
from zExceptions import Unauthorized
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
import transaction import transaction
import AccessControl.User import AccessControl.User
...@@ -170,7 +171,7 @@ class ZPublisherExceptionHook: ...@@ -170,7 +171,7 @@ class ZPublisherExceptionHook:
if t.lower() in ('unauthorized', 'redirect'): if t.lower() in ('unauthorized', 'redirect'):
raise raise
else: else:
if t is SystemExit or t is Redirect: if t is SystemExit or t is Redirect or t is Unauthorized:
raise raise
if issubclass(t, ConflictError): if issubclass(t, ConflictError):
......
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