diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/contrib/sites/models.py --- a/app/django/contrib/sites/models.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/contrib/sites/models.py Tue Oct 14 16:00:59 2008 +0000 @@ -32,17 +32,23 @@ domain = models.CharField(_('domain name'), max_length=100) name = models.CharField(_('display name'), max_length=50) objects = SiteManager() + class Meta: db_table = 'django_site' verbose_name = _('site') verbose_name_plural = _('sites') ordering = ('domain',) - class Admin: - list_display = ('domain', 'name') - search_fields = ('domain', 'name') def __unicode__(self): return self.domain + + def delete(self): + pk = self.pk + super(Site, self).delete() + try: + del(SITE_CACHE[pk]) + except KeyError: + pass class RequestSite(object): """ @@ -58,7 +64,7 @@ def __unicode__(self): return self.domain - def save(self): + def save(self, force_insert=False, force_update=False): raise NotImplementedError('RequestSite cannot be saved.') def delete(self):