Fixed #25519 -- Made the admin "View site" link point to sites running on a subpath.

Used request.META['SCRIPT_NAME'] as the site_url if it hasn't been
customized from the default value of '/'.

1 files changed, 6 insertions, 1 deletions

diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index 39f22b8d0e..bba5665565 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -306,11 +306,16 @@ class AdminSite(object):
         """
         Returns a dictionary of variables to put in the template context for
         *every* page in the admin site.
+
+        For sites running on a subpath, use the SCRIPT_NAME value if site_url
+        hasn't been customized.
         """
+        script_name = request.META['SCRIPT_NAME']
+        site_url = script_name if self.site_url == '/' and script_name else self.site_url
         return {
             'site_title': self.site_title,
             'site_header': self.site_header,
-            'site_url': self.site_url,
+            'site_url': site_url,
             'has_permission': self.has_permission(request),
             'available_apps': self.get_app_list(request),
         }