Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -red376d7ba9e60ab607761599bd56dcf7eb590c47 -rb31bd8c734cb34384750a4bc9d9bf01bc5fe2588
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision ed376d7ba9e60ab607761599bd56dcf7eb590c47)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision b31bd8c734cb34384750a4bc9d9bf01bc5fe2588)
@@ -64,6 +64,7 @@
 	public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages";
 	public static final String ATTR_ALLOW_INSERT_LINKS = "allowInsertLinks";
 	public static final String ATTR_ALLOW_REVERT_PAGES = "allowRevertPages";
+	public static final String ATTR_MAXIMUM_REPLIES = "maximumReplies";
 	public static final String ATTR_ALLOW_RICH_EDITOR = "allowRichEditor";
 
 	public static final String ONLINE_ATTACHMENT = "online_att";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java
===================================================================
diff -u -rb78d62af292ea811fa83f646cf521f0160950c93 -rb31bd8c734cb34384750a4bc9d9bf01bc5fe2588
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java	(.../WikiLinkHandlerServlet.java)	(revision b78d62af292ea811fa83f646cf521f0160950c93)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/WikiLinkHandlerServlet.java	(.../WikiLinkHandlerServlet.java)	(revision b31bd8c734cb34384750a4bc9d9bf01bc5fe2588)
@@ -82,10 +82,6 @@
 public class WikiLinkHandlerServlet extends HttpServlet {
 
 	private static Logger log = Logger.getLogger(WikiLinkHandlerServlet.class);
-
-	private static final String JNDI_DATASOURCE = "java:/jdbc/lams-ds";
-
-	private static final String PASSWORD_QUERY = "select password from lams_user where login=?";
 	
 	private static IWikiService wikiService = null;
 	
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -ra09d5bcce9b6c45776a4488715ccf82cf52ba4d8 -rb31bd8c734cb34384750a4bc9d9bf01bc5fe2588
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision a09d5bcce9b6c45776a4488715ccf82cf52ba4d8)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision b31bd8c734cb34384750a4bc9d9bf01bc5fe2588)
@@ -227,6 +227,7 @@
 		sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_INSERT_LINKS,wiki.isAllowInsertLink());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_REVERT_PAGES,wiki.isAllowRevertPage());
+		sessionMap.put(WikiConstants.ATTR_MAXIMUM_REPLIES,wiki.getMaximumReply());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_RICH_EDITOR,allowRichEditor);
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_ON,wiki.isReflectOnActivity());
 		sessionMap.put(WikiConstants.ATTR_REFLECTION_INSTRUCTION,wiki.getReflectInstructions());
Index: lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -rc5807e3f0e45e194b64154910e663b96aa222cc7 -rb31bd8c734cb34384750a4bc9d9bf01bc5fe2588
--- lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision c5807e3f0e45e194b64154910e663b96aa222cc7)
+++ lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision b31bd8c734cb34384750a4bc9d9bf01bc5fe2588)
@@ -138,7 +138,7 @@
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
 							<c:if
-								test='${(sessionMap.mode == "teacher") || (not sessionMap.finishedLock && (empty msgDto.mark))}'>
+								test='${ (sessionMap.mode == "teacher") || (not sessionMap.finishedLock && (empty msgDto.mark) && (msgDto.message.replyNumber < sessionMap.maximumReplies)) }'>
 								<c:set var="edittopic">
 									<html:rewrite
 										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />