From e4f468b9405ce7560dd00a383138f7d15e8549ec Mon Sep 17 00:00:00 2001
From: Timo Graham <timograham@gmail.com>
Date: Fri, 24 Feb 2012 22:50:36 +0000
Subject: [PATCH] Fixed #17749 - Documented better way of overriding
 ModelAdmin; thanks chrisdpratt and claudep.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/contrib/admin/index.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 1fde2ce5f5..a287aeecca 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1278,11 +1278,10 @@ provided some extra mapping data that would not otherwise be available::
             pass
 
         def change_view(self, request, object_id, extra_context=None):
-            my_context = {
-                'osm_data': self.get_osm_info(),
-            }
+            extra_context = extra_context or {}
+            extra_context['osm_data'] = self.get_osm_info()
             return super(MyModelAdmin, self).change_view(request, object_id,
-                extra_context=my_context)
+                extra_context=extra_context)
 
 .. versionadded:: 1.4