mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-08-03 20:58:11 +02:00
Code Issues Releases Wiki Activity

[3.1.0] Remove multi-description functionality as well as file detection.

Browse Source 
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1525 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-01-27 20:21:31 +00:00
parent 3baf1774b2
commit a74a590f1c
6 changed files with 78 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/HTMLPurifier/ConfigSchema.php
View File

@@ -135,13 +135,8 @@ class HTMLPurifier_ConfigSchema {
if (isset($this->info[$namespace][$name])) {
// already defined
if (
$this->info[$namespace][$name]->type !== $type ||
$this->defaults[$namespace][$name] !== $default
) {
trigger_error('Inconsistent default or type, cannot redefine');
return;
}
trigger_error('Cannot redefine directive');
return;
} else {
// needs defining
@@ -172,11 +167,7 @@ class HTMLPurifier_ConfigSchema {
$this->defaults[$namespace][$name] = $default;
}
if (!HTMLPURIFIER_SCHEMA_STRICT) return;
// This will be removed soon:
$backtrace = debug_backtrace();
$file = $this->mungeFilename($backtrace[1]['file']);
$line = $backtrace[1]['line'];
$this->info[$namespace][$name]->addDescription($file,$line,$description);
$this->info[$namespace][$name]->description = $description;
}
/** @see HTMLPurifier_ConfigSchema->addNamespace() */