Merge branch 'master' into explain and updating a few bits to work with the new

urls and views.

1 files changed, 9 insertions, 2 deletions

diff --git a/debug_toolbar/urls.py b/debug_toolbar/urls.py
index 24d4b12..e0e4b7a 100644
--- a/debug_toolbar/urls.py
+++ b/debug_toolbar/urls.py
@@ -1,6 +1,13 @@
+"""
+URLpatterns for the debug toolbar. 
+
+These should not be loaded explicitly; the debug toolbar middleware will patch
+this into the urlconf for the request.
+"""
 from django.conf.urls.defaults import *
+from django.conf import settings
 
 urlpatterns = patterns('',
-    # EXPLAIN SQL via AJAX
-    url(r'explain/$', 'debug_toolbar.views.explain', name='explain_sql'),
+    url(r'^__debug__/m/(.*)$', 'debug_toolbar.views.debug_media'),
+    url(r'^__debug__/sql_explain/$', 'debug_toolbar.views.sql_explain', name='sql_explain'),
 )