Merge branch 'master' of https://github.com/caspervg/flaskbb

flaskbb/forum/views.py

@@ -196,7 +196,7 @@ def lock_topic(topic_id, slug=None):
     # TODO: Bulk lock
 
     if not can_moderate(user=current_user, forum=topic.forum):
-        flash("You do not have the permissions to lock this topic", "danger")
+        flash("Yo do not have the permissions to lock this topic", "danger")
         return redirect(topic.url)
 
     topic.locked = True

flaskbb/templates/forum/topic.html

@@ -149,7 +149,7 @@
                     <a href="{{ url_for('user.new_message', to_user=post.user.username) }}">PM</a>
                     {% endif %}
                     {% if post.user.website %}
-                    {% if current_user.is_authenticated() %}| {% endif %}<a href="{{post.user.website}}">Website</a>
+                    | <a href="{{post.user.website}}">Website</a>
                     {% endif %}
                 </span>