Index: lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
===================================================================
diff -u -r86d10888b85d470c6f61a8017168fe97f632fb55 -r4b8cea74035b17a81af0b29e54877b2f027641dd
--- lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp	(.../fck_wikilink.jsp)	(revision 86d10888b85d470c6f61a8017168fe97f632fb55)
+++ lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp	(.../fck_wikilink.jsp)	(revision 4b8cea74035b17a81af0b29e54877b2f027641dd)
@@ -26,9 +26,8 @@
 var FCKWikiLinks = oEditor.FCKWikiLinks ;
 
 // Get the array of possible wiki links from the opening window
-wikiArray = window.top.opener.parent.wikiLinkArray;
+wikiArray = window.parent.InnerDialogLoaded().FCK.wikiLinkArray
 
-
 function init()
 {
 	// First of all, translate the dialog box texts
Index: lams_tool_wiki/web/pages/authoring/basic.jsp
===================================================================
diff -u -r17bc5f0af3cf849188b294cb7f1fe761f45585ca -r4b8cea74035b17a81af0b29e54877b2f027641dd
--- lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 17bc5f0af3cf849188b294cb7f1fe761f45585ca)
+++ lams_tool_wiki/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 4b8cea74035b17a81af0b29e54877b2f027641dd)
@@ -201,13 +201,31 @@
 <!--
 	var wikiLinkArray = new Array();
 	populateWikiLinkArray();
+	
+	
 	function populateWikiLinkArray()
 	{
 		<c:forEach var="wikiPage" items="${wikiPages}">
 			wikiLinkArray[wikiLinkArray.length] = '${wikiPage.javaScriptTitle}';
 		</c:forEach>
+		
+		
 	}
 	
+	/*
+	window.onload = function () {
+		<c:forEach var="wikiPage" items="${wikiPages}">
+			wikiLinkArray[wikiLinkArray.length] = '${wikiPage.javaScriptTitle}';
+		</c:forEach>
+		
+		var oEditor = FCKeditorAPI.GetInstance('wikiBody');
+		var oEditor2 = FCKeditorAPI.GetInstance('newPageWikiBody');
+		
+		oEditor.wikiLinkArray = wikiLinkArray;
+		oEditor2.wikiLinkArray = wikiLinkArray;
+	}
+	*/
+	
 	function doEditOrAdd(dispatch)
 	{
 		var title="";
@@ -253,6 +271,11 @@
 		document.getElementById("authoringForm").submit();
 	}
 	
+	function FCKeditor_OnComplete(editorInstance) 
+	{ 	
+		editorInstance.wikiLinkArray = wikiLinkArray;
+	}
+	
 -->
 </script>
 
Index: lams_tool_wiki/web/pages/learning/wiki.jsp
===================================================================
diff -u -r17bc5f0af3cf849188b294cb7f1fe761f45585ca -r4b8cea74035b17a81af0b29e54877b2f027641dd
--- lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 17bc5f0af3cf849188b294cb7f1fe761f45585ca)
+++ lams_tool_wiki/web/pages/learning/wiki.jsp	(.../wiki.jsp)	(revision 4b8cea74035b17a81af0b29e54877b2f027641dd)
@@ -401,6 +401,8 @@
 		if (!${wikiDTO.allowLearnerInsertLinks}) {	
 			hideToolbarItem(editorInstance, 'Link');
 		}
+		
+		editorInstance.wikiLinkArray = wikiLinkArray;
 	}
 
 -->
Index: lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
===================================================================
diff -u -r17bc5f0af3cf849188b294cb7f1fe761f45585ca -r4b8cea74035b17a81af0b29e54877b2f027641dd
--- lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 17bc5f0af3cf849188b294cb7f1fe761f45585ca)
+++ lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp	(.../wikiDisplay.jsp)	(revision 4b8cea74035b17a81af0b29e54877b2f027641dd)
@@ -296,6 +296,11 @@
 		document.getElementById("monitoringForm").submit();
 	}
 	
+	function FCKeditor_OnComplete(editorInstance) 
+	{ 	
+		editorInstance.wikiLinkArray = wikiLinkArray;
+	}
+	
 -->
 </script>