From e9c22df148c7c0ba24548eb5df9170f677e65896 Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sun, 10 Feb 2008 22:51:33 +0000 Subject: [PATCH] Remove unnecessary includes: includes now works. git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1546 48356398-32a2-884e-a903-53898d9a118a --- TODO | 6 ++---- library/HTMLPurifier/ConfigSchema.php | 6 ------ tests/index.php | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/TODO b/TODO index 4bd56503..c55ceaa1 100644 --- a/TODO +++ b/TODO @@ -12,13 +12,11 @@ amount of effort to implement, it may get endlessly delayed. Do not be afraid to cast your vote for the next feature to be implemented! IMPORTANT - - Put our new configuration thing into effect - - Get rid of the manual includes in ConfigSchema (this means changing - generate-includes.php too) - Get everything into configuration objects (filters, I'm looking at you) - Factor demo.php into a set of Printer classes, and then create a stub file for users here - - Test HTMLPurifier.auto.php + - Test HTMLPurifier.auto.php, HTMLPurifier.includes.php, and combinations + of the two. 3.1 release [Error'ed] # Error logging for filtering/cleanup procedures diff --git a/library/HTMLPurifier/ConfigSchema.php b/library/HTMLPurifier/ConfigSchema.php index df11a54e..ac473675 100644 --- a/library/HTMLPurifier/ConfigSchema.php +++ b/library/HTMLPurifier/ConfigSchema.php @@ -2,12 +2,6 @@ if (!defined('HTMLPURIFIER_SCHEMA_STRICT')) define('HTMLPURIFIER_SCHEMA_STRICT', false); -// REMOVE THESE LATER: -require_once 'HTMLPurifier/ConfigDef.php'; -require_once 'HTMLPurifier/ConfigDef/Directive.php'; -require_once 'HTMLPurifier/ConfigDef/DirectiveAlias.php'; -require_once 'HTMLPurifier/ConfigDef/Namespace.php'; - /** * Configuration definition, defines directives and their defaults. * @note If you update this, please update Printer_ConfigForm diff --git a/tests/index.php b/tests/index.php index 42439503..06445037 100755 --- a/tests/index.php +++ b/tests/index.php @@ -54,6 +54,7 @@ if ($AC['standalone']) { } else { set_include_path(realpath('../library') . PATH_SEPARATOR . get_include_path() ); require_once 'HTMLPurifier.auto.php'; + require_once 'HTMLPurifier.includes.php'; } require_once 'HTMLPurifier/Harness.php';