Changes between Version 7 and Version 9 of Ticket #30021


Ignore:
Timestamp:
Dec 7, 2018, 8:17:31 PM (5 years ago)
Author:
Ira Abbott
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #30021 – Description

    v7 v9  
    2525        """
    2626        from django.conf import settings
    27 ++     mixed = getattr(settings, 'SITE_MIXED_MODE')
     27++     has_mixed = getattr(settings, 'SITE_MIXED_MODE')
     28++     has_site = getattr(settings, 'SITE_ID', '')
    2829--        if getattr(settings, 'SITE_ID', ''):
    29 ++     if getattr(settings, 'SITE_ID', '') and not mixed:
     30++     if has_site and not has_mixed:
    3031                site_id = settings.SITE_ID
    3132            return self._get_site_by_id(site_id)
    3233            elif request:
    3334                 return self._get_site_by_request(request)
    34 ++       elif getattr(settings, 'SITE_ID', '') and mixed == True:
     35++       elif has_site and has_mixed and settings.SITE_MIXED_MODE == True:
    3536++             site_id = settings.SITE_ID
    3637++             return self._get_site_by_id(site_id)
Back to Top