sync merge jambazov -> trunk

[osqa.git] / forum / views / writers.py

diff --git a/forum/views/writers.py b/forum/views/writers.py
index 07364f7647da985ff2c8547316504abcf9a7af7f..dbc68c017c4c583160e453031e2400fef4b013d6 100644 (file)
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -107,6 +107,7 @@ def ask(request):
 
     return render_to_response('ask.html', {
         'form' : form,
+        'tab' : 'ask'
         }, context_instance=RequestContext(request))
 
 def edit_question(request, id):
@@ -217,7 +218,7 @@ def answer(request, id):
     question = get_object_or_404(Question, id=id)
 
     if request.POST:
-        form = AnswerForm(question, request.POST)
+        form = AnswerForm(request.POST, request.user)
 
         if request.session.pop('reviewing_pending_data', False) or not form.is_valid():
             request.session['redirect_POST_data'] = request.POST