Reverting the merges due to unsuccessfull conflict resolvement.

[osqa.git] / forum / utils / userlinking.py

diff --git a/forum/utils/userlinking.py b/forum/utils/userlinking.py
index 53a49dc05ecedab60e8153ed10639bc6026ed86d..da476ee9cc9bf58c07d5f1d34ecb74e1b07aee13 100644 (file)
--- a/forum/utils/userlinking.py
+++ b/forum/utils/userlinking.py
@@ -31,8 +31,6 @@ def auto_user_link(node, content):
             question = node.question
         elif node.answer:
             question = node.answer.question
-    else:
-        return content
     
     # Now we've got the root question. Let's get the list of active users.
     active_users = question.get_active_users()