Merge branch 'release'

2013-09-14 07:00:17 -04:00
parent ed1a07382e b9f8869c50
commit 33f13846a5
1 changed files with 2 additions and 2 deletions
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -576,10 +576,10 @@ class XModuleDescriptor(XModuleFields, HTMLSnippet, ResourceTemplates, XBlock):
        org and course are optional strings that will be used in the generated
            module's url identifiers
        """
-        class_ = XModuleDescriptor.load_class(
+        class_ = system.mixologist.mix(XModuleDescriptor.load_class(
            etree.fromstring(xml_data).tag,
            default_class
-        )
+        ))
        # leave next line, commented out - useful for low-level debugging
        # log.debug('[XModuleDescriptor.load_from_xml] tag=%s, class_=%s' % (
        #        etree.fromstring(xml_data).tag,class_))