diff --git a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php index d7df56ae..a8db5c08 100644 --- a/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php +++ b/library/HTMLPurifier/ConfigSchema/InterchangeBuilder.php @@ -42,7 +42,7 @@ class HTMLPurifier_ConfigSchema_InterchangeBuilder $parser = new HTMLPurifier_StringHashParser(); $this->build( $interchange, - new HTMLPurifier_StringHash( $parser->parseFile($dir . $file) ) + new HTMLPurifier_StringHash( $parser->parseFile($file) ) ); } diff --git a/plugins/phorum/config.default.php b/plugins/phorum/config.default.php index 1b9e9381..e047c0b4 100644 --- a/plugins/phorum/config.default.php +++ b/plugins/phorum/config.default.php @@ -3,7 +3,7 @@ if(!defined("PHORUM")) exit; // default HTML Purifier configuration settings -$config->set('HTML', 'Allowed', +$config->set('HTML.Allowed', // alphabetically sorted 'a[href|title] abbr[title] @@ -45,13 +45,13 @@ tt u ul var'); -$config->set('AutoFormat', 'AutoParagraph', true); -$config->set('AutoFormat', 'Linkify', true); -$config->set('HTML', 'Doctype', 'XHTML 1.0 Transitional'); -$config->set('Core', 'AggressivelyFixLt', true); -$config->set('Core', 'Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll change this eventually +$config->set('AutoFormat.AutoParagraph', true); +$config->set('AutoFormat.Linkify', true); +$config->set('HTML.Doctype', 'XHTML 1.0 Transitional'); +$config->set('Core.AggressivelyFixLt', true); +$config->set('Core.Encoding', $GLOBALS['PHORUM']['DATA']['CHARSET']); // we'll change this eventually if (strtolower($GLOBALS['PHORUM']['DATA']['CHARSET']) !== 'utf-8') { - $config->set('Core', 'EscapeNonASCIICharacters', true); + $config->set('Core.EscapeNonASCIICharacters', true); } // vim: et sw=4 sts=4