From: <jon...@us...> - 2010-10-11 18:07:32
|
Revision: 29944 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=29944&view=rev Author: jonnybradley Date: 2010-10-11 18:07:26 +0000 (Mon, 11 Oct 2010) Log Message: ----------- [FIX] wiki & ckeditors: Use correct is_html option for parse_data when showing preview or switching modes to wysiwyg form wiki. Modified Paths: -------------- branches/6.x/lib/wiki/editlib.php branches/6.x/tiki-auto_save.php branches/6.x/tiki-editpage.php Modified: branches/6.x/lib/wiki/editlib.php =================================================================== --- branches/6.x/lib/wiki/editlib.php 2010-10-11 17:41:57 UTC (rev 29943) +++ branches/6.x/lib/wiki/editlib.php 2010-10-11 18:07:26 UTC (rev 29944) @@ -201,13 +201,13 @@ return $parsed; } - function parseToWysiwyg( $inData ) { + function parseToWysiwyg( $inData, $fromWiki = false ) { global $tikilib, $tikiroot, $prefs; // Parsing page data for wysiwyg editor $inData = $this->partialParseWysiwygToWiki($inData); // remove any wysiwyg plugins so they don't get double parsed $parsed = preg_replace('/(!!*)[\+\-]/m','$1', $inData); // remove show/hide headings $parsed = $tikilib->parse_data( $parsed, array( 'absolute_links'=>true, 'noheaderinc'=>true, 'suppress_icons' => true, - 'ck_editor' => true, 'is_html' => ($prefs['wysiwyg_htmltowiki'] === 'n'))); + 'ck_editor' => true, 'is_html' => ($prefs['wysiwyg_htmltowiki'] === 'n' && !$fromWiki))); $parsed = preg_replace('/<span class=\"img\">(.*?)<\/span>/im','$1', $parsed); // remove spans round img's return $parsed; Modified: branches/6.x/tiki-auto_save.php =================================================================== --- branches/6.x/tiki-auto_save.php 2010-10-11 17:41:57 UTC (rev 29943) +++ branches/6.x/tiki-auto_save.php 2010-10-11 18:07:26 UTC (rev 29944) @@ -78,8 +78,8 @@ } $data = $editlib->partialParseWysiwygToWiki(get_autosave($_REQUEST['editor_id'], $_REQUEST['autoSaveId'])); $smarty->assign( 'diff_style', $_REQUEST['diff_style'] ); + global $tikilib; if (!empty($_REQUEST['diff_style'])) { - global $tikilib; $info = $tikilib->get_page_info($autoSaveIdParts[2]); if (!empty($info)) { require_once('lib/diff/difflib.php'); @@ -90,7 +90,8 @@ $data = $smarty->fetch('pagehistory.tpl'); } } else { - $data = $tikilib->parse_data_raw($data); + $info = $tikilib->get_page_info($autoSaveIdParts[2], false); + $data = $tikilib->parse_data($data, array('is_html' => ($info['is_html'] == 1), 'preview_mode'=>true)); } echo $data; Modified: branches/6.x/tiki-editpage.php =================================================================== --- branches/6.x/tiki-editpage.php 2010-10-11 17:41:57 UTC (rev 29943) +++ branches/6.x/tiki-editpage.php 2010-10-11 18:07:26 UTC (rev 29944) @@ -839,7 +839,7 @@ } elseif (isset($_REQUEST['mode_wysiwyg']) && $_REQUEST['mode_wysiwyg'] === 'y') { // Parsing page data as first time seeing wiki page in wysiwyg editor $smarty->assign('msg', "Parsing wiki to html"); - $parsed = $editlib->parseToWysiwyg($edit_data); + $parsed = $editlib->parseToWysiwyg($edit_data, true); if ($prefs['wysiwyg_htmltowiki'] === 'y') { $is_html = false; $info['is_html'] = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |