Thread:Extension talk:WYSIWYG/Conflict page: current contents of page is displayed as wikitext in wysiwyg editor

Conflict page is page displayed for the last author of the page at save time in case somebody else has saved the page during edit time of first author and if they both were editing same parts of the page.

I was able to fix this problem in #6 bundle by forcing edit mode of current page contents to wikitext/WikiEditor in case conflict page is displayed.

Before my fix for conflict page, current contents of page was using wysiwyg, but text inside it was string of wikitext. I initially tried to fix this by changing wikitext to html, but I could not find a way to insert html text into wysiwyg editor area. There are 3 sections on page: first section is current contents of page displayed in wysiwyg editor, second section is differences part (side by side as wikitext) and then "my modified page" as wikitext in third section of the page.

I tried to put my modifications in function onEditPageBeforeConflictDiff of CKeditor.body.php, another possible place would perhaps be onEditPageShowEditFormFields...the place was not an issue. All my efforts replaced the text either in second differences part or in third section. I was unable to insert the html text into wysiwyg editor area on conflict page (=current contents of page).

Any ideas how this could be done on page of conflicts ?