summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorBrett Haydon <brett@haydon.id.au>2016-06-07 10:26:24 +1000
committerTim Graham <timograham@gmail.com>2016-06-07 09:46:58 -0400
commitbd7de3cb87b40b264ef9c4ecb8af59501525d9a6 (patch)
tree1347d093a1929d01dc7fad93cfce823f47372fb7 /django
parent34f13e030be0f061b23d7332a47292794cd50fed (diff)
[1.10.x] Fixed #26716 -- Made CurrentSiteMiddleware compatible with new-style middleware.
Backport of 5e3f4c2e53d9dde0fcf9f5f33f63c15c4750019f from master
Diffstat (limited to 'django')
-rw-r--r--django/contrib/sites/middleware.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/sites/middleware.py b/django/contrib/sites/middleware.py
index fdc7923581..bc3bf20c48 100644
--- a/django/contrib/sites/middleware.py
+++ b/django/contrib/sites/middleware.py
@@ -1,7 +1,9 @@
+from django.utils.deprecation import MiddlewareMixin
+
from .shortcuts import get_current_site
-class CurrentSiteMiddleware(object):
+class CurrentSiteMiddleware(MiddlewareMixin):
"""
Middleware that sets `site` attribute to request object.
"""