From 1732ef99fd1dcb3478b69a284b0a206d778ab2d1 Mon Sep 17 00:00:00 2001
From: Nick Palmer <nick@sluggardy.net>
Date: Thu, 7 Jun 2007 00:36:02 +0000
Subject: Fix double escape in comments. Add Force Allow HTML feature to deal
 with wysiwyg editors better.

---
 plugins/format.tikiwiki.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/format.tikiwiki.php')

diff --git a/plugins/format.tikiwiki.php b/plugins/format.tikiwiki.php
index c67f260..992ddd8 100644
--- a/plugins/format.tikiwiki.php
+++ b/plugins/format.tikiwiki.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version  $Revision: 1.95 $
+ * @version  $Revision: 1.96 $
  * @package  liberty
  */
 global $gLibertySystem;
@@ -756,9 +756,9 @@ class TikiWikiParser extends BitBase {
 		}
 
 		// disable HTML in wiki page for now - very disruptive. should be changed into a per page setting - xing
-		if( !empty( $contentPrefs['content_enter_html'] ) ) {
+		if( $gBitSystem->isFeatureActive('content_force_allow_html') || ($gBitSystem->isFeatureActive('content_allow_html') && !empty( $contentPrefs['content_enter_html'] ) ) ) {
 		    $data = $gLibertySystem->purifyHtml($data);
-		} elseif( !$gBitSystem->isFeatureActive( 'content_allow_html' ) ) {
+		} else {
 			// convert HTML to chars
 			$data = htmlspecialchars( $data, ENT_NOQUOTES, 'UTF-8' );
 		}
-- 
cgit v1.3