3 files changed, 6 insertions, 5 deletions
diff --git a/askbot/templates/question/content.html b/askbot/templates/question/content.html
index 7efc1d54..babda6b5 100644
--- a/askbot/templates/question/content.html
+++ b/askbot/templates/question/content.html
@@ -20,8 +20,6 @@
 
     {{ macros.paginator(paginator_context, anchor='#sort-top') }}
     <div class="clean"></div>
-{% else %}
-    {% include "question/sharing_prompt_phrase.html" %}
 {% endif %}
 
 {# buttons below cannot be cached yet #}
@@ -31,6 +29,10 @@
         href="{% url "edit_answer" previous_answer.id %}"
     >{% trans %}Edit Your Previous Answer{% endtrans %}</a>
     <span>{% trans %}(only one answer per question is allowed){% endtrans %}</span>
+    <div style="invisible">
+        {# hidden because we still need js from the tinymce widget #}
+        {% include "question/new_answer_form.html" %}
+    </div>
 {% else %}
     {% include "question/new_answer_form.html" %}
 {% endif %}
diff --git a/askbot/templates/question/javascript.html b/askbot/templates/question/javascript.html
index 8b24655a..dc0c68f0 100644
--- a/askbot/templates/question/javascript.html
+++ b/askbot/templates/question/javascript.html
@@ -22,12 +22,14 @@
     askbot['urls']['getGroupsList'] = '{% url get_groups_list %}';
     askbot['urls']['publishAnswer'] = '{% url publish_answer %}';
     askbot['data']['userIsThreadModerator'] = {% if user_is_thread_moderator %}true{% else %}false{% endif %};
+    askbot['data']['userCanPostComment'] = {% if user_can_post_comment %}true{% else %}false{% endif %};
     askbot['messages']['addComment'] = '{% trans %}post a comment{% endtrans %}';
     {% if settings.SAVE_COMMENT_ON_ENTER %}
         askbot['settings']['saveCommentOnEnter'] = true;
     {% else %}
         askbot['settings']['saveCommentOnEnter'] = false;
     {% endif %}
+    askbot['settings']['minRepToPostComment'] = {{ settings.MIN_REP_TO_LEAVE_COMMENTS }};
     askbot['settings']['tagSource'] = '{{ settings.TAG_SOURCE }}';
 </script>
 <script type="text/javascript" src='{{"/bootstrap/js/bootstrap.js"|media}}'></script>
diff --git a/askbot/templates/question/new_answer_form.html b/askbot/templates/question/new_answer_form.html
index bc51f44a..90fe8786 100644
--- a/askbot/templates/question/new_answer_form.html
+++ b/askbot/templates/question/new_answer_form.html
@@ -3,9 +3,6 @@
         action="{% url answer question.id %}"
         method="post"
         >{% csrf_token %}
-    {# ==== START: question/subscribe_by_email_prompt.html ==== #}
-    {% include "question/subscribe_by_email_prompt.html" %}
-    {# ==== END: question/subscribe_by_email_prompt.html ==== #}
     <div style="clear:both"></div>
     {% if request.user.is_anonymous() and settings.ALLOW_POSTING_BEFORE_LOGGING_IN == False %}
         {% if not thread.closed %}