Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -144,7 +144,6 @@
 label.authoring.advance.limited.input  =Maximum number of characters per posting
 label.authoring.basic.instruction  =Instructions
 label.authoring.advance.num.edits  =Number of times a learner can edit a page
-label.authoring.advance.allow.edit  =Allow learners to change their own postings
 label.authoring.advance.maximum.reply  =Maximum:
 button.release.mark  =Release marks
 label.authoring.advance.no.minimum  =No minimum
Index: lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -144,7 +144,6 @@
 label.authoring.advance.limited.input  =Maximum number of characters per posting
 label.authoring.basic.instruction  =Instructions
 label.authoring.advance.num.edits  =Number of times a learner can edit a page
-label.authoring.advance.allow.edit  =Allow learners to change their own postings
 label.authoring.advance.maximum.reply  =Maximum:
 button.release.mark  =Release marks
 label.authoring.advance.no.minimum  =No minimum
Index: lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql
===================================================================
diff -u -rd63c699ddb8a91c4ff20460f9e25b1b245233016 -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql	(.../create_lams_tool_wiki.sql)	(revision d63c699ddb8a91c4ff20460f9e25b1b245233016)
+++ lams_tool_wiki_orig/db/sql/create_lams_tool_wiki.sql	(.../create_lams_tool_wiki.sql)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -34,7 +34,6 @@
    content_in_use smallint,
    define_later smallint,
    content_id bigint unique,
-   allow_edit smallint,
    allow_rich_editor smallint,
    allow_new_wiki_page smallint,
    allow_attach_image smallint,
@@ -120,9 +119,9 @@
 alter table tl_lawiki10_tool_session add index FK_NEW_1983840333_5A04D7AE131CE31E (wiki_uid), add constraint FK_NEW_1983840333_5A04D7AE131CE31E foreign key (wiki_uid) references tl_lawiki10_wiki (uid);
 
 
-INSERT INTO tl_lawiki10_wiki (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor,
+INSERT INTO tl_lawiki10_wiki (uid,title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_rich_editor,
  allow_new_wiki_page,allow_attach_image,allow_insert_link,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) 
-VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,1,0,1,1,0,0,0,0,1,5000,0);
+VALUES(1,"Wiki","Instructions",null,null,${default_content_id},0,0,0,0,0,0,1,1,0,0,0,0,1,5000,0);
 
 INSERT INTO `tl_lawiki10_message` (`uid`, `create_date`, `last_reply_date`, `update_date`, `create_by`, `modified_by`, `subject`, `body`, `is_authored`, `is_anonymous`, `wiki_session_uid`, `parent_uid`, `wiki_uid`, `reply_number`, `hide_flag`, `report_id`) VALUES 
   (1,NOW(),NOW(),NOW(),null,null,'Wiki Page','Wiki content',1,0,NULL,NULL,1,0,0,NULL);
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java	(.../Wiki.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/persistence/Wiki.java	(.../Wiki.java)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -56,7 +56,6 @@
 	private boolean lockWhenFinished;
 	private boolean runOffline;
 	private boolean allowAnonym;
-	private boolean allowEdit;
 	private boolean allowNewWikiPage;
 	private boolean allowAttachImage;
 	private boolean allowInsertLink;
@@ -438,17 +437,6 @@
 		this.contentId = contentId;
 	}
 
-	/**
-	 * @hibernate.property column="allow_edit"
-	 * @return
-	 */
-	public boolean isAllowEdit() {
-		return allowEdit;
-	}
-	public void setAllowEdit(boolean allowEdit) {
-		this.allowEdit = allowEdit;
-	}
-	
 	public static Wiki newInstance(Wiki fromContent, Long contentId, WikiToolContentHandler wikiToolContentHandler){
 		Wiki toContent = new Wiki();
 		fromContent.toolContentHandler = wikiToolContentHandler;
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java	(.../WikiService.java)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -910,7 +910,6 @@
 	    	toolContentObj.setTitle((String)importValues.get(ToolContentImport102Manager.CONTENT_TITLE));
 
 	    	toolContentObj.setAllowAnonym(Boolean.FALSE);
-	    	toolContentObj.setAllowEdit(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setAllowNewWikiPage(Boolean.FALSE); // this is the default value
 	    	toolContentObj.setAllowAttachImage(Boolean.TRUE); // this is the default value
 	    	toolContentObj.setAllowInsertLink(Boolean.FALSE); // this is the default value
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java	(.../WikiConstants.java)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -59,7 +59,6 @@
 	public static final String TOOL_URL_BASE = "/lams/tool/lawiki10/";
 	public static final String FORUM_ID = "wiki_id";
 
-	public static final String ATTR_ALLOW_EDIT = "allowEdit";
 	public static final String ATTR_ALLOW_UPLOAD = "allowUpload";
 	public static final String ATTR_ALLOW_NEW_WIKI_PAGES = "allowNewWikiPages";
 	public static final String ATTR_ALLOW_ATTACH_IMAGES = "allowAttachImages";
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java	(.../LearningAction.java)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -229,7 +229,6 @@
 		sessionMap.put(AttributeNames.ATTR_MODE, mode);
 		sessionMap.put(WikiConstants.ATTR_FINISHED_LOCK, new Boolean(lock));
 		sessionMap.put(WikiConstants.ATTR_USER_FINISHED, wikiUser.isSessionFinished());
-		sessionMap.put(WikiConstants.ATTR_ALLOW_EDIT, wiki.isAllowEdit());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_UPLOAD,wiki.isAllowUpload());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_NEW_WIKI_PAGES,wiki.isAllowNewWikiPage());
 		sessionMap.put(WikiConstants.ATTR_ALLOW_ATTACH_IMAGES,wiki.isAllowAttachImage());
Index: lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiForm.java	(.../WikiForm.java)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -111,7 +111,6 @@
     }
   
     public void reset(ActionMapping mapping, HttpServletRequest request){
-    	wiki.setAllowEdit(false);
     	wiki.setAllowAnonym(false);
     	//wiki.setAllowRichEditor(false);
     	wiki.setLimitedInput(false);
Index: lams_tool_wiki_orig/web/jsps/authoring/advance.jsp
===================================================================
diff -u -r20550d731bc352d13962c705f72a2419bab9201a -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision 20550d731bc352d13962c705f72a2419bab9201a)
+++ lams_tool_wiki_orig/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -40,17 +40,7 @@
 	</label>
 </p>
 
-
 <p>
-	<html:checkbox property="wiki.allowEdit" styleClass="noBorder"
-		styleId="allowEdit">
-	</html:checkbox>
-	<label for="allowEdit">
-		<fmt:message key="label.authoring.advance.allow.edit" />
-	</label>
-</p>
-
-<p>
 	<html:checkbox property="wiki.allowUpload" styleClass="noBorder"
 		styleId="allowUpload">
 	</html:checkbox>
Index: lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp
===================================================================
diff -u -r16be4f178e2ed2998569f494ebe63cf5066836a6 -rf30c16566d5630b5aa1867d41230595773d14d42
--- lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision 16be4f178e2ed2998569f494ebe63cf5066836a6)
+++ lams_tool_wiki_orig/web/jsps/learning/message/topicview.jsp	(.../topicview.jsp)	(revision f30c16566d5630b5aa1867d41230595773d14d42)
@@ -138,7 +138,7 @@
 						<!--  Edit Button -->
 						<c:if test="${not hidden}">
 							<c:if
-								test='${(sessionMap.mode == "teacher") || (not sessionMap.finishedLock && sessionMap.allowEdit && (empty msgDto.mark))}'>
+								test='${(sessionMap.mode == "teacher") || (not sessionMap.finishedLock && (empty msgDto.mark))}'>
 								<c:set var="edittopic">
 									<html:rewrite
 										page="/learning/editTopic.do?sessionMapID=${sessionMapID}&topicID=${msgDto.message.uid}&rootUid=${sessinoMap.rootUid}&create=${msgDto.message.created.time}" />