Ticket #5251: show_in_web-6000.diff

django/contrib/admin/urls.py

@@ -2 +2 @@
 
 urlpatterns = patterns('',
     #('^$', 'django.contrib.admin.views.main.index'),
-    ('^r/(\d+)/(.*)/$', 'django.views.defaults.shortcut'),
+    #('^r/(\d+)/(\d+)/$', 'django.views.defaults.shortcut'),
     #('^jsi18n/$', i18n_view, {'packages': 'django.conf'}),
     #('^logout/$', 'django.contrib.auth.views.logout'),
     #('^password_change/$', 'django.contrib.auth.views.password_change'),

django/contrib/admin/sites.py

@@ -15 +15 @@
 LOGIN_FORM_KEY = 'this_is_the_login_form'
 
 USER_CHANGE_PASSWORD_URL_RE = re.compile('auth/user/(\d+)/password')
+RESOLVE_ABSOLUTE_URL_RE = re.compile('r/(\d+)/(\d+)')
 
 class AlreadyRegistered(Exception):
     pass
@@ -127 +128 @@
             match = USER_CHANGE_PASSWORD_URL_RE.match(url)
             if match:
                 return self.user_change_password(request, match.group(1))
-                
+            match = RESOLVE_ABSOLUTE_URL_RE.match(url)
+            if match:
+                from django.views.defaults import shortcut
+                return shortcut(request, *match.groups() )
+
             if '/' in url:
                 return self.model_page(request, *url.split('/', 2))