From d47d95edf2de3cde9936976dbba866bef4ac7ac4 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 18 Jan 2012 21:43:23 -0500 Subject: [PATCH] Removed simplewiki's custom 404 page so urls work better, and it uses global 404 page. Set bad debug setting to false --- settings.py | 2 +- simplewiki/urls.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.py b/settings.py index 7693d9de7f..8ab2a98df8 100644 --- a/settings.py +++ b/settings.py @@ -13,7 +13,7 @@ DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu' DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu' # For testing the login system -GENERATE_RANDOM_USER_CREDENTIALS = True +GENERATE_RANDOM_USER_CREDENTIALS = False WIKI_REQUIRE_LOGIN_EDIT = True WIKI_REQUIRE_LOGIN_VIEW = True diff --git a/simplewiki/urls.py b/simplewiki/urls.py index fc8ec19598..cdff3de57c 100644 --- a/simplewiki/urls.py +++ b/simplewiki/urls.py @@ -9,10 +9,10 @@ urlpatterns = patterns('', url(r'^random/$', 'simplewiki.views.random_article', name='wiki_random'), url(r'^search/$', 'simplewiki.views.search_articles', name='wiki_search_articles'), url(r'^list/$', 'simplewiki.views.search_articles', name='wiki_list_articles'), #Just an alias for the search, but you usually don't submit a search term - url(r'^search_related/([a-zA-Z\d/_-]*)//$', 'simplewiki.views.search_add_related', name='search_related'), + url(r'^search_related/([a-zA-Z\d/_-]*)/$', 'simplewiki.views.search_add_related', name='search_related'), # url(r'^/?([a-zA-Z\d/_-]*)/_related/add/$', 'simplewiki.views.add_related', name='add_related'), # url(r'^/?([a-zA-Z\d/_-]*)/_related/remove/(\d+)$', 'simplewiki.views.remove_related', name='wiki_remove_relation'), # url(r'^/?([a-zA-Z\d/_-]*)/_add_attachment/$', 'simplewiki.views_attachments.add_attachment', name='add_attachment'), # url(r'^/?([a-zA-Z\d/_-]*)/_view_attachment/(.+)?$', 'simplewiki.views_attachments.view_attachment', name='wiki_view_attachment'), - url(r'^(.*)$', 'simplewiki.views.encode_err', name='wiki_encode_err') +# url(r'^(.*)$', 'simplewiki.views.encode_err', name='wiki_encode_err') )