0
0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2024-09-19 10:45:18 +00:00

Fix two minor bugs, updating Phorum and removing unused $dir variable.

Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com>
This commit is contained in:
Edward Z. Yang 2009-05-27 01:17:23 -04:00
parent a2885181df
commit 4a87f732ca
2 changed files with 8 additions and 8 deletions

View File

@ -42,7 +42,7 @@ class HTMLPurifier_ConfigSchema_InterchangeBuilder
$parser = new HTMLPurifier_StringHashParser(); $parser = new HTMLPurifier_StringHashParser();
$this->build( $this->build(
$interchange, $interchange,
new HTMLPurifier_StringHash( $parser->parseFile($dir . $file) ) new HTMLPurifier_StringHash( $parser->parseFile($file) )
); );
} }

View File

@ -3,7 +3,7 @@
if(!defined("PHORUM")) exit; if(!defined("PHORUM")) exit;
// default HTML Purifier configuration settings // default HTML Purifier configuration settings
$config->set('HTML', 'Allowed', $config->set('HTML.Allowed',
// alphabetically sorted // alphabetically sorted
'a[href|title] 'a[href|title]
abbr[title] abbr[title]
@ -45,13 +45,13 @@ tt
u u
ul ul
var'); var');
$config->set('AutoFormat', 'AutoParagraph', true); $config->set('AutoFormat.AutoParagraph', true);
$config->set('AutoFormat', 'Linkify', true); $config->set('AutoFormat.Linkify', true);
$config->set('HTML', 'Doctype', 'XHTML 1.0 Transitional'); $config->set('HTML.Doctype', 'XHTML 1.0 Transitional');
$config->set('Core', 'AggressivelyFixLt', true); $config->set('Core.AggressivelyFixLt', true);
$config->set('Core', 'Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll change this eventually $config->set('Core.Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll change this eventually
if (strtolower($GLOBALS['PHORUM']['DATA']['CHARSET']) !== 'utf-8') { if (strtolower($GLOBALS['PHORUM']['DATA']['CHARSET']) !== 'utf-8') {
$config->set('Core', 'EscapeNonASCIICharacters', true); $config->set('Core.EscapeNonASCIICharacters', true);
} }
// vim: et sw=4 sts=4 // vim: et sw=4 sts=4