mirror/php-htmlpurifier
1
0
Fork 0
mirror of https://github.com/ezyang/htmlpurifier.git synced 2025-07-12 02:06:18 +02:00
Code Issues Releases Wiki Activity

- Rename Duplicate to Unique, as the name of validator indicates what we want the input to be

Browse Source 
- Enable flush to work when includes are renamed

git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/trunk@1597 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
Edward Z. Yang
2008-03-04 04:20:55 +00:00
parent 4c798bd17e
commit 14437cbf47
7 changed files with 15 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/HTMLPurifier/ConfigSchema.php
View File

@ -158,22 +158,6 @@ class HTMLPurifier_ConfigSchema {
* @param $description Description of the namespace
*/
public function addNamespace($namespace, $description) {
if (HTMLPURIFIER_SCHEMA_STRICT) {
if (isset($this->info[$namespace])) {
trigger_error('Cannot redefine namespace', E_USER_ERROR);
return;
}
if (!ctype_alnum($namespace)) {
trigger_error('Namespace name must be alphanumeric',
E_USER_ERROR);
return;
}
if (empty($description)) {
trigger_error('Description must be non-empty',
E_USER_ERROR);
return;
}
}
$this->info[$namespace] = array();
$this->info_namespace[$namespace] = new HTMLPurifier_ConfigDef_Namespace();
$this->info_namespace[$namespace]->description = $description;

2
library/HTMLPurifier/ConfigSchema/Interchange.php
View File

@ -60,7 +60,7 @@ class HTMLPurifier_ConfigSchema_Interchange
// Common validators
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Exists('ID'));
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Duplicate());
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Unique());
$validator->addValidator(new HTMLPurifier_ConfigSchema_Validator_Exists('DESCRIPTION'));
// Namespace validators

2
library/HTMLPurifier/ConfigSchema/Validator/Duplicate.php → library/HTMLPurifier/ConfigSchema/Validator/Unique.php
View File

@ -6,7 +6,7 @@
* Although this tests both possible values, in practice the ID
* will only be in one or the other. We do this to keep things simple.
*/
class HTMLPurifier_ConfigSchema_Validator_Duplicate extends HTMLPurifier_ConfigSchema_Validator
class HTMLPurifier_ConfigSchema_Validator_Unique extends HTMLPurifier_ConfigSchema_Validator
{
public function validate(&$arr, $interchange) {