Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
===================================================================
diff -u -rb19488eb4b80f01e7dcc599a71a6f8bff477c68c -rff534f5023f5bd3c122d9301b483305d82949abe
--- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision b19488eb4b80f01e7dcc599a71a6f8bff477c68c)
+++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java	(.../MonitoringAction.java)	(revision ff534f5023f5bd3c122d9301b483305d82949abe)
@@ -95,12 +95,20 @@
 	if (wikiService == null) {
 	    wikiService = WikiServiceProxy.getWikiService(this.getServlet().getServletContext());
 	}
-
-	Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
-
 	String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
 
-	Wiki wiki = wikiService.getWikiByContentId(toolContentID);
+	Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, true);
+	Wiki wiki;
+	//toolContentID is null in case request comes from WikiPageAction.revertPage()
+	if (toolContentID == null) {
+	    Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+	    WikiSession session = wikiService.getSessionBySessionId(toolSessionID);
+	    wiki = session.getWiki();
+	    toolContentID = wiki.getToolContentId();
+	    
+	} else {
+	    wiki = wikiService.getWikiByContentId(toolContentID);
+	}
 
 	if (wiki == null) {
 	    throw new WikiException("Could not find wiki with content id: " + toolContentID);
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -r87abd08ba32adb9890becf9f65460298612b8191 -rff534f5023f5bd3c122d9301b483305d82949abe
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 87abd08ba32adb9890becf9f65460298612b8191)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision ff534f5023f5bd3c122d9301b483305d82949abe)
@@ -310,46 +310,38 @@
 </html:form>
 
 <script type="text/javascript">
-<!--
+
 	var wikiLinkArray = new Array();
 	populateWikiLinkArray();
-	function populateWikiLinkArray()
-	{
+	function populateWikiLinkArray() {
 		<c:forEach var="wikiPage" items="${wikiPages}">
 			wikiLinkArray[wikiLinkArray.length] = '${wikiPage.javaScriptTitle}';
 		</c:forEach>
 		document.getElementById("wikiLinks").value = wikiLinkArray.toString();
 	}
 	
-	function doEditOrAdd(dispatch)
-	{
+	function doEditOrAdd(dispatch) {
 		var title="";
-		if(dispatch == "editPage")
-		{
+		if(dispatch == "editPage") {
 			title = document.getElementById("title").value;
 		}
-		else
-		{
+		else {
 			title = document.getElementById("newPageTitle").value;
 		}
 		
 		var i;
 		
-		if (title == null || trim(title).length == 0)
-		{
+		if (title == null || trim(title).length == 0) {
 			alert("<fmt:message key='label.wiki.add.title.required'></fmt:message>");
 			return;
 		}
 		
-		for (i=0; i<wikiLinkArray.length; i++)
-		{
-			if(dispatch == "editPage" && wikiLinkArray[i] == '${currentWikiPage.javaScriptTitle}')
-			{
+		for (i=0; i<wikiLinkArray.length; i++) {
+			if(dispatch == "editPage" && wikiLinkArray[i] == '${currentWikiPage.javaScriptTitle}') {
 				continue;
 			}
 			
-			if (trim(title) == wikiLinkArray[i])
-			{
+			if (trim(title) == wikiLinkArray[i]) {
 				alert("<fmt:message key='label.wiki.add.title.exists'><fmt:param>" + title + "</fmt:param></fmt:message>");
 				return;
 			}
@@ -360,26 +352,18 @@
 		submitWiki(dispatch);
 	}
 	
-	function submitWiki(dispatch)
-	{
+	function submitWiki(dispatch) {
 		document.getElementById("dispatch").value=dispatch;
 		replaceJavascriptTokenAndSubmit("monitoringForm");
 	}
 	
-	CKEDITOR.on('instanceCreated',function (editorInstance) 
-	{ 	
+	CKEDITOR.on('instanceCreated',function (editorInstance) { 	
 		editorInstance.wikiLinkArray = wikiLinkArray;
 	});
 	
-	function refreshPage()
-	{
+	function refreshPage() {
 		var url = "<lams:WebAppURL/>/monitoring.do?dispatch=showWiki&toolSessionID=${sessionDTO.sessionID}&currentWikiPageId=${currentWikiPage.uid}&contentFolderID=${contentFolderID}"
 		window.location=url;
 	}
 	
--->
-</script>
-
-
-
-
+</script>
\ No newline at end of file