Changes between Version 3 and Version 4 of Ticket #30021


Ignore:
Timestamp:
Dec 7, 2018, 7:50:22 PM (6 years ago)
Author:
Ira Abbott
Comment:

Legend:

Unmodified
Added
Removed
Modified

  • Ticket #30021 – Description

    v3 v4  
    2525        """
    2626        from django.conf import settings
     27          mixed = getattr(settings, 'SITE_MIXED_MODE')
    2728--        if getattr(settings, 'SITE_ID', ''):
    28 ++     if getattr(settings, 'SITE_ID', '') and not getattr(settings, 'SITE_MIXED_MODE'):
     29++     if getattr(settings, 'SITE_ID', '') and not mixed:
    2930                site_id = settings.SITE_ID
    3031            return self._get_site_by_id(site_id)
    3132            elif request:
    3233                 return self._get_site_by_request(request)
    33 ++       elif getattr(settings, 'SITE_MIXED_MODE') and settings.SITE_MIXED_MODE == True:
     34++       elif mixed == True:
    3435++             return self._get_site_by_id(site_id)
    3536
Back to Top