From 34c587e81e28dcd3cb0df1c98c25ac64ae17b4ff Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sun, 15 Jan 2006 06:11:14 +0000
Subject: [PATCH] magic-removal: Merged to [1976]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/templates/admin/base.html | 2 +-
 django/db/models/base.py                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html
index 3d35423ac3..ef657528a1 100644
--- a/django/contrib/admin/templates/admin/base.html
+++ b/django/contrib/admin/templates/admin/base.html
@@ -36,7 +36,7 @@
     <!-- Content -->
     <div id="content" class="{% block coltype %}colM{% endblock %}">
         {% block pretitle %}{% endblock %}
-        {% if title %}<h1>{{ title }}</h1>{% endif %}
+        {% block content_title %}{% if title %}<h1>{{ title }}</h1>{% endif %}{% endblock %}
         {% block content %}{{ content }}{% endblock %}
         {% block sidebar %}{% endblock %}
         <br class="clear" />
diff --git a/django/db/models/base.py b/django/db/models/base.py
index 4daab37fb7..80e52388f4 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -413,7 +413,7 @@ class Model(object):
         return getattr(self, cache_var)
 
     def _set_many_to_many_objects(self, id_list, field_with_rel):
-        current_ids = [obj.id for obj in self._get_many_to_many_objects(field_with_rel)]
+        current_ids = [getattr(obj, obj._meta.pk.attname) for obj in self._get_many_to_many_objects(field_with_rel)]
         ids_to_add, ids_to_delete = dict([(i, 1) for i in id_list]), []
         for current_id in current_ids:
             if current_id in id_list: