From f83169f12d19818f8a052abe48fa5d9cc2ebc3fb Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Tue, 21 Aug 2012 17:54:21 -0400
Subject: [PATCH 1/3] Protect asciimath2jax in seq_contents, fix choiceresponse
 on CS169x

---
 lms/djangoapps/courseware/module_render.py | 2 +-
 lms/templates/seq_module.html              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index a61e8b9e23..65e30475f2 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -374,7 +374,7 @@ def modx_dispatch(request, dispatch, location, course_id):
     # ''' (fix emacs broken parsing)
 
     # Check for submitted files and basic file size checks
-    p = request.POST.dict()
+    p = request.POST.copy()
     if request.FILES:
         for fileinput_id in request.FILES.keys():
             inputfiles = request.FILES.getlist(fileinput_id)
diff --git a/lms/templates/seq_module.html b/lms/templates/seq_module.html
index be0f4902d4..985e3c9851 100644
--- a/lms/templates/seq_module.html
+++ b/lms/templates/seq_module.html
@@ -21,7 +21,7 @@
   </nav>
 
   % for item in items:
-  <div class="seq_contents tex2jax_ignore">${item['content'] | h}</div>
+  <div class="seq_contents tex2jax_ignore asciimath2jax_ignore">${item['content'] | h}</div>
   % endfor
   <div id="seq_content"></div>
 

From 1e068b6a4ac8625726856b26a18d7f1792a2108a Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Tue, 21 Aug 2012 18:01:51 -0400
Subject: [PATCH 2/3] Disabled wiki attachments.

---
 lms/envs/common.py    | 2 +-
 repo-requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 151bffaa32..3a79e628b8 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -582,7 +582,7 @@ INSTALLED_APPS = (
     'course_wiki', # Our customizations
     'mptt',
     'sekizai',
-    'wiki.plugins.attachments',
+    #'wiki.plugins.attachments',
     'wiki.plugins.notifications',
     'course_wiki.plugins.markdownedx',
 
diff --git a/repo-requirements.txt b/repo-requirements.txt
index b0cdedf43b..cb016b5222 100644
--- a/repo-requirements.txt
+++ b/repo-requirements.txt
@@ -1,6 +1,6 @@
 -e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles
 -e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
--e git://github.com/benjaoming/django-wiki.git@e237b2ac#egg=django-wiki
+-e git://github.com/benjaoming/django-wiki.git@02275fb4#egg=django-wiki
 -e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
 -e common/lib/capa
 -e common/lib/xmodule

From 214fb9185d2da440d97410b675767d5da97f3790 Mon Sep 17 00:00:00 2001
From: Bridger Maxwell <bridgeyman@gmail.com>
Date: Tue, 21 Aug 2012 18:42:20 -0400
Subject: [PATCH 3/3] Disabling anonymous wiki access until styling supports
 it.

---
 lms/envs/common.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 3a79e628b8..a217f0e7b9 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -317,6 +317,7 @@ SIMPLE_WIKI_REQUIRE_LOGIN_VIEW = False
 WIKI_ACCOUNT_HANDLING = False
 WIKI_EDITOR = 'course_wiki.editors.CodeMirror'
 WIKI_SHOW_MAX_CHILDREN = 0 # We don't use the little menu that shows children of an article in the breadcrumb
+WIKI_ANONYMOUS = False # Don't allow anonymous access until the styling is figured out
 
 ################################# Jasmine ###################################
 JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'