Unstable commit; syncing computers

2012-05-31 21:12:08 -04:00
parent 97c6a26c2b
commit 98d8f4b55b
9 changed files with 14 additions and 12 deletions
--- a/djangoapps/courseware/module_render.py
+++ b/djangoapps/courseware/module_render.py
@@ -128,14 +128,14 @@ def get_module(user, request, xml_module, module_object_preload):
        smod.save()
        module_object_preload.append(smod)

-    return smod
+    return (instance, smod)

 def render_x_module(user, request, xml_module, module_object_preload):
    ''' Generic module for extensions. This renders to HTML. '''
-    if module==None :
+    if xml_module==None :
        return {"content":""}

-    smod = get_module(user, request, xml_module, module_object_preload)
+    (instance, smod) = get_module(user, request, xml_module, module_object_preload)

    # Grab content
    content = instance.get_html()