From: <jon...@us...> - 2012-10-03 14:25:59
|
Revision: 43262 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=43262&view=rev Author: jonnybradley Date: 2012-10-03 14:25:50 +0000 (Wed, 03 Oct 2012) Log Message: ----------- [FIX] articles: More corrections for html decision in print, received and plugin (article_body_is_html pref was removed a while ago - thanks marclaporte) Modified Paths: -------------- branches/9.x/lib/wiki-plugins/wikiplugin_articles.php branches/9.x/tiki-print_article.php branches/9.x/tiki-received_articles.php Modified: branches/9.x/lib/wiki-plugins/wikiplugin_articles.php =================================================================== --- branches/9.x/lib/wiki-plugins/wikiplugin_articles.php 2012-10-03 14:13:38 UTC (rev 43261) +++ branches/9.x/lib/wiki-plugins/wikiplugin_articles.php 2012-10-03 14:25:50 UTC (rev 43262) @@ -347,7 +347,7 @@ $listpages["data"][$i]["parsed_heading"] = $tikilib->parse_data($listpages["data"][$i]["heading"], array('min_one_paragraph' => true)); if ($fullbody == 'y') { $listpages["data"][$i]["parsed_body"] = $tikilib->parse_data($listpages["data"][$i]["body"], array('min_one_paragraph' => true, - 'is_html' => isset($prefs['article_body_is_html']) && $prefs['article_body_is_html'] === 'y')); + 'is_html' => $prefs['feature_wysiwyg'] === 'y' && $prefs['wysiwyg_htmltowiki'] !== 'y')); } $comments_prefix_var='article:'; $comments_object_var=$listpages["data"][$i]["articleId"]; Modified: branches/9.x/tiki-print_article.php =================================================================== --- branches/9.x/tiki-print_article.php 2012-10-03 14:13:38 UTC (rev 43261) +++ branches/9.x/tiki-print_article.php 2012-10-03 14:25:50 UTC (rev 43262) @@ -57,7 +57,7 @@ $smarty->assign('edit_data', 'y'); $body = $article_data["body"]; $heading = $article_data["heading"]; - $smarty->assign('parsed_body', $tikilib->parse_data($body, array('is_html' => $prefs['article_body_is_html'] === 'y'))); + $smarty->assign('parsed_body', $tikilib->parse_data($body, array('is_html' => $prefs['feature_wysiwyg'] === 'y' && $prefs['wysiwyg_htmltowiki'] !== 'y'))); $smarty->assign('parsed_heading', $tikilib->parse_data($heading)); } ask_ticket('print-article'); Modified: branches/9.x/tiki-received_articles.php =================================================================== --- branches/9.x/tiki-received_articles.php 2012-10-03 14:13:38 UTC (rev 43261) +++ branches/9.x/tiki-received_articles.php 2012-10-03 14:25:50 UTC (rev 43262) @@ -112,7 +112,7 @@ $smarty->assign('rating', $info["rating"]); // Assign parsed $smarty->assign('parsed_heading', $tikilib->parse_data($info["heading"])); -$smarty->assign('parsed_body', $tikilib->parse_data($info["body"], array('is_html' => $prefs['article_body_is_html'] === 'y'))); +$smarty->assign('parsed_body', $tikilib->parse_data($info["body"], array('is_html' => $prefs['feature_wysiwyg'] === 'y' && $prefs['wysiwyg_htmltowiki'] !== 'y'))); if (isset($_REQUEST["remove"])) { $access->check_authenticity(); $commlib->remove_received_article($_REQUEST["remove"]); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |