Merge pull request #11316 from open-craft/remove-django-template-loaders

Remove default django template loaders.

common/djangoapps/edxmako/makoloader.py

@@ -19,6 +19,7 @@ class MakoLoader(object):
     This is a Django loader object which will load the template as a
     Mako template if the first line is "## mako". It is based off BaseLoader
     in django.template.loader.
+    We need this in order to be able to include mako templates inside main_django.html.
     """
 
     is_usable = False

lms/envs/common.py

@@ -473,12 +473,10 @@ TEMPLATES = [
         # Options specific to this backend.
         'OPTIONS': {
             'loaders': [
+                # We have to use mako-aware template loaders to be able to include
+                # mako templates inside django templates (such as main_django.html).
                 'edxmako.makoloader.MakoFilesystemLoader',
                 'edxmako.makoloader.MakoAppDirectoriesLoader',
-
-                'django.template.loaders.filesystem.Loader',
-                'django.template.loaders.app_directories.Loader',
-
             ],
             'context_processors': [
                 'django.template.context_processors.request',