diff options
Diffstat (limited to 'django/contrib/staticfiles/utils.py')
| -rw-r--r-- | django/contrib/staticfiles/utils.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/django/contrib/staticfiles/utils.py b/django/contrib/staticfiles/utils.py index 0071dbd370..428bb69b1e 100644 --- a/django/contrib/staticfiles/utils.py +++ b/django/contrib/staticfiles/utils.py @@ -33,13 +33,13 @@ def get_files(storage, ignore_patterns=[], location=''): def check_settings(): """ - Checks if the MEDIA_(ROOT|URL) and STATICFILES_(ROOT|URL) + Checks if the MEDIA_(ROOT|URL) and STATIC_(ROOT|URL) settings have the same value. """ - if settings.MEDIA_URL == settings.STATICFILES_URL: - raise ImproperlyConfigured("The MEDIA_URL and STATICFILES_URL " - "settings must have individual values") - if ((settings.MEDIA_ROOT and settings.STATICFILES_ROOT) and - (settings.MEDIA_ROOT == settings.STATICFILES_ROOT)): - raise ImproperlyConfigured("The MEDIA_ROOT and STATICFILES_ROOT " - "settings must have individual values") + if settings.MEDIA_URL == settings.STATIC_URL: + raise ImproperlyConfigured("The MEDIA_URL and STATIC_URL " + "settings must have different values") + if ((settings.MEDIA_ROOT and settings.STATIC_ROOT) and + (settings.MEDIA_ROOT == settings.STATIC_ROOT)): + raise ImproperlyConfigured("The MEDIA_ROOT and STATIC_ROOT " + "settings must have different values") |