merge notification-config -> trunk, previous commits 695, 751 (email debugging inform...

[osqa.git] / forum / urls.py

diff --git a/forum/urls.py b/forum/urls.py
index 209b3ea28cc0cd235b186c677005787b52978e56..564eafd9fe68c05d54e98ea26b50eb15019849d2 100644 (file)
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -97,7 +97,7 @@ urlpatterns += patterns('',
                         url(r'^%s(?P<id>\d+)/' % _('node_markdown/'), app.commands.node_markdown, name='node_markdown'),
                         url(r'^%s(?P<id>\d+)/' % _('convert/'), app.commands.convert_to_comment,
                             name='convert_to_comment'),
-                        url(r'^%s(?P<id>\d+)/' % _('convert_to_question/'), app.commands.convert_to_question,
+                        url(r'^%s(?P<id>\d+)/' % _('convert_to_question/'), app.writers.convert_to_question,
                             name='convert_to_question'),
                         url(r'^%s(?P<id>\d+)/' % _('wikify/'), app.commands.wikify, name='wikify'),
 
@@ -216,5 +216,6 @@ urlpatterns += patterns('',
 
                         url(r'^feeds/rss[/]?$', app.readers.feed, name="latest_questions_feed"),
 
-                        url(r'^(?P<path>.+)$', app.meta.page, name="static_page"),
+                        #url(r'^.+$', app.meta.page, name="static_page"),
                         )
+