From 837a2e2773125fcda0c419597b2c19a3d05b4879 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Wed, 2 Feb 2011 15:25:57 +0000 Subject: [PATCH] [1.2.X] Fixed #15212 -- ensure that ModelAdmin.get_actions still returns a SortedDict if there are no actions. Backport of [15393]. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15394 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index a108c7e993..a80509f801 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -536,7 +536,7 @@ class ModelAdmin(BaseModelAdmin): # If self.actions is explicitally set to None that means that we don't # want *any* actions enabled on this page. if self.actions is None: - return [] + return SortedDict() actions = []