diff options
| author | Nick Palmer <nick@sluggardy.net> | 2007-06-07 00:36:02 +0000 |
|---|---|---|
| committer | Nick Palmer <nick@sluggardy.net> | 2007-06-07 00:36:02 +0000 |
| commit | 1732ef99fd1dcb3478b69a284b0a206d778ab2d1 (patch) | |
| tree | a5a99b765dcb10d2b5fab98432c5de43f8ccf8c7 /plugins/format.tikiwiki.php | |
| parent | 200bbf6445c4c1898331f1704fbf2b589891c802 (diff) | |
| download | liberty-1732ef99fd1dcb3478b69a284b0a206d778ab2d1.tar.gz liberty-1732ef99fd1dcb3478b69a284b0a206d778ab2d1.tar.bz2 liberty-1732ef99fd1dcb3478b69a284b0a206d778ab2d1.zip | |
Fix double escape in comments. Add Force Allow HTML feature to deal with
wysiwyg editors better.
Diffstat (limited to 'plugins/format.tikiwiki.php')
| -rw-r--r-- | plugins/format.tikiwiki.php | 6 |
1 files changed, 3 insertions, 3 deletions
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' ); } |